Index: xotcl/Makefile
===================================================================
diff -u -r8378485a74867cfbd1bbc4d6d0fd1b2919f205c3 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/Makefile	(.../Makefile)	(revision 8378485a74867cfbd1bbc4d6d0fd1b2919f205c3)
+++ xotcl/Makefile	(.../Makefile)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -12,24 +12,24 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: Makefile,v 1.35 2005/01/14 23:45:58 neumann Exp $
+# RCS: @(#) $Id: Makefile,v 1.36 2005/09/09 21:07:22 neumann Exp $
 
 #========================================================================
 # Add additional lines to handle any additional AC_SUBST cases that
 # have been added in a customized configure script.
 #========================================================================
 
-#XOTCL_VERSION 	= 1.3.5
+#XOTCL_VERSION 	= 1.3.7
 XOTCL_VERSION 	= 1.3
 
 src_lib_dir 	= ${srcdir}/library
 src_doc_dir 	= ${srcdir}/doc
 src_test_dir 	= ${srcdir}/tests
 src_app_dir 	= ${srcdir}/apps
 src_generic_dir = ${srcdir}/generic
-TCL_LIB_SPEC    = -L/home/neumann/import/tcl8.4.9/unix -ltcl8.4
-TK_LIB_SPEC	= 
-subdirs		= 
+TCL_LIB_SPEC    = -L/usr/local/lib -ltcl8.4
+TK_LIB_SPEC	= -L/usr/local/lib -ltk8.4
+subdirs		=  library/store/XOTclSdbm/ library/store/XOTclGdbm/ library/xml/TclExpat-1.1/
 aol_prefix	= /usr/local/aolserver
 
 # Requires native paths
@@ -42,9 +42,9 @@
 src_app_dir_native	= `echo ${src_app_dir}`
 src_generic_dir_native	= `echo ${src_generic_dir}`
 
-libdirs = comm lib serialize 
+libdirs = comm lib serialize actiweb rdf registry store xml patterns
 libsrc 	= COPYRIGHT pkgIndex.tcl 
-appdirs = comm scripts utils 
+appdirs = comm scripts utils actiweb persistence
 appsrc 	= COPYRIGHT 
 
 DOC_SOURCE = \
@@ -98,23 +98,23 @@
 # configuration options) composed of the named objects.
 #========================================================================
 
-PKG_LIB_FILE	= libxotcl1.3.5.so
-PKG_STUB_LIB_FILE = libxotclstub1.3.5.a
+PKG_LIB_FILE	= libxotcl1.3.7.dylib
+PKG_STUB_LIB_FILE = libxotclstub1.3.7.a
 
 lib_BINARIES	= $(PKG_LIB_FILE) $(PKG_STUB_LIB_FILE)
 BINARIES	= $(lib_BINARIES)
 
 SHELL		= /bin/sh
 
 srcdir		= .
-prefix		= /usr
-exec_prefix	= /usr
+prefix		= /usr/local
+exec_prefix	= /usr/local
 
 bindir		= ${exec_prefix}/bin
-libdir		= /usr/lib
-datadir		= /usr/share
+libdir		= /usr/local/lib
+datadir		= /usr/local/share
 mandir		= ${prefix}/man
-includedir	= /usr/include
+includedir	= /usr/local/include
 
 DESTDIR		=
 
@@ -126,36 +126,36 @@
 INSTALL_SCRIPT	= ${INSTALL}
 
 PACKAGE_NAME	= xotcl
-PACKAGE_VERSION	= 1.3.5
+PACKAGE_VERSION	= 1.3.7
 CC		= gcc -pipe
-CFLAGS_DEFAULT	= -O
-CFLAGS_WARNING	= -Wall -Wconversion -Wno-implicit-int
+CFLAGS_DEFAULT	= -Os
+CFLAGS_WARNING	= -Wall -Wno-implicit-int
 CLEANFILES	= *.o *.a *.so *~ core gmon.out
 EXEEXT		= 
-LDFLAGS_DEFAULT	= -rdynamic
-MAKE_LIB	= ${SHLIB_LD} -o $@ $(PKG_OBJECTS) ${SHLIB_LD_FLAGS} ${SHLIB_LD_LIBS} 
-MAKE_SHARED_LIB	= ${SHLIB_LD} -o $@ $(PKG_OBJECTS) ${SHLIB_LD_FLAGS} ${SHLIB_LD_LIBS}
+LDFLAGS_DEFAULT	=  -prebind -Wl,-search_paths_first
+MAKE_LIB	= ${SHLIB_LD} -o $@ $(PKG_OBJECTS) ${SHLIB_LD_LIBS} 
+MAKE_SHARED_LIB	= ${SHLIB_LD} -o $@ $(PKG_OBJECTS) ${SHLIB_LD_LIBS}
 MAKE_STATIC_LIB	= ${STLIB_LD} $@ $(PKG_OBJECTS)
 MAKE_STUB_LIB	= ${STLIB_LD} $@ $(PKG_STUB_OBJECTS)
 OBJEXT		= o
 RANLIB		= :
 RANLIB_STUB	= ranlib
-SHLIB_CFLAGS	= -fPIC
-SHLIB_LD	= gcc -pipe -shared
-SHLIB_LD_FLAGS	= 
-SHLIB_LD_LIBS	= ${LIBS} -L/home/neumann/import/tcl8.4.9/unix -ltclstub8.4
+SHLIB_CFLAGS	= -fno-common
+SHLIB_LD	= cc -dynamiclib ${LDFLAGS}
+SHLIB_LD_FLAGS	= @SHLIB_LD_FLAGS@
+SHLIB_LD_LIBS	= ${LIBS} -L/usr/local/lib -ltclstub8.4 -L/usr/local/lib -ltkstub8.4
 STLIB_LD	= ${AR} cr
-TCL_DEFS	=  -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_ATFORK=1 -DHAVE_READDIR_R=1 -DHAVE_THREE_ARG_READDIR_R=1 -DPEEK_XCLOSEIM=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_OPEN64=1 -DHAVE_LSEEK64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_SYS_IOCTL_H=1 
-TCL_BIN_DIR	= /home/neumann/tcl8.4.9/unix
-TCL_SRC_DIR	= /home/neumann/import/tcl8.4.9
+TCL_DEFS	=  -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DTCL_WIDE_INT_TYPE=long\ long -DWORDS_BIGENDIAN=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DNO_VALUES_H=1 -DNO_DLFCN_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -Dsocklen_t=unsigned -DHAVE_SIGNED_CHAR=1 -DHAVE_PUTENV_THAT_COPIES=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1 
+TCL_BIN_DIR	= /usr/local/lib
+TCL_SRC_DIR	= /Volumes/MacOS/Users/jago/tcl8.4.4
 # This is necessary for packages that use private Tcl headers
 #TCL_TOP_DIR_NATIVE	= $(TCL_SRC_DIR)
 # Not used, but retained for reference of what libs Tcl required
 TCL_LIBS	= ${DL_LIBS} ${LIBS} ${MATH_LIBS}
 
-pkgdatadir	= /usr/share/xotcl1.3.5
-pkglibdir	= /usr/lib/xotcl1.3.5
-pkgincludedir	= /usr/include/xotcl1.3.5
+pkgdatadir	= /usr/local/share/xotcl1.3.7
+pkglibdir	= /usr/local/lib/xotcl1.3.7
+pkgincludedir	= /usr/local/include/xotcl1.3.7
 
 #========================================================================
 # TCLLIBPATH seeds the auto_path in Tcl's init.tcl so we can test our
@@ -166,23 +166,23 @@
 
 EXTRA_PATH	= $(top_builddir):$(TCL_BIN_DIR)
 TCLSH_ENV	= TCL_LIBRARY=`echo $(TCL_SRC_DIR)/library` \
-		  LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \
+		  DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \
 		  PATH="$(EXTRA_PATH):$(PATH)" \
 		  TCLLIBPATH="$(top_builddir) ${srcdir}"
-TCLSH_PROG	= /home/neumann/tcl8.4.9/unix/tclsh
+TCLSH_PROG	= /usr/bin/tclsh8.4.4
 TCLSH		= $(TCLSH_ENV) $(TCLSH_PROG)
 SHARED_BUILD	= 1
 
 INCLUDES	=  -I$(TCL_SRC_DIR)/generic -I$(TCL_SRC_DIR)/unix -I./generic
-EXTRA_CFLAGS	=   -DXOTCLVERSION=\"1.3\" -DXOTCLPATCHLEVEL=\".5\" 	 -DHAVE_TCL_COMPILE_H=1
+EXTRA_CFLAGS	=  -DXOTCLVERSION=\"1.3\" -DXOTCLPATCHLEVEL=\".7\" 	 
 
 # TCL_DEFS is not strictly need here, but if you remove it, then you
 # must make sure that configure.in checks for the necessary components
 # that your library may use.  TCL_DEFS can actually be a problem if
 # you do not compile with a similar machine setup as the Tcl core was
 # compiled with.
-#DEFS		= $(TCL_DEFS) -DPACKAGE_NAME=\"xotcl\" -DPACKAGE_TARNAME=\"xotcl\" -DPACKAGE_VERSION=\"1.3.5\" -DPACKAGE_STRING=\"xotcl\ 1.3.5\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1 -DCOMPILE_XOTCL_STUBS=1  $(EXTRA_CFLAGS)
-DEFS		= -DPACKAGE_NAME=\"xotcl\" -DPACKAGE_TARNAME=\"xotcl\" -DPACKAGE_VERSION=\"1.3.5\" -DPACKAGE_STRING=\"xotcl\ 1.3.5\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1 -DCOMPILE_XOTCL_STUBS=1  $(EXTRA_CFLAGS) 
+#DEFS		= $(TCL_DEFS) -DPACKAGE_NAME=\"xotcl\" -DPACKAGE_TARNAME=\"xotcl\" -DPACKAGE_VERSION=\"1.3.7\" -DPACKAGE_STRING=\"xotcl\ 1.3.7\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DWORDS_BIGENDIAN=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DTCL_WIDE_INT_TYPE=long\ long -DUSE_TCL_STUBS=1 -DCOMPILE_XOTCL_STUBS=1  $(EXTRA_CFLAGS)
+DEFS		= -DPACKAGE_NAME=\"xotcl\" -DPACKAGE_TARNAME=\"xotcl\" -DPACKAGE_VERSION=\"1.3.7\" -DPACKAGE_STRING=\"xotcl\ 1.3.7\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DWORDS_BIGENDIAN=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DTCL_WIDE_INT_TYPE=long\ long -DUSE_TCL_STUBS=1 -DCOMPILE_XOTCL_STUBS=1  $(EXTRA_CFLAGS) 
 
 CONFIG_CLEAN_FILES = Makefile xotclConfig.sh apps/utils/xotclsh apps/utils/xowish unix/xotcl.spec unix/pkgIndex.unix autom4te.cache/
 
@@ -213,7 +213,7 @@
 # of the Makefile, in the "BINARIES" variable.
 #========================================================================
 
-binaries: $(BINARIES) xotclsh  pkgIndex.tcl
+binaries: $(BINARIES) xotclsh xowish pkgIndex.tcl
 	@if test ! "x$(subdirs)" = "x" ; then dirs="$(subdirs)" ; \
 	for dir in $$dirs ; do \
 	   if (cd $$dir; $(MAKE) $@) ; then true ; else exit 1 ; fi ; \
@@ -325,7 +325,7 @@
 gdb:
 	$(TCLSH_ENV) gdb $(TCLSH_PROG) $(SCRIPT)
 
-test: binaries libraries test-core 
+test: binaries libraries test-core test-actiweb
 
 #TESTFLAGS = -srcdir $(srcdir)
 test-core: $(TCLSH_PROG)
@@ -487,7 +487,7 @@
 #========================================================================
 
 clean:  
-	-rm -rf $(BINARIES) $(CLEANFILES) xotclsh  pkgIndex.tcl ./receiver \
+	-rm -rf $(BINARIES) $(CLEANFILES) xotclsh xowish pkgIndex.tcl ./receiver \
 		$(target_doc_dir)/*-xotcl.html
 	find ${srcdir} -type f -name \*~ -exec rm \{} \;
 	@if test ! "x$(subdirs)" = "x" ; then dirs="$(subdirs)" ; \
@@ -527,6 +527,7 @@
 	    else \
 		echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
 		$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
+		ln -s $(DESTDIR)$(pkglibdir)/$$p $(DESTDIR)$(libdir)/$$p; \
 	    fi; \
 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
 	    if test "x$$ext" = "xdll"; then \
@@ -617,7 +618,7 @@
 	@echo "   setenv TCLLIBPATH \"$(TCLLIBPATH)\""
 	@echo " and"
 	@if test "x$(XOTCLSH)" = "x" ; then \
-	  echo "   /home/neumann/tcl8.4.9/unix/tclsh" ; \
+	  echo "   /usr/bin/tclsh8.4.4" ; \
 	  echo "   package require XOTcl; namespace import -force xotcl::*" ; \
 	  echo " or" ; \
 	  echo "   put the 'package require' line into your ~/.tclshrc" ; \
@@ -641,6 +642,7 @@
 	(cd ..; tar zcvf xotcl-$(PACKAGE_VERSION)-bin-linux-i686-glibc.tar.gz \
                 `find $(exec_prefix)/bin/xotclsh $(exec_prefix)/bin/xowish \
                   $(prefix)/lib/xotcl* \
+                  $(prefix)/lib/libxotcl* \
 		  $(prefix)/include/xotcl*.h \
                   $(DESTDIR)$(pkglibdir) $(prefix)/man/man1/xo* \
                 -type f -o -type l | fgrep -v CVS | fgrep -v SCCS | fgrep -v .junk| fgrep -v .db | fgrep -v "~" | fgrep -v "#" | fgrep -v /receiver/` \
Index: xotcl/Makefile.in
===================================================================
diff -u -r0896d4deb00780e48b5b03269bf9c4ecca948919 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/Makefile.in	(.../Makefile.in)	(revision 0896d4deb00780e48b5b03269bf9c4ecca948919)
+++ xotcl/Makefile.in	(.../Makefile.in)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -12,7 +12,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.14 2005/01/06 03:10:04 neumann Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.15 2005/09/09 21:07:22 neumann Exp $
 
 #========================================================================
 # Add additional lines to handle any additional AC_SUBST cases that
@@ -174,7 +174,7 @@
 SHARED_BUILD	= @SHARED_BUILD@
 
 INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@ @XOTCL_BUILD_INCLUDE_SPEC@
-EXTRA_CFLAGS	= @EXTRA_CFLAGS@ @PKG_CFLAGS@
+EXTRA_CFLAGS	= @PKG_CFLAGS@
 
 # TCL_DEFS is not strictly need here, but if you remove it, then you
 # must make sure that configure.in checks for the necessary components
@@ -188,7 +188,7 @@
 
 CPPFLAGS	= @CPPFLAGS@
 LIBS		= @PKG_LIBS@ @LIBS@
-AR		= ar
+AR		= @AR@
 CFLAGS		= @CFLAGS@
 COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 
@@ -527,6 +527,7 @@
 	    else \
 		echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
 		$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
+		ln -s $(DESTDIR)$(pkglibdir)/$$p $(DESTDIR)$(libdir)/$$p; \
 	    fi; \
 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
 	    if test "x$$ext" = "xdll"; then \
@@ -641,6 +642,7 @@
 	(cd ..; tar zcvf xotcl-$(PACKAGE_VERSION)-bin-linux-i686-glibc.tar.gz \
                 `find $(exec_prefix)/bin/xotclsh $(exec_prefix)/bin/xowish \
                   $(prefix)/lib/xotcl* \
+                  $(prefix)/lib/libxotcl* \
 		  $(prefix)/include/xotcl*.h \
                   $(DESTDIR)$(pkglibdir) $(prefix)/man/man1/xo* \
                 -type f -o -type l | fgrep -v CVS | fgrep -v SCCS | fgrep -v .junk| fgrep -v .db | fgrep -v "~" | fgrep -v "#" | fgrep -v /receiver/` \
Index: xotcl/apps/actiweb/Counter2.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/apps/actiweb/Counter2.xotcl	(.../Counter2.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/apps/actiweb/Counter2.xotcl	(.../Counter2.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,9 +1,10 @@
 #!../../src/xotclsh
-# $Id: Counter2.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: Counter2.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
 array set opts {-pkgdir .}; array set opts $argv
 lappend auto_path $opts(-pkgdir)
 
 package require XOTcl; namespace import -force xotcl::*
+
 package require xotcl::actiweb::htmlPlace
 package require xotcl::actiweb::pageTemplate
 
Index: xotcl/apps/actiweb/univ/UNIVERSAL.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/apps/actiweb/univ/UNIVERSAL.xotcl	(.../UNIVERSAL.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/apps/actiweb/univ/UNIVERSAL.xotcl	(.../UNIVERSAL.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,5 +1,5 @@
 #!/usr/local/bin/xotclsh
-#$Id: UNIVERSAL.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+#$Id: UNIVERSAL.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
 package require XOTcl; namespace import -force xotcl::*
 array set opts {
   -ssl 0 -instanceFile UNIVERSAL.rdf -cssFile UNIVERSAL.css -root . -pkgdir .}
@@ -45,10 +45,12 @@
 #
 # instantiate parser and parser an example text into a node tree
 #
+
+#puts stderr "parsing [loadFile $opts(-instanceFile)]"
 RDFParser R
 R parse [loadFile $opts(-instanceFile)]
+puts stderr "parsing done"
 
-
 #
 # load the nodetree from the parser into the triple database
 #
@@ -83,7 +85,7 @@
   set result ""
   foreach c [my info children] {
     if {![my isContainer $c] && 
-	[$c info class] != "::RDFTriple"} {lappend result $c}
+	[$c istype Resource]} {lappend result $c}
   }
   return $result
 }
@@ -97,10 +99,12 @@
   }
   return $result
 }
+
 # create an Instance of the Resource Database 
 RDFdb tv::db
 
 
+
 # define Resources with its methods
 Class Resource
 Resource instproc dump {} {
@@ -214,11 +218,11 @@
 }
 
 LrManager instproc nav {} {
-  set right  [my selfAction "catalog"]
-  set result [my html-title "Universal Navigation Bar"]
+  set right   [my selfAction "catalog"]
+  set result  [my html-title "Universal Navigation Bar"]
   set rdfsrc  [my selfAction "source $::opts(-instanceFile)"]
   set csssrc  [my selfAction "source $::opts(-root)/$::opts(-cssFile)"]
-  set src  [my selfAction "source [info script]"]
+  set src     [my selfAction "source [info script]"]
   append result <BODY>\n \
        "<IMG SRC= 'UNIVERSAL.jpg' align='center'  alt='UNIVERSAL HOME' border='0'> \n\
       <p> <a href='$right' target='Rechts'>All local Resources</a></p>
@@ -231,8 +235,8 @@
 }
 
 LrManager instproc default {} {
-  set right [my selfAction "catalog"]
-  set nav   [my selfAction "nav"]
+  set right  [my selfAction "catalog"]
+  set nav    [my selfAction "nav"]
   set result [my html-title "Universal"]
   append result "<frameset framespacing='0' border='false' frameborder='0' cols='200,*'>
   <frame name='Links'  src='$nav'>
@@ -243,21 +247,21 @@
 </frameset>"
 }
 
-
 LrManager instproc init args {
   next
   ::receiver exportObjs [self]             ;# export object
   my exportProcs details catalog nav source  ;# export methods
 }
 
 
-# create an instance of the Rearning Resource manager
+# create an instance of the Learning Resource manager
 LrManager univ
 receiver proc default {} {univ default}  ;# call it like index.html as default
 
 # Invoke Tiple Visitor to feed the database
 tv interprete
 #puts stderr [tv::db prettyTriples]
 
+
 receiver startEventLoop   ;# Start event loop
 
Index: xotcl/apps/comm/webserver.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/apps/comm/webserver.xotcl	(.../webserver.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/apps/comm/webserver.xotcl	(.../webserver.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,11 +1,16 @@
 #!../../src/xotclsh
-# $Id: webserver.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: webserver.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
 array set opts {-root ../../doc -port 8086 -protected-port 9096 -pkgdir .}
 array set opts $argv
 lappend auto_path $opts(-pkgdir)
 #if {$::tcl_platform(platform) == "windows"} {lappend auto_path .}
 package require XOTcl; namespace import -force xotcl::*
 
+proc ! string {
+  set f [open /tmp/log w+]; 
+  puts $f "[clock format [clock seconds]] $string"
+  close $f}
+
 @ @File {
   description {
     This small demo program starts two different webservers:
@@ -24,15 +29,21 @@
   }
 }
 
+! "#### webserver starting"
 # We load the following packages:
 #
+#::xotcl::package import ::xotcl::comm::httpd
 package require xotcl::comm::httpd
 
+! "#### httpd required"
+
 # now we can start the web-server instance with these settings
 #
 Httpd h1 -port $opts(-port) -root $opts(-root)
 @ Httpd h1 {description "unprotected web server"}
 
+! "#### h1 started"
+
 # specialized worker, which executes tcl commands in web pages
 @ Class SpecializedWorker { description {
   Specialized worker that can be passed to any webserver
@@ -95,9 +106,11 @@
 
 Httpd h2 -port $opts(-protected-port) -root $opts(-root) \
     -httpdWrk SpecializedWorker \
-    -mixin BasicAccessControl \
+    -mixin Httpd::BasicAccessControl \
     -addRealmEntry test "u1 test $USER test"  -protectDir test "" {} 
 
+! "#### h2 started"
+
 #
 # and finally call the event loop... 
 #
Index: xotcl/doc/langRef.xotcl
===================================================================
diff -u -r55764ef8921abb0e4f506e0ae6b0caf3f842276d -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/doc/langRef.xotcl	(.../langRef.xotcl)	(revision 55764ef8921abb0e4f506e0ae6b0caf3f842276d)
+++ xotcl/doc/langRef.xotcl	(.../langRef.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,5 +1,5 @@
-# $Id: langRef.xotcl,v 1.7 2005/01/10 11:57:35 neumann Exp $
-package provide XOTcl-langRef 1.3.3
+# $Id: langRef.xotcl,v 1.8 2005/09/09 21:07:23 neumann Exp $
+package provide XOTcl-langRef 1.3.6
 package require Tcl
 
 @ @File {
@@ -35,8 +35,10 @@
         <@li><@TT>self calledproc</@TT>: Returns method 
         name of the target proc (only applicable
         in a filter).
+        <@li><@TT>self isnextcall</@TT>: Return 1 if this method
+        was invoked via next, otherwise 0
         <@li><@TT>self next</@TT>: Return the
-         "next" method on the path as a string.
+         "next" method on the precedence path as a string.
         <@li><@TT>self filterreg</@TT>: In a filter: returns the name
        of the object/class on which the filter is registered. Returns either 
         'objName filter filterName' or 'className instfilter filterName'.
@@ -57,12 +59,17 @@
     called in a context of an instproc or an method specific proc. It allows certain 
     optimizations and shorter to write.
     <@/p><@p>
-    <@tt> next <@/tt> executes the "next" method on the precedence
-     order and return with the result.
+    <@tt>next <@/tt> invokes the next shadowed (same-named) method on the
+      precedence path and returns its result. If <@tt>next</@tt> is
+      called without arguments, the arguments of the current method
+      are passed through the called method. If <@tt>next</@tt> is 
+      invoked with the flag <@tt>--noArgs</@tt>, the shadowed method
+      is called without arguments. If other arguments are specified 
+      for next, these will be used for the call.
     <@/p>
 
   }
-  date { $Date: 2005/01/10 11:57:35 $ }
+  date { $Date: 2005/09/09 21:07:23 $ }
 }
 
 ##
@@ -370,18 +377,20 @@
       not specified, otherwise it returns 1 if classname matches the 
       object's class and 0 if not.
 
-      <@li><@TT>objName info children ?pattern?</@TT>: Returns the list of aggregated 
-      objects with fully qualified names if <@TT>pattern</@TT> was not specified, 
-      otherwise  it returns all children where the object name matches the pattern.
+      <@li><@TT>objName info children ?pattern?</@TT>: Returns the
+      list of aggregated objects with fully qualified names if
+      <@TT>pattern</@TT> was not specified, otherwise it returns all
+      children where the object name matches the pattern.
 
-      <@li><@TT>objName info commands ?pattern</@TT>: Returns all commands 
-      defined for the object if <@TT>pattern</@TT> was not specified, otherwise 
-      it returns all commands that match the pattern.
+      <@li><@TT>objName info commands ?pattern</@TT>: Returns all
+      commands defined for the object if <@TT>pattern</@TT> was not
+      specified, otherwise it returns all commands that match the
+      pattern.
 
-      <@li><@TT>objName info default method arg var</@TT>: Returns 1 if the 
-      argument <@TT>arg</@TT> of the proc (object specific method) 
-      <@TT>method</@TT> has a default 
-      value, otherwise 0. If it exists the default value is stored in <@TT>var</@TT>.
+      <@li><@TT>objName info default method arg var</@TT>: Returns 1
+      if the argument <@TT>arg</@TT> of the proc (object specific
+      method) <@TT>method</@TT> has a default value, otherwise 0. If
+      it exists the default value is stored in <@TT>var</@TT>.
 
       <@li><@TT>objName info filter</@TT>: Returns a list of filters. 
       With -guard modifier all filterguards are integrated 
@@ -430,14 +439,22 @@
       <@li><@TT>objName info pre methodName</@TT>: 
       Returns pre assertions of methodName.
 
-      <@li><@TT>objName info procs ?pattern?</@TT>: Returns all procs defined 
-      for the object if <@TT>pattern</@TT> was not specified, 
+      <@li><@TT>objName info procs ?pattern?</@TT>: Returns all procs
+      defined for the object if <@TT>pattern</@TT> was not specified,
       otherwise it returns all procs that match the pattern.
 
-      <@li><@TT>objName info vars ?pattern?</@TT>: Returns all variables defined 
-      for the object if <@TT>pattern</@TT> was not specified, otherwise it 
-      returns all variables that match the pattern.
-      <@/ul>
+      <@li><@TT>objName info precedence ?pattern?</@TT>: Returns all
+      classes in the precedence order from which the specified 
+      object inherits methods. The returned list of classes contains
+      the mixin and instmixin classes as well as the classes of the
+      superclass chain in linearized order (i.e., duplicate classes 
+      are removed). If the pattern is specified, only matching classes
+      are returned.
+
+      <@li><@TT>objName info vars ?pattern?</@TT>: Returns all
+      variables defined for the object if <@TT>pattern</@TT> was not
+      specified, otherwise it returns all variables that match the
+      pattern.  <@/ul>
     }
     return "Value of introspected option as a string."
 }
@@ -1190,6 +1207,9 @@
     of classes. After this call, XOTcl tries again to 
     resolve D. If it succeeds, XOTcl will continue; otherwise,
     an error is generated.
+    <@p>
+    This method is called on mixin/instmixin definition calls, 
+    istype, ismixin, class, superclass and parameterclass
   }
   return "empty string"
 }
Index: xotcl/doc/tutorial.html
===================================================================
diff -u -r8378485a74867cfbd1bbc4d6d0fd1b2919f205c3 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/doc/tutorial.html	(.../tutorial.html)	(revision 8378485a74867cfbd1bbc4d6d0fd1b2919f205c3)
+++ xotcl/doc/tutorial.html	(.../tutorial.html)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<!-- $Id: tutorial.html,v 1.9 2005/01/14 23:45:22 neumann Exp $ -->
+<!-- $Id: tutorial.html,v 1.10 2005/09/09 21:07:23 neumann Exp $ -->
 <HTML>
 <HEAD>
 	<TITLE>XOTcl - Tutorial</TITLE>
 	<META NAME="AUTHOR" CONTENT="Gustaf Neumann and Uwe Zdun">
-	<META NAME="DOCNUMBER" CONTENT="1.3.3">
+	<META NAME="DOCNUMBER" CONTENT="1.3.6">
 	<META NAME="CHANGEDBY" CONTENT="Gustaf ">
 <STYLE>
 BODY	{
@@ -560,17 +560,18 @@
 <P>The instance methods common to all objects are defined in the root
 class <tt>Object</tt> (predefined or user-defined). Since a class is a
 special (managing) kind of object it is managed itself by a special
-class called ``meta-class'' (which manages itself). One interesting
-aspect of meta-classes is that by providing a constructor
-pre-configured classes can be derived. New user-defined meta-classes
-can be derived from the predefined meta-class <tt>Class</tt> in order
-to restrict or enhance the abilities of the classes that they manage.
-Therefore meta-classes can be used to instantiate large program
-structures, like some design patterns (see <a
-href="#xotcl-filter">[Neumann and Zdun 1999a]</a> for more
-details). The meta-class may hold the generic parts of the
+class called ``meta-class'' (which manages itself). Meta-Classes are
+used to define classes and to provides methods for these.  Most
+classes are defined by the predefined meta-class <tt>Class</tt>. One
+interesting aspect of meta-classes is that by providing a constructor
+pre-configured classes can be derived.  Meta-classes can be used to
+instantiate large program structures, like some design patterns (see
+<a href="#xotcl-filter">[Neumann and Zdun 1999a]</a> for more
+details), where the meta-class may holds the generic parts of the
 structures. Since a meta-class is an entity of the program, it is
-possible to collect these in pattern libraries for later reuse easily.
+possible to collect these entities in pattern libraries for later
+reuse easily (more details about meta-classes are given in a later <A
+HREF="meta-classes">section</A>).
 </P>
 <P>XOTcl supports single and multiple inheritance. Classes are ordered
 by the relationship <tt>superclass</tt> in a directed acyclic
@@ -939,15 +940,22 @@
 	    the default value exists it is stored in <em>var</em>.</P>
 	  </TD>
 	</TR>
+
 	<TR>
-	  <TD><tt><em>objName</em> <tt>info</tt> procs <em>?pattern?</em></tt>
+	  <TD><tt><em>objName</em> <tt>info</tt> precedence <em>?pattern?</em></tt>
 	  </TD>
+
 	  <TD>
-	    <P ALIGN=LEFT>Returns all procs defined on the object if
-	    <em>pattern</em> was not specified, otherwise it returns
-	    all procs that match the pattern.</P>
+	    <P ALIGN=LEFT>Returns all classes in the precedence order
+	    from which the specified object inherits methods. The
+	    returned list of classes contains the mixin and instmixin
+	    classes as well as the classes of the superclass chain in
+	    linearized order (i.e., duplicate classes are removed). If
+	    the <em>pattern</em> is specified, only matching classes are
+	    returned.</P>
 	  </TD>
 	</TR>
+
 	<TR>
 	  <TD><tt><em>objName</em> <tt>info</tt> vars <em>?pattern?</em></tt>
 	  </TD>
@@ -1514,7 +1522,17 @@
 <P>Meta-classes are a special kind of classes. Similar as classes are
 managing objects (where managing means: control the creation and
 destruction of instances, know what instances exist, provide methods),
-meta-classes are managing classes. Since these concepts are sometimes
+meta-classes are managing classes. So, meta-classes are used to define
+classes. In other words, every Class in XOTcl is created by a
+meta-class, in most cases by the meta-class named <tt>Class</tt>.  New
+user-defined meta-classes can be defined as subclasses of the
+predefined meta-class <tt>Class</tt>, or by adding an instmixin class
+(see <A HREF="per-class-mixins">below</A>) containing <tt>Class</tt>
+to the precedence chain of the class.  By defining <tt>Object
+instmixin Class</tt> one can even change the object system of XOTcl in
+in a way such that every created Object is a meta-class.
+</P>
+<P>Since the concept of a meta-class are sometimes
 confusing to people of a background of some other programming
 languages, we explain meta-classes slowly with the analogy of classes
 and objects.
@@ -1808,7 +1826,8 @@
 The non-positional arguments are defined with the following syntax:
 </P>
 <pre CLASS="code">
- {-name?:checkoption1, checkoption2, ...? default value} {-name?:checkoption1, checkoption2, ...? ?default value?} ...
+ {-name?:checkoption1, checkoption2, ...? default value} \
+     {-name?:checkoption1, checkoption2, ...? ?default value?} ...
 </pre>
 <p>
 Only the name of the non-positional argument is really required, all
@@ -1821,79 +1840,82 @@
 </p>
 <pre CLASS="code">
  <tt>Object</tt> o
- o <tt>proc</tt> y {-a {-b {1 2 3}} x y} {
+ o <tt>proc</tt> someproc {-a {-b {1 2 3}} x y} {
      puts "$a $b $x $y"
  }
 </pre><P>
 We can invoke this method as follows:
 </p>
 <pre CLASS="code">
- o y -b 4 5 -a 1 3 4
+ o someproc -b {4 5} -a 1 3 4
 </pre><P>
 
-Here, the order of "a" and "b" can be changed; hence the name
-non-positional arguments.  As "b" has a default value, we do not need
-to provide a value for it. In the following invocation "b" has the
+Here, the order of <tt>a</tt> and <tt>b</tt> can be changed; hence the name
+non-positional arguments.  As <tt>b</tt> has a default value, we do not need
+to provide a value for it. In the following invocation <tt>b</tt> has the
 value "1 2 3":
 </p>
 <pre CLASS="code">
- o y -a 1 3 4
+ o someproc -a 1 3 4
 </pre><P>
 The ordinary arguments start after the last non-positional argument
 (here: "3 4").  We can explicitly end the non-positional arguments by
 using "--". This is useful if we want to provide arguments that contain 
 dashes ("-"), e.g.:
 </p>
 <pre CLASS="code">
- o y -a 1 -- -b -c
+ o someproc -a 1 -- -b -c
 </pre><P>
 
 Sometimes we want to check or control the non-positional
 arguments. For instance, in the above invocation, we might want to
-check that "a" is not forgotten, because otherwise the method cannot
+check that <tt>a</tt> is not forgotten, because otherwise the method cannot
 execute properly. This is the role of the checkoptions. There are two
-predefined checkoptions: "required" and "boolean". "required" checks
-whether a non-positional argument is given, "boolean" checks that a
+predefined checkoptions: <tt>required</tt> and <tt>boolean</tt>. 
+<tt>required</tt> checks
+whether a non-positional argument is given, <tt>boolean</tt> checks that a
 non-positional argument is of boolean type. For instance:
 </p>
 <pre CLASS="code">
-<tt>Class</tt> P
- P <tt>instproc</tt> y {-a:required {-b:boolean true}} {
+ <tt>Class</tt> P
+ P <tt>instproc</tt> someproc {-a:required {-b:boolean true}} {
      puts "$a $b"
  }
  P p
 </pre><P>
 
-This method requires "a", and "b" needs to be of type boolean (is has
-the default value "true"). This invocation is valid:
+This method requires <tt>a</tt>, and <tt>b</tt> needs to be 
+of type boolean (is has
+the default value <tt>true</tt>). This invocation is valid:
 </p>
 <pre CLASS="code">
- p y -a 1 -b 0
+ p someproc -a 1 -b 0
 </pre><P>
 
-This invocation is invalid, because "a" is missing, and "b" is not a
-Tcl boolean type:
+This invocation is invalid, because <tt>a</tt> is missing, 
+and <tt>b</tt> is not a Tcl boolean type:
 </p>
 <pre CLASS="code">
- p y -b " a b v"
+ p someproc -b " a b v"
 </pre><P>
 The checkoptions are extensible. In fact, they are defined in an
-object "::xotcl::nonposArgs". We can extend this object with new
+object <tt>::xotcl::nonposArgs</tt>. We can extend this object with new
 methods.
 <!-- and we can provide other checkobjects. -->
 A check option method has the following syntax:
 </P>
 <pre CLASS="code">
- <em>object|class</em> <tt>proc|instproc</tt> methodName {?optional arguments argName args} {
+ <em>someobject|someclass</em> <tt>proc|instproc</tt> methodName {?optional arguments? argName args} {
   ...
  }
 </pre>
 <p>
 
-"argName" is here used to denote the name of the argument, and "args"
+<tt>argName</tt> is here used to denote the name of the argument, 
+and <tt>args</tt>
 get the argument's current value after all non-positional arguments
 have been applied. If the argument it is not given and has no default
-value, "args" is empty.
+value, <tt>args</tt> is empty.
 
 </p>
 
@@ -1924,7 +1946,7 @@
 -->
 
 Of course, the non-positional arguments can also be introspected. The
-following "info" options return the non-positional arguments of a
+following <tt>info</tt> options return the non-positional arguments of a
 method:
 
 </P>
@@ -1980,120 +2002,49 @@
 detail. The table below gives an impression, when which interceptor
 may be applied.
 
-<P ALIGN=CENTER STYLE="margin-bottom: 0in"><STRONG>Message
-Interceptors Overview</STRONG></P>
-<CENTER>
-	<TABLE BORDER=1 CELLPADDING=2>
-			<TR>
+    <P ALIGN=CENTER STYLE="margin-bottom: 0in"><STRONG>Message
+	Interceptors Overview</STRONG></P>
+
+    <CENTER>
+      <TABLE BORDER=1 CELLPADDING=2>
+	<TR>
 	  <TD></TD>
-				<TD>
-					<P ALIGN=LEFT><strong>Applied When</strong</P>
-				</TD>
-				<TD>
-					<P ALIGN=LEFT><strong>Primary Target Structure</strong</P>
-				</TD>
-				<TD>
-					<P ALIGN=LEFT><strong>Coverage</strong</P>
-				</TD>
-			</TR>
-			<TR>
-				<TD>
-					<P ALIGN=LEFT><em> Per-Object Filter</em>
-					</P>
-				</TD>
-				<TD>
-					<P ALIGN=LEFT>before/after a call
-					</P>
-				</TD>
-				<TD>
-					<P ALIGN=LEFT> object
-hierarchies
-					</P>
-				</TD>
-				<TD>
-					<P ALIGN=LEFT>all methods
-					</P>
-				</TD>
-			</TR>
-			<TR>
-				<TD>
-					<P ALIGN=LEFT><em> Per-Class Filter</em>
-					</P>
-				</TD>
-				<TD>
-					<P ALIGN=LEFT>before/after a call
-					</P>
-				</TD>
-				<TD>
-					<P ALIGN=LEFT> class and class 
-hierarchies
-					</P>
-				</TD>
-				<TD>
-					<P ALIGN=LEFT>all methods
-					</P>
-				</TD>
-			</TR>
-		</TBODY>
-		<TBODY>
-			<TR>
-				<TD>
-					<P ALIGN=LEFT><em> Per-Object Mixin</em>
-					</P>
-				</TD>
-				<TD>
-					<P ALIGN=LEFT> before/after a call
-					</P>
-				</TD>
-				<TD>
-					<P ALIGN=LEFT> object
-					</P>
-				</TD>
-				<TD>
-					<P ALIGN=LEFT> specific methods
-					</P>
-				</TD>
-			</TR>
-			<TR>
-				<TD>
-					<P ALIGN=LEFT><em> Per-Class Mixin</em>
-					</P>
-				</TD>
-				<TD>
-					<P ALIGN=LEFT> before/after a call
-					</P>
-				</TD>
-				<TD>
-					<P ALIGN=LEFT> class and class 
-hierarchies
-					</P>
-				</TD>
-				<TD>
-					<P ALIGN=LEFT> specific methods
-					</P>
-				</TD>
-			</TR>
-			<TR>
-				<TD>
-					<P ALIGN=LEFT><em> Unknown Mechanism</em>
-					</P>
-				</TD>
-				<TD>
-					<P ALIGN=LEFT> after method
-was not found
-					</P>
-				</TD>
-				<TD>
-					<P ALIGN=LEFT> object
-					</P>
-				</TD>
-				<TD>
-					<P ALIGN=LEFT> all unknown calls
-					</P>
-				</TD>
-			</TR>
-	</TABLE>
-</CENTER>
+	  <TD><P ALIGN=LEFT><strong>Applied When</strong></P></TD>
+	  <TD><P ALIGN=LEFT><strong>Primary Target Structure</strong></P></TD>
+	  <TD><P ALIGN=LEFT><strong>Coverage</strong></P></TD>
+	</TR>
+	<TR>
+	  <TD><P ALIGN=LEFT><em> Per-Object Filter</em></P></TD>
+	  <TD><P ALIGN=LEFT>before/after a call</P></TD>
+	  <TD><P ALIGN=LEFT> object hierarchies</P></TD>
+	  <TD><P ALIGN=LEFT>all methods</P></TD>
+	</TR>
+	<TR>
+	  <TD><P ALIGN=LEFT><em> Per-Class Filter</em></P></TD>
+	  <TD><P ALIGN=LEFT>before/after a call</P></TD>
+	  <TD><P ALIGN=LEFT> class and class hierarchies</P></TD>
+	  <TD><P ALIGN=LEFT>all methods</P></TD>
+	</TR>
+	<TR>
+	  <TD><P ALIGN=LEFT><em> Per-Object Mixin</em></P></TD>
+	  <TD><P ALIGN=LEFT> before/after a call</P></TD>
+	  <TD><P ALIGN=LEFT> object</P></TD>
+	  <TD><P ALIGN=LEFT> specific methods</P></TD>
+	</TR>
+	<TR>
+	  <TD><P ALIGN=LEFT><em> Per-Class Mixin</em></P></TD>
+	  <TD><P ALIGN=LEFT> before/after a call</P></TD>
+	  <TD><P ALIGN=LEFT> class and class hierarchies</P></TD>
+	  <TD><P ALIGN=LEFT> specific methods</P></TD>
+	</TR>
+	<TR>
+	  <TD><P ALIGN=LEFT><em> Unknown Mechanism</em></P></TD>
+	  <TD><P ALIGN=LEFT> after method was not found</P></TD>
+	  <TD><P ALIGN=LEFT> object</P></TD>
+	  <TD><P ALIGN=LEFT> all unknown calls</P></TD>
+	</TR>
+      </TABLE>
+    </CENTER>
 
 <br>
 
@@ -2903,6 +2854,14 @@
 	  </TD>
 	</TR>
 	<TR>
+	  <TD><tt>self isnextcall</tt>
+	  </TD>
+	  <TD VALIGN=TOP>
+	    <P ALIGN=LEFT>Return 1 if this method
+              was invoked via next, otherwise 0
+	  </TD>
+	</TR>
+	<TR>
 	  <TD><tt>self next</tt>
 	  </TD>
 	  <TD VALIGN=TOP>
Index: xotcl/doc/xo-daemon.html
===================================================================
diff -u -r8378485a74867cfbd1bbc4d6d0fd1b2919f205c3 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/doc/xo-daemon.html	(.../xo-daemon.html)	(revision 8378485a74867cfbd1bbc4d6d0fd1b2919f205c3)
+++ xotcl/doc/xo-daemon.html	(.../xo-daemon.html)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -13,7 +13,7 @@
   <HR>
   <P>
     <h2> Package/File Information </h2>
-    <b> Package required: </b> XOTcl 
+    <b> No package provided/required </b>
     <BR>
     <BR>
     <b> Filename: </b>
@@ -76,7 +76,7 @@
           <em> Date:</em>
         </TD>
         <TD VALIGN="top">
-          [::xotcl::rcs date {$Date: 2005/01/14 23:45:58 $}]
+          [::xotcl::rcs date {$Date: 2005/09/09 21:07:23 $}]
         </TD>
       </TR>
     </TABLE>
Index: xotcl/doc/xo-whichPkg.html
===================================================================
diff -u -r8378485a74867cfbd1bbc4d6d0fd1b2919f205c3 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/doc/xo-whichPkg.html	(.../xo-whichPkg.html)	(revision 8378485a74867cfbd1bbc4d6d0fd1b2919f205c3)
+++ xotcl/doc/xo-whichPkg.html	(.../xo-whichPkg.html)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -13,11 +13,9 @@
   <HR>
   <P>
     <h2> Package/File Information </h2>
-    <b> Package required: </b> XOTcl 
+    <b> No package provided/required </b>
     <BR>
-    <b> Package required: </b> xotcl::package 
     <BR>
-    <BR>
     <b> Filename: </b>
     <A HREF="./apps/utils/xo-whichPkg">
       ./apps/utils/xo-whichPkg
@@ -52,7 +50,7 @@
           <em> Date:</em>
         </TD>
         <TD VALIGN="top">
-          [::xotcl::rcs date {$Date: 2005/01/14 23:45:58 $}]
+          [::xotcl::rcs date {$Date: 2005/09/09 21:07:23 $}]
         </TD>
       </TR>
     </TABLE>
Index: xotcl/generic/aol-xotcl.tcl
===================================================================
diff -u -r8378485a74867cfbd1bbc4d6d0fd1b2919f205c3 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/generic/aol-xotcl.tcl	(.../aol-xotcl.tcl)	(revision 8378485a74867cfbd1bbc4d6d0fd1b2919f205c3)
+++ xotcl/generic/aol-xotcl.tcl	(.../aol-xotcl.tcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,4 +1,4 @@
-# $Id: aol-xotcl.tcl,v 1.6 2005/01/14 23:45:22 neumann Exp $
+# $Id: aol-xotcl.tcl,v 1.7 2005/09/09 21:07:23 neumann Exp $
 
 #
 # Load XOTcl library and some related packages.
@@ -42,7 +42,7 @@
         set objects ""
     }
     ns_ictl save [append script \n \
-	"namespace import ::xotcl::*" \n \
+	"namespace import -force ::xotcl::*" \n \
 	$objects \n $import]
     if {0} {
        set f [open /tmp/__aolserver-blueprint.tcl w]
Index: xotcl/generic/predefined.h
===================================================================
diff -u -r55764ef8921abb0e4f506e0ae6b0caf3f842276d -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/generic/predefined.h	(.../predefined.h)	(revision 55764ef8921abb0e4f506e0ae6b0caf3f842276d)
+++ xotcl/generic/predefined.h	(.../predefined.h)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,5 +1,5 @@
 static char cmd[] = 
-"# $Id: predefined.h,v 1.6 2005/01/10 11:57:35 neumann Exp $\n"
+"# $Id: predefined.h,v 1.7 2005/09/09 21:07:23 neumann Exp $\n"
 "::xotcl::Object instproc init args {}\n"
 "::xotcl::Object create ::xotcl::@\n"
 "::xotcl::@ proc unknown args {}\n"
@@ -28,10 +28,10 @@
 "puts \"method '$m' unknown for [self]\"\n"
 "puts \"   valid commands are: {[lsort [my info procs]]}\"}\n"
 "::xotcl::Relations create ::xotcl::relmgr -requireNamespace\n"
-"::xotcl::Object instforward mixin -default [list get set] xotcl::relmgr %1 %self %proc\n"
-"::xotcl::Object instforward filter -default [list get set] xotcl::relmgr %1 %self %proc\n"
-"::xotcl::Class instforward instmixin -default [list get set] xotcl::relmgr %1 %self %proc\n"
-"::xotcl::Class instforward instfilter -default [list get set] xotcl::relmgr %1 %self %proc\n"
+"::xotcl::Object instforward mixin -default [list get set] ::xotcl::relmgr %1 %self %proc\n"
+"::xotcl::Object instforward filter -default [list get set] ::xotcl::relmgr %1 %self %proc\n"
+"::xotcl::Class instforward instmixin -default [list get set] ::xotcl::relmgr %1 %self %proc\n"
+"::xotcl::Class instforward instfilter -default [list get set] ::xotcl::relmgr %1 %self %proc\n"
 "::xotcl::Object instproc self {} {return [::xotcl::self]}\n"
 "::xotcl::Object instproc defaultmethod {} {\n"
 "return [::xotcl::self]}\n"
@@ -127,8 +127,7 @@
 "error \"invalid method type '$methtype', \\\n"
 "must be either 'proc' or 'instproc'.\"}\n"
 "::xotcl::my $methtype $methname $arglist \"\n"
-"if {\\[::xotcl::self callingproc\\] != \\[::xotcl::self proc\\] &&\n"
-"\\[::xotcl::self callingobject\\] != \\[::xotcl::self\\]} {\n"
+"if {!\\[::xotcl::self isnextcall\\]} {\n"
 "error \\\"Abstract method $methname $arglist called\\\"} else {::xotcl::next}\n"
 "\"}\n"
 "::xotcl::Class create ::xotcl::Object::CopyHandler -parameter {\n"
@@ -276,5 +275,76 @@
 "set ::xotcl::confdir ~/.xotcl\n"
 "set ::xotcl::logdir $::xotcl::confdir/log\n"
 "::xotcl::Class proc __unknown name {}\n"
+"::xotcl::Class instproc uses list {\n"
+"foreach package $list {\n"
+"::xotcl::package import -into [self] $package\n"
+"puts stderr \"*** using ${package}::* in [self]\"}}\n"
+"::xotcl::Class create ::xotcl::package -superclass ::xotcl::Class -parameter {\n"
+"provide\n"
+"{version 1.0}\n"
+"{autoexport {}}\n"
+"{export {}}}\n"
+"::xotcl::package proc create {name args} {\n"
+"set nq [namespace qualifiers $name]\n"
+"if {$nq ne \"\" && ![namespace exists $nq]} {Object create $nq}\n"
+"next}\n"
+"::xotcl::package proc extend {name args} {\n"
+"my require $name\n"
+"eval $name configure $args}\n"
+"::xotcl::package instproc contains script {\n"
+"if {[my exists provide]} {\n"
+"package provide [my provide] [my version]} else {\n"
+"package provide [self] [my version]}\n"
+"namespace eval [self] {namespace import ::xotcl::*}\n"
+"namespace eval [self] $script\n"
+"foreach e [my export] {\n"
+"set nq [namespace qualifiers $e]\n"
+"if {$nq ne \"\"} {\n"
+"namespace eval [self]::$nq [list namespace export [namespace tail $e]]} else {\n"
+"namespace eval [self] [list namespace export $e]}}\n"
+"foreach e [my autoexport] {\n"
+"namespace eval :: [list namespace import [self]::$e]}}\n"
+"::xotcl::package configure \\\n"
+"-set component . \\\n"
+"-set verbose 0 \\\n"
+"-set packagecmd ::package\n"
+"::xotcl::package proc unknown args {\n"
+"eval [my set packagecmd] $args}\n"
+"::xotcl::package proc verbose value {\n"
+"my set verbose $value}\n"
+"::xotcl::package proc present args {\n"
+"if {$::tcl_version<8.3} {\n"
+"my instvar loaded\n"
+"switch -exact -- [lindex $args 0] {\n"
+"-exact  {set pkg [lindex $args 1]}\n"
+"default {set pkg [lindex $args 0]}}\n"
+"if {[info exists loaded($pkg)]} {\n"
+"return $loaded($pkg)} else {\n"
+"error \"not found\"}} else {\n"
+"eval [my set packagecmd] present $args}}\n"
+"::xotcl::package proc import {{-into ::} pkg} {\n"
+"my require $pkg\n"
+"namespace eval $into [subst -nocommands {\n"
+"namespace import ${pkg}::*}]\n"
+"foreach e [$pkg export] {\n"
+"set nq [namespace qualifiers $e]\n"
+"if {$nq ne \"\"} {\n"
+"namespace eval $into$nq [list namespace import ${pkg}::$e]}}}\n"
+"::xotcl::package proc require args {\n"
+"::xotcl::my instvar component verbose uses loaded\n"
+"set prevComponent $component\n"
+"if {[catch {set v [eval package present $args]} msg]} {\n"
+"switch -exact -- [lindex $args 0] {\n"
+"-exact  {set pkg [lindex $args 1]}\n"
+"default {set pkg [lindex $args 0]}}\n"
+"set component $pkg\n"
+"lappend uses($prevComponent) $component\n"
+"set v [uplevel \\#1 [my set packagecmd] require $args]\n"
+"if {$v ne \"\" && $verbose} {\n"
+"set path [lindex [::package ifneeded $pkg $v] 1]\n"
+"puts \"... $pkg $v loaded from '$path'\"\n"
+"set loaded($pkg) $v   ;# loaded stuff needed for Tcl 8.0}}\n"
+"set component $prevComponent\n"
+"return $v}\n"
 "";
 
Index: xotcl/generic/predefined.xotcl
===================================================================
diff -u -r55764ef8921abb0e4f506e0ae6b0caf3f842276d -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/generic/predefined.xotcl	(.../predefined.xotcl)	(revision 55764ef8921abb0e4f506e0ae6b0caf3f842276d)
+++ xotcl/generic/predefined.xotcl	(.../predefined.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,4 +1,4 @@
-# $Id: predefined.xotcl,v 1.5 2005/01/10 11:57:35 neumann Exp $
+# $Id: predefined.xotcl,v 1.6 2005/09/09 21:07:23 neumann Exp $
 
 # init must exist on Object. per default it is empty.
 ::xotcl::Object instproc init args {}
@@ -55,10 +55,10 @@
 
 ::xotcl::Relations create ::xotcl::relmgr -requireNamespace
 
-::xotcl::Object instforward mixin -default [list get set] xotcl::relmgr %1 %self %proc
-::xotcl::Object instforward filter -default [list get set] xotcl::relmgr %1 %self %proc
-::xotcl::Class instforward instmixin -default [list get set] xotcl::relmgr %1 %self %proc
-::xotcl::Class instforward instfilter -default [list get set] xotcl::relmgr %1 %self %proc
+::xotcl::Object instforward mixin -default [list get set] ::xotcl::relmgr %1 %self %proc
+::xotcl::Object instforward filter -default [list get set] ::xotcl::relmgr %1 %self %proc
+::xotcl::Class instforward instmixin -default [list get set] ::xotcl::relmgr %1 %self %proc
+::xotcl::Class instforward instfilter -default [list get set] ::xotcl::relmgr %1 %self %proc
 
 
 ::xotcl::Object instproc self {} {return [::xotcl::self]}
@@ -206,8 +206,7 @@
 	must be either 'proc' or 'instproc'."
   }
   ::xotcl::my $methtype $methname $arglist "
-    if {\[::xotcl::self callingproc\] != \[::xotcl::self proc\] && 
-	\[::xotcl::self callingobject\] != \[::xotcl::self\]} {
+    if {!\[::xotcl::self isnextcall\]} {
       error \"Abstract method $methname $arglist called\"
     } else {::xotcl::next}
   "
@@ -453,4 +452,111 @@
   #unknown $name
 }
 
+#
+# package support
+#
+::xotcl::Class instproc uses list {
+  foreach package $list {
+    ::xotcl::package import -into [self] $package
+    puts stderr "*** using ${package}::* in [self]"
+  }
+}
+::xotcl::Class create ::xotcl::package -superclass ::xotcl::Class -parameter {
+  provide 
+  {version 1.0} 
+  {autoexport {}}
+  {export {}}
+}
+::xotcl::package proc create {name args} {
+  set nq [namespace qualifiers $name]
+  if {$nq ne "" && ![namespace exists $nq]} {Object create $nq}
+  next
+}
+::xotcl::package proc extend {name args} {
+  my require $name
+  eval $name configure $args
+}
+::xotcl::package instproc contains script {
+  if {[my exists provide]} {
+    package provide [my provide] [my version]
+  } else {
+    package provide [self] [my version]
+  }
+  namespace eval [self] {namespace import ::xotcl::*}
+  namespace eval [self] $script
+  foreach e [my export] { 
+    set nq [namespace qualifiers $e]
+    if {$nq ne ""} {
+      namespace eval [self]::$nq [list namespace export [namespace tail $e]]
+    } else {
+      namespace eval [self] [list namespace export $e] 
+    }
+  }
+  foreach e [my autoexport] { 
+    namespace eval :: [list namespace import [self]::$e]
+  }
+}
+::xotcl::package configure \
+    -set component . \
+    -set verbose 0 \
+    -set packagecmd ::package
 
+::xotcl::package proc unknown args {
+  #puts stderr "unknown: package $args"
+  eval [my set packagecmd] $args
+}
+::xotcl::package proc verbose value {
+  my set verbose $value
+}
+::xotcl::package proc present args {
+  if {$::tcl_version<8.3} {
+    my instvar loaded
+    switch -exact -- [lindex $args 0] {
+      -exact  {set pkg [lindex $args 1]}
+      default {set pkg [lindex $args 0]}
+    }
+    if {[info exists loaded($pkg)]} {
+      return $loaded($pkg)
+    } else {
+      error "not found"
+    }
+  } else {
+    eval [my set packagecmd] present $args
+  }
+}
+::xotcl::package proc import {{-into ::} pkg} {
+  my require $pkg
+  namespace eval $into [subst -nocommands {
+    #puts stderr "*** package import ${pkg}::* into [namespace current]"
+    namespace import ${pkg}::*
+  }]
+  # import subclasses if any
+  foreach e [$pkg export] {
+    set nq [namespace qualifiers $e]
+    if {$nq ne ""} {
+      namespace eval $into$nq [list namespace import ${pkg}::$e]
+    }
+  }
+}
+::xotcl::package proc require args {
+  #puts "XOTCL package require $args, current=[namespace current]"
+  ::xotcl::my instvar component verbose uses loaded
+  set prevComponent $component
+  if {[catch {set v [eval package present $args]} msg]} {
+    #puts stderr "we have to load $msg"
+    switch -exact -- [lindex $args 0] {
+      -exact  {set pkg [lindex $args 1]}
+      default {set pkg [lindex $args 0]}
+    }
+    set component $pkg
+    lappend uses($prevComponent) $component
+    set v [uplevel \#1 [my set packagecmd] require $args]
+    if {$v ne "" && $verbose} {
+      set path [lindex [::package ifneeded $pkg $v] 1]
+      puts "... $pkg $v loaded from '$path'"
+      set loaded($pkg) $v   ;# loaded stuff needed for Tcl 8.0
+    }
+  }
+  set component $prevComponent
+  return $v
+}
Index: xotcl/generic/xotcl.c
===================================================================
diff -u -r8378485a74867cfbd1bbc4d6d0fd1b2919f205c3 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/generic/xotcl.c	(.../xotcl.c)	(revision 8378485a74867cfbd1bbc4d6d0fd1b2919f205c3)
+++ xotcl/generic/xotcl.c	(.../xotcl.c)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,8 +1,8 @@
-/* $Id: xotcl.c,v 1.36 2005/01/14 23:45:22 neumann Exp $
+/* $Id: xotcl.c,v 1.37 2005/09/09 21:07:23 neumann Exp $
  *
  *  XOTcl - Extended OTcl
  *
- *  Copyright (C) 1999-2004 Gustaf Neumann (a), Uwe Zdun (a,b)
+ *  Copyright (C) 1999-2005 Gustaf Neumann (a), Uwe Zdun (a)
  *
  * (a) Vienna University of Economics and Business Administration
  *     Dept. of Information Systems / New Media
@@ -86,11 +86,15 @@
 
 static Tcl_Obj*NameInNamespaceObj(Tcl_Interp *in, char *name, Tcl_Namespace *ns);
 static Tcl_Namespace *callingNameSpace(Tcl_Interp *in);
+XOTCLINLINE static Tcl_Command NSFindCommand(Tcl_Interp *in, char *name, Tcl_Namespace *ns);
 
 XOTCLINLINE static void GuardAdd(Tcl_Interp *in, XOTclCmdList* filterCL, Tcl_Obj *guard);
 static int GuardCheck(Tcl_Interp *in, ClientData guards);
 static int GuardCall(XOTclObject *obj, XOTclClass* cl, Tcl_Command cmd, Tcl_Interp *in, ClientData clientData, int push);
 static void GuardDel(XOTclCmdList* filterCL);
+static int IsMetaClass(Tcl_Interp *in, XOTclClass *cl);
+static int hasMixin(Tcl_Interp *in, XOTclObject *obj, XOTclClass *cl);
+static int isSubType(XOTclClass *subcl, XOTclClass *cl);
 
 static Tcl_ObjType XOTclObjectType = {
   "XOTclObject",
@@ -130,10 +134,7 @@
 static int XOTclNextMethod(XOTclObject *obj, Tcl_Interp *in, XOTclClass *givenCl,
 			   char *givenMethod, int objc, Tcl_Obj *CONST objv[], 
 			   int useCSObjs);
-#if defined(TCLCMD)
-static int XOTclOEvalMethod(ClientData cd, Tcl_Interp *in, int objc, 
-			    Tcl_Obj * CONST objv[]);
-#endif
+
 static int XOTclForwardMethod(ClientData cd, Tcl_Interp *in, int objc, 
 			    Tcl_Obj * CONST objv[]);
 static int callDestroyMethod(ClientData cd, Tcl_Interp *in, XOTclObject *obj, int flags);
@@ -206,6 +207,8 @@
   if (objc>2)
     memcpy(tov+2, objv, sizeof(Tcl_Obj *)*(objc-2));
 
+  /*  fprintf(stderr, "cmdname=%s, method=%s, objc=%d\n", 
+      ObjStr(tov[0]),ObjStr(tov[1]),objc);*/
   result = DoDispatch(cd, in, objc, tov, flags);
   /*fprintf(stderr, "     callMethod returns %d\n", result);*/
   FREE_ON_STACK(tov);
@@ -470,6 +473,7 @@
   Tcl_ObjType *oldTypePtr = objPtr->typePtr;
   char *string = ObjStr(objPtr);
   XOTclObject *obj;
+  Tcl_Obj *tmpName = NULL;
   int result = TCL_OK;
 
 #ifdef XOTCLOBJ_TRACE
@@ -479,29 +483,26 @@
     fprintf(stderr,"   convert %s to XOTclObject\n", oldTypePtr->name);
 #endif
 
-#if 0
-  {
-    Tcl_Obj *tmpName = NULL;
-    if (*string != ':') {
-      tmpName = NameInNamespaceObj(in,string,callingNameSpace(in));
-      string = ObjStr(tmpName);
-
-      fprintf(stderr," **** name is '%s'\n",  string);
-      INCR_REF_COUNT(tmpName);
-    }
-    obj = XOTclpGetObject(in, string);
-    if (tmpName) {DECR_REF_COUNT(tmpName);}
+  if (!isAbsolutePath(string)) {
+    tmpName = NameInNamespaceObj(in,string,callingNameSpace(in));
+    
+    string = ObjStr(tmpName);
+    /*fprintf(stderr," **** name is '%s'\n",  string);*/
+    INCR_REF_COUNT(tmpName);
   }
-#else
-    obj = XOTclpGetObject(in, string);
+  obj = XOTclpGetObject(in, string);
+  if (tmpName) {
+    DECR_REF_COUNT(tmpName);
+  }
+#if 0
+  obj = XOTclpGetObject(in, string);
 #endif
 
-
   if (obj) {
     if ((oldTypePtr != NULL) && (oldTypePtr->freeIntRepProc != NULL)) {
 #ifdef XOTCLOBJ_TRACE
-      fprintf(stderr,"   freeing type=%p, xottyp=%p\n",
-	      objPtr->typePtr, &XOTclObjectType);
+      fprintf(stderr,"   freeing type=%p, type=%s\n",
+	      objPtr->typePtr, objPtr->typePtr ? objPtr->typePtr->name : "");
 #endif
       oldTypePtr->freeIntRepProc(objPtr);
     }
@@ -626,7 +627,10 @@
 # endif
   }
 #endif
-
+  
+  /*fprintf(stderr,"GetXotclObjectFromObj '%s' type=%p '%s'\n",
+	  ObjStr(objPtr),
+	  cmdType,cmdType? cmdType->name : "");*/
   /*
    * Only really share the "::x" Tcl_Objs but not "x" because we so not have
    * references upon object kills and then will get dangling
@@ -658,7 +662,7 @@
 		objPtr, objPtr->refCount, o, o->refCount, refetch, objPtr->bytes);
       else
 	fprintf(stderr,"GetXOTclObjectFromObj tcl %p (%d) **** rc=%d r=%d %s\n",
-		objPtr, objPtr->refCount, result,refetch, objPtr->bytes);
+		objPtr, objPtr->refCount, result, refetch, objPtr->bytes);
 #endif
     } else {
       result = TCL_OK;
@@ -688,8 +692,8 @@
   convert_to_xotcl_object:
 #endif
     result = SetXOTclObjectFromAny(in, objPtr);
-    if (result == TCL_OK) {
-      if (obj) *obj = (XOTclObject*) objPtr->internalRep.otherValuePtr;
+    if (result == TCL_OK && obj) {
+      *obj = (XOTclObject*) objPtr->internalRep.otherValuePtr;
     }
   }
   return result;
@@ -718,6 +722,7 @@
   int len;
   char *p;
 
+  /*fprintf(stderr,"NameInNamespaceObj %s (%p) ",name,ns);*/
   if (!ns)
     ns = Tcl_GetCurrentNamespace(in);
   objName = Tcl_NewStringObj(ns->fullName,-1);
@@ -728,6 +733,8 @@
     Tcl_AppendToObj(objName,"::",2);
   }
   Tcl_AppendToObj(objName, name, -1);
+
+  /*fprintf(stderr,"returns %s\n",ObjStr(objName));*/
   return objName;
 }
 
@@ -737,17 +744,41 @@
 GetXOTclClassFromObj(Tcl_Interp *in, register Tcl_Obj *objPtr,
 		     XOTclClass **cl, int retry) {
   XOTclObject *obj;
-  XOTclClass *cls;
-  int result = GetXOTclObjectFromObj(in, objPtr, &obj);
-  if (result == TCL_OK) {
-    cls = XOTclObjectToClass(obj);
-    if (cls) {
-      if (cl) *cl = cls;
-    } else
-      result = TCL_ERROR;
-  } else if (retry) {
+  XOTclClass *cls = NULL;
+  int result = TCL_OK;
+  char *objName = ObjStr(objPtr);
+
+  /*fprintf(stderr, "GetXOTclClassFromObj %s retry %d\n", objName, retry);*/
+  
+  if (retry) {
+    /* we refer to an existing object; use command resolver */
+    if (!isAbsolutePath(objName)) {
+      Tcl_Command cmd = NSFindCommand(in, objName, callingNameSpace(in));
+
+      /*fprintf(stderr, "GetXOTclClassFromObj %s cmd = %p cl=%p retry=%d\n",
+	objName, cmd, cmd? XOTclGetClassFromCmdPtr(cmd) : NULL, retry);*/
+      if (cmd) {
+	cls = XOTclGetClassFromCmdPtr(cmd);
+	if (cl) *cl = cls;
+      }
+    }
+  }
+
+  if (!cls) {
+    result = GetXOTclObjectFromObj(in, objPtr, &obj);
+    if (result == TCL_OK) {
+      cls = XOTclObjectToClass(obj);
+      if (cls) {
+	if (cl) *cl = cls;
+      } else {
+	/* we have an object, but no class */
+	result = TCL_ERROR;
+      }
+    }
+  }
+
+  if (!cls && retry) {
     Tcl_Obj *ov[3];
-    char* objName = ObjStr(objPtr);
     ov[0] = RUNTIME_STATE(in)->theClass->object.cmdName;
     ov[1] = XOTclGlobalObjects[XOTE___UNKNOWN];
     if (!isAbsolutePath(objName)) {
@@ -757,15 +788,17 @@
     }
     INCR_REF_COUNT(ov[2]);
     /*fprintf(stderr,"+++ calling %s __unknown for %s\n", 
-      ObjStr(ov[0]), ObjStr(ov[2]));*/
+      ObjStr(ov[0]), ObjStr(ov[2])); */
 
     result = Tcl_EvalObjv(in, 3, ov, 0);
-    
     if (result == TCL_OK) {
       result = GetXOTclClassFromObj(in, objPtr, cl, 0);
     }
     DECR_REF_COUNT(ov[2]);
   }
+
+  /*fprintf(stderr, "GetXOTclClassFromObj %s returns %d cls = %p *cl = %p\n",
+    objName, result, cls, cl?*cl:NULL);*/
   return result;
 }
 
@@ -1532,6 +1565,12 @@
   register Tcl_Command cmd;
   assert(name);
   cmd = NSFindCommand(in, name, NULL);
+  /*
+  if (cmd) {
+    fprintf(stderr,"+++ XOTclGetObject objProc=%p, dispatch=%p\n",
+	    Tcl_Command_objProc(cmd), XOTclObjDispatch);
+  }
+  */
   if (cmd && Tcl_Command_objProc(cmd) == XOTclObjDispatch) {
     return (XOTclObject*)Tcl_Command_objClientData(cmd);
   }
@@ -1970,8 +2009,11 @@
   register XOTclCallStackContent *top = cs->top;
   Tcl_CallFrame *varFramePtr = (Tcl_CallFrame *)Tcl_Interp_varFramePtr(in);
 
+  /*fprintf(stderr, "Tcl_Interp_framePtr(in) %p != varFramePtr %p && top->currentFramePtr %p\n", Tcl_Interp_framePtr(in), varFramePtr, top->currentFramePtr);*/
+
   if (Tcl_Interp_framePtr(in) != varFramePtr && top->currentFramePtr) {
     XOTclCallStackContent *bot = cs->content + 1;
+    /*fprintf(stderr, "uplevel\n");*/
     /* we are in a uplevel */
     while (varFramePtr != top->currentFramePtr && top>bot) {
       top--;
@@ -2520,7 +2562,8 @@
  */
 static void
 MixinComputeOrderFullList(Tcl_Interp *in, XOTclCmdList **mixinList,
-			  XOTclClasses **mixinClasses) {
+			  XOTclClasses **mixinClasses, 
+			  XOTclClasses **checkList, int level) {
   XOTclCmdList *m;
   XOTclClasses *pl, **clPtr = mixinClasses;
 
@@ -2537,14 +2580,37 @@
 	  if (opt && opt->instmixins != 0) {
 	    /* compute transitively the instmixin classes of this added
 	       class */
-	    MixinComputeOrderFullList(in, &opt->instmixins, mixinClasses);
+	    XOTclClasses *cls;
+	    int i, found=0;
+	    for (i=0, cls = *checkList; cls; i++,cls = cls->next) {
+	      fprintf(stderr,"+++ c%d: %s\n",
+		      i,ObjStr(cls->cl->object.cmdName));
+	      if (pl->cl == cls->cl) {
+		found = 1;
+		break;
+	      }
+	    }
+	    if (!found) {
+	      XOTclAddClass(checkList, pl->cl, NULL);
+	      /*fprintf(stderr, "+++ transitive %s\n", 
+		ObjStr(pl->cl->object.cmdName));*/
+	      MixinComputeOrderFullList(in, &opt->instmixins, mixinClasses, 
+					checkList, level+1);
+	    }
 	  }
+	  /*fprintf(stderr,"+++ add to mixinClasses %p path: %s\n",
+		  mixinClasses,
+		  ObjStr(pl->cl->object.cmdName));*/
 	  clPtr = XOTclAddClass(clPtr, pl->cl, m->clientData);
 	}
       }
     }
     m = m->next;
   }
+  if (level == 0 && *checkList) {
+    XOTclFreeClasses(*checkList);
+    *checkList = NULL;
+  }
 }
 
 static void
@@ -2562,45 +2628,53 @@
  */
 static void
 MixinComputeOrder(Tcl_Interp *in, XOTclObject *obj) {
-  XOTclClasses *fullList, *mixinClasses = 0, *nextCl, *pl,
+  XOTclClasses *fullList, *checkList=0, *mixinClasses = 0, *nextCl, *pl,
     *checker, *guardChecker;
 
   if (obj->mixinOrder)  MixinResetOrder(obj);
   /*fprintf(stderr, "Mixin Order:\n First List: ");*/
 
   /* append per-obj mixins */
   if (obj->opt)
-    MixinComputeOrderFullList(in, &obj->opt->mixins, &mixinClasses);
+    MixinComputeOrderFullList(in, &obj->opt->mixins, &mixinClasses, 
+			      &checkList, 0);
 
   /* append per-class mixins */
   for (pl = ComputeOrder(obj->cl, Super); pl; pl = pl->next) {
     XOTclClassOpt* opt = pl->cl->opt;
     if (opt && opt->instmixins)
-      MixinComputeOrderFullList(in, &opt->instmixins, &mixinClasses);
+      MixinComputeOrderFullList(in, &opt->instmixins, &mixinClasses, 
+				&checkList, 0);
   }
-
   fullList = mixinClasses;
 
   /* use no duplicates & no classes of the precedence order
      on the resulting list */
   while (mixinClasses) {
     checker = nextCl = mixinClasses->next;
+    /* fprintf(stderr,"--- checking %s\n",
+       ObjStr(mixinClasses->cl->object.cmdName));*/
+
     while (checker) {
       if (checker->cl == mixinClasses->cl) break;
       checker = checker->next;
     }
-    /* if mixinClasses has no duplicate on mixinList ->
-       check obj->cl hierachy */
+    /* if checker is set, it is a duplicate and ignored */
+
     if (checker == 0) {
+      /* check obj->cl hierachy */
       for (checker = ComputeOrder(obj->cl, Super); checker; checker = checker->next) {
-	if (checker->cl == mixinClasses->cl)
+	if (checker->cl == mixinClasses->cl) 
 	  break;
       }
+      /* if checker is set, it was found in the class hierarchy
+	 and it is ignored */
     }
-    /* if class is also not found on precedence order ->
-       add it to mixinOrder list (otherwise free the memory) */
     if (checker == 0) {
+      /* add the class to the mixinOrder list */
       XOTclCmdList* new;
+      /* fprintf(stderr,"--- adding to mixinlist %s\n",
+	 ObjStr(mixinClasses->cl->object.cmdName));*/
       new = CmdListAdd(&obj->mixinOrder, mixinClasses->cl->object.id,
 		       /*noDuplicates*/ 0);
 
@@ -2612,20 +2686,13 @@
 	  break;
 	}
       }
-
-      /*
-      fprintf(stderr, "  Adding %s,\n", ObjStr(mixinClasses->cl->object.cmdName));
-      */
     }
     mixinClasses = nextCl;
   }
 
   /* ... and free the memory of the full list */
-  while (fullList) {
-    nextCl = fullList->next;
-    FREE(XOTclClasses, fullList);
-    fullList = nextCl;
-  }
+  XOTclFreeClasses(fullList);
+
   /*CmdListPrint(in,"mixin order\n", obj->mixinOrder);*/
 
 }
@@ -3871,21 +3938,14 @@
 	  isTclProc, cmd,
 	  Tcl_GetCommandName(in, cmd),
 	  Tcl_Command_objProc(cmd) == XOTclObjDispatch, XOTclObjDispatch,
-#if defined(TCLCMD)
-	  Tcl_Command_objProc(cmd) == XOTclOEvalMethod, XOTclOEvalMethod,
-#else 
 	  Tcl_Command_objProc(cmd) == XOTclForwardMethod, XOTclForwardMethod, 
-#endif
 	  objv[0], objc
 	  );
   */
 
   if (isTclProc 
       || (Tcl_Command_objProc(cmd) == XOTclObjDispatch)
       || (Tcl_Command_objProc(cmd) == XOTclForwardMethod)
-#if defined(TCLCMD)
-      || (Tcl_Command_objProc(cmd) == XOTclOEvalMethod) 
-#endif
       ) {
     /* push the xotcl info */
     if ((CallStackPush(in, obj, cl, cmd, objc, objv, frameType)) == TCL_OK)
@@ -4045,11 +4105,8 @@
 
   if (cp) {
     if (
-#if defined(TCLCMD)
-	Tcl_Command_objProc(cmd) == XOTclOEvalMethod ||
-#endif
 	Tcl_Command_objProc(cmd) == XOTclForwardMethod) {
-      /*fprintf(stderr,"calling oeval obj=%p %s\n", obj, ObjStr(obj->cmdName));*/
+      /*fprintf(stderr,"calling forward obj=%p %s\n", obj, ObjStr(obj->cmdName));*/
       
       tclCmdClientData *tcd = (tclCmdClientData *)cp;
       tcd->obj = obj;
@@ -4069,11 +4126,7 @@
 	  TclIsProc((Command*)cmd)!=0, cmd,
 	  Tcl_GetCommandName(in, cmd),
 	  Tcl_Command_objProc(cmd) == XOTclObjDispatch, XOTclObjDispatch,
-#if defined(TCLCMD)
-	  Tcl_Command_objProc(cmd) == XOTclOEvalMethod, XOTclOEvalMethod,
-#else 
 	  Tcl_Command_objProc(cmd) == XOTclForwardMethod, XOTclForwardMethod, 
-#endif
 	  objv[0], objc, xotclCall, fromNext
 	  );
   */
@@ -4675,6 +4728,7 @@
   Tcl_AppendElement(in, "methods");
   Tcl_AppendElement(in, "parent");
   Tcl_AppendElement(in, "pre"); Tcl_AppendElement(in, "post");
+  Tcl_AppendElement(in, "precedence");
   if (isclass) {
     Tcl_AppendElement(in, "superclass"); Tcl_AppendElement(in, "subclass");
     Tcl_AppendElement(in, "heritage"); Tcl_AppendElement(in, "instances");
@@ -5046,8 +5100,8 @@
 static int
 ListHeritage(Tcl_Interp *in, XOTclClass *cl, char *pattern) {
   XOTclClasses* pl = ComputeOrder(cl, Super);
-  if (pl) pl = pl->next;
   Tcl_ResetResult(in);
+  if (pl) pl=pl->next;
   for (; pl != 0; pl = pl->next) {
     char *name = className(pl->cl);
     if (pattern && !Tcl_StringMatch(name, pattern)) continue;
@@ -5056,6 +5110,34 @@
   return TCL_OK;
 }
 
+static int
+ListPrecedence(Tcl_Interp *in, XOTclObject *obj, char *pattern) {
+  XOTclClasses* pl;
+  Tcl_ResetResult(in);
+  if (!(obj->flags & XOTCL_MIXIN_ORDER_VALID))
+    MixinComputeDefined(in, obj);
+
+  if (obj->flags & XOTCL_MIXIN_ORDER_DEFINED_AND_VALID) {
+    XOTclCmdList *ml = obj->mixinOrder;
+
+    while (ml) {
+      XOTclClass *mixin = XOTclGetClassFromCmdPtr(ml->cmdPtr);
+      char *name = className(mixin);
+      if (pattern && !Tcl_StringMatch(name, pattern)) continue;
+      Tcl_AppendElement(in, name);
+      ml = ml->next;
+    }
+  }
+  pl = ComputeOrder(obj->cl, Super);
+  for (; pl != 0; pl = pl->next) {
+    char *name = className(pl->cl);
+    if (pattern && !Tcl_StringMatch(name, pattern)) continue;
+    Tcl_AppendElement(in, name);
+  }
+  return TCL_OK;
+}
+
+
 static Proc*
 FindProc(Tcl_Interp *in, Tcl_HashTable *table, char *name) {
   Tcl_HashEntry* hPtr = table ? Tcl_FindHashEntry(table, name) : 0;
@@ -5735,6 +5817,16 @@
 		   NULL);
 	Tcl_SetObjResult(in, FilterFindReg(in, obj, GetSelfProcCmdPtr(in)));
 	return TCL_OK;
+      case 'i':
+	if (!strcmp(option, "isnextcall")) {
+	  XOTclCallStack *cs = &RUNTIME_STATE(in)->cs;
+	  csc = cs->top;
+	  csc--;
+	  Tcl_SetBooleanObj(Tcl_GetObjResult(in),
+			    (csc > cs->content && 
+			     (csc->callType & XOTCL_CSC_CALL_IS_NEXT)));
+	  return TCL_OK;
+	}
       case 'n':
 	if (!strcmp(option, "next"))
 	  return FindSelfNext(in, obj);
@@ -5754,6 +5846,9 @@
     return XOTclVarErrMsg(in, "wrong # of args for self", (char *)NULL);
 
   obj = GetSelfObj(in);
+  
+  /*fprintf(stderr,"getSelfObj returns %p\n",obj);XOTclCallStackDump(in);*/
+
   if (!obj) {
     if (objc == 2 && !strcmp(ObjStr(objv[1]),"callinglevel")) {
       Tcl_SetIntObj(Tcl_GetObjResult(in), 1);
@@ -6288,17 +6383,24 @@
 
 /* change XOTcl class conditionally; obj must not be NULL */
 
-XOTCLINLINE static void
+XOTCLINLINE static int
 changeClass(Tcl_Interp *in, XOTclObject *obj, XOTclClass *cl) {
   assert(obj);
 
   if (cl != obj->cl) {
+    if (IsMetaClass(in, cl) && !IsMetaClass(in, obj->cl)) {
+      return XOTclVarErrMsg(in, "cannot change class of object ",
+			    ObjStr(obj->cmdName),
+			    " to metaclass ",
+			    ObjStr(cl->object.cmdName),(char *)NULL);
+    }
     (void)RemoveInstance(obj, obj->cl);
     AddInstance(obj, cl);
 
     MixinComputeDefined(in, obj);
     FilterComputeDefined(in, obj);
   }
+  return TCL_OK;
 }
 
 
@@ -6327,12 +6429,14 @@
    *  re-create, first ensure correct class for newobj
    */
 
-  changeClass(in, newobj, (XOTclClass*) classobj);
+  result = changeClass(in, newobj, (XOTclClass*) classobj);
 
-  /*
-   * dispatch "cleanup"
-   */
-  result = callMethod((ClientData) newobj, in, XOTclGlobalObjects[XOTE_CLEANUP], 2, 0, 0);
+  if (result == TCL_OK) {
+    /*
+     * dispatch "cleanup"
+     */
+    result = callMethod((ClientData) newobj, in, XOTclGlobalObjects[XOTE_CLEANUP], 2, 0, 0);
+  }
   return result;
 }
 
@@ -6391,7 +6495,9 @@
     obj->flags |= XOTCL_INIT_CALLED;
   }
 
-  Tcl_SetObjResult(in, savedObjResult);
+  if (result == TCL_OK) {
+    Tcl_SetObjResult(in, savedObjResult);
+  }
   DECR_REF_COUNT(savedObjResult);
 
   return result;
@@ -6578,15 +6684,35 @@
 static int
 IsMetaClass(Tcl_Interp *in, XOTclClass *cl) {
   /* check if cl is a meta-class by checking is Class is a superclass of cl*/
-  XOTclClasses* pl;
+  XOTclClasses *pl, *checkList=0, *mixinClasses = 0;
+  int hasMCM = 0;
+
   if (cl == RUNTIME_STATE(in)->theClass)
     return 1;
 
   for (pl = ComputeOrder(cl, Super); pl; pl = pl->next) {
     if (pl->cl == RUNTIME_STATE(in)->theClass)
       return 1;
   }
-  return 0;
+
+  for (pl = ComputeOrder(cl, Super); pl; pl = pl->next) {
+    XOTclClassOpt* opt = pl->cl->opt;
+    if (opt && opt->instmixins)
+      MixinComputeOrderFullList(in, &opt->instmixins, &mixinClasses, 
+				&checkList, 0);
+  }
+  
+  for (; mixinClasses; mixinClasses = mixinClasses->next) {
+    /*fprintf(stderr,"- got %s\n",ObjStr(mixinClasses->cl->object.cmdName));*/
+    if (isSubType(mixinClasses->cl, RUNTIME_STATE(in)->theClass)) {
+      hasMCM = 1;
+      break;
+    }
+  }
+  XOTclFreeClasses(mixinClasses);
+  /*fprintf(stderr,"has MC returns %d\n",hasMCM);*/
+
+  return hasMCM;
 }
 
 static int
@@ -6609,59 +6735,76 @@
   return TCL_OK;
 }
 
+
 static int
+isSubType(XOTclClass *subcl, XOTclClass *cl) {
+  XOTclClasses *t;
+  int success;
+  assert(cl && subcl);
+
+  if (cl == subcl) {
+    success = 1;
+  } else {
+    success = 0;
+    for (t = ComputeOrder(subcl, Super); t && t->cl; t = t->next) {
+      if (t->cl == cl) {
+	success = 1;
+	break;
+      }
+    }
+  }
+  return success;
+}
+
+
+
+static int
 XOTclOIsTypeMethod(ClientData cd, Tcl_Interp *in, int objc, Tcl_Obj *CONST objv[]) {
   XOTclObject *obj = (XOTclObject*)cd;
   XOTclClass *cl;
-  XOTclClasses *t;
+  int success = 0;
 
   if (!obj) return XOTclObjErrType(in, objv[0], "Object");
   if (objc != 2) return XOTclObjErrArgCnt(in, obj->cmdName, "istype <className>");
+  if (obj->cl && GetXOTclClassFromObj(in,objv[1],&cl, 1) == TCL_OK) {
+    success = isSubType(obj->cl,cl);
+  }
   Tcl_ResetResult(in);
+  Tcl_SetIntObj(Tcl_GetObjResult(in), success);
+  return TCL_OK;
+}
 
-  if (obj->cl && GetXOTclClassFromObj(in,objv[1],&cl, 0) == TCL_OK) {
-    if (cl == obj->cl) {
-      Tcl_SetIntObj(Tcl_GetObjResult(in), 1);
-      return TCL_OK;
+static int
+hasMixin(Tcl_Interp *in, XOTclObject *obj, XOTclClass *cl) {
+
+  if (!(obj->flags & XOTCL_MIXIN_ORDER_VALID))
+    MixinComputeDefined(in, obj);
+
+  if ((obj->flags & XOTCL_MIXIN_ORDER_DEFINED_AND_VALID)) {
+    XOTclCmdList *ml;
+    for (ml = obj->mixinOrder; ml; ml = ml->next) {
+      XOTclClass *mixin = XOTclGetClassFromCmdPtr(ml->cmdPtr);
+      if (mixin == cl) {
+	return 1;
+      }
     }
-    t = ComputeOrder(obj->cl, Super);
-    while (t && t->cl && t->cl != cl) {
-      t = t->next;
-    }
-    if (t && t->cl == cl) {
-      Tcl_SetIntObj(Tcl_GetObjResult(in), 1);
-      return TCL_OK;
-    }
   }
-  Tcl_SetIntObj(Tcl_GetObjResult(in), 0);
-  return TCL_OK;
+  return 0;
 }
 
 static int
 XOTclOIsMixinMethod(ClientData cd, Tcl_Interp *in, int objc, Tcl_Obj *CONST objv[]) {
   XOTclObject *obj = (XOTclObject*)cd;
   XOTclClass *cl;
+  int success = 0;
 
   if (!obj) return XOTclObjErrType(in, objv[0], "Object");
   if (objc != 2) return XOTclObjErrArgCnt(in, obj->cmdName, "ismixin <className>");
 
-  if (!(obj->flags & XOTCL_MIXIN_ORDER_VALID))
-    MixinComputeDefined(in, obj);
-
-  if ((obj->flags & XOTCL_MIXIN_ORDER_DEFINED_AND_VALID) &&
-      GetXOTclClassFromObj(in,objv[1],&cl, 0) == TCL_OK) {
-    XOTclCmdList *ml = obj->mixinOrder;
-    XOTclClass *mixin;
-    while (ml) {
-      mixin = XOTclGetClassFromCmdPtr(ml->cmdPtr);
-      if (mixin && mixin == cl) {
-	Tcl_SetIntObj(Tcl_GetObjResult(in), 1);
-	return TCL_OK;
-      }
-      ml = ml->next;
-    }
-  }
-  Tcl_SetIntObj(Tcl_GetObjResult(in), 0);
+  if (GetXOTclClassFromObj(in,objv[1],&cl, 1) == TCL_OK) {
+    success = hasMixin(in, obj, cl);
+  }  
+  Tcl_SetIntObj(Tcl_GetObjResult(in), success);
   return TCL_OK;
 }
 
@@ -6679,9 +6822,7 @@
   if (GetXOTclClassFromObj(in, objv[1], &cl, 1) != TCL_OK)
     return XOTclErrBadVal(in, "a class", ObjStr(objv[1]));
 
-  changeClass(in, obj, cl);
-
-  return TCL_OK;
+  return changeClass(in, obj, cl);
 }
 
 static int
@@ -6923,7 +7064,7 @@
       int noprocs = 0, nocmds = 0, nomixins = 0, inContext = 0;
       if (objc-modifiers > 3)
 	return XOTclObjErrArgCnt(in, obj->cmdName,
-	 "info methods ?-noprocs? ?-nocmds? ?-nomixins? -incontext ?pat?");
+	 "info methods ?-noprocs? ?-nocmds? ?-nomixins? ?-incontext? ?pat?");
       if (modifiers > 0) {
 	noprocs = checkForModifier(objv, modifiers, "-noprocs");
 	nocmds = checkForModifier(objv, modifiers, "-nocmds");
@@ -6987,6 +7128,8 @@
 	if (procs) Tcl_SetObjResult(in, AssertionList(in, procs->post));
       }
       return TCL_OK;
+    } else if (!strcmp(cmd, "precedence")) {
+      return ListPrecedence(in, obj, pattern);
     }
     break;
   case 'v':
@@ -7553,7 +7696,8 @@
 
   if (!framePtr) {
     XOTclCallStackContent *csc = XOTclCallStackFindLastInvocation(in, 1);
-    framePtr = csc->currentFramePtr;
+    if (csc) 
+      framePtr = csc->currentFramePtr;
   }
 
   savedVarFramePtr = (Tcl_CallFrame *)Tcl_Interp_varFramePtr(in);
@@ -7588,37 +7732,7 @@
   return result;
 }
 
-#if defined(TCLCMD)
 static int
-XOTclOEvalMethod(ClientData cd, Tcl_Interp *in, int objc, Tcl_Obj * CONST objv[]) {
-  tclCmdClientData *tcd = (tclCmdClientData *)cd;
-  XOTcl_FrameDecls;
-  int result;
-  ALLOC_ON_STACK(Tcl_Obj*,objc, ov);
-
-  if (!tcd || !tcd->obj) return XOTclObjErrType(in, objv[0], "Object");
-
-  RUNTIME_STATE(in)->cs.top->currentFramePtr = 
-    (Tcl_CallFrame *) Tcl_Interp_varFramePtr(in);
-
-  /*fprintf(stderr, "*** varframe %p top %p\n", Tcl_Interp_varFramePtr(in),
-    RUNTIME_STATE(in)->cs.top); */
-  XOTcl_PushFrame(in, tcd->obj);
-  /*
-  fprintf(stderr,"*** ovalmethod oc=%d tcd=%p cmdname=%s obj=%s\n",
-  objc,tcd,ObjStr(tcd->cmdName), ObjStr(tcd->obj->cmdName));*/
-  /*XOTclCallStackDump(in);*/
-  ov[0] = tcd->cmdName;
-  memcpy(ov+1, objv+1, sizeof(Tcl_Obj *)*(objc-1));
-  result = Tcl_EvalObjv(in, objc, ov, 0);
-
-  XOTcl_PopFrame(in, tcd->obj);
-  FREE_ON_STACK(ov);
-  return result;
-}
-#endif
-
-static int
 forwardArg(Tcl_Interp *in, int objc, Tcl_Obj *CONST objv[], 
 	   Tcl_Obj *o, forwardCmdClientData *tcd, Tcl_Obj **out, 
 	   Tcl_Obj **freeList, int *inputarg, int *mapvalue) {
@@ -7827,14 +7941,16 @@
 
     if (tcd->objscope) {
       XOTcl_PushFrame(in, tcd->obj);
+      /*fprintf(stderr,"pushing obj=%p '%s'\n",tcd->obj, tcd->obj ? ObjStr(tcd->obj->cmdName) : "");
+	XOTclCallStackDump(in);*/
     }
 
     if (tcd->cmdName->typePtr == &XOTclObjectType
 	&& GetXOTclObjectFromObj(in, tcd->cmdName, (void*)&cd) == TCL_OK) {
       /*fprintf(stderr, "XOTcl object %s, objc=%d\n", ObjStr(tcd->cmdName),objc);*/
       result = ObjDispatch(cd, in, objc, ov, 0);
     } else {
-      /* fprintf(stderr, "no XOTcl object %s\n", ObjStr(tcd->cmdName));*/
+      /*fprintf(stderr, "no XOTcl object %s\n", ObjStr(tcd->cmdName));*/
       OV[0] = tcd->cmdName;
       result = Tcl_EvalObjv(in, objc, ov, 0);
     }
@@ -7859,6 +7975,7 @@
   XOTclObject  *obj   = (XOTclObject*)cd;
   Tcl_Obj      **ov;
   int          i, oc, result = TCL_OK;
+  char         *varname = 0, *alias = 0;
   callFrameContext ctx = {0};
 
   if (!obj) return XOTclObjErrType(in, objv[0], "Object");
@@ -7872,17 +7989,26 @@
     return XOTclVarErrMsg(in, "instvar used on ", ObjStr(obj->cmdName),
 			  ", but callstack is not in procedure scope", NULL);
   }
-
+  
   for (i=1; i<objc; i++) {
     if ((result = Tcl_ListObjGetElements(in, objv[i], &oc, &ov)) == TCL_OK) {
-      char *alias = 0;
-      if (oc == 2)
-	alias = ObjStr(ov[1]);
-      result = GetInstVarIntoCurrentScope(in, obj, ObjStr(ov[0]), alias);
-      if (result != TCL_OK)
-	break;
-    } else
+      switch (oc) {
+      case 0: {varname = ObjStr(objv[i]); break;}
+      case 1: {varname = ObjStr(ov[0]);   break;}
+      case 2: {varname = ObjStr(ov[0]);   alias = ObjStr(ov[1]); break;}
+      }
+      if (varname) {
+	result = GetInstVarIntoCurrentScope(in, obj, varname, alias);
+      } else {
+	result = XOTclVarErrMsg(in, "invalid variable specification '", 
+				ObjStr(objv[i]), "'",NULL);
+      }
+      if (result != TCL_OK) {
+	break;	
+      }
+    } else {
       break;
+    }
   }
   CallStackRestoreSavedFrames(in, &ctx);
   return result;
@@ -8364,21 +8490,24 @@
     XOTclMutexLock(&initMutex);
     if (listType == NULL) {
       listType = Tcl_GetObjType("list");
+      /*fprintf(stderr, "fetching listType=%p\n",listType);*/
     }
     XOTclMutexUnlock(&initMutex);
 #endif
   }
 
   if (obj->typePtr == listType) {
-    if (Tcl_ListObjGetElements(in, obj, objc, objv) == TCL_OK && *objc>0) {
+    if (Tcl_ListObjGetElements(in, obj, objc, objv) == TCL_OK && *objc>1) {
       flag = ObjStr(*objv[0]);
+      /*fprintf(stderr, "we have a list starting with '%s'\n", flag);*/
       if (*flag == '-') {
 	*methodName = flag+1;
 	return LIST_DASH;
       }
     }
   }
   flag = ObjStr(obj);
+  /*fprintf(stderr, "we have a scalar '%s'\n", flag);*/
   if (*flag == '-' && isalpha((int)*((flag)+1))) {
     *methodName = flag+1;
     *objc = 1;
@@ -8392,7 +8521,7 @@
 		    char *methodName, int argc, Tcl_Obj *argv[]) {
   int result;
   Tcl_Obj *method = Tcl_NewStringObj(methodName,-1);
-
+  
   /*fprintf(stderr,"callConfigureMethod method %s->'%s' argc %d\n",
     ObjStr(obj->cmdName), methodName, argc);*/
 
@@ -8403,8 +8532,8 @@
   result = callMethod((ClientData)obj, in, method, argc, argv, XOTCL_CM_NO_UNKNOWN);
   DECR_REF_COUNT(method);
 
-  /* fprintf(stderr, "method  '%s' called args: %d o=%p, result=%d\n",
-     methodName, argc+1, obj, result); */
+  /*fprintf(stderr, "method  '%s' called args: %d o=%p, result=%d\n",
+    methodName, argc+1, obj, result);  */
 
   if (result != TCL_OK) {
     Tcl_AppendResult(in, " during '", ObjStr(obj->cmdName), " ",
@@ -8507,6 +8636,7 @@
   XOTclCallStack *cs = &RUNTIME_STATE(in)->cs;
   XOTclCallStackContent *top = cs->top;
   XOTclCallStackContent *csc = XOTclCallStackFindLastInvocation(in, 0);
+
   /*fprintf(stderr," **** use last invocation csc = %p\n",  csc);*/
   if (csc && csc->currentFramePtr) {
     /* use the callspace from the last invocation */
@@ -8517,19 +8647,29 @@
     if (f) {
       ns = f->nsPtr;
     } else {
-      /* ns = csc->currentFramePtr->nsPtr;*/
-      /*ns = Tcl_GetCurrentNamespace(in);*/
+      Tcl_CallFrame *f = Tcl_CallFrame_callerPtr(csc->currentFramePtr);
+      ns = Tcl_GetCurrentNamespace(in);
+      /* find last incovation outside ::xotcl (for things like relmgr) */
+      while (ns == RUNTIME_STATE(in)->XOTclNS) {
+	if (f) {
+	  ns = f->nsPtr;
+	  f = Tcl_CallFrame_callerPtr(f);
+	} else {
+	  ns = NULL;
+	}
+      }
     }
-  } else {
-    /* transparent calls on xotcl toplevel */
+  }
+  if (!ns) {
+    /* calls on xotcl toplevel */
     XOTclCallStackContent *bot = cs->content + 1;
     /*fprintf(stderr, " **** bot=%p diff=%d\n",bot, top-bot);*/
     if (top - bot >= 0 && bot->currentFramePtr) {
       /* get calling tcl environment */
       Tcl_CallFrame *f = Tcl_CallFrame_callerPtr(bot->currentFramePtr);
       if (f) {
 	ns = f->nsPtr;
-	/*fprintf(stderr, "top=%p, bot=%p b->c=%p f=%p ns=%p\n",
+	/* fprintf(stderr, "top=%p, bot=%p b->c=%p f=%p ns=%p\n",
 		top,bot,bot->currentFramePtr, f, ns);
 	fprintf(stderr,"ns from calling tcl environment %p '%s'\n", 
 	ns, ns?ns->fullName : "" );*/
@@ -8538,10 +8678,11 @@
       }
     } 
   }
-  /*
-    XOTclCallStackDump(in);
-    XOTclStackDump(in);
-  */
+
+  /*XOTclCallStackDump(in);*/
+  /*XOTclStackDump(in);*/
+
+  /*fprintf(stderr,"callingNameSpace returns %p %s\n",ns,ns?ns->fullName:"");*/
   return ns;
 }
 
@@ -8581,7 +8722,10 @@
       Tcl_Obj *tmpName = NULL;
       
       if (!isAbsolutePath(objName)) {
+	/*fprintf(stderr, "CallocMethod\n");*/
 	tmpName = NameInNamespaceObj(in,objName,callingNameSpace(in));
+	/*fprintf(stderr, "NoAbsoluteName for '%s' -> determined = '%s'\n",
+	  objName, ObjStr(tmpName));*/
 	objName = ObjStr(tmpName);
 
 	/*fprintf(stderr," **** name is '%s'\n",  objName);*/
@@ -8650,11 +8794,13 @@
   }
   newobj = XOTclpGetObject(in, objName);  
   
-  /*fprintf(stderr,"+++ create objv[1] '%s', usedName '%s', newObj=%p\n",
+  /*fprintf(stderr,"+++ create objv[1] '%s', specifiedName '%s', newObj=%p\n",
     specifiedName, objName, newobj);*/
- 
-  if (newobj) {
-    /*fprintf(stderr, "+++ recreate, call recreate method ... %s\n", ObjStr(tov[1]));*/
+
+  /* don't allow an object to be recreated as a class */
+  if (newobj && (!IsMetaClass(in, cl) || IsMetaClass(in, newobj->cl))) { 
+    /*fprintf(stderr, "+++ recreate, call recreate method ... %s\n", 
+      ObjStr(tov[1]));*/
     /* call recreate --> initialization */
     result = callMethod((ClientData) obj, in,
 			XOTclGlobalObjects[XOTE_RECREATE], objc+1, tov+1, 0);
@@ -8706,14 +8852,12 @@
 static int
 XOTclCCreateMethod(ClientData cd, Tcl_Interp *in, int objc, Tcl_Obj *objv[]) {
   XOTclClass *cl = XOTclObjectToClass(cd);
-  XOTclObject *obj = &cl->object;
   
   if (!cl) return XOTclObjErrType(in, objv[0], "Class");
-  if (!obj) return XOTclObjErrType(in, objv[0], "Object");
   if (objc < 2)
     return XOTclObjErrArgCnt(in, cl->object.cmdName, "create <obj> ?args?");
 
-  return createMethod(in, cl, obj, objc, objv);
+  return createMethod(in, cl, &cl->object, objc, objv);
 }
 
 static char *
@@ -8744,18 +8888,18 @@
 static int
 XOTclCNewMethod(ClientData cd, Tcl_Interp *in, int objc, Tcl_Obj *objv[]) {
   XOTclClass  *cl = XOTclObjectToClass(cd);
-  XOTclObject *obj = &cl->object, *child = NULL;
+  XOTclObject *child = NULL;
   Tcl_Obj *fullname;
   int result, offset = 1, 
 #if REFCOUNTED
     isrefcount = 0, 
 #endif
-    i;
+    i, prefixLength;
   Tcl_DString dFullname, *dsPtr = &dFullname;
   XOTclStringIncrStruct *iss = &RUNTIME_STATE(in)->iss;
 
   if (!cl) return XOTclObjErrType(in, objv[0], "Class");
-  if (!obj) return XOTclObjErrType(in, objv[0], "Object");
+
   if (objc < 1)
     return XOTclObjErrArgCnt(in, cl->object.cmdName, "new [-childof obj] ?args?");
 
@@ -8782,9 +8926,19 @@
   } else {
     Tcl_DStringAppend(dsPtr, "::xotcl::__#", 12);
   }
-  (void)XOTclStringIncr(iss);
-  Tcl_DStringAppend(dsPtr, iss->start, iss->length);
+  prefixLength = dsPtr->length;
 
+  while (1) {
+    (void)XOTclStringIncr(iss);
+    Tcl_DStringAppend(dsPtr, iss->start, iss->length);
+    if (!Tcl_FindCommand(in, Tcl_DStringValue(dsPtr), NULL, 0)) {
+      break;
+    }
+    /* in case the value existed already, reset prefix to the 
+       original length */
+    Tcl_DStringSetLength(dsPtr, prefixLength);
+  }
+
   fullname = Tcl_NewStringObj(Tcl_DStringValue(dsPtr), Tcl_DStringLength(dsPtr));
 
   INCR_REF_COUNT(fullname);
@@ -8825,11 +8979,10 @@
 static int
 XOTclCRecreateMethod(ClientData cd, Tcl_Interp *in, int objc, Tcl_Obj *objv[]) {
   XOTclClass *cl = XOTclObjectToClass(cd);
-  XOTclObject *obj = &cl->object, *newobj;
+  XOTclObject *newobj;
   int result;
 
   if (!cl) return XOTclObjErrType(in, objv[0], "Class");
-  if (!obj) return XOTclObjErrType(in, objv[0], "Object");
   if (objc < 2)
     return XOTclObjErrArgCnt(in, cl->object.cmdName, "recreate <obj> ?args?");
 
@@ -8840,7 +8993,7 @@
   INCR_REF_COUNT(objv[1]);
   newobj->flags |= XOTCL_RECREATE;
 
-  result = doCleanup(in, newobj, obj, objc, objv);
+  result = doCleanup(in, newobj, &cl->object, objc, objv);
   if (result == TCL_OK) {
       result = doObjInitialization(in, newobj, objc, objv);
       if (result == TCL_OK)
@@ -8858,7 +9011,7 @@
   XOTclClass **scl = 0;
   int reversed = 0;
   int i, j;
-  XOTclClasses* filterCheck = ComputeOrder(cl, Super);
+  XOTclClasses* filterCheck;
 
   if (!cl) return XOTclObjErrType(in, objv[0], "Class");
   if (objc != 2)
@@ -8868,6 +9021,7 @@
     return XOTclObjErrArgCnt(in, cl->object.cmdName, "superclass <classes>");
 
 
+  filterCheck = ComputeOrder(cl, Super);
   /*
    * we have to remove all dependent superclass filter referenced
    * by class or one of its subclasses
@@ -8960,266 +9114,270 @@
 static int
 XOTclCInfoMethod(ClientData cd, Tcl_Interp *in, int objc, Tcl_Obj * CONST objv[]) {
   XOTclClass *cl = XOTclObjectToClass(cd);
-  Tcl_Namespace *nsp = cl->nsPtr;
-  XOTclClassOpt* opt = cl->opt;
-
+  Tcl_Namespace *nsp;
+  XOTclClassOpt *opt;
   char *pattern, *cmd;
   int modifiers = 0;
 
-  if (!cl)
-    return XOTclObjErrType(in, objv[0], "Class");
   if (objc < 2)
     return XOTclObjErrArgCnt(in, cl->object.cmdName, "info <opt> ?args?");
 
-  cmd = ObjStr(objv[1]);
-  pattern = (objc > 2) ? ObjStr(objv[2]) : 0;
+  if (cl) {
+    nsp = cl->nsPtr;
+    opt = cl->opt;
 
-  /*
-   * check for "-" modifiers
-   */
-  if (pattern && *pattern == '-') {
-    modifiers = countModifiers(objc, objv);
-    pattern = (objc > 2+modifiers) ? ObjStr(objv[2+modifiers]) : 0;
-  }
-
-  switch (*cmd) {
-  case 'c':
-    if (!strcmp(cmd, "classchildren")) {
-      if (objc > 3 || modifiers > 0)
-	return XOTclObjErrArgCnt(in, cl->object.cmdName, "info classchildren ?pat?");
-      return ListChildren(in, (XOTclObject*) cl, pattern, 1);
-    } else if (!strcmp(cmd, "classparent")) {
-      if (objc > 2 || modifiers > 0)
-	return XOTclObjErrArgCnt(in, cl->object.cmdName, "info classparent");
-      return ListParent(in, &cl->object);
+    cmd = ObjStr(objv[1]);
+    pattern = (objc > 2) ? ObjStr(objv[2]) : 0;
+    
+    /*
+     * check for "-" modifiers
+     */
+    if (pattern && *pattern == '-') {
+      modifiers = countModifiers(objc, objv);
+      pattern = (objc > 2+modifiers) ? ObjStr(objv[2+modifiers]) : 0;
     }
-    break;
-
-  case 'h':
-    if (!strcmp(cmd, "heritage")) {
-      if (objc > 3 || modifiers > 0)
-	return XOTclObjErrArgCnt(in, cl->object.cmdName, "info heritage ?pat?");
-      return ListHeritage(in, cl, pattern);
-    }
-    break;
-
-  case 'i':
-    if (cmd[1] == 'n' && cmd[2] == 's' && cmd[3] == 't') {
-      char *cmdTail = cmd + 4;
-      switch (*cmdTail) {
-      case 'a':
-	if (!strcmp(cmdTail, "ances")) {
-	  if (objc > 3 || modifiers > 0)
-	    return XOTclObjErrArgCnt(in, cl->object.cmdName, "info instances ?pat?");
-	  return ListObjPtrHashTable(in, &cl->instances, pattern);
-	} else if (!strcmp(cmdTail, "args")) {
-	  if (objc != 3 || modifiers > 0)
-	    return XOTclObjErrArgCnt(in, cl->object.cmdName,
-				     "info instargs <instproc>");
-	  if (cl->nonposArgsTable) {
-	    XOTclNonposArgs* nonposArgs = 
-	      NonposArgsGet(cl->nonposArgsTable, pattern);
-	    if (nonposArgs) {
-	      return ListArgsFromOrdinaryArgs(in, nonposArgs);
+    
+    switch (*cmd) {
+    case 'c':
+      if (!strcmp(cmd, "classchildren")) {
+	if (objc > 3 || modifiers > 0)
+	  return XOTclObjErrArgCnt(in, cl->object.cmdName, "info classchildren ?pat?");
+	return ListChildren(in, (XOTclObject*) cl, pattern, 1);
+      } else if (!strcmp(cmd, "classparent")) {
+	if (objc > 2 || modifiers > 0)
+	  return XOTclObjErrArgCnt(in, cl->object.cmdName, "info classparent");
+	return ListParent(in, &cl->object);
+      }
+      break;
+      
+    case 'h':
+      if (!strcmp(cmd, "heritage")) {
+	if (objc > 3 || modifiers > 0)
+	  return XOTclObjErrArgCnt(in, cl->object.cmdName, "info heritage ?pat?");
+	return ListHeritage(in, cl, pattern);
+      }
+      break;
+      
+    case 'i':
+      if (cmd[1] == 'n' && cmd[2] == 's' && cmd[3] == 't') {
+	char *cmdTail = cmd + 4;
+	switch (*cmdTail) {
+	case 'a':
+	  if (!strcmp(cmdTail, "ances")) {
+	    if (objc > 3 || modifiers > 0)
+	      return XOTclObjErrArgCnt(in, cl->object.cmdName, "info instances ?pat?");
+	    return ListObjPtrHashTable(in, &cl->instances, pattern);
+	  } else if (!strcmp(cmdTail, "args")) {
+	    if (objc != 3 || modifiers > 0)
+	      return XOTclObjErrArgCnt(in, cl->object.cmdName,
+				       "info instargs <instproc>");
+	    if (cl->nonposArgsTable) {
+	      XOTclNonposArgs* nonposArgs = 
+		NonposArgsGet(cl->nonposArgsTable, pattern);
+	      if (nonposArgs) {
+		return ListArgsFromOrdinaryArgs(in, nonposArgs);
+	      }
 	    }
+	    return ListProcArgs(in, Tcl_Namespace_cmdTable(nsp), pattern);
 	  }
-	  return ListProcArgs(in, Tcl_Namespace_cmdTable(nsp), pattern);
-	}
-	break;
+	  break;
+	  
+	case 'b':
+	  if (!strcmp(cmdTail, "body")) {
+	    if (objc != 3 || modifiers > 0)
+	      return XOTclObjErrArgCnt(in, cl->object.cmdName,
+				       "info instbody <instproc>");
+	    return ListProcBody(in, Tcl_Namespace_cmdTable(nsp), pattern);
+	  }
+	  break;
 
-      case 'b':
-	if (!strcmp(cmdTail, "body")) {
-	  if (objc != 3 || modifiers > 0)
-	    return XOTclObjErrArgCnt(in, cl->object.cmdName,
-				     "info instbody <instproc>");
-	  return ListProcBody(in, Tcl_Namespace_cmdTable(nsp), pattern);
-	}
-	break;
-
-      case 'c':
-	if (!strcmp(cmdTail, "commands")) {
-	  if (objc > 3 || modifiers > 0)
-	    return XOTclObjErrArgCnt(in, cl->object.cmdName,
-				     "info instcommands ?pat?");
-	  return ListKeys(in, Tcl_Namespace_cmdTable(nsp), pattern);
-	}
-	break;
-
-      case 'd':
-	if (!strcmp(cmdTail, "default")) {
-	  if (objc != 5 || modifiers > 0)
-	    return XOTclObjErrArgCnt(in, cl->object.cmdName,
-				     "info instdefault <instproc> <arg> <var>");
-
-	  if (cl->nonposArgsTable) {
-	    XOTclNonposArgs* nonposArgs = 
-	      NonposArgsGet(cl->nonposArgsTable, pattern);
-	    if (nonposArgs) {
-	      return ListDefaultFromOrdinaryArgs(in, pattern, nonposArgs, 
-						 ObjStr(objv[3]), objv[4]);
+	case 'c':
+	  if (!strcmp(cmdTail, "commands")) {
+	    if (objc > 3 || modifiers > 0)
+	      return XOTclObjErrArgCnt(in, cl->object.cmdName,
+				       "info instcommands ?pat?");
+	    return ListKeys(in, Tcl_Namespace_cmdTable(nsp), pattern);
+	  }
+	  break;
+	  
+	case 'd':
+	  if (!strcmp(cmdTail, "default")) {
+	    if (objc != 5 || modifiers > 0)
+	      return XOTclObjErrArgCnt(in, cl->object.cmdName,
+				       "info instdefault <instproc> <arg> <var>");
+	    
+	    if (cl->nonposArgsTable) {
+	      XOTclNonposArgs* nonposArgs = 
+		NonposArgsGet(cl->nonposArgsTable, pattern);
+	      if (nonposArgs) {
+		return ListDefaultFromOrdinaryArgs(in, pattern, nonposArgs, 
+						   ObjStr(objv[3]), objv[4]);
+	      }
 	    }
+	    return ListProcDefault(in, Tcl_Namespace_cmdTable(nsp), pattern,
+				   ObjStr(objv[3]), objv[4]);
 	  }
-	  return ListProcDefault(in, Tcl_Namespace_cmdTable(nsp), pattern,
-				 ObjStr(objv[3]), objv[4]);
-	}
-	break;
-
-      case 'f':
-	if (!strcmp(cmdTail, "filter")) {
-	  int withGuards = 0;
-	  if (objc-modifiers > 3)
-	    return XOTclObjErrArgCnt(in, cl->object.cmdName,
-				     "info instfilter ?-guards? ?pat?");
-	  if (modifiers > 0) {
-	    withGuards = checkForModifier(objv, modifiers, "-guards");
-	    if (withGuards == 0)
-	      return XOTclVarErrMsg(in, "info instfilter: unknown modifier ",
-				    ObjStr(objv[2]), (char *)NULL);
+	  break;
+	  
+	case 'f':
+	  if (!strcmp(cmdTail, "filter")) {
+	    int withGuards = 0;
+	    if (objc-modifiers > 3)
+	      return XOTclObjErrArgCnt(in, cl->object.cmdName,
+				       "info instfilter ?-guards? ?pat?");
+	    if (modifiers > 0) {
+	      withGuards = checkForModifier(objv, modifiers, "-guards");
+	      if (withGuards == 0)
+		return XOTclVarErrMsg(in, "info instfilter: unknown modifier ",
+				      ObjStr(objv[2]), (char *)NULL);
+	    }
+	    return opt ? FilterInfo(in, opt->instfilters, pattern, withGuards, 0) : TCL_OK;
+	    
+	  } else if (!strcmp(cmdTail, "filterguard")) {
+	    if (objc != 3 || modifiers > 0)
+	      return XOTclObjErrArgCnt(in, cl->object.cmdName,
+				       "info instfilterguard filter");
+	    return opt ? GuardList(in, opt->instfilters, pattern) : TCL_OK;
+	  } else if (!strcmp(cmdTail, "forward")) {
+	    int argc = objc-modifiers;
+	    int definition;
+	    if (argc < 2 || argc > 3)
+	      return XOTclObjErrArgCnt(in, cl->object.cmdName,
+				       "info instforward ?-definition? ?name?");
+	    definition = checkForModifier(objv, modifiers, "-definition");
+	    if (nsp) 
+	      return forwardList(in, Tcl_Namespace_cmdTable(nsp), pattern, definition);
+	    else
+	      return TCL_OK;
 	  }
-	  return opt ? FilterInfo(in, opt->instfilters, pattern, withGuards, 0) : TCL_OK;
+	  break;
 
-	} else if (!strcmp(cmdTail, "filterguard")) {
-	  if (objc != 3 || modifiers > 0)
-	    return XOTclObjErrArgCnt(in, cl->object.cmdName,
-				     "info instfilterguard filter");
-	  return opt ? GuardList(in, opt->instfilters, pattern) : TCL_OK;
-	} else if (!strcmp(cmdTail, "forward")) {
-	  int argc = objc-modifiers;
-	  int definition;
-	  if (argc < 2 || argc > 3)
-	    return XOTclObjErrArgCnt(in, cl->object.cmdName,
-				     "info instforward ?-definition? ?name?");
-	  definition = checkForModifier(objv, modifiers, "-definition");
-	  if (nsp) 
-	    return forwardList(in, Tcl_Namespace_cmdTable(nsp), pattern, definition);
-	  else
+	case 'i':
+	  if (!strcmp(cmdTail, "invar")) {
+	    XOTclAssertionStore *assertions = opt ? opt->assertions : 0;
+	    if (objc != 2 || modifiers > 0)
+	      return XOTclObjErrArgCnt(in, cl->object.cmdName, 
+				       "info instinvar");
+	    
+	    if (assertions && assertions->invariants)
+	      Tcl_SetObjResult(in, AssertionList(in, assertions->invariants));
 	    return TCL_OK;
-	}
-	break;
-
-      case 'i':
-	if (!strcmp(cmdTail, "invar")) {
-	  XOTclAssertionStore *assertions = opt ? opt->assertions : 0;
-	  if (objc != 2 || modifiers > 0)
-	    return XOTclObjErrArgCnt(in, cl->object.cmdName, "info instinvar");
-
-	  if (assertions && assertions->invariants)
-	    Tcl_SetObjResult(in, AssertionList(in, assertions->invariants));
-	  return TCL_OK;
-	}
-	break;
-
-      case 'm':
-	if (!strcmp(cmdTail, "mixin")) {
-	  int withGuards = 0;
-
-	  if (objc-modifiers > 3 || modifiers > 1)
-	    return XOTclObjErrArgCnt(in, cl->object.cmdName,
-				     "info instmixin ?-guards? ?class?");
-	  if (modifiers > 0) {
-	    withGuards = checkForModifier(objv, modifiers, "-guards");
-	    if (withGuards == 0)
-	      return XOTclVarErrMsg(in, "info instfilter: unknown modifier ",
-				    ObjStr(objv[2]), (char *)NULL);
 	  }
-	  return opt ? MixinInfo(in, opt->instmixins, pattern, withGuards) : TCL_OK;
-
-	} else if (!strcmp(cmdTail, "mixinguard")) {
-	  if (objc != 3 || modifiers > 0)
-	    return XOTclObjErrArgCnt(in, cl->object.cmdName,
-				     "info instmixinguard mixin");
-	  return opt ? GuardList(in, opt->instmixins, pattern) : TCL_OK;
-	}
-	break;
-
-      case 'n':
-	if (!strcmp(cmdTail, "nonposargs")) {
-	  if (objc != 3 || modifiers > 0)
-	    return XOTclObjErrArgCnt(in, cl->object.cmdName, 
-				     "info instnonposargs <instproc>");
-	  if (cl->nonposArgsTable) {
-	    XOTclNonposArgs* nonposArgs = 
-	      NonposArgsGet(cl->nonposArgsTable, pattern);
-	    if (nonposArgs) {
-	      Tcl_SetObjResult(in, NonposArgsFormat(in, 
-						    nonposArgs->nonposArgs));
+	  break;
+	  
+	case 'm':
+	  if (!strcmp(cmdTail, "mixin")) {
+	    int withGuards = 0;
+	    
+	    if (objc-modifiers > 3 || modifiers > 1)
+	      return XOTclObjErrArgCnt(in, cl->object.cmdName,
+				       "info instmixin ?-guards? ?class?");
+	    if (modifiers > 0) {
+	      withGuards = checkForModifier(objv, modifiers, "-guards");
+	      if (withGuards == 0)
+		return XOTclVarErrMsg(in, "info instfilter: unknown modifier ",
+				      ObjStr(objv[2]), (char *)NULL);
 	    }
+	    return opt ? MixinInfo(in, opt->instmixins, pattern, withGuards) : TCL_OK;
+	    
+	  } else if (!strcmp(cmdTail, "mixinguard")) {
+	    if (objc != 3 || modifiers > 0)
+	      return XOTclObjErrArgCnt(in, cl->object.cmdName,
+				       "info instmixinguard mixin");
+	    return opt ? GuardList(in, opt->instmixins, pattern) : TCL_OK;
 	  }
-	  return TCL_OK;
-	}
-	break;
-
-      case 'p':
-	if (!strcmp(cmdTail, "procs")) {
-	  if (objc > 3 || modifiers > 0)
-	    return XOTclObjErrArgCnt(in, cl->object.cmdName, "info instprocs ?pat?");
-	  return ListMethodKeys(in, Tcl_Namespace_cmdTable(nsp), pattern,
-				/*noProcs*/ 0, /*noCmds*/ 1, /* noDups */ 0, 0);
-	} else if (!strcmp(cmdTail, "pre")) {
-	  XOTclProcAssertion* procs;
-	  if (objc != 3 || modifiers > 0)
-	    return XOTclObjErrArgCnt(in, cl->object.cmdName,
-				     "info instpre <proc>");
-	  if (opt && opt->assertions) {
-	    procs = AssertionFindProcs(opt->assertions, ObjStr(objv[2]));
-	    if (procs) Tcl_SetObjResult(in, AssertionList(in, procs->pre));
+	  break;
+	  
+	case 'n':
+	  if (!strcmp(cmdTail, "nonposargs")) {
+	    if (objc != 3 || modifiers > 0)
+	      return XOTclObjErrArgCnt(in, cl->object.cmdName, 
+				       "info instnonposargs <instproc>");
+	    if (cl->nonposArgsTable) {
+	      XOTclNonposArgs* nonposArgs = 
+		NonposArgsGet(cl->nonposArgsTable, pattern);
+	      if (nonposArgs) {
+		Tcl_SetObjResult(in, NonposArgsFormat(in, 
+						      nonposArgs->nonposArgs));
+	      }
+	    }
+	    return TCL_OK;
 	  }
-	  return TCL_OK;
-	} else if (!strcmp(cmdTail, "post")) {
-	  XOTclProcAssertion* procs;
-	  if (objc != 3 || modifiers > 0)
-	    return XOTclObjErrArgCnt(in, cl->object.cmdName,
-				     "info instpost <proc>");
-	  if (opt && opt->assertions) {
-	    procs = AssertionFindProcs(opt->assertions, ObjStr(objv[2]));
-	    if (procs) Tcl_SetObjResult(in, AssertionList(in, procs->post));
+	  break;
+	  
+	case 'p':
+	  if (!strcmp(cmdTail, "procs")) {
+	    if (objc > 3 || modifiers > 0)
+	      return XOTclObjErrArgCnt(in, cl->object.cmdName, "info instprocs ?pat?");
+	    return ListMethodKeys(in, Tcl_Namespace_cmdTable(nsp), pattern,
+				  /*noProcs*/ 0, /*noCmds*/ 1, /* noDups */ 0, 0);
+	  } else if (!strcmp(cmdTail, "pre")) {
+	    XOTclProcAssertion* procs;
+	    if (objc != 3 || modifiers > 0)
+	      return XOTclObjErrArgCnt(in, cl->object.cmdName,
+				       "info instpre <proc>");
+	    if (opt && opt->assertions) {
+	      procs = AssertionFindProcs(opt->assertions, ObjStr(objv[2]));
+	      if (procs) Tcl_SetObjResult(in, AssertionList(in, procs->pre));
+	    }
+	    return TCL_OK;
+	  } else if (!strcmp(cmdTail, "post")) {
+	    XOTclProcAssertion* procs;
+	    if (objc != 3 || modifiers > 0)
+	      return XOTclObjErrArgCnt(in, cl->object.cmdName,
+				       "info instpost <proc>");
+	    if (opt && opt->assertions) {
+	      procs = AssertionFindProcs(opt->assertions, ObjStr(objv[2]));
+	      if (procs) Tcl_SetObjResult(in, AssertionList(in, procs->post));
+	    }
+	    return TCL_OK;
 	  }
-	  return TCL_OK;
+	  break;
 	}
-	break;
       }
-    }
-    break;
-
-  case 'p':
-    if (!strcmp(cmd, "parameterclass")) {
-      if (opt && opt->parameterClass) {
-	Tcl_SetObjResult(in, opt->parameterClass);
-      } else {
-	Tcl_SetObjResult(in, XOTclGlobalObjects[XOTE_PARAM_CL]);
+      break;
+      
+    case 'p':
+      if (!strcmp(cmd, "parameterclass")) {
+	if (opt && opt->parameterClass) {
+	  Tcl_SetObjResult(in, opt->parameterClass);
+	} else {
+	  Tcl_SetObjResult(in, XOTclGlobalObjects[XOTE_PARAM_CL]);
+	}
+	return TCL_OK;
+      } else if (!strcmp(cmd, "parameter")) {
+	if (cl->parameters) {
+	  Tcl_SetObjResult(in, cl->parameters);
+	} else {
+	  Tcl_SetObjResult(in, XOTclGlobalObjects[XOTE_EMPTY]);
+	}
+	return TCL_OK;
       }
-      return TCL_OK;
-    } else if (!strcmp(cmd, "parameter")) {
-      if (cl->parameters) {
-	Tcl_SetObjResult(in, cl->parameters);
-      } else {
-	Tcl_SetObjResult(in, XOTclGlobalObjects[XOTE_EMPTY]);
+      break;
+      
+    case 's':
+      if (!strcmp(cmd, "superclass")) {
+	if (objc > 3 || modifiers > 0)
+	  return XOTclObjErrArgCnt(in, cl->object.cmdName, 
+				   "info superclass ?class?");
+	return ListSuperclasses(in, cl, pattern);
+      } else if (!strcmp(cmd, "subclass")) {
+	if (objc > 3 || modifiers > 0)
+	  return XOTclObjErrArgCnt(in, cl->object.cmdName, 
+				   "info subclass ?class?");
+	return ListSubclasses(in, cl, pattern);
       }
-      return TCL_OK;
+      break;
     }
-    break;
-
-  case 's':
-    if (!strcmp(cmd, "superclass")) {
-      if (objc > 3 || modifiers > 0)
-        return XOTclObjErrArgCnt(in, cl->object.cmdName, "info superclass ?class?");
-      return ListSuperclasses(in, cl, pattern);
-    } else if (!strcmp(cmd, "subclass")) {
-      if (objc > 3 || modifiers > 0)
-	return XOTclObjErrArgCnt(in, cl->object.cmdName, "info subclass ?class?");
-      return ListSubclasses(in, cl, pattern);
-    }
-    break;
   }
+
   return XOTclOInfoMethod(cd, in, objc, (Tcl_Obj **)objv);
 }
 
 static int
 XOTclCParameterMethod(ClientData cd, Tcl_Interp *in, int objc, Tcl_Obj *objv[]) {
   XOTclClass *cl = XOTclObjectToClass(cd);
-  XOTclObject *obj = &cl->object;
-  Tcl_Obj     **pv = 0;
-  Tcl_Obj     **ov = 0;
+  Tcl_Obj     **pv = 0, **ov = 0;
   int         elts, pc, oc, result;
   char *      params;
   if (!cl) return XOTclObjErrType(in, objv[0], "Class");
@@ -9228,6 +9386,7 @@
   if (cl->parameters) {
     DECR_REF_COUNT(cl->parameters);
   }
+  
   /* did we delete the parameters ? */
   params = ObjStr(objv[1]);
   if ((params == NULL) || (*params == '\0')) {
@@ -9245,8 +9404,9 @@
     for (elts = 0; elts < pc; elts++) {
       result = Tcl_ListObjGetElements(in, pv[elts], &oc, &ov);
       if (result == TCL_OK && oc > 0 ) {
-	result = callParameterMethodWithArg(obj, in, XOTclGlobalObjects[XOTE_MKGETTERSETTER],
-			    cl->object.cmdName, 3+oc, ov,0);
+	result = callParameterMethodWithArg(&cl->object, in, 
+					    XOTclGlobalObjects[XOTE_MKGETTERSETTER],
+					    cl->object.cmdName, 3+oc, ov,0);
       }
       if (result != TCL_OK)
 	break;
@@ -9258,13 +9418,14 @@
 XOTclCParameterClassMethod(ClientData cd, Tcl_Interp *in, int objc, Tcl_Obj *objv[]) {
   XOTclClass *cl = XOTclObjectToClass(cd);
   char *paramClStr;
-  XOTclClassOpt* opt = cl->opt;
+  XOTclClassOpt *opt;
 
   if (!cl) return XOTclObjErrType(in, objv[0], "Class");
   if (objc != 2)
     return XOTclObjErrArgCnt(in, cl->object.cmdName, "parameterclass cl");
 
   paramClStr = ObjStr(objv[1]);
+  opt = cl->opt;
   if (opt && opt->parameterClass) {
     DECR_REF_COUNT(opt->parameterClass);
   }
@@ -9302,64 +9463,6 @@
   return TCL_OK;
 }
 
-#if defined(TCLCMD)
-static void tclCmdDeleteProc(ClientData cd) {
-  tclCmdClientData *tcd = (tclCmdClientData *)cd;
-  DECR_REF_COUNT(tcd->cmdName);
-  FREE(tclCmdClientData, tcd);
-}
-
-static int
-XOTclCInstTclCmdMethod(ClientData cd, Tcl_Interp *in,
-		      int objc, Tcl_Obj * CONST objv[]) {
-  XOTclClass *cl = XOTclObjectToClass(cd);
-  tclCmdClientData *tcd;
-  char *cmdName;
-
-  if (!cl) return XOTclObjErrType(in, objv[0], "Class");
-  if (objc < 2) return XOTclObjErrArgCnt(in, cl->object.cmdName, "insttclcmd name");
-  cmdName = ObjStr(objv[1]);
-  tcd = NEW(tclCmdClientData);
-  tcd->obj = (XOTcl_Object*)cl;
-  tcd->cmdName = objv[1];
-  INCR_REF_COUNT(tcd->cmdName);
-
-  XOTclAddIMethod(in, (XOTcl_Class*) cl, NSTail(cmdName), 
-		  (Tcl_ObjCmdProc*)XOTclOEvalMethod,
-		  (ClientData)tcd, tclCmdDeleteProc);
-  return TCL_OK;
-}
-
-static int
-XOTclCTclCmdMethod(ClientData cd, Tcl_Interp *in, int objc, Tcl_Obj * CONST objv[]) {
-  XOTcl_Object *obj = (XOTcl_Object*) cd;
-  char *name;
-  Tcl_Obj *cmdObj;
-  tclCmdClientData *tcd;
-
-  if (objc < 2)  return XOTclObjErrArgCnt(in, obj->cmdName, "tclcmd name");
-
-  name = ObjStr(objv[1]);
-  if (isAbsolutePath(name)) {
-    cmdObj = objv[1];
-  } else {
-    cmdObj = NameInNamespaceObj(in, name, callingNameSpace(in));
-  }
-  tcd = NEW(tclCmdClientData);
-  tcd->obj = obj;
-  tcd->cmdName = cmdObj;
-  INCR_REF_COUNT(tcd->cmdName);
-  /*
-  fprintf(stderr,"tcd?%p, tcd->cmdName=%p, %s\n",
-	  tcd, tcd->cmdName, ObjStr(tcd->cmdName));
-  */
-
-  XOTclAddPMethod(in, obj, NSTail(ObjStr(cmdObj)), (Tcl_ObjCmdProc*)XOTclOEvalMethod,
-		  (ClientData)tcd, tclCmdDeleteProc);
-  return TCL_OK;
-}
-#endif
-
 static void forwardCmdDeleteProc(ClientData cd) {
   forwardCmdClientData *tcd = (forwardCmdClientData *)cd;
   if (tcd->cmdName)     {DECR_REF_COUNT(tcd->cmdName);}
@@ -10657,7 +10760,7 @@
 XOTcl_ThreadExitProc(ClientData cd) {
   /*fprintf(stderr,"+++ XOTcl_ThreadExitProc\n");*/
 #if !defined(PRE83)
-  static void XOTcl_ExitProc(ClientData cd);
+  void XOTcl_ExitProc(ClientData cd);
   Tcl_DeleteExitHandler(XOTcl_ExitProc, cd);
 #endif
   ExitHandler(cd);
@@ -10667,7 +10770,7 @@
 /*
  * Gets activated at application-exit
  */
-static void
+void
 XOTcl_ExitProc(ClientData cd) {
   /*fprintf(stderr,"+++ XOTcl_ExitProc\n");*/
 #if !defined(PRE83) && defined(TCL_THREADS)
@@ -10880,9 +10983,6 @@
   XOTclAddIMethod(in, (XOTcl_Class*) theobj, "procsearch", (Tcl_ObjCmdProc*)XOTclOProcSearchMethod, 0, 0);
   XOTclAddIMethod(in, (XOTcl_Class*) theobj, "requireNamespace", (Tcl_ObjCmdProc*)XOTclORequireNamespaceMethod, 0, 0);
   XOTclAddIMethod(in, (XOTcl_Class*) theobj, "set", (Tcl_ObjCmdProc*)XOTclOSetMethod, 0, 0);
-#if defined(TCLCMD)
-  XOTclAddIMethod(in, (XOTcl_Class*) theobj, "tclcmd", (Tcl_ObjCmdProc*)XOTclCTclCmdMethod, 0, 0);  
-#endif
   XOTclAddIMethod(in, (XOTcl_Class*) theobj, "forward", (Tcl_ObjCmdProc*)XOTclCForwardMethod, 0, 0);
   XOTclAddIMethod(in, (XOTcl_Class*) theobj, "unset", XOTclOUnsetMethod, 0, 0);
   XOTclAddIMethod(in, (XOTcl_Class*) theobj, "uplevel", XOTclOUplevelMethod, 0,0);
@@ -10902,9 +11002,6 @@
   XOTclAddIMethod(in, (XOTcl_Class*) thecls, "instmixinguard", (Tcl_ObjCmdProc*)XOTclCInstMixinGuardMethod, 0, 0);
   XOTclAddIMethod(in, (XOTcl_Class*) thecls, "instparametercmd", (Tcl_ObjCmdProc*)XOTclCInstParameterCmdMethod, 0, 0);
   XOTclAddIMethod(in, (XOTcl_Class*) thecls, "instproc", (Tcl_ObjCmdProc*)XOTclCInstProcMethod, 0, 0);
-#if defined(TCLCMD)
-  XOTclAddIMethod(in, (XOTcl_Class*) thecls, "insttclcmd", (Tcl_ObjCmdProc*)XOTclCInstTclCmdMethod, 0, 0);
-#endif
   XOTclAddIMethod(in, (XOTcl_Class*) thecls, "instforward", (Tcl_ObjCmdProc*)XOTclCInstForwardMethod, 0, 0);
 
   XOTclAddIMethod(in, (XOTcl_Class*) thecls, "parameter", (Tcl_ObjCmdProc*)XOTclCParameterMethod, 0, 0);
@@ -10990,9 +11087,9 @@
 #ifndef AOL_SERVER
   /* the AOL server uses a different package loading mechanism */
 # ifdef COMPILE_XOTCL_STUBS
-  Tcl_PkgProvideEx(in, "XOTcl", XOTCLVERSION, (ClientData) &xotclStubs);
+  Tcl_PkgProvideEx(in, "XOTcl", PACKAGE_VERSION, (ClientData) &xotclStubs);
 # else
-  Tcl_PkgProvide(in, "XOTcl", XOTCLVERSION);
+  Tcl_PkgProvide(in, "XOTcl", PACKAGE_VERSION);
 # endif
 #endif
 
@@ -11009,10 +11106,10 @@
   return TCL_OK;
 }
 
-#ifdef NEVER
+
 extern int
-Xotcl_SafeInit(Tcl_Interp *in) {
+Xotcl_SafeInit(Tcl_Interp *interp) {
   /*** dummy for now **/
   return Xotcl_Init(interp);
 }
-#endif
+
Index: xotcl/generic/xotclInt.h
===================================================================
diff -u -r0896d4deb00780e48b5b03269bf9c4ecca948919 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/generic/xotclInt.h	(.../xotclInt.h)	(revision 0896d4deb00780e48b5b03269bf9c4ecca948919)
+++ xotcl/generic/xotclInt.h	(.../xotclInt.h)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,5 +1,5 @@
 /* -*- Mode: c++ -*-
- *  $Id: xotclInt.h,v 1.13 2005/01/06 03:10:05 neumann Exp $
+ *  $Id: xotclInt.h,v 1.14 2005/09/09 21:07:23 neumann Exp $
  *  Extended Object Tcl (XOTcl)
  *
  *  Copyright (C) 1999-2002 Gustaf Neumann, Uwe Zdun
@@ -267,7 +267,7 @@
 # endif
 #endif
 
-#if 1
+#if 0
 #define XOTcl_FrameDecls CallFrame *oldFramePtr = 0, frame, *newFramePtr = &frame
 #define XOTcl_PushFrame(in,obj) \
      memset(newFramePtr, 0, sizeof(CallFrame)); \
@@ -524,7 +524,7 @@
     XOTE___UNKNOWN, XOTE_ARGS, XOTE_SPLIT, XOTE_COMMA,
     /** these are the redefined tcl commands; leave them
 	together at the end */
-    XOTE_EXPR, XOTE_INCR, XOTE_INFO, XOTE_RENAME, XOTE_SUBST,
+    XOTE_EXPR, XOTE_INCR, XOTE_INFO, XOTE_RENAME, XOTE_SUBST
 } XOTclGlobalNames;
 #if !defined(XOTCL_C)
 extern char *XOTclGlobalStrings[];
Index: xotcl/library/actiweb/Agent.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/actiweb/Agent.xotcl	(.../Agent.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/actiweb/Agent.xotcl	(.../Agent.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,224 +1,236 @@
-# $Id: Agent.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: Agent.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::actiweb::agent 0.8
 
 package require xotcl::trace
 package require xotcl::comm::httpAccess
 package require xotcl::actiweb::webObject
 package require xotcl::store::persistence
 
+package require XOTcl
+
 #
 # current response codes for agent requests:
 #
 # OK      -- content arrived (can be retrieved with sinks content method)
 # ERROR   -- error on the place invocation
 # FAILED  -- call itself failed, e.g. cancel
 #
-Class AgentMemSink \
-  -superclass MemorySink \
-  -parameter {{agent ""} responseCode}
 
-AgentMemSink instproc startCb {r}   {
-  my set d "" 
-  next
-}
-AgentMemSink instproc notifyCb {r} {next}
-AgentMemSink instproc incCb {r t c} {next}
-AgentMemSink instproc endCb {r} {
-  if {[Agent exists responseCodes([$r set responseCode])]} {
-    my set responseCode OK
-  } else {
-    my set responseCode ERROR
-  }
-  next
-}
-AgentMemSink instproc cancelCb {r} {
-  my set responseCode FAILED
-  next
-}
-AgentMemSink instproc endReq {r} {
-  my instvar agent 
-  if {[Object isobject $agent]} {
-    if {[$agent exists sinks($r)]} {
-      $agent unset sinks($r)
+namespace eval ::xotcl::actiweb::agent {
+    namespace import ::xotcl::*
+
+    Class AgentMemSink \
+	-superclass MemorySink \
+	-parameter {{agent ""} responseCode}
+
+    AgentMemSink instproc startCb {r}   {
+	my set d "" 
+	next
     }
-  }
-}
+    AgentMemSink instproc notifyCb {r} {next}
+    AgentMemSink instproc incCb {r t c} {next}
+    AgentMemSink instproc endCb {r} {
+	if {[Agent exists responseCodes([$r set responseCode])]} {
+	    my set responseCode OK
+	} else {
+	    my set responseCode ERROR
+	}
+	next
+    }
+    AgentMemSink instproc cancelCb {r} {
+	my set responseCode FAILED
+	next
+    }
+    AgentMemSink instproc endReq {r} {
+	my instvar agent 
+	if {[Object isobject $agent]} {
+	    if {[$agent exists sinks($r)]} {
+		$agent unset sinks($r)
+	    }
+	}
+    }
 
-# sink class that calls the agent's endcmd in async calls
-# the sink is destroyed automatically after endCmd is called
-Class AgentAsyncSink -superclass AgentMemSink
-AgentAsyncSink instproc endCb {r} {
-  next
-  my instvar endCmd responseCode
-  set result [my content]
-  if {[info exists endCmd]} {
-    eval [concat $endCmd $responseCode \"$result\"]
-  }
-  my endReq $r
-}
-AgentAsyncSink instproc cancelCb {r} {
-  my instvar endCmd responseCode
-  if {[info exists endCmd]} {
-    eval [concat $endCmd $responseCode ""]
-  }
-  next
-  my endReq $r
-}
+    # sink class that calls the agent's endcmd in async calls
+    # the sink is destroyed automatically after endCmd is called
+    Class AgentAsyncSink -superclass AgentMemSink
+    AgentAsyncSink instproc endCb {r} {
+	next
+	my instvar endCmd responseCode
+	set result [my content]
+	if {[info exists endCmd]} {
+	    eval [concat $endCmd $responseCode \"$result\"]
+	}
+	my endReq $r
+    }
+    AgentAsyncSink instproc cancelCb {r} {
+	my instvar endCmd responseCode
+	if {[info exists endCmd]} {
+	    eval [concat $endCmd $responseCode ""]
+	}
+	next
+	my endReq $r
+    }
 
-# sink type for sync request 
-# has to be destroyed with endReq when content is 
-# read (see createSyncRequest)
-Class AgentSyncSink -superclass AgentMemSink
+    # sink type for sync request 
+    # has to be destroyed with endReq when content is 
+    # read (see createSyncRequest)
+    Class AgentSyncSink -superclass AgentMemSink
 
 
-Class Agent -superclass WebObject
-Agent array set responseCodes {
-  200 {OK}
-}
+    Class Agent -superclass WebObject
+    Agent array set responseCodes {
+	200 {OK}
+    }
 
-Agent instproc init args {
-  #my showCall
-  #my exportProcs invoke
-  my array set endCmds {}
-  my array set sinks {}
-  next
-}
+    Agent instproc init args {
+	#my showCall
+	#my exportProcs invoke
+	my array set endCmds {}
+	my array set sinks {}
+	next
+    }
 
-#
-# method to create async requests
-#
-# endCmd specifies the command (or object method or proc ...) that
-# is to be called, when the request has ended, empty for sync requests
-#
-# args are to be given in the form -name value, like:
-#   -contentType text/xml
-#   -method PUT 
-#   -data XXX
-#
-# returns the request object name
-#
-Agent instproc createRequest {endCmd url args} {
-  #my showCall
-  puts stderr "[self] [self proc]"
-  my instvar place
-  set s [AgentAsyncSink create [$place autoname agentmemsink] \
-	     -agent [self]]
-  set cmd [list Access createRequest -caching 0 -url $url \
-	       -informObject $s]
-  foreach {n v} $args {lappend cmd $n $v}
-  $s set endCmd $endCmd
-  set t ::[string trimleft [::eval $cmd $args] :]
-  my set sinks($t) $s
-  return $t
-}
-#
-# method to create sync reqs ... url and args identical to
-# async req
-#
-# returns the result of sync request, if "OK" 
-# otherwise: Raises an error
-#
-Agent instproc createSyncRequest {url args} {
-  #my showCall
-  puts stderr "[self] [self proc]"
-  my instvar place
-  set s [AgentSyncSink [$place autoname agentmemsink] -agent [self]]
-  set cmd [list Access createRequest \
-	       -httpVersion 1.0 \
-	       -caching 0 -url $url -informObject $s -blocking 1]
-  foreach {n v} $args {lappend cmd $n $v}
-  set t ::[string trimleft [::eval $cmd] :]
-  #puts stderr "After SyncRequest t=$t [$s responseCode]"
-  if {[$s responseCode] == "OK"} {
-    set content [$s content]
-    # kill the sink
-    $s endReq $t
-    return $content
-  }
-  $s endReq $t
-  error "[self] -- Sync request failed: url=$url, responseCode=[$s responseCode]"
-}
-#
-# invoke a remote method directly along the places' dispatcher 
-#
-Agent instproc invoke {endCmd host receiver args} {
-  puts stderr [self proc]----host=$host
-  #my showCall
-  set url http://$host/${receiver}+[url encode $args]
-  my createRequest $endCmd $url
-}
-Agent instproc syncInvoke {host receiver args} {
-  puts stderr [self proc]----host=$host
-  #[self] showCall
-  set url http://$host/${receiver}+[url encode $args]
-  my createSyncRequest $url
-}
+    #
+    # method to create async requests
+    #
+    # endCmd specifies the command (or object method or proc ...) that
+    # is to be called, when the request has ended, empty for sync requests
+    #
+    # args are to be given in the form -name value, like:
+    #   -contentType text/xml
+    #   -method PUT 
+    #   -data XXX
+    #
+    # returns the request object name
+    #
+    Agent instproc createRequest {endCmd url args} {
+	#my showCall
+	puts stderr "[self] [self proc]"
+	my instvar place
+	set s [AgentAsyncSink create [$place autoname agentmemsink] \
+		   -agent [self]]
+	set cmd [list Access createRequest -caching 0 -url $url \
+		     -informObject $s]
+	foreach {n v} $args {lappend cmd $n $v}
+	$s set endCmd $endCmd
+	set t ::[string trimleft [::eval $cmd $args] :]
+	my set sinks($t) $s
+	return $t
+    }
+    #
+    # method to create sync reqs ... url and args identical to
+    # async req
+    #
+    # returns the result of sync request, if "OK" 
+    # otherwise: Raises an error
+    #
+    Agent instproc createSyncRequest {url args} {
+	#my showCall
+	puts stderr "[self] [self proc]"
+	my instvar place
+	set s [AgentSyncSink [$place autoname agentmemsink] -agent [self]]
+	set cmd [list Access createRequest \
+		     -httpVersion 1.0 \
+		     -caching 0 -url $url -informObject $s -blocking 1]
+	foreach {n v} $args {lappend cmd $n $v}
+	set t ::[string trimleft [::eval $cmd] :]
+	#puts stderr "After SyncRequest t=$t [$s responseCode]"
+	if {[$s responseCode] == "OK"} {
+	    set content [$s content]
+	    # kill the sink
+	    $s endReq $t
+	    return $content
+	}
+	$s endReq $t
+	error "[self] -- Sync request failed: url=$url, responseCode=[$s responseCode]"
+    }
+    #
+    # invoke a remote method directly along the places' dispatcher 
+    #
+    Agent instproc invoke {endCmd host receiver args} {
+	puts stderr [self proc]----host=$host
+	#my showCall
+	set url http://$host/${receiver}+[url encode $args]
+	my createRequest $endCmd $url
+    }
+    Agent instproc syncInvoke {host receiver args} {
+	puts stderr [self proc]----host=$host
+	#[self] showCall
+	set url http://$host/${receiver}+[url encode $args]
+	my createSyncRequest $url
+    }
 
-#
-# invoke a cloning migration 
-#
-Agent instproc cloneImpl {async host startcmd {endCmd ""}} {
-  #my showCall
-  set ai [my agentInfo]
-  set place [Place getInstance]
+    #
+    # invoke a cloning migration 
+    #
+    Agent instproc cloneImpl {async host startcmd {endCmd ""}} {
+	#my showCall
+	set ai [my agentInfo]
+	set place [Place getInstance]
 
-  # get the full name of the agent ns from the places's agent mgr
-  #set ns [${place}::agentMgr::rdfNS searchPrefix agent]
+	# get the full name of the agent ns from the places's agent mgr
+	#set ns [${place}::agentMgr::rdfNS searchPrefix agent]
 
-  $ai set agentData(script) [${place}::scriptCreator makeScript [self]]
-  $ai append agentData(script) [my makeVarScript]
-  $ai set agentData(startcmd) $startcmd
+	$ai set agentData(script) [${place}::scriptCreator makeScript [self]]
+	$ai append agentData(script) [my makeVarScript]
+	$ai set agentData(startcmd) $startcmd
 
-  set data [$ai getXMLScript [$ai name]]
-  ###puts $data
+	set data [$ai getXMLScript [$ai name]]
+	###puts $data
 
-  #set data [[Place getInstance]::rdfCreator createFromTriples [$ai getTriples]]
-  if {$async} {
-    return [my createRequest $endCmd http://$host/[my selfName] \
-	      -contentType text/xml \
-	      -method PUT \
-	      -data $data]
-  } else {
-    return [my createSyncRequest http://$host/[my selfName] \
-	      -contentType text/xml \
-	      -method PUT \
-	      -data $data]
-  }
-}
-Agent instproc clone {host startCmd endCmd} {
-  my cloneImpl 1 $host $startCmd $endCmd
-}
-Agent instproc syncClone {host startCmd} {
-  my cloneImpl 0 $host $startCmd
-}
+	#set data [[Place getInstance]::rdfCreator createFromTriples [$ai getTriples]]
+	if {$async} {
+	    return [my createRequest $endCmd http://$host/[my selfName] \
+			-contentType text/xml \
+			-method PUT \
+			-data $data]
+	} else {
+	    return [my createSyncRequest http://$host/[my selfName] \
+			-contentType text/xml \
+			-method PUT \
+			-data $data]
+	}
+    }
+    Agent instproc clone {host startCmd endCmd} {
+	my cloneImpl 1 $host $startCmd $endCmd
+    }
+    Agent instproc syncClone {host startCmd} {
+	my cloneImpl 0 $host $startCmd
+    }
 
-#
-# invoke a migration that destroys the object in the current place 
-#
-Agent instproc migrateImpl {async host startcmd {endCmd ""}} {
-  ### GN ???
-  puts stderr "--- async=$async"
-  if {$async} {
-    set r [my clone $host $startcmd $endCmd]
-  } else {
-    set r [my syncClone $host $startcmd]
-  }
-  puts stderr "--- [self] destroy +++ "
-  my destroy  ;### FIXME: this does not work in the asynchronous case
-  return $r
+    #
+    # invoke a migration that destroys the object in the current place 
+    #
+    Agent instproc migrateImpl {async host startcmd {endCmd ""}} {
+	### GN ???
+	puts stderr "--- async=$async"
+	if {$async} {
+	    set r [my clone $host $startcmd $endCmd]
+	} else {
+	    set r [my syncClone $host $startcmd]
+	}
+	puts stderr "--- [self] destroy +++ "
+	my destroy  ;### FIXME: this does not work in the asynchronous case
+	return $r
+    }
+    Agent instproc migrate {host startCmd endCmd} {
+	#my migrateImpl 1 $host $startCmd $endCmd
+	my migrateImpl 0 $host $startCmd $endCmd
+    }
+    Agent instproc syncMigrate {host startCmd} {
+	my migrateImpl 0 $host $startCmd
+    }
+    #
+    # query a place with its hostname for its name
+    #
+    Agent instproc getPlaceFromHostName {endCb host} {
+	set r [my autoname __result]
+	my createRequest "[self]::$r set" http://$host/ 
+	return [set [self]::$r]
+    }
+
+    namespace export AgentMemSink AgentAsyncSink AgentSyncSink Agent
 }
-Agent instproc migrate {host startCmd endCmd} {
-  #my migrateImpl 1 $host $startCmd $endCmd
-  my migrateImpl 0 $host $startCmd $endCmd
-}
-Agent instproc syncMigrate {host startCmd} {
-  my migrateImpl 0 $host $startCmd
-}
-#
-# query a place with its hostname for its name
-#
-Agent instproc getPlaceFromHostName {endCb host} {
-  set r [my autoname __result]
-  my createRequest "[self]::$r set" http://$host/ 
-  return [set [self]::$r]
-}
+
+namespace import ::xotcl::actiweb::agent::*
Index: xotcl/library/actiweb/AgentManagement.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/actiweb/AgentManagement.xotcl	(.../AgentManagement.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/actiweb/AgentManagement.xotcl	(.../AgentManagement.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,207 +1,218 @@
-# $Id: AgentManagement.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: AgentManagement.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::actiweb::agentManagement 0.8
 
 package require xotcl::rdf::parser
 package require xotcl::rdf::triple
 package require xotcl::actiweb::agent
 
-Class AgentInfo -parameter {
-  {name ""}
-  {changed 1}
-}
+package require XOTcl
 
-AgentInfo instproc init args {
-  next
-  #
-  # array providing info on a (migrated) agent
-  #
-  my array set agentData {}
-  RDFTripleDB [self]::db
-  my trace variable agentData w [list [self] changeOccured]
-  my trace variable name w [list [self] changeOccured]
-}
+namespace eval ::xotcl::actiweb::agentManagement {
+    namespace import ::xotcl::*
 
-AgentInfo instproc getXMLScript {name} {
-  #my showCall
-  set s {<?xml version="1.0"?>
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:xotcl="http://www.xotcl.org/agent">
-  <rdf:Description about="$name">}
-  set s [subst -nobackslashes $s]
-  foreach n [my array name agentData] {
-      append s "
+    Class AgentInfo -parameter {
+	{name ""}
+	{changed 1}
+    }
+
+    AgentInfo instproc init args {
+	next
+	#
+	# array providing info on a (migrated) agent
+	#
+	my array set agentData {}
+	RDFTripleDB [self]::db
+	my trace variable agentData w [list [self] changeOccured]
+	my trace variable name w [list [self] changeOccured]
+    }
+
+    AgentInfo instproc getXMLScript {name} {
+	#my showCall
+	set s {<?xml version="1.0"?>
+	    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	    xmlns:xotcl="http://www.xotcl.org/agent">
+	    <rdf:Description about="$name">}
+	set s [subst -nobackslashes $s]
+	foreach n [my array name agentData] {
+	    append s "
     <agent:$n> [my set agentData($n)] </agent:$n>"
-  }
-  append s "  
+	}
+	append s "  
   </rdf:Description>
 </rdf:RDF>"
-}
+    }
 
-AgentInfo instproc changeOccured args {my set changed 1}
+    AgentInfo instproc changeOccured args {my set changed 1}
 
-AgentInfo instproc getTriples {} {
-  #my showCall
-  if {[my set changed]} {
-    # build up the triple-db
-    [self]::db reset
-    set place [Place getInstance]
-    set subject "http://[$place set host]:[$place set port]/[my name]"
-    foreach n [my array names agentData] {
-      [self]::db add $n $subject [my set agentData($n)]
+    AgentInfo instproc getTriples {} {
+	#my showCall
+	if {[my set changed]} {
+	    # build up the triple-db
+	    [self]::db reset
+	    set place [Place getInstance]
+	    set subject "http://[$place set host]:[$place set port]/[my name]"
+	    foreach n [my array names agentData] {
+		[self]::db add $n $subject [my set agentData($n)]
+	    }
+	}
+	return [[self]::db getTriples]
     }
-  }
-  return [[self]::db getTriples]
-}
 
-AgentInfo instproc print {} {
-  puts "AGENT-INFO:"
-  puts "Name == [my set name]"
-  foreach a [my array names agentData] {
-    puts "$a == [my set agentData($a)]"
-  }
-}
+    AgentInfo instproc print {} {
+	puts "AGENT-INFO:"
+	puts "Name == [my set name]"
+	foreach a [my array names agentData] {
+	    puts "$a == [my set agentData($a)]"
+	}
+    }
 
-Class AgentVisitor -superclass NodeTreeVisitor -parameter {
-  {openProperty ""}
-  {agentInfo ""}
-  {rdfNS {[my info parent]::rdfNS}}
-}
+    Class AgentVisitor -superclass NodeTreeVisitor -parameter {
+	{openProperty ""}
+	{agentInfo ""}
+	{rdfNS {[my info parent]::rdfNS}}
+    }
 
-AgentVisitor instproc fullName {obj n} {
-  set ns [$obj resolveNS]
-  return [$ns getFullName $n]
-}
-
-AgentVisitor instproc visit {objName} {
-  #puts stderr "AgentVisitor visit -- $objName"
-  set ai [my set agentInfo]
-  set cl [$objName info class]
-  #puts stderr "AgentVisitor visit -- $objName cl=$cl <[$ai name]>"
-  if {[$ai name] == ""} {
-    #### not fixed yet
-    puts stderr "my fixme (AgentManagement)"
-    if {$cl == "::About" &&
-	[string first "::Description" [[$objName info parent] info class]] == 0} {
-      $ai name [$objName set content]
+    AgentVisitor instproc fullName {obj n} {
+	set ns [$obj resolveNS]
+	return [$ns getFullName $n]
     }
-  } else {  
-    #puts stderr C=<[$objName content]>
-    #$cl showVars
-    switch -exact $cl {
-      ::RDFProperty {
-	set c [$objName content]
-	#$objName showVars
-	if {[$objName exists pcdata]} {
-	  $ai set agentData($c) [lindex [$objName getPCdataList] 0]
-	} else {
-	  #puts stderr "empty PCDATA"
+
+    AgentVisitor instproc visit {objName} {
+	#puts stderr "AgentVisitor visit -- $objName"
+	set ai [my set agentInfo]
+	set cl [$objName info class]
+	#puts stderr "AgentVisitor visit -- $objName cl=$cl <[$ai name]>"
+	if {[$ai name] == ""} {
+	    #### not fixed yet
+	    puts stderr "my fixme (AgentManagement)"
+	    if {$cl == "::About" &&
+		[string first "::Description" [[$objName info parent] info class]] == 0} {
+		$ai name [$objName set content]
+	    }
+	} else {  
+	    #puts stderr C=<[$objName content]>
+	    #$cl showVars
+	    switch -exact $cl {
+		::RDFProperty {
+		    set c [$objName content]
+		    #$objName showVars
+		    if {[$objName exists pcdata]} {
+			$ai set agentData($c) [lindex [$objName getPCdataList] 0]
+		    } else {
+			#puts stderr "empty PCDATA"
+		    }
+		}
+	    }
 	}
-      }
     }
-  }
-}
 
-AgentVisitor instproc interpretNodeTree node {
-  if {[my set agentInfo] == "" } {
-    error "Agent Visitor: no agent info provided."
-  } 
-  $node accept [self]
-}
+    AgentVisitor instproc interpretNodeTree node {
+	if {[my set agentInfo] == "" } {
+	    error "Agent Visitor: no agent info provided."
+	} 
+	$node accept [self]
+    }
 
-Class AgentMgr -superclass Agent \
-  -parameter {
-    {acceptedData [list script startcmd senderPlace senderPort senderHost]}
-  }
+    Class AgentMgr -superclass Agent \
+	-parameter {
+	    {acceptedData [list script startcmd senderPlace senderPort senderHost]}
+	}
 
-AgentMgr instproc init args {
-  next
-  my array set agents {}
-  #
-  # this ns class holds the prefix/Rdf-ns pairs used by this
-  # agent mgr (with default values)
-  #
-  XMLNamespace [self]::rdfNS
-  [self]::rdfNS add agent {http://www.xotcl.org/schema/agent#}
-  [self]::rdfNS add service {http://www.xotcl.org/schema/service#}
-  [self]::rdfNS add xotcl {http://www.xotcl.org/schema/xotcl#}
-  RDFParser [self]::rdfParser 
-  AgentVisitor [self]::agentVisitor
-    
-    #package require xotcl::xml::printVisitor 
-    #PrintVisitor [self]::pv
-}
+    AgentMgr instproc init args {
+	next
+	my array set agents {}
+	#
+	# this ns class holds the prefix/Rdf-ns pairs used by this
+	# agent mgr (with default values)
+	#
+	XMLNamespace [self]::rdfNS
+	[self]::rdfNS add agent {http://www.xotcl.org/schema/agent#}
+	[self]::rdfNS add service {http://www.xotcl.org/schema/service#}
+	[self]::rdfNS add xotcl {http://www.xotcl.org/schema/xotcl#}
+	RDFParser [self]::rdfParser 
+	AgentVisitor [self]::agentVisitor
+	
+	#package require xotcl::xml::printVisitor 
+	#PrintVisitor [self]::pv
+    }
 
-AgentMgr instproc register {name} {
-  set ai [AgentInfo [self]::[my autoname agentInfo]]
-  my set agents($name) $ai
-  $ai name $name
-  return $ai
-}
+    AgentMgr instproc register {name} {
+	set ai [AgentInfo [self]::[my autoname agentInfo]]
+	my set agents($name) $ai
+	$ai name $name
+	return $ai
+    }
 
-AgentMgr instproc deregister {name} {
-  if {[my info agents $name]} {
-    # destroy the agents info objects
-    #my showMsg "calling destroy on [my set agents($name)]"
-    [my set agents($name)] destroy
-    # unset the var
-    my unset agents($name)
-  }
-}
+    AgentMgr instproc deregister {name} {
+	if {[my info agents $name]} {
+	    # destroy the agents info objects
+	    #my showMsg "calling destroy on [my set agents($name)]"
+	    [my set agents($name)] destroy
+	    # unset the var
+	    my unset agents($name)
+	}
+    }
 
-AgentMgr instproc info args {
-  if {[lindex $args 0] == "agents"} {
-    if {[llength $args] > 1} {
-      return [my exists agents([lindex $args 1])]
-    } else {
-      return [my array names agents]
+    AgentMgr instproc info args {
+	if {[lindex $args 0] == "agents"} {
+	    if {[llength $args] > 1} {
+		return [my exists agents([lindex $args 1])]
+	    } else {
+		return [my array names agents]
+	    }
+	}
+	next
     }
-  }
-  next
-}
 
-#
-# parses the data of a migration request into a new agent
-# info object
-#
-# name must be stringleft : !!
-AgentMgr instproc parseData {name data} {
-  set ai [my register $name]
-  next
+    #
+    # parses the data of a migration request into a new agent
+    # info object
+    #
+    # name must be stringleft : !!
+    AgentMgr instproc parseData {name data} {
+	set ai [my register $name]
+	next
 
-  [self]::rdfParser reset
-  [self]::rdfParser parse $data
+	[self]::rdfParser reset
+	[self]::rdfParser parse $data
 
-  #puts stderr ===========================================================
-  #[self]::pv interpretAll [self]::rdfParser
-  #puts stderr ===========================================================
+	#puts stderr ===========================================================
+	#[self]::pv interpretAll [self]::rdfParser
+	#puts stderr ===========================================================
 
-  [self]::agentVisitor agentInfo $ai
-  #foreach tn [[self]::rdfParser info children topNode*] {
-  #  [self]::agentVisitor interpretNodeTree $tn
-  #}
+	[self]::agentVisitor agentInfo $ai
+	#foreach tn [[self]::rdfParser info children topNode*] {
+	#  [self]::agentVisitor interpretNodeTree $tn
+	#}
 
-  [self]::agentVisitor interpretAll [self]::rdfParser
-  
-  #puts "************** Received Agent:"
-  #$ai print
-  
-  return $ai
-}
+	[self]::agentVisitor interpretAll [self]::rdfParser
+	
+	#puts "************** Received Agent:"
+	#$ai print
+	
+	return $ai
+    }
 
-AgentMgr instproc immigrate {AI} {
-  #set ns [[self]::rdfNS searchPrefix agent]
-  #::eval [$AI set agentData(${ns}script)]
+    AgentMgr instproc immigrate {AI} {
+	#set ns [[self]::rdfNS searchPrefix agent]
+	#::eval [$AI set agentData(${ns}script)]
 
-  #puts stderr "immigrate call showVars"
-  #$AI showVars
-  #puts stderr "immigrate showVars done"
+	#puts stderr "immigrate call showVars"
+	#$AI showVars
+	#puts stderr "immigrate showVars done"
 
-  ::eval [$AI set agentData(agent:script)]
-  #puts stderr "immigrate persistentVars = '[[$AI name] persistentVars]'"
-  #foreach v [[$AI name] info vars] { $n persistent $v }
+	::eval [$AI set agentData(agent:script)]
+	#puts stderr "immigrate persistentVars = '[[$AI name] persistentVars]'"
+	#foreach v [[$AI name] info vars] { $n persistent $v }
 
-  if {[$AI exists agentData(agent:startcmd)]} {
-    ::after 10 [list [$AI name] [$AI set agentData(agent:startcmd)]]
-  }
-  return ""
+	if {[$AI exists agentData(agent:startcmd)]} {
+	    ::after 10 [list [$AI name] [$AI set agentData(agent:startcmd)]]
+	}
+	return ""
+    }
+
+    namespace export AgentInfo AgentVisitor AgentMgr
 }
+
+namespace import ::xotcl::actiweb::agentManagement::*
Index: xotcl/library/actiweb/HtmlPlace.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/actiweb/HtmlPlace.xotcl	(.../HtmlPlace.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/actiweb/HtmlPlace.xotcl	(.../HtmlPlace.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,4 +1,5 @@
-# $Id: HtmlPlace.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: HtmlPlace.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::actiweb::htmlPlace 0.8
 
 package require xotcl::trace
@@ -7,30 +8,40 @@
 package require xotcl::actiweb::agent
 package require xotcl::actiweb::pageTemplate
 
-Class HtmlPlace -superclass Place -parameter {allowExit}
+package require XOTcl
 
-HtmlPlace instproc init args {
-  next
-  #
-  # just define a minimal object that can react 
-  # with HTML decoration, if the called object
-  # doesn't exist
-  PageTemplateHtml create [self]::start.html
+namespace eval ::xotcl::actiweb::htmlPlace {
+    namespace import ::xotcl::*
 
-  my startingObj [self]::start.html
-  if {[my exists allowExit]} {
-    set exitObj [WebObject create [self]::[my set allowExit]]
-    [Place getInstance] exportObjs $exitObj
-    $exitObj proc default {} {after 500 ::exit; return "Server terminates"}
-  }
-}
-HtmlPlace instproc default {} {
-  set place [string trimleft [self] :]
-  set msg "<HTML><TITLE>Place $place</TITLE>
+    Class HtmlPlace -superclass Place -parameter {allowExit}
+
+    HtmlPlace instproc init args {
+	next
+	#
+	# just define a minimal object that can react 
+	# with HTML decoration, if the called object
+	# doesn't exist
+	PageTemplateHtml create [self]::start.html
+
+	my startingObj [self]::start.html
+	if {[my exists allowExit]} {
+	    set exitObj [WebObject create [self]::[my set allowExit]]
+	    [Place getInstance] exportObjs $exitObj
+	    $exitObj proc default {} {after 500 ::exit; return "Server terminates"}
+	}
+    }
+    HtmlPlace instproc default {} {
+	set place [string trimleft [self] :]
+	set msg "<HTML><TITLE>Place $place</TITLE>
 	<BODY><H2>Place $place</H2> Try one of the following links:<UL>"
-  foreach o [my exportedObjs] {
-    set o [string trimleft $o :]
-    append msg "<LI><A HREF='[url encodeItem $o]'>$o</A></LI>"
-  }
-  append msg "</UL></BODY>\n"
+	foreach o [my exportedObjs] {
+	    set o [string trimleft $o :]
+	    append msg "<LI><A HREF='[url encodeItem $o]'>$o</A></LI>"
+	}
+	append msg "</UL></BODY>\n"
+    }
+
+    namespace export HtmlPlace
 }
+
+namespace import ::xotcl::actiweb::htmlPlace::*
Index: xotcl/library/actiweb/HttpPlace.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/actiweb/HttpPlace.xotcl	(.../HttpPlace.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/actiweb/HttpPlace.xotcl	(.../HttpPlace.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,4 +1,5 @@
-# $Id: HttpPlace.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: HttpPlace.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::actiweb::httpPlace 0.8
 
 package require xotcl::trace
@@ -12,236 +13,258 @@
 package require xotcl::actiweb::agentManagement
 package require xotcl::rdf::tripleRecreator
 
-Singleton Place -superclass Invoker -parameter {
-  {exportedObjs ""} 
-  {startingObj ""}
-  {startCommand ""}
-  {root $::env(HOME)/public_html}
-  {port 8086}
-  {redirect [list]}
-  {logdir $::xotcl::logdir} 
-  {host localhost}
-  {allowImmigrationHosts ""}
-  persistenceFile persistenceDir bccFile bccDir dbPackage
-  {startHTTPServer 1}
-}
+package require XOTcl
 
-#    Giving a bccFile (and possibly bccDir) as optional parameter means 
-#    that an identical copy database will be created in that 
-#    location (e.g. for creating a backup on a second hard drive.
+namespace eval ::xotcl::actiweb::httpPlace {
+    namespace import ::xotcl::*
 
-Place instproc exportObjs args {
-  foreach obj $args {
-    my lappend exportedObjs [string trimleft $obj :]
-    puts stderr "*** exporting $obj, self=[self], objs=[my set exportedObjs]"
-  }
-} 
-Place instproc isExportedObj obj {
-  expr {[lsearch [my exportedObjs] [string trimleft $obj :]] != -1}
-}
-Place instproc default {} {
-  [self]
-}
-Place instproc init args {
-  if {[my set startHTTPServer]} {
-	Httpd [self]::httpd \
-	    -port [my port] \
-	    -root [my root] \
-	    -redirect [my redirect] \
-	    -logdir [my logdir] \
-	    -httpdWrk Place::HttpdWrk
-  }
-  #
-  # PersistenceMgr object for web entities
-  #
-  ##### so ist das nicht toll ... init args sollten anders konfigurierbar sein
-  PersistenceMgr [self]::agentPersistenceMgr -dbPackage multi
 
-  if {[my exists dbPackage]} {
-    set dbp [my set dbPackage]
-  } else {
-    set dbp ""
-  }
+    Singleton Place -superclass Invoker -parameter {
+	{exportedObjs ""} 
+	{startingObj ""}
+	{startCommand ""}
+	{root $::env(HOME)/public_html}
+	{port 8086}
+	{redirect [list]}
+	{logdir $::xotcl::logdir} 
+	{host localhost}
+	{allowImmigrationHosts ""}
+	persistenceFile persistenceDir bccFile bccDir dbPackage
+	{startHTTPServer 1}
+    }
 
+    #    Giving a bccFile (and possibly bccDir) as optional parameter means 
+    #    that an identical copy database will be created in that 
+    #    location (e.g. for creating a backup on a second hard drive.
 
-  if {![my exists persistenceDir]} {
-    my persistenceDir [string trimleft [self] :]
-  }
-  if {![my exists persistenceFile]} {
-    my persistenceFile persistentObjs-[my port]
-  }
-
-  [self]::agentPersistenceMgr store add $dbp \
-      -dirName [my persistenceDir] \
-      -fileName [my persistenceFile]
-
-  if {[my exists bccDir] || [my exists bccFile]} {
-    if {![my exists bccDir]} {
-      my bccDir [my set persistenceDir]
+    Place instproc exportObjs args {
+	foreach obj $args {
+	    my lappend exportedObjs [string trimleft $obj :]
+	    puts stderr "*** exporting $obj, self=[self], objs=[my set exportedObjs]"
+	}
+    } 
+    Place instproc isExportedObj obj {
+	expr {[lsearch [my exportedObjs] [string trimleft $obj :]] != -1}
     }
-    if {![my exists bccFile]} {
-      my bccFile [my persistenceFile]
+    Place instproc default {} {
+	[self]
     }
-    [self]::agentPersistenceMgr store add $dbp \
-	-dirName [my bccDir] \
-	-fileName [my bccFile]
-  }
+    Place instproc init args {
+	if {[my set startHTTPServer]} {
+	    Httpd [self]::httpd \
+		-port [my port] \
+		-root [my root] \
+		-redirect [my redirect] \
+		-logdir [my logdir] \
+		-httpdWrk Place::HttpdWrk
+	}
+	#
+	# PersistenceMgr object for web entities
+	#
+	##### so ist das nicht toll ... init args sollten anders konfigurierbar sein
+	PersistenceMgr [self]::agentPersistenceMgr -dbPackage multi
 
-  AgentMgr create [self]::agentMgr 
-  RDFCreator create [self]::rdfCreator
+	if {[my exists dbPackage]} {
+	    set dbp [my set dbPackage]
+	} else {
+	    set dbp ""
+	}
 
-  #
-  # minimal obj for default behavior of the place -> calls go
-  # to web entities default (customize through a redirecting proc
-  # as in HtmlPlace or changing startingObj)
-  #
-  WebObject create [self]::start
-  my startingObj [self]::start
-  Registry [self]::registry
-  ErrorMgr [self]::error
 
-  ScriptCreator [self]::scriptCreator -dependencyChecking 0
+	if {![my exists persistenceDir]} {
+	    my persistenceDir [string trimleft [self] :]
+	}
+	if {![my exists persistenceFile]} {
+	    my persistenceFile persistentObjs-[my port]
+	}
 
-  my exportObjs [self]::start [self]::agentMgr [self]::registry
-  next
-}
+	[self]::agentPersistenceMgr store add $dbp \
+	    -dirName [my persistenceDir] \
+	    -fileName [my persistenceFile]
 
-Place instproc startEventLoop args {
-  if {[llength $args] > 0} {
-    set startCommand [lindex $args 0]
-    ::eval $startCommand
-  }
+	if {[my exists bccDir] || [my exists bccFile]} {
+	    if {![my exists bccDir]} {
+		my bccDir [my set persistenceDir]
+	    }
+	    if {![my exists bccFile]} {
+		my bccFile [my persistenceFile]
+	    }
+	    [self]::agentPersistenceMgr store add $dbp \
+		-dirName [my bccDir] \
+		-fileName [my bccFile]
+	}
 
-  vwait forever  ;# if we are in xotclsh call the event loop...
-}
+	AgentMgr create [self]::agentMgr 
+	RDFCreator create [self]::rdfCreator
 
-###
-### Mixin-Classes for Http/Wrk that restricts the usable HTTP methods
-###
-Class RestrictHTTPMethods -parameter {
-  {allowedHTTPMethods "GET PUT HEAD POST CGI"}
-}
-RestrictHTTPMethods instproc init args {
-  next
-  my lappend workerMixins RestrictHTTPMethods::Wrk
-}
-Class RestrictHTTPMethods::Wrk
-RestrictHTTPMethods::Wrk instproc respond {} {
-  my instvar method 
-  [my info parent] instvar allowedHTTPMethods
-  if {[lsearch $allowedHTTPMethods $method] != -1} {
-    return [next]
-  } else {
-    my log Error "Restricted Method $method called"
-    my replyCode 405
-    my replyErrorMsg
-  }
-}
+	#
+	# minimal obj for default behavior of the place -> calls go
+	# to web entities default (customize through a redirecting proc
+	# as in HtmlPlace or changing startingObj)
+	#
+	WebObject create [self]::start
+	my startingObj [self]::start
+	Registry [self]::registry
+	ErrorMgr [self]::error
 
-Class Place::HttpdWrk -superclass Httpd::Wrk 
+	ScriptCreator [self]::scriptCreator -dependencyChecking 0
 
-Place::HttpdWrk instproc init args {
-  my set place [Place getInstance] 
-  next
-  #puts "New Http-Worker: [self class]->[self] on [my set place]" 
-} 
+	my exportObjs [self]::start [self]::agentMgr [self]::registry
+	next
+    }
 
-Place::HttpdWrk instproc parseParams {o m a call} {
-  upvar [self callinglevel] $o obj $m method $a args 
-  ### 
-  set decodedCall [url decodeItem $call]
-  #my showMsg decodedCall=$decodedCall
-  if {[regexp {^([^ ]*) ?([^ ]*) ?(.*)$} $decodedCall _ \
-	   obj method args]} {
-    #foreach a [my set formData] {lappend args [$a set content]}
-    #puts stderr "Parsed -- Obj: $obj, Method: $method, Args: $args" 
-    return 1
-  } else {
-    puts stderr "could not parse <$decodedCall>"
-    return 0
-  }
-}
-Place::HttpdWrk instproc respond-HEAD {} {
-  my respond-GET;  ### sendMsg inhibits content for method HEAD
-}
-Place::HttpdWrk instproc respond-GET {} {
-  my instvar fileName resourceName place
-  if {$resourceName == ""} {
-    my sendMsg [$place default] text/html  ;# kind of index.html
-  } elseif {[my parseParams obj method arguments $resourceName]} {
-    if {![my isobject $obj] && [file readable $fileName]} {
-      next      ;# let Httpd handle this
-    } else {
-      set response [$place invokeCall obj status $method $arguments]
-      #puts stderr "RESPONSE: $response"
-      #
-      # let the object's sending strategy mixin choose 
-      # the appropriate sending mode
-      #
-      # $obj showClass
-      if {[info exists status] && $status >= 300} {
-	my replyCode $status
-	my replyErrorMsg $response
-      } else {
-	#my lappend replyHeaderFields Cache-Control maxage=0
-	my lappend replyHeaderFields Pragma no-cache
-	$obj send [self] $response
-      }
+    Place instproc startEventLoop args {
+	if {[llength $args] > 0} {
+	    set startCommand [lindex $args 0]
+	    ::eval $startCommand
+	}
+
+	vwait forever  ;# if we are in xotclsh call the event loop...
     }
-  } else {
-    my set version 1.0
-    my replyCode 400
-    my replyErrorMsg [my callError "Could not parse: " $resourceName]
-  }
-}
-Place::HttpdWrk instproc respond-POST {} {
-  my instvar resourceName place
-  my respond-GET
-}
 
+    ###
+    ### Mixin-Classes for Http/Wrk that restricts the usable HTTP methods
+    ###
+    Class RestrictHTTPMethods -parameter {
+	{allowedHTTPMethods "GET PUT HEAD POST CGI"}
+    }
+    RestrictHTTPMethods instproc init args {
+	next
+	my lappend workerMixins RestrictHTTPMethods::Wrk
+    }
+    Class RestrictHTTPMethods::Wrk
+    RestrictHTTPMethods::Wrk instproc respond {} {
+	my instvar method 
+	[my info parent] instvar allowedHTTPMethods
+	if {[lsearch $allowedHTTPMethods $method] != -1} {
+	    return [next]
+	} else {
+	    my log Error "Restricted Method $method called"
+	    my replyCode 405
+	    my replyErrorMsg
+	}
+    }
 
-Place::HttpdWrk instproc respond-PUT {} {
-  my instvar resourceName place data
-  #my showCall
-  
-  if {$resourceName != ""} {
-    if {[my parseParams obj m a $resourceName]} {
-      set obj [string trimleft $obj :]
-      set AMgr ${place}::agentMgr
+    Class Place::HttpdWrk -superclass Httpd::Wrk 
 
-      if {[info commands $obj] == "" &&
-	  ![$AMgr info agents $obj]} {
-	#puts stderr "Receiving to put --------------------------------$obj  $data"
-	set AI [$AMgr parseData $obj $data]
-	#puts stderr "parray --${AI}::agentData------------------------"
-	#parray ${AI}::agentData
-	#puts stderr "parray --${AI}::agentData----------------DONE--------"
-	#$AI showVars
-	#puts stderr "----[$AI exists agentData(agent:script)]----"
-	if {[$AI exists agentData(agent:script)]} {
-	  set immigrateResult [$AMgr immigrate $AI]
-	  #puts stderr "immigrateResult=<$immigrateResult>"
-	  my replyCode 200  
-	  my sendMsg $immigrateResult text/plain
+    Place::HttpdWrk instproc init args {
+	my set place [Place getInstance] 
+	next
+	#puts "New Http-Worker: [self class]->[self] on [my set place]" 
+    } 
+
+    Place::HttpdWrk instproc parseParams {o m a call} {
+	upvar [self callinglevel] $o obj $m method $a args 
+	### 
+	set decodedCall [url decodeItem $call]
+	#my showMsg decodedCall=$decodedCall
+	if {[regexp {^([^ ]*) ?([^ ]*) ?(.*)$} $decodedCall _ \
+		 obj method args]} {
+	    #foreach a [my set formData] {lappend args [$a set content]}
+	    #puts stderr "Parsed -- Obj: $obj, Method: $method, Args: $args" 
+	    return 1
 	} else {
-	  my set version 1.0
-	  my replyCode 400
-	  my replyErrorMsg "Migration failed"
+	    puts stderr "could not parse <$decodedCall>"
+	    return 0
 	}
-      } else {
-	my set version 1.0
-	my replyCode 400
-	my replyErrorMsg "Migration: object name already in use."
-      }
-    } else {
-      my set version 1.0
-      my replyCode 400 
-      my replyErrorMsg "Migration call must provide object name"
     }
-  } else {
-    # return the own place name -> any client can call the place via
-    # placename::start !
-    my sendMsg $place text/plain
-  }
+    Place::HttpdWrk instproc respond-HEAD {} {
+	my respond-GET;  ### sendMsg inhibits content for method HEAD
+    }
+    Place::HttpdWrk instproc respond-GET {} {
+	my instvar fileName resourceName place
+	if {$resourceName == ""} {
+	    my sendMsg [$place default] text/html  ;# kind of index.html
+	} elseif {[my parseParams obj method arguments $resourceName]} {
+	    if {![my isobject $obj] && [file readable $fileName]} {
+		next      ;# let Httpd handle this
+	    } else {
+		set response [$place invokeCall obj status $method $arguments]
+		#puts stderr "RESPONSE: $response"
+		#
+		# let the object's sending strategy mixin choose 
+		# the appropriate sending mode
+		#
+		# $obj showClass
+		if {[info exists status] && $status >= 300} {
+		    my replyCode $status
+		    my replyErrorMsg $response
+		} else {
+		    #my lappend replyHeaderFields Cache-Control maxage=0
+		    my lappend replyHeaderFields Pragma no-cache
+		    $obj send [self] $response
+		}
+	    }
+	} else {
+	    my set version 1.0
+	    my replyCode 400
+	    my replyErrorMsg [my callError "Could not parse: " $resourceName]
+	}
+    }
+    Place::HttpdWrk instproc respond-POST {} {
+	my instvar resourceName place
+	my respond-GET
+    }
+
+
+    Place::HttpdWrk instproc respond-PUT {} {
+	my instvar resourceName place data
+	#my showCall
+	
+	if {$resourceName != ""} {
+	    if {[my parseParams obj m a $resourceName]} {
+		set obj [string trimleft $obj :]
+		set AMgr ${place}::agentMgr
+
+		if {[info commands $obj] == "" &&
+		    ![$AMgr info agents $obj]} {
+		    #puts stderr "Receiving to put --------------------------------$obj  $data"
+		    set AI [$AMgr parseData $obj $data]
+		    #puts stderr "parray --${AI}::agentData------------------------"
+		    #parray ${AI}::agentData
+		    #puts stderr "parray --${AI}::agentData----------------DONE--------"
+		    #$AI showVars
+		    #puts stderr "----[$AI exists agentData(agent:script)]----"
+		    if {[$AI exists agentData(agent:script)]} {
+			set immigrateResult [$AMgr immigrate $AI]
+			#puts stderr "immigrateResult=<$immigrateResult>"
+			my replyCode 200  
+			my sendMsg $immigrateResult text/plain
+		    } else {
+			my set version 1.0
+			my replyCode 400
+			my replyErrorMsg "Migration failed"
+		    }
+		} else {
+		    my set version 1.0
+		    my replyCode 400
+		    my replyErrorMsg "Migration: object name already in use."
+		}
+	    } else {
+		my set version 1.0
+		my replyCode 400 
+		my replyErrorMsg "Migration call must provide object name"
+	    }
+	} else {
+	    # return the own place name -> any client can call the place via
+	    # placename::start !
+	    my sendMsg $place text/plain
+	}
+    }
+
+    namespace export RestrictHTTPMethods Place
+    namespace eval RestrictHTTPMethods {
+	namespace export Wrk
+    }
+    namespace eval Place {
+	namespace export HttpdWrk
+    }
 }
 
+namespace import ::xotcl::actiweb::httpPlace::*
+namespace eval RestrictHTTPMethods {
+    namespace import ::xotcl::actiweb::httpPlace::RestrictHTTPMethods::*
+}
+namespace eval Place {
+    namespace import ::xotcl::actiweb::httpPlace::Place::*
+}
Index: xotcl/library/actiweb/Invoker.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/actiweb/Invoker.xotcl	(.../Invoker.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/actiweb/Invoker.xotcl	(.../Invoker.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,152 +1,165 @@
-# $Id: Invoker.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: Invoker.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::actiweb::invoker 0.8
 
-Class AbstractInvoker
-AbstractInvoker abstract instproc invokeCall {o method arguments}
-AbstractInvoker abstract instproc eval {obj method arguments}
-#
-# error types are: tclError, invocationError
-#
-AbstractInvoker abstract instproc callError {type msg obj arguments} 
+package require XOTcl
 
-Class Invoker -superclass AbstractInvoker -parameter {{place [self]}}
+namespace eval ::xotcl::actiweb::invoker {
+    namespace import ::xotcl::*
 
-Invoker instproc handleException {response} {
-  if {[my isExceptionObject $response]} {
-    set exceptionObj $response
-    switch [$exceptionObj info class] {
-      ::RedirectException {
-	set obj [$exceptionObj obj]
-	set method [$exceptionObj method]
-	set arguments [$exceptionObj arguments]
-	set response [my eval $obj $method $arguments]
-      }
-      ::ErrorException {
-	set response [$exceptionObj set errorText]
-      }
+    Class AbstractInvoker
+    AbstractInvoker abstract instproc invokeCall {o method arguments}
+    AbstractInvoker abstract instproc eval {obj method arguments}
+    #
+    # error types are: tclError, invocationError
+    #
+    AbstractInvoker abstract instproc callError {type msg obj arguments} 
+
+    Class Invoker -superclass AbstractInvoker -parameter {{place [self]}}
+
+    Invoker instproc handleException {response} {
+	if {[my isExceptionObject $response]} {
+	    set exceptionObj $response
+	    switch [$exceptionObj info class] {
+		::RedirectException {
+		    set obj [$exceptionObj obj]
+		    set method [$exceptionObj method]
+		    set arguments [$exceptionObj arguments]
+		    set response [my eval $obj $method $arguments]
+		}
+		::ErrorException {
+		    set response [$exceptionObj set errorText]
+		}
+	    }
+	    $exceptionObj destroy
+	}
+	return $response
     }
-    $exceptionObj destroy
-  }
-  return $response
-}
 
-Invoker instproc invokeCall {o s method arguments} {
-  upvar [self callinglevel] $o obj $s status
-  my instvar place
-  set response ""
-  if {[$place isExportedObj $obj]} {
-    # if method is not given -> call default on the object
-    if {$method == ""} {
-      set method default
+    Invoker instproc invokeCall {o s method arguments} {
+	upvar [self callinglevel] $o obj $s status
+	my instvar place
+	set response ""
+	if {[$place isExportedObj $obj]} {
+	    # if method is not given -> call default on the object
+	    if {$method == ""} {
+		set method default
+	    }
+	    if {[$obj isExportedProc $method]} {
+		#puts stderr "ExportedProcs of $obj: [$obj exportedProcs]"
+		#puts stderr "Call: $obj -- $method -- $arguments"
+		set response [my eval $obj $method $arguments]
+	    } else {
+		#puts stderr "ExportedProcs of $obj: [$obj exportedProcs]"
+		set response [my callError invocationError [$place startingObj] \
+				  "Method not found or not exported" \
+				  "$obj $method $arguments"]
+		set status 405
+	    }
+	} else {
+	    set called $obj
+	    set obj [$place startingObj]
+	    set response [my callError invocationError $obj \
+			      "Object '$called' unknown" ""]
+	    set status 404
+	}
+	
+	return [my handleException $response]
     }
-    if {[$obj isExportedProc $method]} {
-      #puts stderr "ExportedProcs of $obj: [$obj exportedProcs]"
-      #puts stderr "Call: $obj -- $method -- $arguments"
-      set response [my eval $obj $method $arguments]
-    } else {
-      #puts stderr "ExportedProcs of $obj: [$obj exportedProcs]"
-      set response [my callError invocationError [$place startingObj] \
-		      "Method not found or not exported" \
-		      "$obj $method $arguments"]
-      set status 405
+
+    #
+    # tests whether "name" is an exception object or not
+    #
+    Invoker instproc isExceptionObject name {
+	if {[Object isobject $name] && [$name istype Exception]} {
+	    return 1
+	}
+	return 0
     }
-  } else {
-    set called $obj
-    set obj [$place startingObj]
-    set response [my callError invocationError $obj \
-		    "Object '$called' unknown" ""]
-    set status 404
-  }
-  
-  return [my handleException $response]
-}
 
-#
-# tests whether "name" is an exception object or not
-#
-Invoker instproc isExceptionObject name {
-  if {[Object isobject $name] && [$name istype Exception]} {
-    return 1
-  }
-  return 0
-}
-
-#
-# central eval  -- all remote call
-# are invoked through this method
-#
-Invoker instproc eval {obj method arguments} {
-  puts stderr "[clock format [clock seconds] \
+    #
+    # central eval  -- all remote call
+    # are invoked through this method
+    #
+    Invoker instproc eval {obj method arguments} {
+	puts stderr "[clock format [clock seconds] \
 	-format %Y/%m/%d@%H:%M:%S] \
 	Eval Call: $obj $method $arguments"
-  if {[catch {
-    set r [::eval $obj $method $arguments]
-  } ei]} {
-    set r [my callError tclError $obj $ei "$obj $method $::errorInfo"]
-  }
-  return $r
-}
+	if {[catch {
+	    set r [::eval $obj $method $arguments]
+	} ei]} {
+	    set r [my callError tclError $obj $ei "$obj $method $::errorInfo"]
+	}
+	return $r
+    }
 
-Invoker instproc callError {type obj msg arguments} {
-  [my set place]::error $type $obj $msg $arguments
-}
+    Invoker instproc callError {type obj msg arguments} {
+	[my set place]::error $type $obj $msg $arguments
+    }
 
-Class ErrorMgr
-ErrorMgr instproc isHtml o {
-  if {[my isobject $o]} {
-    if {[$o exists contentType]} {
-      if {[$o set contentType] == "text/html"} {
-	return 1
-      }
+    Class ErrorMgr
+    ErrorMgr instproc isHtml o {
+	if {[my isobject $o]} {
+	    if {[$o exists contentType]} {
+		if {[$o set contentType] == "text/html"} {
+		    return 1
+		}
+	    }
+	}
+	return 0
     }
-  }
-  return 0
-}
 
-ErrorMgr instproc invocationError {obj msg arguments} {
-  my showCall
-  set ee [ErrorException [self]::[my autoname ee]]
-  $ee instvar errorText
-  if {[my isHtml $obj]} {
-    set errorText "<p> invocation error: $msg"
-    if {[llength $arguments] > 0} {
-      append errorText ":\n<p> object: '[lindex $arguments 0]' \n"
-    } else {
-      append errorText \n
+    ErrorMgr instproc invocationError {obj msg arguments} {
+	my showCall
+	set ee [ErrorException [self]::[my autoname ee]]
+	$ee instvar errorText
+	if {[my isHtml $obj]} {
+	    set errorText "<p> invocation error: $msg"
+	    if {[llength $arguments] > 0} {
+		append errorText ":\n<p> object: '[lindex $arguments 0]' \n"
+	    } else {
+		append errorText \n
+	    }
+	    if {[llength $arguments] > 1} {
+		append errorText "<p> call: '[lrange $arguments 1 end]' \n"
+	    }
+	} else {
+	    set errorText "invocation error: $msg $arguments"
+	}
+	return $ee
     }
-    if {[llength $arguments] > 1} {
-      append errorText "<p> call: '[lrange $arguments 1 end]' \n"
+
+    ErrorMgr instproc tclError {obj msg arguments} {
+	set ee [ErrorException [self]::[my autoname ee]]
+	if {[my isHtml $obj]} {
+	    $ee errorText "<p>tcl error: '$msg' \n<code><p><pre>$arguments</pre></code>"
+	} else {
+	    $ee errorText "tcl error: '$msg'\n$::errorInfo"
+	}
+	return $ee
     }
-  } else {
-    set errorText "invocation error: $msg $arguments"
-  }
-  return $ee
-}
 
-ErrorMgr instproc tclError {obj msg arguments} {
-  set ee [ErrorException [self]::[my autoname ee]]
-  if {[my isHtml $obj]} {
-    $ee errorText "<p>tcl error: '$msg' \n<code><p><pre>$arguments</pre></code>"
-  } else {
-    $ee errorText "tcl error: '$msg'\n$::errorInfo"
-  }
-  return $ee
-}
+    #
+    # exceptions in invocation behavior
+    #
+    Class Exception
+    #
+    # Execpetion that tells the invoker to redirect the call to
+    # parameters
+    #
+    Class RedirectException -superclass Exception -parameter {
+	{obj ""}
+	{method ""}
+	{arguments ""}
+    }
 
-#
-# exceptions in invocation behavior
-#
-Class Exception
-#
-# Execpetion that tells the invoker to redirect the call to
-# parameters
-#
-Class RedirectException -superclass Exception -parameter {
-  {obj ""}
-  {method ""}
-  {arguments ""}
-}
+    Class ErrorException -superclass Exception -parameter {
+	{errorText ""}
+    }
 
-Class ErrorException -superclass Exception -parameter {
-  {errorText ""}
+    namespace export AbstractInvoker \
+	Invoker ErrorMgr Exception \
+	RedirectException ErrorException
 }
+
+namespace import ::xotcl::actiweb::invoker::*
Index: xotcl/library/actiweb/PlaceAccessControl.xotcl
===================================================================
diff -u -r5ce5a10c82bc948f50fc4542f844dcd50de1eae3 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/actiweb/PlaceAccessControl.xotcl	(.../PlaceAccessControl.xotcl)	(revision 5ce5a10c82bc948f50fc4542f844dcd50de1eae3)
+++ xotcl/library/actiweb/PlaceAccessControl.xotcl	(.../PlaceAccessControl.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,80 +1,90 @@
-# $Id: PlaceAccessControl.xotcl,v 1.2 2004/07/03 21:19:39 neumann Exp $
+# $Id: PlaceAccessControl.xotcl,v 1.3 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::actiweb::placeAccessControl 0.8
 
 package require xotcl::comm::httpd
 package require xotcl::actiweb::httpPlace
 
+package require XOTcl
+
 #
 # Simple Object Pwd Protection with BasicAccessControl
 #
 #Usage example:
 #ConferenceOrgPlace confPlace -port $placeport -root [pwd] \
-#  -mixin PlaceAccessControl
+    #  -mixin PlaceAccessControl
 #
 #confPlace protect conference.html [confData set password]
 #
 #confPlace setPasswd conference.html xxx
 
-Class ObjectAccessControl -superclass BasicAccessControl
+namespace eval ::xotcl::actiweb::placeAccessControl {
+    namespace import ::xotcl::*
 
-ObjectAccessControl instproc protectedResource {fn method varAuthMethod varRealm} {
-  # check whether access to $fn via $method is protected
-  upvar [self callinglevel] $varAuthMethod authMethod $varRealm realm
-  my instvar root
-  # we check only the current directory, not the parent directories
-  set call [url decodeItem $fn]
-  regsub "^$root" $call "" call
-  set call [string trimleft $call /]
-  set call [string trimleft $call :]
-  regexp {^([^ ]*)} $call _ call
-  set call "$root/$call"
+    Class ObjectAccessControl -superclass BasicAccessControl
 
-  foreach i [list $call $call:$method] {
-    #puts stderr "check <$i>"
-    if {[my exists protected($i)]} {
-      set realm [my set protected($i)]
-      set authMethod Basic
-      return 1
+    ObjectAccessControl instproc protectedResource {fn method varAuthMethod varRealm} {
+	# check whether access to $fn via $method is protected
+	upvar [self callinglevel] $varAuthMethod authMethod $varRealm realm
+	my instvar root
+	# we check only the current directory, not the parent directories
+	set call [url decodeItem $fn]
+	regsub "^$root" $call "" call
+	set call [string trimleft $call /]
+	set call [string trimleft $call :]
+	regexp {^([^ ]*)} $call _ call
+	set call "$root/$call"
+
+	foreach i [list $call $call:$method] {
+	    #puts stderr "check <$i>"
+	    if {[my exists protected($i)]} {
+		set realm [my set protected($i)]
+		set authMethod Basic
+		return 1
+	    }
+	}
+	return 0
     }
-  }
-  return 0
-}
 
-Class PlaceAccessControl
-PlaceAccessControl instproc init args {
-  next
-  [self]::httpd mixin add ObjectAccessControl
-  [self]::httpd initWorkerMixins
-}
+    Class PlaceAccessControl
+    PlaceAccessControl instproc init args {
+	next
+	[self]::httpd mixin add ObjectAccessControl
+	[self]::httpd initWorkerMixins
+    }
 
-PlaceAccessControl instproc protect {objName id pwd} {
-  set objName [string trimleft $objName :]
-  [self]::httpd protectDir $objName $objName {}
-  if {$pwd != ""} {
-    my setPassword $objName $id $pwd
-  } 
-}
+    PlaceAccessControl instproc protect {objName id pwd} {
+	set objName [string trimleft $objName :]
+	[self]::httpd protectDir $objName $objName {}
+	if {$pwd != ""} {
+	    my setPassword $objName $id $pwd
+	} 
+    }
 
-PlaceAccessControl instproc credentialsNotOk {credentials authMethod realm} {
-  #my instvar passwd
-  #parray passwd
-  next
-}
+    PlaceAccessControl instproc credentialsNotOk {credentials authMethod realm} {
+	#my instvar passwd
+	#parray passwd
+	next
+    }
 
-PlaceAccessControl instproc setPassword {realm id pwd} {
-  set httpd [self]::httpd 
-  if {[$httpd exists passwd($realm:$id)]} {
-    $httpd unset passwd($realm:$id)
-    $httpd set passwd($realm:$id) $pwd
-  } else {
-    $httpd addRealmEntry $realm "$id $pwd"
-  }
-  #$httpd set passwd($realm:admin) nimda
+    PlaceAccessControl instproc setPassword {realm id pwd} {
+	set httpd [self]::httpd 
+	if {[$httpd exists passwd($realm:$id)]} {
+	    $httpd unset passwd($realm:$id)
+	    $httpd set passwd($realm:$id) $pwd
+	} else {
+	    $httpd addRealmEntry $realm "$id $pwd"
+	}
+	#$httpd set passwd($realm:admin) nimda
+    }
+    PlaceAccessControl instproc removeID {realm id} {
+	set httpd [self]::httpd
+	if {[$httpd exists passwd($realm:$id)]} {
+	    $httpd unset passwd($realm:$id)
+	}
+    }
+
+    namespace export ObjectAccessControl PlaceAccessControl
 }
-PlaceAccessControl instproc removeID {realm id} {
-  set httpd [self]::httpd
-  if {[$httpd exists passwd($realm:$id)]} {
-    $httpd unset passwd($realm:$id)
-  }
-}
 
+namespace import ::xotcl::actiweb::placeAccessControl::*
Index: xotcl/library/actiweb/SecureHtmlPlace.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/actiweb/SecureHtmlPlace.xotcl	(.../SecureHtmlPlace.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/actiweb/SecureHtmlPlace.xotcl	(.../SecureHtmlPlace.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,7 +1,18 @@
-# $Id: SecureHtmlPlace.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: SecureHtmlPlace.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::actiweb::secureHtmlPlace 0.8
 
 package require xotcl::actiweb::secureHttpPlace
 package require xotcl::actiweb::htmlPlace
 
-Class SecureHtmlPlace -superclass {SecurePlace HtmlPlace}
+package require XOTcl
+
+namespace eval ::xotcl::actiweb::secureHtmlPlace {
+    namespace import ::xotcl::*
+
+    Class SecureHtmlPlace -superclass {SecurePlace HtmlPlace}
+
+    namespace export SecureHtmlPlace
+}
+
+namespace import ::xotcl::actiweb::secureHtmlPlace::*
Index: xotcl/library/actiweb/SecureHttpPlace.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/actiweb/SecureHttpPlace.xotcl	(.../SecureHttpPlace.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/actiweb/SecureHttpPlace.xotcl	(.../SecureHttpPlace.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,35 +1,52 @@
-# $Id: SecureHttpPlace.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: SecureHttpPlace.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::actiweb::secureHttpPlace 0.8
 
 package require xotcl::actiweb::httpPlace
 
-Class SecurePlace -superclass Place -parameter {
-  {port 443}
-  {requestCert 0}
-  {requireValidCert 0}
-  {certfile server.pem}
-  {keyfile server.key} 
-  {cafile cacert.pem}
-  {infoCb {}}
-}
+package require XOTcl
 
-SecurePlace instproc startHttpd {} {
-  my instvar port root  requestCert requireValidCert \
-      certfile cafile infoCb keyfile
-  Httpsd h1 -port $port \
-      -root $root \
-      -httpdWrk SecurePlace::HttpsdWrk \
-      -infoCb $infoCb \
-      -requestCert $requestCert \
-      -requireValidCert $requireValidCert \
-      -certfile $certfile -cafile $cafile \
-      -keyfile $keyfile
-}
+namespace eval ::xotcl::actiweb::secureHttpPlace {
+    namespace import ::xotcl::*
 
-SecurePlace instproc init args {
-  my set startHTTPServer 0
-  next
-  [self] startHttpd
+    Class SecurePlace -superclass Place -parameter {
+	{port 443}
+	{requestCert 0}
+	{requireValidCert 0}
+	{certfile server.pem}
+	{keyfile server.key} 
+	{cafile cacert.pem}
+	{infoCb {}}
+    }
+
+    SecurePlace instproc startHttpd {} {
+	my instvar port root  requestCert requireValidCert \
+	    certfile cafile infoCb keyfile
+	Httpsd h1 -port $port \
+	    -root $root \
+	    -httpdWrk SecurePlace::HttpsdWrk \
+	    -infoCb $infoCb \
+	    -requestCert $requestCert \
+	    -requireValidCert $requireValidCert \
+	    -certfile $certfile -cafile $cafile \
+	    -keyfile $keyfile
+    }
+
+    SecurePlace instproc init args {
+	my set startHTTPServer 0
+	next
+	[self] startHttpd
+    }
+
+    Class SecurePlace::HttpsdWrk -superclass {Httpsd::Wrk Place::HttpdWrk} 
+
+    namespace export SecurePlace
+    namespace eval SecurePlace {
+	namespace export HttpsdWrk
+    }
 }
 
-Class SecurePlace::HttpsdWrk -superclass {Httpsd::Wrk Place::HttpdWrk} 
+namespace import ::xotcl::actiweb::secureHttpPlace::*
+namespace eval SecurePlace {
+    namespace import ::xotcl::actiweb::secureHttpPlace::SecurePlace::*
+}
Index: xotcl/library/actiweb/SendStrategy.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/actiweb/SendStrategy.xotcl	(.../SendStrategy.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/actiweb/SendStrategy.xotcl	(.../SendStrategy.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,38 +1,51 @@
-# $Id: SendStrategy.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: SendStrategy.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::actiweb::sendStrategy 0.8
+
+package require XOTcl
+
 #
 # some simple sending strategy classes -- to be used as mixins
 # for web objects
 # 
 
-Class SendStrategy
-SendStrategy abstract instproc send {httpWrk string}
+namespace eval ::xotcl::actiweb::sendStrategy {
+  namespace import ::xotcl::*
 
-#
-# send the response given from the place as plain text
-#
-Class Send=PlainString -superclass SendStrategy
-Send=PlainString instproc send {httpWrk string} {
-  $httpWrk sendMsg $string text/plain
-}
+  Class SendStrategy
+  SendStrategy abstract instproc send {httpWrk string}
 
-#
-# send the response given from the place with content 
-# type of the obj, if it exists
-#
-Class Send=TypedString -superclass SendStrategy
-Send=TypedString instproc send {httpWrk string} {
-  $httpWrk sendMsg $string [my set contentType]
-}
- 
-#
-# send file specified in obj's instvar filename
-#
-Class Send=File -superclass SendStrategy
-Send=File instproc send {httpWrk {response ""}} {
-  if {[my exists contentType]} {
-    $httpWrk sendFile [my set filename] [my set contentType]
-  } else {
-    $httpWrk sendFile [my set filename] ""
+  #
+  # send the response given from the place as plain text
+  #
+  Class Send=PlainString -superclass SendStrategy
+  Send=PlainString instproc send {httpWrk string} {
+    $httpWrk sendMsg $string text/plain
   }
+
+  #
+  # send the response given from the place with content 
+  # type of the obj, if it exists
+  #
+  Class Send=TypedString -superclass SendStrategy
+  Send=TypedString instproc send {httpWrk string} {
+    $httpWrk sendMsg $string [my set contentType]
+  }
+  
+  #
+  # send file specified in obj's instvar filename
+  #
+  Class Send=File -superclass SendStrategy
+  Send=File instproc send {httpWrk {response ""}} {
+    if {[my exists contentType]} {
+      $httpWrk sendFile [my set filename] [my set contentType]
+    } else {
+      $httpWrk sendFile [my set filename] ""
+    }
+  }
+
+  namespace export \
+      SendStrategy Send=PlainString Send=TypedString Send=File
 }
+
+namespace import ::xotcl::actiweb::sendStrategy::*
Index: xotcl/library/actiweb/UserMgt.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/actiweb/UserMgt.xotcl	(.../UserMgt.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/actiweb/UserMgt.xotcl	(.../UserMgt.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,89 +1,100 @@
-# $Id: UserMgt.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: UserMgt.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::actiweb::userMgt 0.8
 
-Class UserMgt 
-Class UserMgt::User -parameter {name password}
+package require XOTcl
 
-UserMgt instproc addUser {name password} {
-  [self class]::User [self]::$name -name $name -password $password
-}
+namespace eval ::xotcl::actiweb::userMgt {
+    namespace import ::xotcl::*
 
-UserMgt set exportedInstprocs [list \
-  addUser \
-  listUsers \
-  deleteUser \
-  userMgtOptions\
-]
+    Class UserMgt 
+    Class UserMgt::User -parameter {name password}
 
-UserMgt instproc init args {
-  next
-  my exportedProcs [concat [my exportedProcs] [[self class] set exportedInstprocs]]
-}
+    UserMgt instproc addUser {name password} {
+	[self class]::User [self]::$name -name $name -password $password
+    }
 
-UserMgt instproc listUsers {} {
-  #showCall
-  set users ""
-  foreach u [my info children] {
-    lappend users [namespace tail $u]
-  }
-  return $users
-}
+    UserMgt set exportedInstprocs [list \
+				       addUser \
+				       listUsers \
+				       deleteUser \
+				       userMgtOptions\
+				      ]
 
-UserMgt instproc deleteUser {name} {
-  if {[[self class]::User info instances [self]::$name] != ""} {
-    [self]::$name destroy
-  }
-}
-UserMgt instproc userMgtOptions {} {
-  return [[self class] set exportedInstprocs]
-}
+    UserMgt instproc init args {
+	next
+	my exportedProcs [concat [my exportedProcs] [[self class] set exportedInstprocs]]
+    }
 
-Class UserMgtHtml -superclass HtmlRep
+    UserMgt instproc listUsers {} {
+	#showCall
+	set users ""
+	foreach u [my info children] {
+	    lappend users [namespace tail $u]
+	}
+	return $users
+    }
 
-UserMgtHtml instproc addUser args {
-  set place [HtmlPlace getInstance]
-  if {$args == ""} {
-    set action [url encodeItem "[my htmlCall] [my repObj] [self proc]"]
-    set c {
-      <form method=get action=$action>
-      <p> Name: 
-      <input name="name" type=text size=30>
-      <p> Password:
-      <input name="password" type=password typesize=30>
-      <p><p>
-      <input type=submit value="Submit">
-      <input type=reset value="Reset">
+    UserMgt instproc deleteUser {name} {
+	if {[[self class]::User info instances [self]::$name] != ""} {
+	    [self]::$name destroy
+	}
     }
-    set c [subst -nobackslashes -nocommands $c]
-    
-    return [my simplePage $place "New User" $c]
-  } else {
-    if {[llength $args] > 1} {
-      set name [lindex $args 0]
-      set password [lindex $args 1]
-      set user [[my repObj] [self proc] $name $password]		
-      set c "\n$name entered $place successfully\n"
-      return [my simplePage "New User" "New User" $c]
-    } else {
-      #
-      # error !!!
+    UserMgt instproc userMgtOptions {} {
+	return [[self class] set exportedInstprocs]
     }
-    return [my [self proc]]
-  }
-}
 
-UserMgtHtml instproc listUsers {} {
-  set c ""
-  foreach u [[my repObj] [self proc]] {
-    append c "<p> $u \n"
-  }
-  return [my simplePage "User List" "User List" $c]  
+    Class UserMgtHtml -superclass HtmlRep
+
+    UserMgtHtml instproc addUser args {
+	set place [HtmlPlace getInstance]
+	if {$args == ""} {
+	    set action [url encodeItem "[my htmlCall] [my repObj] [self proc]"]
+	    set c {
+		<form method=get action=$action>
+		<p> Name: 
+		<input name="name" type=text size=30>
+		<p> Password:
+		<input name="password" type=password typesize=30>
+		<p><p>
+		<input type=submit value="Submit">
+		<input type=reset value="Reset">
+	    }
+	    set c [subst -nobackslashes -nocommands $c]
+	    
+	    return [my simplePage $place "New User" $c]
+	} else {
+	    if {[llength $args] > 1} {
+		set name [lindex $args 0]
+		set password [lindex $args 1]
+		set user [[my repObj] [self proc] $name $password]		
+		set c "\n$name entered $place successfully\n"
+		return [my simplePage "New User" "New User" $c]
+	    } else {
+		#
+		# error !!!
+	    }
+	    return [my [self proc]]
+	}
+    }
+
+    UserMgtHtml instproc listUsers {} {
+	set c ""
+	foreach u [[my repObj] [self proc]] {
+	    append c "<p> $u \n"
+	}
+	return [my simplePage "User List" "User List" $c]  
+    }
+
+    UserMgtHtml instproc userMgtOptions {} {
+	set c ""
+	foreach u [[my repObj] [self proc]] {
+	    append c "<p> <a href=[my selfAction $u]> $u </a>\n"
+	}
+	return [my simplePage "User Management Options" "User Management Options" $c]  
+    }
+
+    namespace export UserMgt UserMgtHtml
 }
 
-UserMgtHtml instproc userMgtOptions {} {
-  set c ""
-  foreach u [[my repObj] [self proc]] {
-    append c "<p> <a href=[my selfAction $u]> $u </a>\n"
-  }
-  return [my simplePage "User Management Options" "User Management Options" $c]  
-}
\ No newline at end of file
+namespace import ::xotcl::actiweb::userMgt::*
Index: xotcl/library/actiweb/WebAgent.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/actiweb/WebAgent.xotcl	(.../WebAgent.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/actiweb/WebAgent.xotcl	(.../WebAgent.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,51 +1,61 @@
-# $Id: WebAgent.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: WebAgent.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::actiweb::webAgent 0.8
 
 package require xotcl::actiweb::agent
 package require xotcl::actiweb::invoker
 package require xotcl::mixinStrategy
 
-#
-# Web Agent are special agents that allow us to define another
-# object in the paramter webfacade as a facade for the web agent
-# itself and the sub-system shielded by the web agent with an interface
-# for agents
-#
-Class WebAgent -superclass Agent
+package require XOTcl
 
-WebAgent instproc init args {
-  next
-}
+namespace eval ::xotcl::actiweb::webAgent {
+    namespace import ::xotcl::*
 
-#
-# let the web agents facade handle the call -> interprete args
-# as "method args"
-# return result of the invoker
-#
-#WebAgent instproc invokeFacade {args} {
-#  set a ""
-#  set m ""
-#  set l [llength $args]
-#  set o [my webfacade]
-#  if {$l > 0} {
-#    set m [lindex $args 0]
-#  }
-#  if {$l > 1} {
-#    set a [lrange $args 1 end]
-#  } 
-#    
-#  #puts stderr "Web Agent [self]->invoke:  OBJ: $o PROC: $m ARGS: $a"
-#
-#  #
-#  # tell the invoker to redirect the call to the webfacade object
-#  #
-#  set re [RedirectException [self]::[my autoname re] \
-\#	    -obj $o -method $m -arguments $a]
-#
-#  return $re
-#}
-    
+    #
+    # Web Agent are special agents that allow us to define another
+    # object in the paramter webfacade as a facade for the web agent
+    # itself and the sub-system shielded by the web agent with an interface
+    # for agents
+    #
+    Class WebAgent -superclass Agent
 
-#WebAgent instproc default args {
-#  return [next]
-#}
+    WebAgent instproc init args {
+	next
+    }
+
+    #
+    # let the web agents facade handle the call -> interprete args
+    # as "method args"
+    # return result of the invoker
+    #
+    #WebAgent instproc invokeFacade {args} {
+    #  set a ""
+    #  set m ""
+    #  set l [llength $args]
+    #  set o [my webfacade]
+    #  if {$l > 0} {
+    #    set m [lindex $args 0]
+    #  }
+    #  if {$l > 1} {
+    #    set a [lrange $args 1 end]
+    #  } 
+    #    
+    #  #puts stderr "Web Agent [self]->invoke:  OBJ: $o PROC: $m ARGS: $a"
+    #
+    #  #
+    #  # tell the invoker to redirect the call to the webfacade object
+    #  #
+    #  set re [RedirectException [self]::[my autoname re] \
+    #	    -obj $o -method $m -arguments $a]
+    #
+    #  return $re
+    #}
+
+    #WebAgent instproc default args {
+    #  return [next]
+    #}
+
+    namespace export WebAgent
+}
+
+namespace import ::xotcl::actiweb::webAgent::*
Index: xotcl/library/actiweb/WebDocument.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/actiweb/WebDocument.xotcl	(.../WebDocument.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/actiweb/WebDocument.xotcl	(.../WebDocument.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,210 +1,226 @@
-# $Id: WebDocument.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: WebDocument.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::actiweb::webDocument 0.8
 
 package require xotcl::actiweb::webObject
 package require xotcl::comm::httpAccess
 package require xotcl::mixinStrategy
 package require xotcl::actiweb::sendStrategy
 
-Class WebDocument -superclass WebObject \
-  -parameter {
-    {content ""}
-    filename
-  }
+package require XOTcl
 
+namespace eval ::xotcl::actiweb::webDocument {
+    namespace import ::xotcl::*
 
-WebDocument instproc init args {
-  my exportProcs content contentType
-  next
-  my mixinStrategy Send=TypedString
-}
+    Class WebDocument -superclass WebObject \
+	-parameter {
+	    {content ""}
+	    filename
+	}
 
-WebDocument instproc attachFile filename {
-  my filename $filename
-  my set oldSendStrategy [my mixinStrategy Send=File]
-  my contentType [Mime guessContentType $filename]
-}
 
-WebDocument instproc detachFile {} {
-  my mixinStrategy [my set oldSendStrategy]
-  my unset contentType
-  my unset filename
-}
+    WebDocument instproc init args {
+	my exportProcs content contentType
+	next
+	my mixinStrategy ::Send=TypedString
+    }
 
-WebDocument instproc default args {
-  if {[my exists content]} {
-    return [my content]
-  }
-  return ""
-}
-#WebDocument instproc contentLength {} {
-#  my showCall
-#  return [expr {[string length [my content]] + 1}]
-#}
+    WebDocument instproc attachFile filename {
+	my filename $filename
+	my set oldSendStrategy [my mixinStrategy ::Send=File]
+	my contentType [Mime guessContentType $filename]
+    }
 
+    WebDocument instproc detachFile {} {
+	my mixinStrategy [my set oldSendStrategy]
+	my unset contentType
+	my unset filename
+    }
 
-Class TextDocument -superclass WebDocument
-TextDocument instproc init args {
-  next
-  my contentType text/plain
-}
+    WebDocument instproc default args {
+	if {[my exists content]} {
+	    return [my content]
+	}
+	return ""
+    }
+    #WebDocument instproc contentLength {} {
+    #  my showCall
+    #  return [expr {[string length [my content]] + 1}]
+    #}
 
 
-Class HtmlDocument -superclass TextDocument
-HtmlDocument instproc init args {
-  next
-  my contentType text/html
-}
+    Class TextDocument -superclass WebDocument
+    TextDocument instproc init args {
+	next
+	my contentType text/plain
+    }
 
-Class FileDocument -superclass WebDocument
 
-#
-# class factory creates classes on the fly if they do not exist
-# already, otherwise return exisiting class
-#
-# auch flyweigth
-Class DocumentClassFactory
-DocumentClassFactory abstract instproc getClass contentType
+    Class HtmlDocument -superclass TextDocument
+    HtmlDocument instproc init args {
+	next
+	my contentType text/html
+    }
 
-Class FileDocumentClassFactory -superclass DocumentClassFactory
-FileDocumentClassFactory instproc getClass contentType {
-  if {[FileDocument info classchildren $contentType] == ""} {
-    Class ::FileDocument::${contentType} -superclass FileDocument
-  }
-  return ::FileDocument::${contentType}
-}
+    Class FileDocument -superclass WebDocument
 
-Class DocumentFactory
-DocumentFactory abstract instproc create {name args}  
+    #
+    # class factory creates classes on the fly if they do not exist
+    # already, otherwise return exisiting class
+    #
+    # auch flyweigth
+    Class DocumentClassFactory
+    DocumentClassFactory abstract instproc getClass contentType
 
-Class FileDocumentFactory -superclass DocumentFactory
-FileDocumentFactory instproc create {name class filename} {
-  $class $name
-  #$name contentType [$class set contentType]
-  $name attachFile $filename
-  return $name
-}
+    Class FileDocumentClassFactory -superclass DocumentClassFactory
+    FileDocumentClassFactory instproc getClass contentType {
+	if {[FileDocument info classchildren $contentType] == ""} {
+	    Class ::FileDocument::${contentType} -superclass FileDocument
+	}
+	return ::FileDocument::${contentType}
+    }
 
-Class FileObjectifier 
+    Class DocumentFactory
+    DocumentFactory abstract instproc create {name args}  
 
-FileObjectifier instproc init args {
-  next
-  FileDocumentClassFactory [self]::clFactory
-  FileDocumentFactory [self]::objFactory
-}
+    Class FileDocumentFactory -superclass DocumentFactory
+    FileDocumentFactory instproc create {name class filename} {
+	$class $name
+	#$name contentType [$class set contentType]
+	$name attachFile $filename
+	return $name
+    }
 
-#
-# filename must be given with full path ->
-# create objects with filename's tail (prefix can be used to
-# give object name a preceding dir)
-#
-FileObjectifier instproc objectifyFile {place filename {prefix ""}} {
-  set obj ""
-  if {[file isfile $filename]} {
-    set type [Mime guessContentType $filename]
-    #if {$type != "unknown/unknown"} {
-    set fn [string trimleft $prefix/[file tail $filename] /]
-    set class [[self]::clFactory getClass $type]
-    set obj [[self]::objFactory create $fn $class $filename]
-    $place exportObjs $obj
-    #puts stderr "...objectified:  $obj of class $class"
-    #}
-  }
-  return $obj
-}
+    Class FileObjectifier 
 
-#
-# objectify a whole directory tree
-#
-FileObjectifier instproc objectifyTree {place dir {prefix ""}} {
-  if {[file isdirectory $dir]} {
-    foreach f [glob  -nocomplain $dir/*] {
-      if {[file isfile $f]} {
-	my objectifyFile $place $f $prefix
-      } elseif {[file isdirectory $f]} {
-	my objectifyTree $place $f $prefix/[file tail $f]
-      }
+    FileObjectifier instproc init args {
+	next
+	FileDocumentClassFactory [self]::clFactory
+	FileDocumentFactory [self]::objFactory
     }
-  }
-}
 
+    #
+    # filename must be given with full path ->
+    # create objects with filename's tail (prefix can be used to
+    # give object name a preceding dir)
+    #
+    FileObjectifier instproc objectifyFile {place filename {prefix ""}} {
+	set obj ""
+	if {[file isfile $filename]} {
+	    set type [Mime guessContentType $filename]
+	    #if {$type != "unknown/unknown"} {
+	    set fn [string trimleft $prefix/[file tail $filename] /]
+	    set class [[self]::clFactory getClass $type]
+	    set obj [[self]::objFactory create $fn $class $filename]
+	    $place exportObjs $obj
+	    #puts stderr "...objectified:  $obj of class $class"
+	    #}
+	}
+	return $obj
+    }
 
-Class GraphicDirectoryObjectifier -superclass FileObjectifier \
-    -parameter {{thumbnaildir /tmp}}
-GraphicDirectoryObjectifier instproc objectifyTree {place dir {prefix ""}} {
-  if {[file isdirectory $dir]} {
-    set indexpage ""
-    set title ""
-    set date ""
-    foreach f [lsort [glob -nocomplain $dir/* $dir/{.date,.title}]] {
-      set exportedfn [string trimleft $prefix/[file tail $f] /]
-      if {[file isfile $f]} {
-	set type [Mime guessContentType $f]
-	if {[string match image/* $type]} {
-	  set class [[self]::clFactory getClass $type]
-	  $class $exportedfn -init -attachFile $f
-	  $place exportObjs $exportedfn
-	  #puts stderr "...objectified:  FN=$exportedfn cl=$class d=$dir o=$exportedfn"
-	  ######
-	  set expThumbnaildir [file dirname $exportedfn]/.thumbnail
-	  set thumbnaildir    [file dirname $f]/.thumbnail
-	  if {![file isdirectory $thumbnaildir]} {
-	    file mkdir $thumbnaildir
-	  }
-	  set thumbnail $thumbnaildir/[file tail $f]
-	  set expThumbnail $expThumbnaildir/[file tail $f]
-	  if {![file exists $thumbnail]} {
-	    catch {exec djpeg -pnm $f | \
-		       pnmscale -xscale .2 -yscale .2 | ppmquant 256 | \
-		       ppmtogif > $thumbnail}
-	  }
-	  $class $expThumbnail -init -attachFile $thumbnail
-	  $place exportObjs $expThumbnail
-	  ####
-	  append indexpage "<A href='/$exportedfn'>" \
-	      "<IMG SRC='/$expThumbnail'>$exportedfn</A><br>\n"
-	} elseif {[string match *.title $exportedfn]} {
-	  set title [my fileContent $f]
-	} elseif {[string match *.date $exportedfn]} {
-	  set date <H4>[my fileContent $f]</H4>
+    #
+    # objectify a whole directory tree
+    #
+    FileObjectifier instproc objectifyTree {place dir {prefix ""}} {
+	if {[file isdirectory $dir]} {
+	    foreach f [glob  -nocomplain $dir/*] {
+		if {[file isfile $f]} {
+		    my objectifyFile $place $f $prefix
+		} elseif {[file isdirectory $f]} {
+		    my objectifyTree $place $f $prefix/[file tail $f]
+		}
+	    }
 	}
-      } elseif {[file isdirectory $f]} {
-	if {[file exists $f/.title]} {
-	  set desc ": [my fileContent $f/.title]"
-	} else {
-	  set desc ""
-	}
-	append indexpage "<A href='/$exportedfn/gindex.html'>" \
-	    "$exportedfn</A>$desc<br>\n"
-	my objectifyTree $place $f $exportedfn
-      }
-      set gindex [string trimleft $prefix/gindex.html /]
-      HtmlDocument $gindex -content \
-	  "<HTML><TITLE>$title</TITLE><H1>$title</H1>\
+    }
+
+
+    Class GraphicDirectoryObjectifier -superclass FileObjectifier \
+	-parameter {{thumbnaildir /tmp}}
+    GraphicDirectoryObjectifier instproc objectifyTree {place dir {prefix ""}} {
+	if {[file isdirectory $dir]} {
+	    set indexpage ""
+	    set title ""
+	    set date ""
+	    foreach f [lsort [glob -nocomplain $dir/* $dir/{.date,.title}]] {
+		set exportedfn [string trimleft $prefix/[file tail $f] /]
+		if {[file isfile $f]} {
+		    set type [Mime guessContentType $f]
+		    if {[string match image/* $type]} {
+			set class [[self]::clFactory getClass $type]
+			$class $exportedfn -init -attachFile $f
+			$place exportObjs $exportedfn
+			#puts stderr "...objectified:  FN=$exportedfn cl=$class d=$dir o=$exportedfn"
+			######
+			set expThumbnaildir [file dirname $exportedfn]/.thumbnail
+			set thumbnaildir    [file dirname $f]/.thumbnail
+			if {![file isdirectory $thumbnaildir]} {
+			    file mkdir $thumbnaildir
+			}
+			set thumbnail $thumbnaildir/[file tail $f]
+			set expThumbnail $expThumbnaildir/[file tail $f]
+			if {![file exists $thumbnail]} {
+			    catch {exec djpeg -pnm $f | \
+				       pnmscale -xscale .2 -yscale .2 | ppmquant 256 | \
+				       ppmtogif > $thumbnail}
+			}
+			$class $expThumbnail -init -attachFile $thumbnail
+			$place exportObjs $expThumbnail
+			####
+			append indexpage "<A href='/$exportedfn'>" \
+			    "<IMG SRC='/$expThumbnail'>$exportedfn</A><br>\n"
+		    } elseif {[string match *.title $exportedfn]} {
+			set title [my fileContent $f]
+		    } elseif {[string match *.date $exportedfn]} {
+			set date <H4>[my fileContent $f]</H4>
+		    }
+		} elseif {[file isdirectory $f]} {
+		    if {[file exists $f/.title]} {
+			set desc ": [my fileContent $f/.title]"
+		    } else {
+			set desc ""
+		    }
+		    append indexpage "<A href='/$exportedfn/gindex.html'>" \
+			"$exportedfn</A>$desc<br>\n"
+		    my objectifyTree $place $f $exportedfn
+		}
+		set gindex [string trimleft $prefix/gindex.html /]
+		HtmlDocument $gindex -content \
+		    "<HTML><TITLE>$title</TITLE><H1>$title</H1>\
 		<BODY>$date$indexpage</BODY></HTML>"
-      #puts stderr "mixins of HtmlDocument=<[$gindex info mixins]>"
-      $gindex mixinStrategy Send=TypedString
-      #$gindex showVars
-      receiver exportObjs $gindex
+		#puts stderr "mixins of HtmlDocument=<[$gindex info mixins]>"
+		$gindex mixinStrategy ::Send=TypedString
+		#$gindex showVars
+		receiver exportObjs $gindex
+	    }
+	}
     }
-  }
-}
-GraphicDirectoryObjectifier instproc fileContent {f} {
-  set FILE [open $f r]
-  set content [read $FILE]
-  close $FILE
-  return $content
-}
+    GraphicDirectoryObjectifier instproc fileContent {f} {
+	set FILE [open $f r]
+	set content [read $FILE]
+	close $FILE
+	return $content
+    }
 
 
 
-Class HtmlProxy -superclass HtmlDocument  -parameter realSubject
-HtmlProxy instproc init args {
-  next
-  [Place getInstance] exportObjs [self]
+    Class HtmlProxy -superclass HtmlDocument  -parameter realSubject
+    HtmlProxy instproc init args {
+	next
+	[Place getInstance] exportObjs [self]
+    }
+    HtmlProxy instproc unknown {m args} {
+	my instvar realSubject
+	::eval $realSubject $m $args
+	return [my default]
+    }
+
+    namespace export \
+	WebDocument TextDocument HtmlDocument FileDocument \
+	DocumentClassFactory FileDocumentClassFactory \
+	DocumentFactory FileDocumentFactory \
+	FileObjectifier GraphicDirectoryObjectifier \
+	HtmlProxy
 }
-HtmlProxy instproc unknown {m args} {
-  my instvar realSubject
-  ::eval $realSubject $m $args
-  return [my default]
-}
+
+namespace import ::xotcl::actiweb::webDocument::*
Index: xotcl/library/actiweb/WebObject.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/actiweb/WebObject.xotcl	(.../WebObject.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/actiweb/WebObject.xotcl	(.../WebObject.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,119 +1,130 @@
-# $Id: WebObject.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: WebObject.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::actiweb::webObject 0.8
 
 package require xotcl::actiweb::sendStrategy
 package require xotcl::mixinStrategy
 package require xotcl::store::persistence
 
-#
-# base interface for all web-entitites
-#
-Class WebObject -parameter {
-  {exportedProcs {echo default}}
-  agentInfo
-  {contentType ""}
-  {place ""}
-}
+package require XOTcl
 
-#
-# default send strategy == send the response from the place
-#
-WebObject instproc init args {
-  #my showCall
-  my mixinStrategy Send=PlainString
-  my registerPlace
-  my mixinStrategy Persistent=Eager
-  my persistenceMgr [my place]::agentPersistenceMgr
-  next
-}
+namespace eval ::xotcl::actiweb::webObject {
+    namespace import ::xotcl::*
 
-WebObject instproc registerPlace {} {
-  my set place [Place getInstance]
-  my set agentInfo [[my place]::agentMgr register [my selfName]]
-}
+    #
+    # base interface for all web-entitites
+    #
+    Class WebObject -parameter {
+	{exportedProcs {echo default}}
+	agentInfo
+	{contentType ""}
+	{place ""}
+    }
 
-WebObject instproc deregisterPlace {} {
-  [my place]::agentMgr deregister [my selfName]
-}
+    #
+    # default send strategy == send the response from the place
+    #
+    WebObject instproc init args {
+	#my showCall
+	my mixinStrategy ::Send=PlainString
+	my registerPlace
+	my mixinStrategy ::Persistent=Eager
+	my persistenceMgr [my place]::agentPersistenceMgr
+	next
+    }
 
-#
-# seek for the HTTP worker object that has invoked
-# the current call
-#
-WebObject instproc getWorker {} {
-  for {set level 1} {1} {incr level} {
-    if {[catch {set worker [uplevel $level self]}]} {
-      return ""
-    } elseif {[$worker istype Place::HttpdWrk]} {
-      return $worker
+    WebObject instproc registerPlace {} {
+	my set place [Place getInstance]
+	my set agentInfo [[my place]::agentMgr register [my selfName]]
     }
-  }
-}
-WebObject instproc getFormData {} {
-  [my getWorker] formData
-}
 
-#
-# code a call for an action on self;
-# action is "proc args"
-#
-WebObject instproc selfAction {action} {
-  return [url encodeItem "[string trimleft [self] :] $action"]
-}
-WebObject instproc action {o action} {
-  return [url encodeItem "[string trimleft $o :] $action"]
-}
-WebObject instproc echo {} {
-  return [self]
-}
+    WebObject instproc deregisterPlace {} {
+	[my place]::agentMgr deregister [my selfName]
+    }
 
-WebObject instproc error args {
-  return "Error on [self]: Invocation '$args' failed."
-}
+    #
+    # seek for the HTTP worker object that has invoked
+    # the current call
+    #
+    WebObject instproc getWorker {} {
+	for {set level 1} {1} {incr level} {
+	    if {[catch {set worker [uplevel $level self]}]} {
+		return ""
+	    } elseif {[$worker istype Place::HttpdWrk]} {
+		return $worker
+	    }
+	}
+    }
+    WebObject instproc getFormData {} {
+	[my getWorker] formData
+    }
 
-WebObject instproc default {} {
-  return "No default behaviour on [self]."
-}
+    #
+    # code a call for an action on self;
+    # action is "proc args"
+    #
+    WebObject instproc selfAction {action} {
+	return [url encodeItem "[string trimleft [self] :] $action"]
+    }
+    WebObject instproc action {o action} {
+	return [url encodeItem "[string trimleft $o :] $action"]
+    }
+    WebObject instproc echo {} {
+	return [self]
+    }
 
-WebObject instproc exportProcs args {
-  my instvar exportedProcs
-  foreach a $args {
-    if {[lsearch $exportedProcs $a] == -1} {
-      lappend exportedProcs $a
+    WebObject instproc error args {
+	return "Error on [self]: Invocation '$args' failed."
     }
-  }
-}
 
-WebObject instproc isExportedProc p {
-  expr {[lsearch [my set exportedProcs] $p] != -1}
-}
+    WebObject instproc default {} {
+	return "No default behaviour on [self]."
+    }
 
-WebObject instproc selfName {} {
-  return [string trimleft [self] :]
-}
+    WebObject instproc exportProcs args {
+	my instvar exportedProcs
+	foreach a $args {
+	    if {[lsearch $exportedProcs $a] == -1} {
+		lappend exportedProcs $a
+	    }
+	}
+    }
 
-WebObject instproc objName {obj} {
-  return [string trimleft $obj :]
-}
+    WebObject instproc isExportedProc p {
+	expr {[lsearch [my set exportedProcs] $p] != -1}
+    }
 
-WebObject instproc buildAdress {} {
-  my instvar place
-  set a http://[$place host]
-  if {[set p [$place port]]} {
-    append a :$p
-  }
-}
+    WebObject instproc selfName {} {
+	return [string trimleft [self] :]
+    }
 
-WebObject instproc destroy args {
-  my deregisterPlace
-  next
+    WebObject instproc objName {obj} {
+	return [string trimleft $obj :]
+    }
+
+    WebObject instproc buildAdress {} {
+	my instvar place
+	set a http://[$place host]
+	if {[set p [$place port]]} {
+	    append a :$p
+	}
+    }
+
+    WebObject instproc destroy args {
+	my deregisterPlace
+	next
+    }
+
+    #
+    # simple class, to be inherited before WebObject, if
+    # every remote method should reach the object
+    #
+    Class ExportAll
+    ExportAll instproc isExportedProc p {
+	return 1
+    }
+
+    namespace export WebObject ExportAll
 }
 
-#
-# simple class, to be inherited before WebObject, if
-# every remote method should reach the object
-#
-Class ExportAll
-ExportAll instproc isExportedProc p {
-   return 1
-}
\ No newline at end of file
+namespace import ::xotcl::actiweb::webObject::*
Index: xotcl/library/comm/Access.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/comm/Access.xotcl	(.../Access.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/comm/Access.xotcl	(.../Access.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,4 +1,5 @@
-# -*- tcl -*- $Id: Access.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# -*- tcl -*- $Id: Access.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 set httpAccessVersion 0.91
 package provide xotcl::comm::httpAccess $httpAccessVersion
 
@@ -7,1677 +8,1692 @@
 package require xotcl::comm::connection
 package require xotcl::trace
 
-if {[catch {set os [exec uname -sr]}]} {
-  if {[catch {set os [exec uname -a]}]} { set os unknownOS }
-}
-if {![info exists VERSION]} { set VERSION 1.0 }
+package require XOTcl
 
+namespace eval ::xotcl::comm::httpAccess {
+    namespace import ::xotcl::*
 
-# assert is used only for invariants in the source
-proc assert {f r} {
-  set got [eval $f]
-  if {$got != $r} {
-    puts stderr "assertion failed: \[$f\] == $r (got $got)"
-  }
-}
+    variable os
+    variable VERSION
 
+    if {[catch {set os [exec uname -sr]}]} {
+	if {[catch {set os [exec uname -a]}]} { set os unknownOS }
+    }
+    if {![info exists VERSION]} { set VERSION 1.0 }
 
-# resolve and checkUrl implement URL handling (primarily completion)
-proc checkUrl {url} {
-  #puts stderr "checkUrl: <$url>"
-  if {![regexp {^([^:]+:/)/([^/]+)(/.*)?$} $url _ scheme network path]} {
-    regexp {^([^:]+:)(/.*)?$} $url _ scheme path
-  }
-  if {![info exists path]} {
-    # no access scheme provided, try some heuristics...
-    if {[regexp {^[./]} $url]} {
-      # expand leading "." to pwd
-      if {[regexp {^\.(.*)$} $url _ url]} { set url [pwd]$url }
-      return file:$url
-    } else {
-      set url http://$url
-      regsub {///$} $url // url
-      return $url
+
+    # assert is used only for invariants in the source
+    proc assert {f r} {
+	set got [eval $f]
+	if {$got != $r} {
+	    puts stderr "assertion failed: \[$f\] == $r (got $got)"
+	}
     }
-  }
-  if {$path == ""} {set path /}
-  return [expr {[info exists network] ?
-		"$scheme/$network$path" : "$scheme$path"}]
-}
 
-# resolving a relative url with respect to a base url (based on rfc 1808)
-proc resolve {rel base {childTagName ""}} {
-  if {$base == ""}    { return [checkUrl $rel] }
-  if {$rel == ""}     { return $base }
-  if {[regexp {^[^:]+:/} $rel _]} { return [checkUrl $rel] }
-  if {![regexp {^([^:]+:/)/([^/]+)(/.*)$} $base _ baseScheme baseNetwork basePath]} {
-    regexp {^([^:]+:)(/.*)$} $base _ baseScheme basePath
-  } elseif {[regexp {^[^:/]+:} $rel]} {
-    return $rel
-  }
-  regexp {^(.*)\#.*$} $basePath _ basePath
-  regexp {^(.*)[?].*$} $basePath _ basePath
-  if {[regexp {^//([^/]+)/(.*)$} $rel _ relNetwork relPath]} {
-    return $baseScheme/$relNetwork/$relPath
-  }
-  if {[info exists baseNetwork]} {
-    append baseScheme /$baseNetwork
-  }
-  #puts stderr rel=<$rel>
-  if {![string match /* $rel]} {
-    #puts stderr rel<$rel>base<$basePath>
-    if {[string match \#* $rel]} {
-      set r $basePath$rel
-    } elseif {![regsub {/([^/]*)$} $basePath /$rel r]} {
-      set r /$rel
+
+    # resolve and checkUrl implement URL handling (primarily completion)
+    proc checkUrl {url} {
+	#puts stderr "checkUrl: <$url>"
+	if {![regexp {^([^:]+:/)/([^/]+)(/.*)?$} $url _ scheme network path]} {
+	    regexp {^([^:]+:)(/.*)?$} $url _ scheme path
+	}
+	if {![info exists path]} {
+	    # no access scheme provided, try some heuristics...
+	    if {[regexp {^[./]} $url]} {
+		# expand leading "." to pwd
+		if {[regexp {^\.(.*)$} $url _ url]} { set url [pwd]$url }
+		return file:$url
+	    } else {
+		set url http://$url
+		regsub {///$} $url // url
+		return $url
+	    }
+	}
+	if {$path == ""} {set path /}
+	return [expr {[info exists network] ?
+		      "$scheme/$network$path" : "$scheme$path"}]
     }
-    while {[regsub -all {/\./} $r / r]} {}
-    regsub {/\.$} $r / r
-    while {[regsub -all {/[^/.]+/\.\./} $r / r]} {}
-    # remove leading /../ (netscapes navigator does this)
-    while {[regsub {^/\.\./} $r / r]} {}
-    set rel $r
-    #puts stderr finalrel<$r>
-  }
-  #if {$childTagName != ""} 
-  if {1} {
-    upvar 1 $childTagName childTag 
-    catch {unset childTag}
-    if {[regexp {^(.+)\#(.+)$} $rel _ rel childTag]} {
-      #puts stderr childTag=$childTag,url=$baseScheme$rel.
+
+    # resolving a relative url with respect to a base url (based on rfc 1808)
+    proc resolve {rel base {childTagName ""}} {
+	if {$base == ""}    { return [checkUrl $rel] }
+	if {$rel == ""}     { return $base }
+	if {[regexp {^[^:]+:/} $rel _]} { return [checkUrl $rel] }
+	if {![regexp {^([^:]+:/)/([^/]+)(/.*)$} $base _ baseScheme baseNetwork basePath]} {
+	    regexp {^([^:]+:)(/.*)$} $base _ baseScheme basePath
+	} elseif {[regexp {^[^:/]+:} $rel]} {
+	    return $rel
+	}
+	regexp {^(.*)\#.*$} $basePath _ basePath
+	regexp {^(.*)[?].*$} $basePath _ basePath
+	if {[regexp {^//([^/]+)/(.*)$} $rel _ relNetwork relPath]} {
+	    return $baseScheme/$relNetwork/$relPath
+	}
+	if {[info exists baseNetwork]} {
+	    append baseScheme /$baseNetwork
+	}
+	#puts stderr rel=<$rel>
+	if {![string match /* $rel]} {
+	    #puts stderr rel<$rel>base<$basePath>
+	    if {[string match \#* $rel]} {
+		set r $basePath$rel
+	    } elseif {![regsub {/([^/]*)$} $basePath /$rel r]} {
+		set r /$rel
+	    }
+	    while {[regsub -all {/\./} $r / r]} {}
+	    regsub {/\.$} $r / r
+	    while {[regsub -all {/[^/.]+/\.\./} $r / r]} {}
+	    # remove leading /../ (netscapes navigator does this)
+	    while {[regsub {^/\.\./} $r / r]} {}
+	    set rel $r
+	    #puts stderr finalrel<$r>
+	}
+	#if {$childTagName != ""} 
+	if {1} {
+	    upvar 1 $childTagName childTag 
+	    catch {unset childTag}
+	    if {[regexp {^(.+)\#(.+)$} $rel _ rel childTag]} {
+		#puts stderr childTag=$childTag,url=$baseScheme$rel.
+	    }
+	}
+	return $baseScheme$rel
     }
-  }
-  return $baseScheme$rel
-}
 
-assert {resolve "" http://mohegan/} http://mohegan/
-assert {resolve http://mohegan/ ""} http://mohegan/
-assert {resolve http://mohegan ""} http://mohegan/
-assert {resolve http://mohegan/ http://nestroy} http://mohegan/
-assert {resolve test.html http://127.0.0.1/} http://127.0.0.1/test.html
-assert {resolve test http://nestroy/} http://nestroy/test
-assert {resolve test file:/u/neumann/old} file:/u/neumann/test
-assert {resolve /test http://nestroy/} http://nestroy/test
-assert {resolve //mohegan/index.html http://nestroy/} http://mohegan/index.html
-assert {resolve //mohegan/index.html http://nestroy/} http://mohegan/index.html
-assert {resolve index.html http://nestroy/dir/} http://nestroy/dir/index.html
-assert {resolve ./index.html http://nestroy/dir/} http://nestroy/dir/index.html
-assert {resolve ././index.html http://nestroy/dir/} http://nestroy/dir/index.html
-assert {resolve ../index.html http://nestroy/dir/} http://nestroy/index.html
-assert {resolve ../../index.html http://nestroy/dir/} http://nestroy/index.html
-assert {resolve ../../../test file:/u/neumann/old} file:/test
-assert {resolve newdir/  http://nestroy/dir/} http://nestroy/dir/newdir/
-assert {resolve /newdir/  http://nestroy/dir/} http://nestroy/newdir/
-assert {resolve file:/u/neumann/ice.html ""} file:/u/neumann/ice.html
-assert {resolve \#label http://nestroy/h.html} http://nestroy/h.html
-assert {resolve mailto:user@host http://nestroy/h.html} mailto:user@host
-assert {resolve ../../../../mis2001/folien/081101.ppt  http://wwwi.wu-wien.ac.at/Studium/Abschnitt_2/LVA_ws01/IT/index.html} http://wwwi.wu-wien.ac.at/mis2001/folien/081101.ppt
+    assert {resolve "" http://mohegan/} http://mohegan/
+    assert {resolve http://mohegan/ ""} http://mohegan/
+    assert {resolve http://mohegan ""} http://mohegan/
+    assert {resolve http://mohegan/ http://nestroy} http://mohegan/
+    assert {resolve test.html http://127.0.0.1/} http://127.0.0.1/test.html
+    assert {resolve test http://nestroy/} http://nestroy/test
+    assert {resolve test file:/u/neumann/old} file:/u/neumann/test
+    assert {resolve /test http://nestroy/} http://nestroy/test
+    assert {resolve //mohegan/index.html http://nestroy/} http://mohegan/index.html
+    assert {resolve //mohegan/index.html http://nestroy/} http://mohegan/index.html
+    assert {resolve index.html http://nestroy/dir/} http://nestroy/dir/index.html
+    assert {resolve ./index.html http://nestroy/dir/} http://nestroy/dir/index.html
+    assert {resolve ././index.html http://nestroy/dir/} http://nestroy/dir/index.html
+    assert {resolve ../index.html http://nestroy/dir/} http://nestroy/index.html
+    assert {resolve ../../index.html http://nestroy/dir/} http://nestroy/index.html
+    assert {resolve ../../../test file:/u/neumann/old} file:/test
+    assert {resolve newdir/  http://nestroy/dir/} http://nestroy/dir/newdir/
+    assert {resolve /newdir/  http://nestroy/dir/} http://nestroy/newdir/
+    assert {resolve file:/u/neumann/ice.html ""} file:/u/neumann/ice.html
+    assert {resolve \#label http://nestroy/h.html} http://nestroy/h.html
+    assert {resolve mailto:user@host http://nestroy/h.html} mailto:user@host
+    assert {resolve ../../../../mis2001/folien/081101.ppt  http://wwwi.wu-wien.ac.at/Studium/Abschnitt_2/LVA_ws01/IT/index.html} http://wwwi.wu-wien.ac.at/mis2001/folien/081101.ppt
 
 
-##############################################################
-# Every object of class Access informs the (possibly empty) list of 
-# informObjects during its lifecycle with the following messages
-#   
-#   startCb:   when the request for the object is created
-#              and was classified and initialized
-#
-#   notifyCb:  when the type of the incming data is dertermined
-#              (typically after parsing the http header)
-#
-#   incCb:     when new data is available
-#
-#   endCb:     when the request is finished sucessfully and the object
-#              is going to be destroyed
-#
-#   cancelCb:  when the request is finished nonsucessfully and the object
-#              is going to be destroyed
-#
-# All these messages receive the name of the Access object
-# as first parameter, incCb has two more arguments (totalsize 
-# and currentsize) 
+    ##############################################################
+    # Every object of class Access informs the (possibly empty) list of 
+    # informObjects during its lifecycle with the following messages
+    #   
+    #   startCb:   when the request for the object is created
+    #              and was classified and initialized
+    #
+    #   notifyCb:  when the type of the incming data is dertermined
+    #              (typically after parsing the http header)
+    #
+    #   incCb:     when new data is available
+    #
+    #   endCb:     when the request is finished sucessfully and the object
+    #              is going to be destroyed
+    #
+    #   cancelCb:  when the request is finished nonsucessfully and the object
+    #              is going to be destroyed
+    #
+    # All these messages receive the name of the Access object
+    # as first parameter, incCb has two more arguments (totalsize 
+    # and currentsize) 
 
-# caching:
-# 0 no caching
-# 1 volatile cache (does not check cache, keeps spool file for back button)
-# 2 persistent cache
+    # caching:
+    # 0 no caching
+    # 1 volatile cache (does not check cache, keeps spool file for back button)
+    # 2 persistent cache
 
-Class Access -parameter {
-  {method GET} {blocking 0} {httpVersion 1.1} {headers {}} 
-  url query data contentType path caching sinkClass parentUrl
-}
-Access instproc informObject x {
-  foreach i $x { my lappend informObjects $i }
-}
-Access instproc method x {
-  my set method [string toupper $x]
-}
-Access instproc unknown {m args} {
-  error "Method '$m' with args '$args' is unknown for [self class]"
-}
+    Class Access -parameter {
+	{method GET} {blocking 0} {httpVersion 1.1} {headers {}} 
+	url query data contentType path caching sinkClass parentUrl
+    }
+    Access instproc informObject x {
+	foreach i $x { my lappend informObjects $i }
+    }
+    Access instproc method x {
+			      my set method [string toupper $x]
+			  }
+    Access instproc unknown {m args} {
+	error "Method '$m' with args '$args' is unknown for [self class]"
+    }
 
-Access proc checkRunning {} {
-  foreach u [my array names running] {
-    puts stderr "... running: $u"
-  }
-  puts stderr "... -----------"
-}
-Access proc createRequest args {
-  #my showCall
-  set informobject {}
-  set allowJoin 1
-  set nargs {}
-  foreach {a v} $args {
-    switch -exact -- $a {
-      -url           {set url $v;          lappend nargs $a $v}
-      -informObject  {set informobject $v; lappend nargs $a $v}
-      -parentRequest {set parentRequest $v}
-      -allowJoin     {set allowJoin $v}
-      default        {lappend nargs $a $v}
+    Access proc checkRunning {} {
+	foreach u [my array names running] {
+	    puts stderr "... running: $u"
+	}
+	puts stderr "... -----------"
     }
-  }
-  #if {[my array exists running]} {parray [self]::running}
-  if {[my exists running($url)] && $allowJoin} {
-    my showMsg "we can join running($url)=[my set running($url)]"
-    # we can join the request.
-    # requests are joined by adding the informobjects to
-    # the existing request
-    set token [my set running($url)]
-    # delegation to a different request works only so easy
-    # when loading to a file...
-    $token informObject $informobject
-    return $token
-  } else {
-    set token [my autoname ::req]
-    if {[info exists parentRequest]} {
-      set token ${parentRequest}$token
-    } 
-    #my showMsg "TOKEN = $token $url"
-    return [eval my create $token $nargs]
-  }
-}
-Access instproc running {} {
-  #my showCall
-  [self class] set running([my url]) [self]
-}
-Access instproc stop {} {
-  #showCall
-  my instvar url
-  if {[[self class] exists running($url)]} {
-    #puts stderr "my unset [[self class] set running($url)]
-    [self class] unset running($url)
-    #if {[my array exists running]} { parray [self class]::running }
-  } else {
-    #puts stderr "not running($url)"
-    #if {[my array exists running]} { parray [self class]::running }
-  }
-}
-#Access instproc destroy args {
-#  my showCall
-#  next
-#}
-Access instproc init args {
-  #my showCall
-  my instvar method url
-  if {![my exists informObjects]} {
-    my set informObjects {}
-  }
-  next
-  if {![my exists caching]} { 
-    if {$method == "GET"} {
-      set defaultCaching 2
-    } else {
-      set defaultCaching 1
+    Access proc createRequest args {
+	#my showCall
+	set informobject {}
+	set allowJoin 1
+	set nargs {}
+	foreach {a v} $args {
+	    switch -exact -- $a {
+		-url           {set url $v;          lappend nargs $a $v}
+		-informObject  {set informobject $v; lappend nargs $a $v}
+		-parentRequest {set parentRequest $v}
+		-allowJoin     {set allowJoin $v}
+		default        {lappend nargs $a $v}
+	    }
+	}
+	#if {[my array exists running]} {parray [self]::running}
+	if {[my exists running($url)] && $allowJoin} {
+	    my showMsg "we can join running($url)=[my set running($url)]"
+	    # we can join the request.
+	    # requests are joined by adding the informobjects to
+	    # the existing request
+	    set token [my set running($url)]
+	    # delegation to a different request works only so easy
+	    # when loading to a file...
+	    $token informObject $informobject
+	    return $token
+	} else {
+	    set token [my autoname ::req]
+	    if {[info exists parentRequest]} {
+		set token ${parentRequest}$token
+	    } 
+	    #my showMsg "TOKEN = $token $url"
+	    return [eval my create $token $nargs]
+	}
     }
-    my caching $defaultCaching
-  }
-  #my showVars
+    Access instproc running {} {
+	#my showCall
+	[self class] set running([my url]) [self]
+    }
+    Access instproc stop {} {
+	#showCall
+	my instvar url
+	if {[[self class] exists running($url)]} {
+	    #puts stderr "my unset [[self class] set running($url)]
+	    [self class] unset running($url)
+	    #if {[my array exists running]} { parray [self class]::running }
+	} else {
+	    #puts stderr "not running($url)"
+	    #if {[my array exists running]} { parray [self class]::running }
+	}
+    }
+    #Access instproc destroy args {
+    #  my showCall
+    #  next
+    #}
+    Access instproc init args {
+	#my showCall
+	my instvar method url
+	if {![my exists informObjects]} {
+	    my set informObjects {}
+	}
+	next
+	if {![my exists caching]} { 
+	    if {$method == "GET"} {
+		set defaultCaching 2
+	    } else {
+		set defaultCaching 1
+	    }
+	    my caching $defaultCaching
+	}
+	#my showVars
 
-  set url [string trim $url]
-  my initialize
-  if {[my classify $url]} {
-    #my showVars
-    # now inform all interested objects that we have the object
-    my doCallbacks startCb
-    #my showVars blocking
-    # trigger the transfer... (might be blocking or not)
-    my $method
-    if {![my exists finished]} {
-      # the request is not finished
-      if {[my blocking]} {
-	#my showMsg "waiting"
-	my vwait finished
-	#my showMsg "waiting DONE"
-      }
+	set url [string trim $url]
+	my initialize
+	if {[my classify $url]} {
+	    #my showVars
+	    # now inform all interested objects that we have the object
+	    my doCallbacks startCb
+	    #my showVars blocking
+	    # trigger the transfer... (might be blocking or not)
+	    my $method
+	    if {![my exists finished]} {
+		# the request is not finished
+		if {[my blocking]} {
+		    #my showMsg "waiting"
+		    my vwait finished
+		    #my showMsg "waiting DONE"
+		}
+	    }
+	}
     }
-  }
-}
-Access instproc getContent {} {
-  [my set sink] content
-}
+    Access instproc getContent {} {
+	[my set sink] content
+    }
 
-#########################################
-Access instproc timeout t {
-  my set timeout [::after $t [self] timeoutOccured]
-}
-Access instproc timeoutOccured {} {
-  #my showCall
-  my unset timeout
-  my abort "timeout exceeded"
-}
-Access instproc timeoutFinish {} {
-  if {[my exists timeout]} {
-    after cancel [my set timeout]
-    my unset timeout
-  }
-}
-#########################################
+    #########################################
+    Access instproc timeout t {
+	my set timeout [::after $t [self] timeoutOccured]
+    }
+    Access instproc timeoutOccured {} {
+	#my showCall
+	my unset timeout
+	my abort "timeout exceeded"
+    }
+    Access instproc timeoutFinish {} {
+	if {[my exists timeout]} {
+	    after cancel [my set timeout]
+	    my unset timeout
+	}
+    }
+    #########################################
 
-Access instproc initialize {} {
-  #my showCall
-  my set state           0
-  my set meta            {}
-  my set currentsize     0
-  my set totalsize       0
-}
-Access instproc classify {url} {
-  my instvar host path port method
-  #my showVars caching
-  if {[my caching] > 1 && [persistentCache isValidated $url]} {
-    #puts stderr "*** cacheable && validated"
-    #showVars
-    #persistentCache dump
-    set access CacheAccess
-  } elseif {[regexp -nocase {^http://([^/:]+)(:([0-9]+))?(/.*)?$} $url \
-		 _ host y givenPort path]} {
-    if {[string compare "" $givenPort]} {set port $givenPort } {set port 80}
-    switch -exact $method {
-      PROPFIND -
-      PROPPATCH -
-      COPY -
-      MKCOL -
-      MOVE -
-      LOCK -
-      UNLOCK {
-	package require xotcl::comm::dav
-	set access Dav
-      }
-      default {set access Http}
+    Access instproc initialize {} {
+	#my showCall
+	my set state           0
+	my set meta            {}
+	my set currentsize     0
+	my set totalsize       0
     }
-  } elseif {[regexp -nocase {^https://([^/:]+)(:([0-9]+))?(/.*)$} $url \
-		 _ host y givenPort path]} {
-    if {[string compare "" $givenPort]} {set port $givenPort } {set port 443}
-    set access Https
-  } elseif {[regexp -nocase {^file:(.*)$} $url _ path]} {
-    set access File
-  } elseif {[regexp -nocase {^ftp://([^/]+)/(.*)$} $url _ host path]} {
-    package require xotcl::comm::ftp
-    set access Ftp
-  } elseif {[regexp -nocase {^imap://([^/]+)/(.*)$} $url _ host path]} {
-    package require xotcl::comm::imap
-    set access Imap
-  } elseif {[regexp -nocase {^cmd:/(.*)$} $url _ path]} {
-    set access xotcl::Cmd    
-  } elseif {[regexp -nocase {^ldap://([^/:]+)?(:([0-9]+))?(/.*)$} \
-		 $url _ host y givenPort path]} {
-    if {$givenPort != ""} { set port $givenPort }
-    my showMsg "*** ldap://<$host>:<$port>/<$path>"
-    package require xotcl::comm::ldap
-    set access Ldap  
-  } else {
-    #my set state 0
-    my abort "Unsupported URL: '$url'"
-    return 0
-  }
-  my class $access
-  #my showMsg "class of request = $access"
-  return 1
-}
-Access instproc revisit {} {
-  my class ReAccess
-  my initialize
-  my [my set method]
-}
-### dummy stubs for 'close' and 'GET' for error cases
-Access instproc close {} {
-}
-Access instproc GET {} {
-  if {[my exists errormsg]} { ;# the error was already reportet
-    my finish
-  } else {
-    my abort "unknown error"
-  }
-}
+    Access instproc classify {url} {
+	my instvar host path port method
+	#my showVars caching
+	if {[my caching] > 1 && [persistentCache isValidated $url]} {
+	    #puts stderr "*** cacheable && validated"
+	    #showVars
+	    #persistentCache dump
+	    set access CacheAccess
+	} elseif {[regexp -nocase {^http://([^/:]+)(:([0-9]+))?(/.*)?$} $url \
+		       _ host y givenPort path]} {
+	    if {[string compare "" $givenPort]} {set port $givenPort } {set port 80}
+	    switch -exact $method {
+		PROPFIND -
+		PROPPATCH -
+		COPY -
+		MKCOL -
+		MOVE -
+		LOCK -
+		UNLOCK {
+		    package require xotcl::comm::dav
+		    set access Dav
+		}
+		default {set access Http}
+	    }
+	} elseif {[regexp -nocase {^https://([^/:]+)(:([0-9]+))?(/.*)$} $url \
+		       _ host y givenPort path]} {
+	    if {[string compare "" $givenPort]} {set port $givenPort } {set port 443}
+	    set access Https
+	} elseif {[regexp -nocase {^file:(.*)$} $url _ path]} {
+	    set access File
+	} elseif {[regexp -nocase {^ftp://([^/]+)/(.*)$} $url _ host path]} {
+	    package require xotcl::comm::ftp
+	    set access Ftp
+	} elseif {[regexp -nocase {^imap://([^/]+)/(.*)$} $url _ host path]} {
+	    package require xotcl::comm::imap
+	    set access Imap
+	} elseif {[regexp -nocase {^cmd:/(.*)$} $url _ path]} {
+	    set access xotcl::Cmd    
+	} elseif {[regexp -nocase {^ldap://([^/:]+)?(:([0-9]+))?(/.*)$} \
+		       $url _ host y givenPort path]} {
+	    if {$givenPort != ""} { set port $givenPort }
+	    my showMsg "*** ldap://<$host>:<$port>/<$path>"
+	    package require xotcl::comm::ldap
+	    set access Ldap  
+	} else {
+	    #my set state 0
+	    my abort "Unsupported URL: '$url'"
+	    return 0
+	}
+	my class $access
+	#my showMsg "class of request = $access"
+	return 1
+    }
+    Access instproc revisit {} {
+	my class ReAccess
+	my initialize
+	my [my set method]
+    }
+    ### dummy stubs for 'close' and 'GET' for error cases
+    Access instproc close {} {
+    }
+    Access instproc GET {} {
+	if {[my exists errormsg]} { ;# the error was already reportet
+	    my finish
+	} else {
+	    my abort "unknown error"
+	}
+    }
 
-Access instproc headerDone {} {
-  my instvar caching sink
-  if {[my exists ignoreBody]} return
-  if {[my exists sinkClass] && $caching>0 } {
-    error "can�t set both sinkclass and caching"
-  }
-  switch $caching {
-    2 {
-      set sink [CacheFileSink create [self]::cfs]
-      #my showMsg "[self class] result goes to cache"
-      $sink notifyCb [self]
+    Access instproc headerDone {} {
+	my instvar caching sink
+	if {[my exists ignoreBody]} return
+	if {[my exists sinkClass] && $caching>0 } {
+	    error "can�t set both sinkclass and caching"
+	}
+	switch $caching {
+	    2 {
+		set sink [CacheFileSink create [self]::cfs]
+		#my showMsg "[self class] result goes to cache"
+		$sink notifyCb [self]
+	    }
+	    1 {
+		set sink [CacheFileSink create [self]::cfs -persistent 0]
+		#my showMsg "result goes to volatile cache"
+		$sink notifyCb [self]
+	    }
+	    0 {
+		if {[my exists sinkClass]} {
+		    set sink [[my sinkClass] create [self]::s]
+		}
+	    }
+	}
+	my doCallbacks notifyCb
     }
-    1 {
-      set sink [CacheFileSink create [self]::cfs -persistent 0]
-      #my showMsg "result goes to volatile cache"
-      $sink notifyCb [self]
+    Access instproc mkSpoolFile {{name ""}} {
+	if {![my exists fileName]} {
+	    my set fileName [persistentCache newEntry [my url] [self] [my caching] $name]
+	}
     }
-    0 {
-      if {[my exists sinkClass]} {
-	set sink [[my sinkClass] create [self]::s]
-      }
+    Access instproc block {} {
+	my set block
     }
-  }
-  my doCallbacks notifyCb
-}
-Access instproc mkSpoolFile {{name ""}} {
-  if {![my exists fileName]} {
-    my set fileName [persistentCache newEntry [my url] [self] [my caching] $name]
-  }
-}
-Access instproc block {} {
-  my set block
-}
-Access instproc kill {} {
-  my showCall
-  my set state -1; #interrupted
-  my finish
-}
-Access instproc abort {msg} {
-  #my showCall
-  #my showVars
-  my instvar state errormsg
-  if {[catch {::printError "[self] ($state): $msg"} err]} {
-    puts stderr "\n$err\nERROR [self] ($state): $msg\n"
-  }
-  #my set error [list $msg $::errorInfo $::errorCode]
-  my caching 0
-  if {[my exists ignoreBody]} {
-    my unset ignoreBody
-  }
-  set state -2 ;# error
-  set errormsg $msg
-  my finish
-}
-Access instproc finish {} {
-  #my showCall
-  my timeoutFinish
-  my close
-  #my showVars state ignoreBody
-  # state is "interrupted" or "error"
-  if {[my set state] < 0} {
-    set action cancelCb
-    set success 0
-  } else {
-    set action endCb
-    #set state ok
-    set success 1
-  }
-  if {[my exists ignoreBody]} {
-    my stop
-    #my set finished $success
-    set cmd [my set ignoreBody]
-    my unset ignoreBody
-    #my showMsg "executing... <$cmd>"
-    eval my $cmd
-  } else {
-    if {[my exists sink]} {
-      [my set sink] $action [self]
+    Access instproc kill {} {
+	my showCall
+	my set state -1; #interrupted
+	my finish
     }
-    #catch {after cancel $after} ;# ????
-    my doCallbacks $action
-    my stop
-    my set finished $success
-  }
-}
-Access instproc eof {} {
-  #my showCall
-  #my showMsg "c [my set currentsize]== t [[self set totalsize]]"
-  #my set state eof
-  my finish
-}
-Access instproc doCallbacks {cb} {
-  #my showCall
-  if {[my exists ignoreBody]} {
-    my showMsg "ignoring callback"
-  } else {
-    foreach obj [my set informObjects] {
-      #my showMsg "*** $obj $cb [self]"
-      #puts stderr "------------ calling: $obj $cb [self]"
-      if {[catch {$obj $cb [self]} errormsg]} {
-	puts stderr "--------------$cb:errormsg=$errormsg, \
+    Access instproc abort {msg} {
+	#my showCall
+	#my showVars
+	my instvar state errormsg
+	if {[catch {::printError "[self] ($state): $msg"} err]} {
+	    puts stderr "\n$err\nERROR [self] ($state): $msg\n"
+	}
+	#my set error [list $msg $::errorInfo $::errorCode]
+	my caching 0
+	if {[my exists ignoreBody]} {
+	    my unset ignoreBody
+	}
+	set state -2 ;# error
+	set errormsg $msg
+	my finish
+    }
+    Access instproc finish {} {
+	#my showCall
+	my timeoutFinish
+	my close
+	#my showVars state ignoreBody
+	# state is "interrupted" or "error"
+	if {[my set state] < 0} {
+	    set action cancelCb
+	    set success 0
+	} else {
+	    set action endCb
+	    #set state ok
+	    set success 1
+	}
+	if {[my exists ignoreBody]} {
+	    my stop
+	    #my set finished $success
+	    set cmd [my set ignoreBody]
+	    my unset ignoreBody
+	    #my showMsg "executing... <$cmd>"
+	    eval my $cmd
+	} else {
+	    if {[my exists sink]} {
+		[my set sink] $action [self]
+	    }
+	    #catch {after cancel $after} ;# ????
+	    my doCallbacks $action
+	    my stop
+	    my set finished $success
+	}
+    }
+    Access instproc eof {} {
+	#my showCall
+	#my showMsg "c [my set currentsize]== t [[self set totalsize]]"
+	#my set state eof
+	my finish
+    }
+    Access instproc doCallbacks {cb} {
+	#my showCall
+	if {[my exists ignoreBody]} {
+	    my showMsg "ignoring callback"
+	} else {
+	    foreach obj [my set informObjects] {
+		#my showMsg "*** $obj $cb [self]"
+		#puts stderr "------------ calling: $obj $cb [self]"
+		if {[catch {$obj $cb [self]} errormsg]} {
+		    puts stderr "--------------$cb:errormsg=$errormsg, \
 		     errorInfo=$::errorInfo, \
 		     errorCode=$::errorCode."
-      }
-      #puts stderr "------------ calling DONE: $obj $cb [self]"
+		}
+		#puts stderr "------------ calling DONE: $obj $cb [self]"
+	    }
+	}
     }
-  }
-}
-Access instproc shutdown {} {
-  #my showMsg "state=[my set state] > 3"
-  if {[my set state] > 3} {
-    my set mustDestroy 1
-  } else {
-    #my showVars
-    #my showStack
-    #my showMsg "DESTROY !!!"
-    if {[my set state] > -2} {
-      my destroy
+    Access instproc shutdown {} {
+	#my showMsg "state=[my set state] > 3"
+	if {[my set state] > 3} {
+	    my set mustDestroy 1
+	} else {
+	    #my showVars
+	    #my showStack
+	    #my showMsg "DESTROY !!!"
+	    if {[my set state] > -2} {
+		my destroy
+	    }
+	}
     }
-  }
-}
 
 
-Class FileAccess -superclass Access
-FileAccess instproc initialize args {
-  my caching 0
-  next
-}
-FileAccess instproc close {} {
-}
-FileAccess instproc block {} {
-  my showTimeStart
-  set S [open [my set fileName] r]
-  fconfigure $S -translation binary
-  set block [::read $S]
-  ::close $S
-  my showTimeEnd
-  return $block
-}
-FileAccess instproc GET {} {
-  my instvar path response totalsize currentsize \
-      fileName informObjects
-  set fileName $path
-  set totalsize [file size $path]
-  set response "file 200 OK"
-  my headerDone
-  my set state 4
-  set currentsize $totalsize
-  #my showVars informObjects 
-  foreach obj $informObjects {
-    $obj incCb [self] $totalsize $currentsize
-  }
-  my eof
-}
+    Class FileAccess -superclass Access
+    FileAccess instproc initialize args {
+	my caching 0
+	next
+    }
+    FileAccess instproc close {} {
+    }
+    FileAccess instproc block {} {
+	my showTimeStart
+	set S [open [my set fileName] r]
+	fconfigure $S -translation binary
+	set block [::read $S]
+	::close $S
+	my showTimeEnd
+	return $block
+    }
+    FileAccess instproc GET {} {
+	my instvar path response totalsize currentsize \
+	    fileName informObjects
+	set fileName $path
+	set totalsize [file size $path]
+	set response "file 200 OK"
+	my headerDone
+	my set state 4
+	set currentsize $totalsize
+	#my showVars informObjects 
+	foreach obj $informObjects {
+	    $obj incCb [self] $totalsize $currentsize
+	}
+	my eof
+    }
 
 
-Class File -superclass FileAccess
-File instproc GET {} {
-  my instvar path
-  #puts stderr path=$path,exists=[file exists $path]
-  if {![file exists $path]} {
-    my abort "No such file '$path'"
-    return
-  }
-  if {![my exists contentType]} {
-    my contentType [Mime guessContentType $path]
-  }
-  my set sink [FileSink create [self]::fas -fileName $path]
-  #puts stderr ****sink=$sink,[$sink info class]
-  #puts stderr "*** before next ([self class])"
-  next
-  #puts stderr "*** after next ([self class])"
-}
+    Class File -superclass FileAccess
+    File instproc GET {} {
+	my instvar path
+	#puts stderr path=$path,exists=[file exists $path]
+	if {![file exists $path]} {
+	    my abort "No such file '$path'"
+	    return
+	}
+	if {![my exists contentType]} {
+	    my contentType [Mime guessContentType $path]
+	}
+	my set sink [FileSink create [self]::fas -fileName $path]
+	#puts stderr ****sink=$sink,[$sink info class]
+	#puts stderr "*** before next ([self class])"
+	next
+	#puts stderr "*** after next ([self class])"
+    }
 
-Class CacheAccess -superclass File
-CacheAccess instproc GET {} {
-  my instvar url
-  my path         [persistentCache cacheFileName $url]
-  my contentType  [persistentCache contentType $url]
-  my set meta     [persistentCache meta $url]
-  next
-}
+    Class CacheAccess -superclass File
+    CacheAccess instproc GET {} {
+	my instvar url
+	my path         [persistentCache cacheFileName $url]
+	my contentType  [persistentCache contentType $url]
+	my set meta     [persistentCache meta $url]
+	next
+    }
 
-Class ReAccess -superclass File
-ReAccess instproc GET {} {
-  my instvar fileName sink
-  my set block       ""
-  my set currentsize 0
-  my caching     0
-  if {![info exists fileName]} {
-    set fileName [$sink set fileName]
-  }
-  my set path $fileName
-  next
-}
+    Class ReAccess -superclass File
+    ReAccess instproc GET {} {
+	my instvar fileName sink
+	my set block       ""
+	my set currentsize 0
+	my caching     0
+	if {![info exists fileName]} {
+	    set fileName [$sink set fileName]
+	}
+	my set path $fileName
+	next
+    }
 
 
 
-Class Cmd -superclass Access
-Cmd instproc init args {
-  if {![my exists caching]} {
-    my caching 0
-  }
-  next
-}
-Cmd instproc GET {} {
-  my instvar path block totalsize currentsize \
-      response informObjects state
-  if {[catch {set block [eval $path]} error]} {
-    my contentType text/plain
-    set block $error
-  } else {
-    my contentType text/html
-  }
-  set totalsize [string length $block]
-  set response "cmd 200 OK"
-  my headerDone
-  my set state 4
-  set currentsize $totalsize
-  foreach obj $informObjects {
-    $obj incCb [self] $totalsize $currentsize
-    #$obj endCb [self]
-  }
-  #set state eof
-  my finish
-}
-Cmd instproc block args {
-  my instvar block
-  return $block
-}
+    Class Cmd -superclass Access
+    Cmd instproc init args {
+	if {![my exists caching]} {
+	    my caching 0
+	}
+	next
+    }
+    Cmd instproc GET {} {
+	my instvar path block totalsize currentsize \
+	    response informObjects state
+	if {[catch {set block [eval $path]} error]} {
+	    my contentType text/plain
+	    set block $error
+	} else {
+	    my contentType text/html
+	}
+	set totalsize [string length $block]
+	set response "cmd 200 OK"
+	my headerDone
+	my set state 4
+	set currentsize $totalsize
+	foreach obj $informObjects {
+	    $obj incCb [self] $totalsize $currentsize
+	    #$obj endCb [self]
+	}
+	#set state eof
+	my finish
+    }
+    Cmd instproc block args {
+	my instvar block
+	return $block
+    }
 
 
-#Class NetAccess -superclass Access -parameter {host port}
-Class NetAccess -superclass Access
-NetAccess instproc initialize args {
-  if {![my exists blocksize]} {my set blocksize 512}
-  my set readMethod read
-  next
-}
-NetAccess instproc read {} {
-  #my instvar S blocksize block
-  #set block [::read $S $blocksize]
-  my instvar S block blocksize
-  set block [::read $S $blocksize]
-}
-NetAccess instproc gzread {} {
-  my instvar S Z blocksize block
-  puts -nonewline $Z [::read $S $blocksize]
-  set block [::read $Z]
-  #puts stderr len=[string length $block],block=<$block>
-}
-NetAccess instproc gzopen {} {
-  my instvar Z S readMethod
-  requireModules {zipchan libzipchan.so}
-  fconfigure $S -translation binary
-  set Z [zipchan]
-  set readMethod gzread
-}
-NetAccess instproc close {} {
-  #my showMsg "**** close persistent=[my exists persistent]"
-  if {![my exists persistent]} {
-    foreach stream {S Z} {
-      if {[my exists $stream]} {
-	::close [my set $stream]
-	my unset $stream
-      }
+    #Class NetAccess -superclass Access -parameter {host port}
+    Class NetAccess -superclass Access
+    NetAccess instproc initialize args {
+	if {![my exists blocksize]} {my set blocksize 512}
+	my set readMethod read
+	next
     }
-  }
-  my stop
-}
-NetAccess instproc hold {} {
-  my instvar S
-  $S hold
-}
-NetAccess instproc resume {} {
-  my instvar S
-  $S resume
-}
-NetAccess instproc readData {} {
-  #my showCall
-  if {[catch {
-    #puts stderr "??????????????readMethod=[my set readMethod]"
-    my [my set readMethod]
-    my pushBlock
-  } err]} {
-    puts stderr ERR=$err
-    my set block ""
-    my abort $err
-  }
-}
-NetAccess instproc pushBlock {} {
-  #my showCall
-  my instvar block
-  if {[set n [string length $block]]} {
-    my instvar currentsize totalsize informObjects sink
-    #my showVars n currentsize totalsize
-    incr currentsize $n
-    if {$currentsize > $totalsize} {
-      set totalsize $currentsize
+    NetAccess instproc read {} {
+	#my instvar S blocksize block
+	#set block [::read $S $blocksize]
+	my instvar S block blocksize
+	set block [::read $S $blocksize]
     }
-    #my showMsg "total=$totalsize current=$currentsize"
-    if {[my exists ignoreBody]} {
-      #puts stderr "ignoring: <$block>"
-    } else {
-      if {[info exists sink]} {
-	$sink incCb [self] $totalsize $currentsize
-      }
-      foreach obj $informObjects {
-	#my showMsg "call incbCb $totalsize $currentsize $obj [$obj info class]"
-	$obj incCb [self] $totalsize $currentsize
-	#my showMsg "done incbCb $totalsize $currentsize"
-      }
+    NetAccess instproc gzread {} {
+	my instvar S Z blocksize block
+	puts -nonewline $Z [::read $S $blocksize]
+	set block [::read $Z]
+	#puts stderr len=[string length $block],block=<$block>
     }
-  } else {
-    #my showVars n
-    return [my eof]
-  }
-}
+    NetAccess instproc gzopen {} {
+	my instvar Z S readMethod
+	requireModules {zipchan libzipchan.so}
+	fconfigure $S -translation binary
+	set Z [zipchan]
+	set readMethod gzread
+    }
+    NetAccess instproc close {} {
+	#my showMsg "**** close persistent=[my exists persistent]"
+	if {![my exists persistent]} {
+	    foreach stream {S Z} {
+		if {[my exists $stream]} {
+		    ::close [my set $stream]
+		    my unset $stream
+		}
+	    }
+	}
+	my stop
+    }
+    NetAccess instproc hold {} {
+	my instvar S
+	$S hold
+    }
+    NetAccess instproc resume {} {
+	my instvar S
+	$S resume
+    }
+    NetAccess instproc readData {} {
+	#my showCall
+	if {[catch {
+	    #puts stderr "??????????????readMethod=[my set readMethod]"
+	    my [my set readMethod]
+	    my pushBlock
+	} err]} {
+	    puts stderr ERR=$err
+	    my set block ""
+	    my abort $err
+	}
+    }
+    NetAccess instproc pushBlock {} {
+	#my showCall
+	my instvar block
+	if {[set n [string length $block]]} {
+	    my instvar currentsize totalsize informObjects sink
+	    #my showVars n currentsize totalsize
+	    incr currentsize $n
+	    if {$currentsize > $totalsize} {
+		set totalsize $currentsize
+	    }
+	    #my showMsg "total=$totalsize current=$currentsize"
+	    if {[my exists ignoreBody]} {
+		#puts stderr "ignoring: <$block>"
+	    } else {
+		if {[info exists sink]} {
+		    $sink incCb [self] $totalsize $currentsize
+		}
+		foreach obj $informObjects {
+		    #my showMsg "call incbCb $totalsize $currentsize $obj [$obj info class]"
+		    $obj incCb [self] $totalsize $currentsize
+		    #my showMsg "done incbCb $totalsize $currentsize"
+		}
+	    }
+	} else {
+	    #my showVars n
+	    return [my eof]
+	}
+    }
 
-Class Http -superclass NetAccess  ;###  -parameter {query {httpVersion 1.0}}
-Http set proxyfilter  httpProxyRequired
-Http set proxyhost    {}
-Http set proxyport    {}
-Http set accept       */*
-if {[info exists argv0]} {
-  Http set useragent    "[file tail $argv0] httpAccess/$httpAccessVersion xotcl/$::xotcl::version ($os)"
-}
-Http proc proxyfilter {host phostv pportv} {
-  my instvar proxyfilter proxyhost proxyport
-  upvar \#1 $phostv phost $pportv pport
-  switch -- $proxyfilter {
-    httpProxyRequired {
-      if {[string length $proxyhost]} {
-	if {![string length $proxyport]} { set proxyport 8080 }
-	set phost $proxyhost
-	set pport $proxyport
-      }
+    Class Http -superclass NetAccess  ;###  -parameter {query {httpVersion 1.0}}
+    Http set proxyfilter  httpProxyRequired
+    Http set proxyhost    {}
+    Http set proxyport    {}
+    Http set accept       */*
+    if {[info exists argv0]} {
+	Http set useragent    "[file tail $argv0] httpAccess/$httpAccessVersion xotcl/$::xotcl::version ($os)"
     }
-  }
-}
+    Http proc proxyfilter {host phostv pportv} {
+	my instvar proxyfilter proxyhost proxyport
+	upvar \#1 $phostv phost $pportv pport
+	switch -- $proxyfilter {
+	    httpProxyRequired {
+		if {[string length $proxyhost]} {
+		    if {![string length $proxyport]} { set proxyport 8080 }
+		    set phost $proxyhost
+		    set pport $proxyport
+		}
+	    }
+	}
+    }
 
-Http instproc initialize args {
-  if {![my exists port]}        {my set port 80}
-  if {![my exists httpVersion]} {my set httpVersion 1.1}
-  next
-  #my showMsg "result queried from net"
-}
-Http instproc GET {} {
-  #my showCall
-  if {[my exists query]} {
-    my instvar query caching
-    my append url ?$query
-    my append path ?$query
-    if {$caching == 2} {set caching 1}
-    my showVars caching $query
-  }
-  my open
-}
-Http instproc HEAD {} {
-  my open
-}
-Http instproc POST {} {
-  # we have query and data only for a uniform interface for
-  # forms that cann pass the attribute value pairs always via
-  # query.
-  if {[my exists query]} {
-    my data [my query]
-  }
-  my open
-}
-Http instproc PUT {} {  
-  my open
-}
-# Http1.1
-Http instproc OPTIONS {} {
-  my showCall
-  my open  
-}
-# Http1.1
-Http instproc TRACE {} {
-  my showCall
-}
-# Http1.1
-Http instproc DELETE {} {
-  #my showCall
-  my open  
-}
-Http instproc openConnection {host port reuse} {
-  return [Connection make [self] $host $port $reuse _]
-}
-Http instproc open {} {
-  #my showCall
-  my instvar url S state host port path
-  if {$state > 0} {
-    puts stderr "... [self]:$proc ignoring request in state $state"
-    return
-  }
-  Http proxyfilter $host phost pport
-  if {[info exists phost] && [string length $phost]} {
-    set usePort $pport
-    set useHost $phost
-    set path $url
-  } else {
-    set usePort $port
-    set useHost $host
-  }
+    Http instproc initialize args {
+	if {![my exists port]}        {my set port 80}
+	if {![my exists httpVersion]} {my set httpVersion 1.1}
+	next
+	#my showMsg "result queried from net"
+    }
+    Http instproc GET {} {
+	#my showCall
+	if {[my exists query]} {
+	    my instvar query caching
+	    my append url ?$query
+	    my append path ?$query
+	    if {$caching == 2} {set caching 1}
+	    my showVars caching $query
+	}
+	my open
+    }
+    Http instproc HEAD {} {
+	my open
+    }
+    Http instproc POST {} {
+	# we have query and data only for a uniform interface for
+	# forms that cann pass the attribute value pairs always via
+	# query.
+	if {[my exists query]} {
+	    my data [my query]
+	}
+	my open
+    }
+    Http instproc PUT {} {  
+	my open
+    }
+    # Http1.1
+    Http instproc OPTIONS {} {
+	my showCall
+	my open  
+    }
+    # Http1.1
+    Http instproc TRACE {} {
+	my showCall
+    }
+    # Http1.1
+    Http instproc DELETE {} {
+	#my showCall
+	my open  
+    }
+    Http instproc openConnection {host port reuse} {
+	return [Connection make [self] $host $port $reuse _]
+    }
+    Http instproc open {} {
+	#my showCall
+	my instvar url S state host port path
+	if {$state > 0} {
+	    puts stderr "... [self]:$proc ignoring request in state $state"
+	    return
+	}
+	Http proxyfilter $host phost pport
+	if {[info exists phost] && [string length $phost]} {
+	    set usePort $pport
+	    set useHost $phost
+	    set path $url
+	} else {
+	    set usePort $port
+	    set useHost $host
+	}
 
-  set S [my openConnection $useHost $usePort [expr {[my httpVersion]>1.0}]]
-  if {[$S exists error]} {
-    my abort [$S set error]
-    return
-  }
-  set state 2
-  my running
-  $S event writable [self] ask
-}
+	set S [my openConnection $useHost $usePort [expr {[my httpVersion]>1.0}]]
+	if {[$S exists error]} {
+	    my abort [$S set error]
+	    return
+	}
+	set state 2
+	my running
+	$S event writable [self] ask
+    }
 
-Http instproc ask {} {
-  my instvar url S state host port path \
-      method headers data caching
+    Http instproc ask {} {
+	my instvar url S state host port path \
+	    method headers data caching
 
-  $S event writable [self] {}
+	$S event writable [self] {}
 
-  if {[pwdManager checkAvailableCredentials $url credentials]} {
-    eval lappend headers $credentials
-    #my showMsg "*** new headers = <$headers>"
-  }
-  if {$caching==2 && [persistentCache ifModifiedHeader $url ifModified]} {
-    eval lappend headers $ifModified
-    #puts stderr "new headers = <$headers>"
-  }
-  # Send data in cr-lf format, but accept any line terminators
-  $S translation {auto crlf}
+	if {[pwdManager checkAvailableCredentials $url credentials]} {
+	    eval lappend headers $credentials
+	    #my showMsg "*** new headers = <$headers>"
+	}
+	if {$caching==2 && [persistentCache ifModifiedHeader $url ifModified]} {
+	    eval lappend headers $ifModified
+	    #puts stderr "new headers = <$headers>"
+	}
+	# Send data in cr-lf format, but accept any line terminators
+	$S translation {auto crlf}
 
-  #my showMsg "'$method $path HTTP/[my httpVersion]' headers {$headers}"
-  $S puts "$method $path HTTP/[my httpVersion]"
-  if {[$S  exists error]} {
-    my abort "Connection refused by host '$host' port '$port'\n\
+	#my showMsg "'$method $path HTTP/[my httpVersion]' headers {$headers}"
+	$S puts "$method $path HTTP/[my httpVersion]"
+	if {[$S  exists error]} {
+	    my abort "Connection refused by host '$host' port '$port'\n\
     	[$S set error]"
-    return
-  }
+	    return
+	}
 
-  $S puts "Accept: [Http set accept]"
-  $S puts "Host: $host"
-  $S puts "User-Agent: [Http set useragent]"
-  foreach {tag value} $headers {
-    regsub -all \[\n\r\] $value {} value
-    set tag [string trim $tag]
-    if {[string length $tag]} {
-      #my showMsg "+++ <$tag: $value>"
-      $S puts "$tag: $value"
-    }
-  }
-  if {[my exists data]} {
-    $S puts "Content-Length: [string length $data]"
-    $S puts "Content-Type: [my contentType]"
-    $S puts ""
-    $S translation {auto binary}
-    $S puts-nonewline $data
-  } else {
-    $S puts ""
-  }
-  $S flush
-  if {[$S  exists error]} {
-    my instvar host port
-    my abort "Connection refused by host '$host' port '$port'\n\
+	$S puts "Accept: [Http set accept]"
+	$S puts "Host: $host"
+	$S puts "User-Agent: [Http set useragent]"
+	foreach {tag value} $headers {
+	    regsub -all \[\n\r\] $value {} value
+	    set tag [string trim $tag]
+	    if {[string length $tag]} {
+		#my showMsg "+++ <$tag: $value>"
+		$S puts "$tag: $value"
+	    }
+	}
+	if {[my exists data]} {
+	    $S puts "Content-Length: [string length $data]"
+	    $S puts "Content-Type: [my contentType]"
+	    $S puts ""
+	    $S translation {auto binary}
+	    $S puts-nonewline $data
+	} else {
+	    $S puts ""
+	}
+	$S flush
+	if {[$S  exists error]} {
+	    my instvar host port
+	    my abort "Connection refused by host '$host' port '$port'\n\
 		[$S set error]"
-  } else {
-    set state 3
-    $S event readable [self] headerStart
-  }
-}
+	} else {
+	    set state 3
+	    $S event readable [self] headerStart
+	}
+    }
 
-Http instproc headerStart {} {
-  #my showCall
-  my instvar S response
-  set n [$S gets response]
-  #my showVars n response
-  if {[$S  exists error]} {
-    my instvar host port
-    my abort "Error on connection to host '$host' port '$port'\n\
+    Http instproc headerStart {} {
+	#my showCall
+	my instvar S response
+	set n [$S gets response]
+	#my showVars n response
+	if {[$S  exists error]} {
+	    my instvar host port
+	    my abort "Error on connection to host '$host' port '$port'\n\
 		[$S set error]"
-    return
-  }
-  #my showMsg "n=$n, eof=[$S eof]"
-  if {$n == -1 && ![$S eof]} {
-    #my showMsg "******************************input pending, no full line"
-    return
-  }
-  my instvar responseCode responseHttpVersion
-  if {[regexp {^HTTP/([0-9.]+) +([0-9]+) *} $response _ \
-	   responseHttpVersion responseCode]} {
-    #my showMsg "response valid: '$response'"
-    $S event readable [self] header
-  } else {
-    my instvar host port
-    my abort "Unexpected response from $host:$port\n    $n: '$response'"
-  }
-}
-Http instproc header {} {
-  my instvar S meta totalsize
-  if {[$S gets line]} {
-    #my showMsg "line=$line"
-    if {[regexp -nocase {^content-type:(.+)$} $line _ type]} {
-      my contentType [string trim $type]
-    } elseif {[regexp -nocase {^content-length:(.+)$} $line _ length]} {
-      set totalsize [string trim $length]
+	    return
+	}
+	#my showMsg "n=$n, eof=[$S eof]"
+	if {$n == -1 && ![$S eof]} {
+	    #my showMsg "******************************input pending, no full line"
+	    return
+	}
+	my instvar responseCode responseHttpVersion
+	if {[regexp {^HTTP/([0-9.]+) +([0-9]+) *} $response _ \
+		 responseHttpVersion responseCode]} {
+	    #my showMsg "response valid: '$response'"
+	    $S event readable [self] header
+	} else {
+	    my instvar host port
+	    my abort "Unexpected response from $host:$port\n    $n: '$response'"
+	}
     }
-    if {[regexp -nocase {^([^:]+): *(.+)$} $line _ key value]} {
-      lappend meta [string tolower $key] $value
+    Http instproc header {} {
+	my instvar S meta totalsize
+	if {[$S gets line]} {
+	    #my showMsg "line=$line"
+	    if {[regexp -nocase {^content-type:(.+)$} $line _ type]} {
+		my contentType [string trim $type]
+	    } elseif {[regexp -nocase {^content-length:(.+)$} $line _ length]} {
+		set totalsize [string trim $length]
+	    }
+	    if {[regexp -nocase {^([^:]+): *(.+)$} $line _ key value]} {
+		lappend meta [string tolower $key] $value
+	    }
+	} else {
+	    my headerDone
+	}
     }
-  } else {
-    my headerDone
-  }
-}
-Http array set expectsBody \
-      {GET 1 HEAD 0 POST 1 PUT 0 DELETE 1 OPTIONS 0 TRACE 1}
-Http instproc headerDone {} {
-  #my showVars meta
-  my instvar S meta method responseCode responseHttpVersion
-  [self class] instvar expectsBody
-  set expectBody $expectsBody($method)
+    Http array set expectsBody \
+	{GET 1 HEAD 0 POST 1 PUT 0 DELETE 1 OPTIONS 0 TRACE 1}
+    Http instproc headerDone {} {
+	#my showVars meta
+	my instvar S meta method responseCode responseHttpVersion
+	[self class] instvar expectsBody
+	set expectBody $expectsBody($method)
 
-  array set v [my set meta]
-  if {([info exists v(connection)] && $v(connection) == "close") || \
-	  $responseHttpVersion < 1.1} {
-    $S makePersistent 0
-  } else {
-    $S makePersistent 1
-  }
-  
-  switch $responseCode {
-    200 {}
-    204 {
-      #set state empty
-      my finish
-      set block ""
-      set expectBody 0
-      return
+	array set v [my set meta]
+	if {([info exists v(connection)] && $v(connection) == "close") || \
+		$responseHttpVersion < 1.1} {
+	    $S makePersistent 0
+	} else {
+	    $S makePersistent 1
+	}
+	
+	switch $responseCode {
+	    200 {}
+	    204 {
+		#set state empty
+		my finish
+		set block ""
+		set expectBody 0
+		return
+	    }
+	    301 -
+	    302 {
+		# the request is redirected to another server
+		my set ignoreBody [list redirect $v(location)]
+		
+		# RFC2068 Note: When automatically redirecting a POST request after
+		# receiving a 302 status code, some existing HTTP/1.0 user agents
+		# will erroneously change it into a GET request.
+		#my method GET 
+		
+		my showMsg "redirect '[my url]' --> '$v(location)'"
+	    }
+	    304 { ;#  Not Modified, use cached version
+		my set ignoreBody cacheAccess
+		set expectBody 1
+		#my showMsg "result comes from cache"
+	    }
+	    401 {
+		my set ignoreBody \
+		    [list resubmitAuthenticated $v(www-authenticate)]
+		#my showMsg "resubmitAuthenticated $v(www-authenticate)"
+		if {[my exists resubmitAuthenticated]} {
+		    if {[my set resubmitAuthenticated] > 5} {
+			my abort "Too many wrong passwords given"
+		    } else {
+			my incr resubmitAuthenticated
+		    }
+		} else {
+		    my set resubmitAuthenticated 1
+		}
+		set expectBody 1
+	    }
+	    404 {
+		my instvar url
+		#my showVars
+		my set ignoreBody [list abort "File Not Found on Server '$url'"]
+		set expectBody 1
+	    }
+	    default {
+		#my showVars responseCode
+	    }
+	}
+	next
+	if {![my exists S]} {;# this request was already canceled
+	    return
+	}
+	if {[info exists v(transfer-encoding)]} {
+	    if {$v(transfer-encoding) == "chunked"} {
+		$S translation {auto binary}
+		my set state 4
+		$S event readable [self] readChunkedLength
+	    } else {
+		my abort "Unexpected Transfer encoding '$v(transfer-encoding)'"
+	    }
+	} else {
+	    # yahoo does not send a content length for a get request
+	    #if {$totalsize == 0 && ($responseCode > 300 || !$expectsBody($method) )} 
+	    #my showVars method totalsize expectsBody($method) expectBody
+	    # the following is used currently for Actiweb-Agents:
+	    # the reponse of a PUTS contains a BODY!
+	    if {!$expectBody && 
+		[::info exists v(content-length)] &&
+		$v(content-length) > 0} {
+		set expectBody 1
+		#my showMsg "setting expectBody 1"
+	    }
+
+	    if {!$expectBody} {
+		#$S event readable [self] ""
+		#set state eof
+		my finish
+		set block ""
+	    } else {
+		### To avoid CRLF problmes we set the translation for 
+		### the body entity  to binary
+		$S translation binary
+		my set state 4
+		$S event readable [self] readData
+	    }
+	}
     }
-    301 -
-    302 {
-      # the request is redirected to another server
-      my set ignoreBody [list redirect $v(location)]
-      
-      # RFC2068 Note: When automatically redirecting a POST request after
-      # receiving a 302 status code, some existing HTTP/1.0 user agents
-      # will erroneously change it into a GET request.
-      #my method GET 
-      
-      my showMsg "redirect '[my url]' --> '$v(location)'"
+
+    Http instproc cacheAccess {} {
+	# there is an actual version of the document in the cache
+	#showCall
+	persistentCache validated [my url]
+	#my close
+	my class CacheAccess
+	#my showMsg "result comes from cache [persistentCache cacheFileName $url]"
+	my caching 0 ;# should be really: toCache 0
+	my GET
     }
-    304 { ;#  Not Modified, use cached version
-      my set ignoreBody cacheAccess
-      set expectBody 1
-      #my showMsg "result comes from cache"
+
+    Http instproc redirect location {
+	# the request is redirected to another server
+	if {[string compare $location [my url]]} {
+	    #my showVars
+	    my url $location
+	    my initialize
+	    my classify $location
+	    my [my set method]
+	}
     }
-    401 {
-      my set ignoreBody \
-	  [list resubmitAuthenticated $v(www-authenticate)]
-      #my showMsg "resubmitAuthenticated $v(www-authenticate)"
-      if {[my exists resubmitAuthenticated]} {
-	if {[my set resubmitAuthenticated] > 5} {
-	  my abort "Too many wrong passwords given"
+    Http instproc resubmitAuthenticated headerField {
+	#my showCall
+	# the server requires authentification
+	my instvar path method
+	if {[pwdManager checkRequestedAuthentification $method $path $headerField \
+		 type realm]} {
+	    my instvar url caching method headers
+	    array set v $headers
+	    #my showVars
+	    catch {unset v(Authorization)}
+	    set headers [array get v]
+	    pwdManager removePasswd $realm
+	    my close
+	    if {[pwdManager requireCredentials $realm $url]} {
+		my initialize
+		if {$caching == 2} {set caching 1}
+		my $method
+	    }
 	} else {
-	  my incr resubmitAuthenticated
+	    my abort "unknown authentication method '$headerField'"
 	}
-      } else {
-	my set resubmitAuthenticated 1
-      }
-      set expectBody 1
     }
-    404 {
-      my instvar url
-      #my showVars
-      my set ignoreBody [list abort "File Not Found on Server '$url'"]
-      set expectBody 1
+    Http instproc readChunkedLength {} {
+	#my showCall
+	my instvar S chunkLength totalsize
+	set length [$S gets lengthString]
+	if {$length > 0} {
+	    set chunkLength [expr 0x$lengthString]
+	    #my showVars lengthString chunkLength
+	    if {$chunkLength == 0} {
+		$S event readable [self] readChunkedTrailer
+	    } else {
+		incr totalsize $chunkLength
+		$S translation {binary}
+		$S event readable [self] readChunkedData
+	    }
+	}
     }
-    default {
-      #my showVars responseCode
+    Http instproc readChunkedTrailer {} {
+	#my showCall
+	my instvar S state block
+	set size [$S gets line]
+	if {$size != 0} {
+	    showObj [self]
+	    my abort "expected trailer size 0, got size $size"
+	} else {
+	    #set state eof
+	    my finish
+	    set block ""
+	    #showObj [self]
+	}
     }
-  }
-  next
-  if {![my exists S]} {;# this request was already canceled
-    return
-  }
-  if {[info exists v(transfer-encoding)]} {
-    if {$v(transfer-encoding) == "chunked"} {
-      $S translation {auto binary}
-      my set state 4
-      $S event readable [self] readChunkedLength
-    } else {
-      my abort "Unexpected Transfer encoding '$v(transfer-encoding)'"
+    Http instproc readChunkedData {} {
+	#my showCall
+	my instvar S block totalsize currentsize chunkLength
+	set block [$S readSize $chunkLength]
+	set received [string length $block]
+	#my showVars block
+	#my showVars currentsize totalsize chunkLength received
+	if {$chunkLength == $received} {
+	    $S translation {auto binary}
+	    $S event readable [self] readChunkedLength
+	} else {
+	    incr chunkLength -$received
+	}
+	my pushBlock
     }
-  } else {
-    # yahoo does not send a content length for a get request
-    #if {$totalsize == 0 && ($responseCode > 300 || !$expectsBody($method) )} 
-    #my showVars method totalsize expectsBody($method) expectBody
-    # the following is used currently for Actiweb-Agents:
-    # the reponse of a PUTS contains a BODY!
-    if {!$expectBody && 
-	[::info exists v(content-length)] &&
-	$v(content-length) > 0} {
-      set expectBody 1
-      #my showMsg "setting expectBody 1"
-    }
 
-    if {!$expectBody} {
-      #$S event readable [self] ""
-      #set state eof
-      my finish
-      set block ""
-    } else {
-      ### To avoid CRLF problmes we set the translation for 
-      ### the body entity  to binary
-      $S translation binary
-      my set state 4
-      $S event readable [self] readData
+    Http instproc readData {} {
+	#my showCall
+	my instvar S block totalsize currentsize
+	set block [$S read]
+	#puts stderr "????? bl=[string length $block]"
+	if {[$S exists error]} {
+	    set block ""
+	    my abort [$S set error]
+	    return
+	}
+	my pushBlock
+	#my showMsg "c [my set currentsize]== t [[self set totalsize]]"
+	if {$currentsize == $totalsize && 
+	    [my exists S] && [$S exists persistent]} {
+	    #my showMsg "PERSITENT, end of entity reached"
+	    #my set state eof
+	    my finish
+	    set block ""
+	    #showObj [self]
+	}
+	if {[my exists mustDestroy]} {
+	    #my showMsg "mustDestroy was set"
+	    my destroy
+	}
     }
-  }
-}
-
-Http instproc cacheAccess {} {
-  # there is an actual version of the document in the cache
-  #showCall
-  persistentCache validated [my url]
-  #my close
-  my class CacheAccess
-  #my showMsg "result comes from cache [persistentCache cacheFileName $url]"
-  my caching 0 ;# should be really: toCache 0
-  my GET
-}
-
-Http instproc redirect location {
-  # the request is redirected to another server
-  if {[string compare $location [my url]]} {
-    #my showVars
-    my url $location
-    my initialize
-    my classify $location
-    my [my set method]
-  }
-}
-Http instproc resubmitAuthenticated headerField {
-  #my showCall
-  # the server requires authentification
-  my instvar path method
-  if {[pwdManager checkRequestedAuthentification $method $path $headerField \
-	   type realm]} {
-    my instvar url caching method headers
-    array set v $headers
-    #my showVars
-    catch {unset v(Authorization)}
-    set headers [array get v]
-    pwdManager removePasswd $realm
-    my close
-    if {[pwdManager requireCredentials $realm $url]} {
-      my initialize
-      if {$caching == 2} {set caching 1}
-      my $method
+    Http instproc close {} {
+	#my showCall
+	if {[my exists S]} {
+	    [my set S] close
+	    #unset S
+	}
+	#next
     }
-  } else {
-    my abort "unknown authentication method '$headerField'"
-  }
-}
-Http instproc readChunkedLength {} {
-  #my showCall
-  my instvar S chunkLength totalsize
-  set length [$S gets lengthString]
-  if {$length > 0} {
-    set chunkLength [expr 0x$lengthString]
-    #my showVars lengthString chunkLength
-    if {$chunkLength == 0} {
-      $S event readable [self] readChunkedTrailer
-    } else {
-      incr totalsize $chunkLength
-      $S translation {binary}
-      $S event readable [self] readChunkedData
+    Http instproc freeConnection {} {
+	#showCall
+	my instvar S
+	#::puts stderr "[self] freeing $S !!!!!!!!!!!!!!!!!!!!!!!"
+	unset S
     }
-  }
-}
-Http instproc readChunkedTrailer {} {
-  #my showCall
-  my instvar S state block
-  set size [$S gets line]
-  if {$size != 0} {
-    showObj [self]
-    my abort "expected trailer size 0, got size $size"
-  } else {
-    #set state eof
-    my finish
-    set block ""
-    #showObj [self]
-  }
-}
-Http instproc readChunkedData {} {
-  #my showCall
-  my instvar S block totalsize currentsize chunkLength
-  set block [$S readSize $chunkLength]
-  set received [string length $block]
-  #my showVars block
-  #my showVars currentsize totalsize chunkLength received
-  if {$chunkLength == $received} {
-    $S translation {auto binary}
-    $S event readable [self] readChunkedLength
-  } else {
-    incr chunkLength -$received
-  }
-  my pushBlock
-}
 
-Http instproc readData {} {
-  #my showCall
-  my instvar S block totalsize currentsize
-  set block [$S read]
-  #puts stderr "????? bl=[string length $block]"
-  if {[$S exists error]} {
-    set block ""
-    my abort [$S set error]
-    return
-  }
-  my pushBlock
-  #my showMsg "c [my set currentsize]== t [[self set totalsize]]"
-  if {$currentsize == $totalsize && 
-      [my exists S] && [$S exists persistent]} {
-    #my showMsg "PERSITENT, end of entity reached"
-    #my set state eof
-    my finish
-    set block ""
-    #showObj [self]
-  }
-  if {[my exists mustDestroy]} {
-    #my showMsg "mustDestroy was set"
-    my destroy
-  }
-}
-Http instproc close {} {
-  #my showCall
-  if {[my exists S]} {
-    [my set S] close
-    #unset S
-  }
-  #next
-}
-Http instproc freeConnection {} {
-  #showCall
-  my instvar S
-  #::puts stderr "[self] freeing $S !!!!!!!!!!!!!!!!!!!!!!!"
-  unset S
-}
 
+    #Access instproc makeZombie {} {
+    #  my showMsg "procs= [my info procs], i [Object info instcommands]"
+    #  my class Zombie
+    #}
+    #Class Zombie
+    #Zombie instproc unknown {m args} {
+    #  my showMsg "+++ zombie method '$m' called"
+    #}
 
-#Access instproc makeZombie {} {
-#  my showMsg "procs= [my info procs], i [Object info instcommands]"
-#  my class Zombie
-#}
-#Class Zombie
-#Zombie instproc unknown {m args} {
-#  my showMsg "+++ zombie method '$m' called"
-#}
 
-
-Class Https -superclass Http
-Https instproc initialize args {
-  #my showCall
-  package require tls 
-  if {![my exists port]} { my set port 443}
-  next
-  ### temporary solution, FIXME: 
-  ### zur zeit muss man den secure-webserver.xotcl und 
-  ### secure-webclient.xotcl jedenfalls aus dem xotcl/apps/xocomm-apps
-  ### verzeichnis starten, da haben wir mal die cfg files in unserem
-  ### baum....
-  source .ssl/ssl-configuration.xotcl
-  ###
-}
-Https instproc openConnection {host port reuse} {
-  set S [Connection make [self] $host $port $reuse reused]
-  if {$reused} {
-    #my showMsg "reusing $S"
-  } else {
-    my showMsg "make the socket ([$S socket]) secure ..."    
-    set cmd [list $S importSSL]
-    foreach attr {cafile cadir certfile cipher command keyfile \
-                      model request require ssl2 ssl3 tls1} {
-      if {[sslClientConfig exists $attr]} {
-        lappend cmd -$attr [sslClientConfig set $attr]
-      }
+    Class Https -superclass Http
+    Https instproc initialize args {
+	#my showCall
+	package require tls 
+	if {![my exists port]} { my set port 443}
+	next
+	### temporary solution, FIXME: 
+	### zur zeit muss man den secure-webserver.xotcl und 
+	### secure-webclient.xotcl jedenfalls aus dem xotcl/apps/xocomm-apps
+	### verzeichnis starten, da haben wir mal die cfg files in unserem
+	### baum....
+	source .ssl/ssl-configuration.xotcl
+	###
     }
-    my showMsg "the assembled command is... �$cmd�"    
-    eval $cmd
-    puts stderr "CHANNELS= [file channels]"
-  }
-  return $S
-}
+    Https instproc openConnection {host port reuse} {
+	set S [Connection make [self] $host $port $reuse reused]
+	if {$reused} {
+	    #my showMsg "reusing $S"
+	} else {
+	    my showMsg "make the socket ([$S socket]) secure ..."    
+	    set cmd [list $S importSSL]
+	    foreach attr {cafile cadir certfile cipher command keyfile \
+			      model request require ssl2 ssl3 tls1} {
+		if {[sslClientConfig exists $attr]} {
+		    lappend cmd -$attr [sslClientConfig set $attr]
+		}
+	    }
+	    my showMsg "the assembled command is... �$cmd�"    
+	    eval $cmd
+	    puts stderr "CHANNELS= [file channels]"
+	}
+	return $S
+    }
 
 
 
-#######################################################################
-Object pwdManager
-pwdManager proc requirePasswd {realm username password} {
-  # used by ftp and imap
-  my instvar user area
-  upvar [self callinglevel] $password passwd
-  if {[my exists pwd($realm)]} {
-    #my showMsg "*** reusing password for $realm"
-    set passwd [my set pwd($realm)]
-    return 1
-  } else {
-    userPwd user $username
-    if {[userPwd show $realm user($realm) passwd]} {
-      set area($realm/$username) $realm
-      return 1
+    #######################################################################
+    Object pwdManager
+    pwdManager proc requirePasswd {realm username password} {
+	# used by ftp and imap
+	my instvar user area
+	upvar [self callinglevel] $password passwd
+	if {[my exists pwd($realm)]} {
+	    #my showMsg "*** reusing password for $realm"
+	    set passwd [my set pwd($realm)]
+	    return 1
+	} else {
+	    userPwd user $username
+	    if {[userPwd show $realm user($realm) passwd]} {
+		set area($realm/$username) $realm
+		return 1
+	    }
+	}
+	return 0
     }
-  }
-  return 0
-}
-pwdManager proc storePasswd {realm username password} {
-  # used by ftp and imap
-  my instvar pwd user
-  set pwd($realm) $password
-  set user($realm) $username
-}
-pwdManager proc removePasswd {realm} {
-  if {[my exists pwd($realm)]} {
-    my unset pwd($realm) 
-    my unset user($realm) 
-  }
-}
-pwdManager proc requireCredentials {realm url} {
-  regexp {^(.*/)[^/]*$} $url _ path
-  if {[my exists pwd($realm)]} {
-    #my showMsg "*** register url=$url for ther realm=$realm"
-    my set area($path) $realm
-    return 1
-  } else {
-    my instvar pwd user
-    if {[info exists ::env(USER)]} {
-      set USER $::env(USER)
-    } elseif {[info exists ::env(USERNAME)]} {
-      set USER $::env(USERNAME)
-    } else {
-      set USER unknown
+    pwdManager proc storePasswd {realm username password} {
+	# used by ftp and imap
+	my instvar pwd user
+	set pwd($realm) $password
+	set user($realm) $username
     }
+    pwdManager proc removePasswd {realm} {
+	if {[my exists pwd($realm)]} {
+	    my unset pwd($realm) 
+	    my unset user($realm) 
+	}
+    }
+    pwdManager proc requireCredentials {realm url} {
+	regexp {^(.*/)[^/]*$} $url _ path
+	if {[my exists pwd($realm)]} {
+	    #my showMsg "*** register url=$url for ther realm=$realm"
+	    my set area($path) $realm
+	    return 1
+	} else {
+	    my instvar pwd user
+	    if {[info exists ::env(USER)]} {
+		set USER $::env(USER)
+	    } elseif {[info exists ::env(USERNAME)]} {
+		set USER $::env(USERNAME)
+	    } else {
+		set USER unknown
+	    }
 
-    userPwd user $USER
-    if {[userPwd show $realm user($realm) pwd($realm)]} {
-      #my showMsg "*** setting password for realm '$realm' url=$path"
-      my set area($path) $realm
-      return 1
+	    userPwd user $USER
+	    if {[userPwd show $realm user($realm) pwd($realm)]} {
+		#my showMsg "*** setting password for realm '$realm' url=$path"
+		my set area($path) $realm
+		return 1
+	    }
+	}
+	return 0
     }
-  }
-  return 0
-}
-pwdManager proc encodeCredentials {authMethod realm} {
-  #my showCall
-  switch $authMethod {
-    basic  {set credential [my encodeCredentialsBasic $realm]}
-    digest {set credential [my encodeCredentialsDigest $realm]}
-  }
-  return $credential
-}
-pwdManager proc encodeCredentialsBasic {realm} {
-  my instvar pwd user
-  return [list Authorization \
-	      "Basic [base64 encode $user($realm):$pwd($realm)]"]
-}
-pwdManager proc encodeCredentialsDigest {realm} {
-  #my showCall
-  package require tcu;        #FIXME: noch nicht in distribution
-  my instvar digestResponseData
-  my mkDigestResponseData $realm
-  set digestResponse {}
-  foreach {t v} [array get digestResponseData] {
-    append digestResponse " $t = \"$v\","
-  }
-  return [list Authorization "Digest [string trimright $digestResponse ,]"] 
-}
-pwdManager proc mkDigestResponseData {realm} {
-  #my showCall
-  my instvar pwd user digestResponseData requestUri
-  # RFC 2617
-  #   credentials      = "Digest" digest-response
-  #   digest-response  = 1#( username | realm | nonce | digest-uri
-  #                                | response | [ algorithm ] | [cnonce] |
-  #                                [opaque] | [message-qop] |
-  #                                    [nonce-count]  | [auth-param] )
-  #   username         = "username" "=" username-value
-  #   username-value   = quoted-string
-  #   digest-uri       = "uri" "=" digest-uri-value
-  #   digest-uri-value = request-uri   ; As specified by HTTP/1.1
-  #   message-qop      = "qop" "=" qop-value
-  #   cnonce           = "cnonce" "=" cnonce-value
-  #   cnonce-value     = nonce-value
-  #   nonce-count      = "nc" "=" nc-value
-  #   nc-value         = 8LHEX
-  #   response         = "response" "=" request-digest
-  #   request-digest = <"> 32LHEX <">
-  #   LHEX             =  "0" | "1"| ...| "e" | "f"  
-  set digestResponseData(username) $user($realm)
-  set digestResponseData(uri) $requestUri
-  set digestResponseData(cnonce) "TEST"
-  set digestResponseData(nc) 00000001
-  set digestResponseData(response) [my mkRequestDigest]
-  #parray digestResponseData
-}
-pwdManager proc mkRequestDigest {} {
-  # returns a string of 32 hex digits, which proves that the user
-  # knows a password
-  
-  #A1 = unq(username-value) ":" unq(realm-value) ":" passwd
-  my instvar digestResponseData pwd requestMethod requestUri
-  append A1 $digestResponseData(username)\
-      : $digestResponseData(realm) : $pwd($digestResponseData(realm))
-  if {![my exists digestResponseData(qop)] || 
-      $digestResponseData(qop) == "auth"} {
-    append A2 $requestMethod : $requestUri
-  } elseif {$digestResponseData(qop) == "auth-int"} {
-    #A2 = Method ":" digest-uri-value ":" H(entity-body)
-    append A2 $requestMethod : $requestUri: ""
-  }
-  if {[my exists digestResponseData(qop)]} {
-    append reqDigest $digestResponseData(nonce) : \
-	$digestResponseData(nc) : \
-	$digestResponseData(cnonce): \
-	$digestResponseData(qop)
-    set reqDigest [md5 [md5 $A1]:$reqDigest:[md5 $A2]]
-  } else {    
-    set reqDigest [md5 [md5 $A1]:$digestResponseData(nonce):[md5 $A2]]
-  }  
-  return $reqDigest 
-}
+    pwdManager proc encodeCredentials {authMethod realm} {
+	#my showCall
+	switch $authMethod {
+	    basic  {set credential [my encodeCredentialsBasic $realm]}
+	    digest {set credential [my encodeCredentialsDigest $realm]}
+	}
+	return $credential
+    }
+    pwdManager proc encodeCredentialsBasic {realm} {
+	my instvar pwd user
+	return [list Authorization \
+		    "Basic [base64 encode $user($realm):$pwd($realm)]"]
+    }
+    pwdManager proc encodeCredentialsDigest {realm} {
+	#my showCall
+	package require tcu;        #FIXME: noch nicht in distribution
+	my instvar digestResponseData
+	my mkDigestResponseData $realm
+	set digestResponse {}
+	foreach {t v} [array get digestResponseData] {
+	    append digestResponse " $t = \"$v\","
+	}
+	return [list Authorization "Digest [string trimright $digestResponse ,]"] 
+    }
+    pwdManager proc mkDigestResponseData {realm} {
+	#my showCall
+	my instvar pwd user digestResponseData requestUri
+	# RFC 2617
+	#   credentials      = "Digest" digest-response
+	#   digest-response  = 1#( username | realm | nonce | digest-uri
+	#                                | response | [ algorithm ] | [cnonce] |
+	#                                [opaque] | [message-qop] |
+	#                                    [nonce-count]  | [auth-param] )
+	#   username         = "username" "=" username-value
+	#   username-value   = quoted-string
+	#   digest-uri       = "uri" "=" digest-uri-value
+	#   digest-uri-value = request-uri   ; As specified by HTTP/1.1
+	#   message-qop      = "qop" "=" qop-value
+	#   cnonce           = "cnonce" "=" cnonce-value
+	#   cnonce-value     = nonce-value
+	#   nonce-count      = "nc" "=" nc-value
+	#   nc-value         = 8LHEX
+	#   response         = "response" "=" request-digest
+	#   request-digest = <"> 32LHEX <">
+	#   LHEX             =  "0" | "1"| ...| "e" | "f"  
+	set digestResponseData(username) $user($realm)
+	set digestResponseData(uri) $requestUri
+	set digestResponseData(cnonce) "TEST"
+	set digestResponseData(nc) 00000001
+	set digestResponseData(response) [my mkRequestDigest]
+	#parray digestResponseData
+    }
+    pwdManager proc mkRequestDigest {} {
+	# returns a string of 32 hex digits, which proves that the user
+	# knows a password
+	
+	#A1 = unq(username-value) ":" unq(realm-value) ":" passwd
+	my instvar digestResponseData pwd requestMethod requestUri
+	append A1 $digestResponseData(username)\
+	    : $digestResponseData(realm) : $pwd($digestResponseData(realm))
+	if {![my exists digestResponseData(qop)] || 
+	    $digestResponseData(qop) == "auth"} {
+	    append A2 $requestMethod : $requestUri
+	} elseif {$digestResponseData(qop) == "auth-int"} {
+	    #A2 = Method ":" digest-uri-value ":" H(entity-body)
+	    append A2 $requestMethod : $requestUri: ""
+	}
+	if {[my exists digestResponseData(qop)]} {
+	    append reqDigest $digestResponseData(nonce) : \
+		$digestResponseData(nc) : \
+		$digestResponseData(cnonce): \
+		$digestResponseData(qop)
+	    set reqDigest [md5 [md5 $A1]:$reqDigest:[md5 $A2]]
+	} else {    
+	    set reqDigest [md5 [md5 $A1]:$digestResponseData(nonce):[md5 $A2]]
+	}  
+	return $reqDigest 
+    }
 
-pwdManager proc checkAvailableCredentials {url returnCredentials} {
-  # we start a fresh request and check, whether we have sent for this url
-  # (directory) already some credentials in an earlier reqhest.
-  my instvar authMethod
-  regexp {^(.*/)[^/]*$} $url _ path
-  if {[my exists area($path)]} {
-    set realm [my set area($path)]
-    upvar [self callinglevel] $returnCredentials credentials
-    #my showMsg "*** adding credentials for realm=$realm and $path"
-    set credentials [my encodeCredentials $authMethod $realm]
-    return 1
-  }
-  return 0
-}
-pwdManager proc checkRequestedAuthentification {reqMethod path headerField 
-						typeVar realmVar} {
-  # check for which realm with which authentification method the
-  # server wants an authentification
-  #my showCall
-  upvar [self callinglevel] $typeVar type $realmVar realm
-  my instvar authMethod digestResponseData requestUri requestMethod
-  set requestUri $path
-  set requestMethod $reqMethod
-  if {[regexp {^Basic realm="(.*)"$} $headerField _ realm]} {
-    set type basic;#    FD: musste da lassen wg. call by reference
-    set authMethod $type
-    return 1
-  } elseif {[regsub {^Digest } $headerField _ headerField]} {
-    set type digest ;# FD: musste da lassen wg. call by reference
-    set authMethod $type
-    foreach pair [split $headerField ,] {      
-      if {[regexp {^(.*) *= *(".*")$} $pair _ n v]} {
-	set digestResponseData([string trim $n]) [string trim [string trim $v] \"]
-      }
+    pwdManager proc checkAvailableCredentials {url returnCredentials} {
+	# we start a fresh request and check, whether we have sent for this url
+	# (directory) already some credentials in an earlier reqhest.
+	my instvar authMethod
+	regexp {^(.*/)[^/]*$} $url _ path
+	if {[my exists area($path)]} {
+	    set realm [my set area($path)]
+	    upvar [self callinglevel] $returnCredentials credentials
+	    #my showMsg "*** adding credentials for realm=$realm and $path"
+	    set credentials [my encodeCredentials $authMethod $realm]
+	    return 1
+	}
+	return 0
     }
-    set realm $digestResponseData(realm)
-    return 1
-  }
-  return 0
-}
+    pwdManager proc checkRequestedAuthentification {reqMethod path headerField 
+						    typeVar realmVar} {
+	# check for which realm with which authentification method the
+	# server wants an authentification
+	#my showCall
+	upvar [self callinglevel] $typeVar type $realmVar realm
+	my instvar authMethod digestResponseData requestUri requestMethod
+	set requestUri $path
+	set requestMethod $reqMethod
+	if {[regexp {^Basic realm="(.*)"$} $headerField _ realm]} {
+	    set type basic;#    FD: musste da lassen wg. call by reference
+	    set authMethod $type
+	    return 1
+	} elseif {[regsub {^Digest } $headerField _ headerField]} {
+	    set type digest ;# FD: musste da lassen wg. call by reference
+	    set authMethod $type
+	    foreach pair [split $headerField ,] {      
+		if {[regexp {^(.*) *= *(".*")$} $pair _ n v]} {
+		    set digestResponseData([string trim $n]) [string trim [string trim $v] \"]
+		}
+	    }
+	    set realm $digestResponseData(realm)
+	    return 1
+	}
+	return 0
+    }
 
-#######################################################################
-# test classes
-Class Sink
-Sink instproc startCb         {r}   {
-  my set contentLength 0
-  next
-}
-Sink instproc notifyCb      {r}     {
-  next
-}
-Sink instproc incCb         {r t c} {
-  my set contentLength $t
-  next
-}
-Sink instproc endCb         {r}     {
-  next
-  #showCall
-}
-Sink instproc cancelCb      {r}     {
-  next
-  #showCall
-}
-Sink instproc content       {}      {
-  next
-  #showCall
-}
-Sink instproc contentLength {}      {
-  my set contentLength
-  #showCall
-}
+    #######################################################################
+    # test classes
+    Class Sink
+    Sink instproc startCb         {r}   {
+	my set contentLength 0
+	next
+    }
+    Sink instproc notifyCb      {r}     {
+	next
+    }
+    Sink instproc incCb         {r t c} {
+	my set contentLength $t
+	next
+    }
+    Sink instproc endCb         {r}     {
+	next
+	#showCall
+    }
+    Sink instproc cancelCb      {r}     {
+	next
+	#showCall
+    }
+    Sink instproc content       {}      {
+	next
+	#showCall
+    }
+    Sink instproc contentLength {}      {
+	my set contentLength
+	#showCall
+    }
 
 
-Class TimeSink -superclass Sink
-TimeSink instproc startCb         {r}   {
-  my set startTime [clock clicks]
-  next
-}
-TimeSink instproc notifyCb      {r}     {
-  my set notifyTime [clock clicks]
-  next
-}
-TimeSink instproc endCb         {r}     {
-  my set endTime [clock clicks]
-  next
-  my reportTimes
-}
-TimeSink instproc cancelCb      {r}     {
-  my set endTime [clock clicks]
-  next
-}
-TimeSink instproc reportTimes {}     {
-  my instvar startTime endTime notifyTime
-  set bytes [my contentLength]
-  set grossSecs		[expr {($endTime-$startTime)/1000000.0}]
-  set grossKbps		[expr {($bytes/1000.0)/$grossSecs}]
-  set netSecs		[expr {($endTime-$notifyTime)/1000000.0}]
-  set netKbps [expr {($bytes/1000.0)/$netSecs}]
-  #if {[catch {set netKbps [expr {($bytes/1000.0)/$netSecs}]}]} {
-  #  set netKbps 0
-  #}
-  set headSecs		[expr {$grossSecs-$netSecs}]
-  foreach v {grossSecs grossKbps netSecs netKbps headSecs} {
-    set $v [format %.2f [set $v]]
-  }
-  my showMsg "got $bytes bytes in $grossSecs ($headSecs+$netSecs) seconds,\
+    Class TimeSink -superclass Sink
+    TimeSink instproc startCb         {r}   {
+	my set startTime [clock clicks]
+	next
+    }
+    TimeSink instproc notifyCb      {r}     {
+	my set notifyTime [clock clicks]
+	next
+    }
+    TimeSink instproc endCb         {r}     {
+	my set endTime [clock clicks]
+	next
+	my reportTimes
+    }
+    TimeSink instproc cancelCb      {r}     {
+	my set endTime [clock clicks]
+	next
+    }
+    TimeSink instproc reportTimes {}     {
+	my instvar startTime endTime notifyTime
+	set bytes [my contentLength]
+	set grossSecs		[expr {($endTime-$startTime)/1000000.0}]
+	set grossKbps		[expr {($bytes/1000.0)/$grossSecs}]
+	set netSecs		[expr {($endTime-$notifyTime)/1000000.0}]
+	set netKbps [expr {($bytes/1000.0)/$netSecs}]
+	#if {[catch {set netKbps [expr {($bytes/1000.0)/$netSecs}]}]} {
+	#  set netKbps 0
+	#}
+	set headSecs		[expr {$grossSecs-$netSecs}]
+	foreach v {grossSecs grossKbps netSecs netKbps headSecs} {
+	    set $v [format %.2f [set $v]]
+	}
+	my showMsg "got $bytes bytes in $grossSecs ($headSecs+$netSecs) seconds,\
 	$grossKbps ($netKbps) KB/S"
-}
+    }
 
 
-Class ParallelSink -superclass Sink -parameter {
-  {httpVersion 1.1}
-  {sinkClass TimeSink}
-  {maxsimultaneous 20}
-}
-ParallelSink instproc init args {
-  next
-  my set running 1
-  my set numrequests 0
-  my set sumbytes 0
-  my set blocked {}
-}
-ParallelSink instproc startCb r {
-  #my showCall
-  my incr running
-  my incr numrequests
-  #puts stderr "... running++ [my set running]"
-}
-ParallelSink instproc endCb r {
-  #my showCall
-  my incr sumbytes [$r set currentsize]
-  my done $r
-}
-ParallelSink instproc cancelCb r {
-  #my showCall
-  my done $r
-}
-ParallelSink instproc done r {
-  #my showCall
-  my instvar blocked
-  $r shutdown
-  my incr running -1
-  #puts stderr "... running-- [my set running] [llength [Http info instances]]"
-  #puts stderr [Http info instances]
-  #foreach i [Http info instances] {puts stderr "\t$i: [$i set method] [$i set url]"}
-  #puts stderr RUNNING=[my set running]
-  if {[llength $blocked] > 0} {
-    set newreq [lindex $blocked 0]
-    set blocked [lrange $blocked 1 end]
-    my scheduleRequest [lindex $newreq 0] [lindex $newreq 1] [lindex $newreq 2]
-  } elseif {[my set running] < 1} {
-    my set done 1
-  }
-}
+    Class ParallelSink -superclass Sink -parameter {
+	{httpVersion 1.1}
+	{sinkClass TimeSink}
+	{maxsimultaneous 20}
+    }
+    ParallelSink instproc init args {
+	next
+	my set running 1
+	my set numrequests 0
+	my set sumbytes 0
+	my set blocked {}
+    }
+    ParallelSink instproc startCb r {
+	#my showCall
+	my incr running
+	my incr numrequests
+	#puts stderr "... running++ [my set running]"
+    }
+    ParallelSink instproc endCb r {
+	#my showCall
+	my incr sumbytes [$r set currentsize]
+	my done $r
+    }
+    ParallelSink instproc cancelCb r {
+	#my showCall
+	my done $r
+    }
+    ParallelSink instproc done r {
+	#my showCall
+	my instvar blocked
+	$r shutdown
+	my incr running -1
+	#puts stderr "... running-- [my set running] [llength [Http info instances]]"
+	#puts stderr [Http info instances]
+	#foreach i [Http info instances] {puts stderr "\t$i: [$i set method] [$i set url]"}
+	#puts stderr RUNNING=[my set running]
+	if {[llength $blocked] > 0} {
+	    set newreq [lindex $blocked 0]
+	    set blocked [lrange $blocked 1 end]
+	    my scheduleRequest [lindex $newreq 0] [lindex $newreq 1] [lindex $newreq 2]
+	} elseif {[my set running] < 1} {
+	    my set done 1
+	}
+    }
 
 
-ParallelSink instproc scheduleRequest {method url {parentUrl ""}} {
-  my instvar requests blocked running maxsimultaneous
-  if {$running > $maxsimultaneous} {
-    lappend blocked [list $method $url $parentUrl]
-  } else {
-    set cmd [list Access createRequest -url $url \
-		 -sinkClass [my sinkClass] \
-		 -informObject [self] \
-		 -method $method \
-		 -timeout 25000 \
-		 -caching 0 -allowJoin 0 -httpVersion [my httpVersion]]
-    if {$parentUrl != ""} {
-      lappend cmd -parentUrl $parentUrl
+    ParallelSink instproc scheduleRequest {method url {parentUrl ""}} {
+	my instvar requests blocked running maxsimultaneous
+	if {$running > $maxsimultaneous} {
+	    lappend blocked [list $method $url $parentUrl]
+	} else {
+	    set cmd [list Access createRequest -url $url \
+			 -sinkClass [my sinkClass] \
+			 -informObject [self] \
+			 -method $method \
+			 -timeout 25000 \
+			 -caching 0 -allowJoin 0 -httpVersion [my httpVersion]]
+	    if {$parentUrl != ""} {
+		lappend cmd -parentUrl $parentUrl
+	    }
+	    set r [eval $cmd]
+	}
     }
-    set r [eval $cmd]
-  }
-}
 
-ParallelSink instproc requests {urls} {
-  my showTimeStart
-  foreach url $urls { my scheduleRequest GET $url }
-  my wait
-  my showTimeEnd
-}
+    ParallelSink instproc requests {urls} {
+	my showTimeStart
+	foreach url $urls { my scheduleRequest GET $url }
+	my wait
+	my showTimeEnd
+    }
 
-ParallelSink instproc wait {} {
-  my instvar running
-  if {$running > 0} {
-    set savedValue $running
-    #my showMsg ".......... waiting for initially $running requests"
-    if {[catch {my vwait done} err]} {
-      my showMsg "vwait returned: $err "
+    ParallelSink instproc wait {} {
+	my instvar running
+	if {$running > 0} {
+	    set savedValue $running
+	    #my showMsg ".......... waiting for initially $running requests"
+	    if {[catch {my vwait done} err]} {
+		my showMsg "vwait returned: $err "
+	    }
+	    #my showMsg "$savedValue requests FINISHED "
+	}
     }
-    #my showMsg "$savedValue requests FINISHED "
-  }
-}
 
-Class MemorySink -superclass Sink
-MemorySink instproc incCb         {r t c} {
-  my append d [$r block]
-  next
-}
-MemorySink instproc content       {}      {
-  return [my set d]
-}
-MemorySink instproc contentLength {}      {
-  if {[my exists d]} {
-    return [string length [my set d]]
-  } else {
-    return 0
-  }
-}
+    Class MemorySink -superclass Sink
+    MemorySink instproc incCb         {r t c} {
+	my append d [$r block]
+	next
+    }
+    MemorySink instproc content       {}      {
+	return [my set d]
+    }
+    MemorySink instproc contentLength {}      {
+	if {[my exists d]} {
+	    return [string length [my set d]]
+	} else {
+	    return 0
+	}
+    }
 
-Class FileSink  -superclass Sink -parameter fileName
-### write methods
-#FileSink instproc startCb         {r}   {
-#  next
-#}
-FileSink instproc notifyCb      {r}     {
-  #my showVars
-  next
-  my instvar file fileName
-  if {[info exists fileName]} {
-    set file [::open $fileName w]
-    fconfigure $file -translation binary
-  } else {
-    # we have no filename; we assume the sink must be a dummy sink
-    # that deletgates its work to some other FileSink
-    my class ShadowFileSink
-    my notifyCb $r
-  }
-}
-FileSink instproc incCb {r t c} {
-  next
-  if {[my exists file]} {
-    if {$r == "req0"} {
-      puts stderr "*******************************************************"
-      puts stderr [$r block]
-      puts stderr "*******************************************************"
+    Class FileSink  -superclass Sink -parameter fileName
+    ### write methods
+    #FileSink instproc startCb         {r}   {
+    #  next
+    #}
+    FileSink instproc notifyCb      {r}     {
+	#my showVars
+	next
+	my instvar file fileName
+	if {[info exists fileName]} {
+	    set file [::open $fileName w]
+	    fconfigure $file -translation binary
+	} else {
+	    # we have no filename; we assume the sink must be a dummy sink
+	    # that deletgates its work to some other FileSink
+	    my class ShadowFileSink
+	    my notifyCb $r
+	}
     }
-    puts -nonewline [my set file] [$r block]
-  }
-}
-FileSink instproc endCb  {r} {
-  #my showCall
-  next
-  my close
-}
-FileSink instproc cancelCb  {r} {
-  next
-  my close
-}
-FileSink instproc close {} {
-  if {[my exists file]} {
-    ::close [my set file]
-    my unset file
-  }
-}
-### read methods
-FileSink instproc content {} {
-  next
-  my instvar file fileName
-  set file [::open $fileName r]
-  fconfigure $file -translation binary
-  set d [read [my set file]]
-  my close
-  return $d
-}
-FileSink instproc contentLength {}      {
-  next
-  if {[my exists fileName]} {
-    return [file size [my set fileName]]
-  } else {
-    return 0
-  }
-}
+    FileSink instproc incCb {r t c} {
+	next
+	if {[my exists file]} {
+	    if {$r == "req0"} {
+		puts stderr "*******************************************************"
+		puts stderr [$r block]
+		puts stderr "*******************************************************"
+	    }
+	    puts -nonewline [my set file] [$r block]
+	}
+    }
+    FileSink instproc endCb  {r} {
+	#my showCall
+	next
+	my close
+    }
+    FileSink instproc cancelCb  {r} {
+	next
+	my close
+    }
+    FileSink instproc close {} {
+	if {[my exists file]} {
+	    ::close [my set file]
+	    my unset file
+	}
+    }
+    ### read methods
+    FileSink instproc content {} {
+	next
+	my instvar file fileName
+	set file [::open $fileName r]
+	fconfigure $file -translation binary
+	set d [read [my set file]]
+	my close
+	return $d
+    }
+    FileSink instproc contentLength {}      {
+	next
+	if {[my exists fileName]} {
+	    return [file size [my set fileName]]
+	} else {
+	    return 0
+	}
+    }
 
 
-Class ShadowFileSink -superclass Sink
-ShadowFileSink instproc notifyCb      {r} {
-  next
-  my set token $r
-}
-ShadowFileSink instproc content       {} {
-  my instvar token
-  next
-  return [[$token set sink] content]
-}
-ShadowFileSink instproc contentLength {} {
-  my instvar token
-  next
-  return [[$token set sink] contentLength]
-}
+    Class ShadowFileSink -superclass Sink
+    ShadowFileSink instproc notifyCb      {r} {
+	next
+	my set token $r
+    }
+    ShadowFileSink instproc content       {} {
+	my instvar token
+	next
+	return [[$token set sink] content]
+    }
+    ShadowFileSink instproc contentLength {} {
+	my instvar token
+	next
+	return [[$token set sink] contentLength]
+    }
 
 
-Class CacheFileSink -superclass FileSink -parameter {{persistent 1}}
-CacheFileSink instproc notifyCb req {
-  #my showCall
-  if {![my exists fileName]} {
-    my instvar persistent
-    set url [$req set url]
-    my set fileName [persistentCache newEntry $url $req $persistent ""]
-  }
-  # it is important to execute next after setting the fileName...
-  next
-}
-CacheFileSink instproc endCb req {
-  #my showCall
-  my instvar persistent
-  next
-  if {$persistent} {
-    persistentCache entryDone [$req set url]
-  }
-}
-CacheFileSink instproc cancelCb req {
-  next
-  if {[my exists fileName]} {
-    file delete [my set fileName]
-    my unset fileName
-  }
-}
-CacheFileSink instproc destroy {} {
-  #my showCall
-  if {[my exists fileName] && ![my set persistent]} {
-    #my showMsg "file delete $fileName"
-    file delete [my set fileName]
-    my unset fileName
-  }
-  next
-}
+    Class CacheFileSink -superclass FileSink -parameter {{persistent 1}}
+    CacheFileSink instproc notifyCb req {
+	#my showCall
+	if {![my exists fileName]} {
+	    my instvar persistent
+	    set url [$req set url]
+	    my set fileName [persistentCache newEntry $url $req $persistent ""]
+	}
+	# it is important to execute next after setting the fileName...
+	next
+    }
+    CacheFileSink instproc endCb req {
+	#my showCall
+	my instvar persistent
+	next
+	if {$persistent} {
+	    persistentCache entryDone [$req set url]
+	}
+    }
+    CacheFileSink instproc cancelCb req {
+	next
+	if {[my exists fileName]} {
+	    file delete [my set fileName]
+	    my unset fileName
+	}
+    }
+    CacheFileSink instproc destroy {} {
+	#my showCall
+	if {[my exists fileName] && ![my set persistent]} {
+	    #my showMsg "file delete $fileName"
+	    file delete [my set fileName]
+	    my unset fileName
+	}
+	next
+    }
 
 
-#===========================================================
+    #===========================================================
 
-Class SimpleRequest -parameter {
-  {caching 0} 
-  {useFileSink 0} 
-  {blocking 1} 
-  {timing 0} 
-  url fileName 
-  timeout httpVersion method headers data query contentType informObject
-}
-SimpleRequest instproc fileName x {
-  my set fileName $x
-  my set useFileSink 1
-}
-SimpleRequest instproc init args {
-  my instvar useFileSink fileName sink caching token  
-  #my showMsg "Starting Request"
-  next
-  if {[info exists fileName]} {
-    set sink [FileSink create [self]::sink -fileName $fileName]
-  } elseif {$useFileSink || $caching > 0} {
-    set sink [FileSink create [self]::sink]
-  } else {
-    set sink [MemorySink create [self]::sink]
-  }
-  #my showMsg "class of sink = [$sink info class]"
-  if {[my set timing]} {
-    $sink mixin TimeSink
-  }
-  set cmd [list Access createRequest \
-	       -url [my url] \
-	       -informObject $sink \
-	       -blocking [my blocking] \
-	       -caching $caching]
-  foreach optionalParameter {
-    timeout httpVersion method headers data query  
-    contentType informObject
-  } {
-    if {[my exists $optionalParameter]} {
-      lappend cmd -$optionalParameter [my set $optionalParameter]
+    Class SimpleRequest -parameter {
+	{caching 0} 
+	{useFileSink 0} 
+	{blocking 1} 
+	{timing 0} 
+	url fileName 
+	timeout httpVersion method headers data query contentType informObject
     }
-  }
-  #my showMsg "cmd=$cmd"
-  set token [eval $cmd]
-  #if {[my success]} {
-  #  $sink reportTimes
-  #  #puts stderr <[$sink content]>
-  #}
-}
-SimpleRequest instproc success {} {
-  if {[my exists token]} {
-    return [expr {[[my set token] set finished] == 1}]
-  } 
-  return 0
-}
-SimpleRequest instproc destroy {} {
-  if {[my exists token]} {
-    [my set token] destroy
-  }
-  next
-}
-SimpleRequest instproc getContent {} {
-  [my set sink] content
-}
-SimpleRequest instproc getContentLength {} {
-  [my set sink] contentLength
-}
-#SimpleRequest instproc destroy args { next }
+    SimpleRequest instproc fileName x {
+	my set fileName $x
+	my set useFileSink 1
+    }
+    SimpleRequest instproc init args {
+	my instvar useFileSink fileName sink caching token  
+	#my showMsg "Starting Request"
+	next
+	if {[info exists fileName]} {
+	    set sink [FileSink create [self]::sink -fileName $fileName]
+	} elseif {$useFileSink || $caching > 0} {
+	    set sink [FileSink create [self]::sink]
+	} else {
+	    set sink [MemorySink create [self]::sink]
+	}
+	#my showMsg "class of sink = [$sink info class]"
+	if {[my set timing]} {
+	    $sink mixin TimeSink
+	}
+	set cmd [list Access createRequest \
+		     -url [my url] \
+		     -informObject $sink \
+		     -blocking [my blocking] \
+		     -caching $caching]
+	foreach optionalParameter {
+	    timeout httpVersion method headers data query  
+	    contentType informObject
+	} {
+	    if {[my exists $optionalParameter]} {
+		lappend cmd -$optionalParameter [my set $optionalParameter]
+	    }
+	}
+	#my showMsg "cmd=$cmd"
+	set token [eval $cmd]
+	#if {[my success]} {
+	#  $sink reportTimes
+	#  #puts stderr <[$sink content]>
+	#}
+    }
+    SimpleRequest instproc success {} {
+	if {[my exists token]} {
+	    return [expr {[[my set token] set finished] == 1}]
+	} 
+	return 0
+    }
+    SimpleRequest instproc destroy {} {
+	if {[my exists token]} {
+	    [my set token] destroy
+	}
+	next
+    }
+    SimpleRequest instproc getContent {} {
+	[my set sink] content
+    }
+    SimpleRequest instproc getContentLength {} {
+	[my set sink] contentLength
+    }
+    #SimpleRequest instproc destroy args { next }
 
-#######################################################################
+    #######################################################################
 
+    namespace export \
+	Access FileAccess File CacheAccess ReAccess \
+	Cmd NetAccess Http Https Sink TimeSink \
+	ParallelSink MemorySink FileSink \
+	ShadowFileSink CacheFileSink SimpleRequest
+}
 
+namespace import ::xotcl::comm::httpAccess::*
Index: xotcl/library/comm/Connection.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/comm/Connection.xotcl	(.../Connection.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/comm/Connection.xotcl	(.../Connection.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,249 +1,256 @@
-# -*- tcl -*- $Id: Connection.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# -*- tcl -*- $Id: Connection.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::comm::connection 1.0
 
-Class Connection -parameter {host port req socket handle}
+package require XOTcl
 
-Connection proc make {r host port reuse reusedVar} {
-  #my showCall
-  my instvar openConnections
-  upvar [self callinglevel] $reusedVar reused
-  if {$reuse} {
-    set handle $host:$port-[$r set blocking]
-    #if {[array exists openConnections]} {parray openConnections}
-    if {![info exists openConnections($handle)]} {
-      # there is no persistent connection, we create a new one
-      set reused 0
-      set openConnections($handle) \
-	  [Connection new -host $host -port $port -req $r -handle $handle]
-      #my showMsg "$openConnections($handle) CONNECTION add for $handle added"
-    } else {
-      # there is a persistent connection
-      set reused 1
-      set c $openConnections($handle)
-      $c instvar req
-      #::puts stderr "$c CONNECTION reuse for $handle ($c) new req=$r"
-      if {[info exists req]} {
-	# the persistent connection is active with some request $req
-	#::puts stderr "$c CONNECTION req $req already active"
-      } else {
-	# the persistent connection is currently not active
-	$c set req $r
-      }
+namespace eval ::xotcl::comm::connection {
+    namespace import ::xotcl::*
+
+    Class Connection -parameter {host port req socket handle}
+
+    Connection proc make {r host port reuse reusedVar} {
+	#my showCall
+	my instvar openConnections
+	upvar [self callinglevel] $reusedVar reused
+	if {$reuse} {
+	    set handle $host:$port-[$r set blocking]
+	    #if {[array exists openConnections]} {parray openConnections}
+	    if {![info exists openConnections($handle)]} {
+		# there is no persistent connection, we create a new one
+		set reused 0
+		set openConnections($handle) \
+		    [Connection new -host $host -port $port -req $r -handle $handle]
+		#my showMsg "$openConnections($handle) CONNECTION add for $handle added"
+	    } else {
+		# there is a persistent connection
+		set reused 1
+		set c $openConnections($handle)
+		$c instvar req
+		#::puts stderr "$c CONNECTION reuse for $handle ($c) new req=$r"
+		if {[info exists req]} {
+		    # the persistent connection is active with some request $req
+		    #::puts stderr "$c CONNECTION req $req already active"
+		} else {
+		    # the persistent connection is currently not active
+		    $c set req $r
+		}
+	    }
+	    return $openConnections($handle)
+	} else {
+	    set reused 0
+	    return [Connection new -host $host -port $port -req $r]
+	}
     }
-    return $openConnections($handle)
-  } else {
-    set reused 0
-    return [Connection new -host $host -port $port -req $r]
-  }
-}
-Connection proc removeHandle handle {
-  #my showVars
-  #puts stderr "***************** unsetting $handle ***************"
-  if {[my exists openConnections($handle)]} {
-    my unset openConnections($handle)
-  }
-}
-Connection instproc init args {  ;# the constructor creates the socket
-  my set blocked {}
-  next
-  if {[my exists socket]} {
-    my set keepOpen 1
-  } else {
-    my set keepOpen 0
-    if {[catch {my socket [socket -async [my host] [my port]]} msg]} {
-      my set error $msg
-      return
+    Connection proc removeHandle handle {
+	#my showVars
+	#puts stderr "***************** unsetting $handle ***************"
+	if {[my exists openConnections($handle)]} {
+	    my unset openConnections($handle)
+	}
     }
-  }
-  ::fconfigure [my socket] -blocking false -buffersize 16384
-}
-#Connection instproc STATUS {ctx} {
-#  my instvar socket
-#  ::puts stderr "*** $ctx: $socket blocking=[::fconfigure $socket -blocking]"
-#}
-Connection instproc destroy {} { ;# the destructor closes the socket
-  #my showCall
-  if {[my exists handle]} {
-    #my showVars handle
-    # the connection was created via make
-    [self class] removeHandle [my handle]
-    #::puts stderr "my CONNECTION close and destroy [my handle]"
-  } else {
-    #::puts stderr "my CONNECTION close and destroy"
-  }
-  # in cases of errors we might not have a socket yet
-  if {[my exists socket]} {
-    close [my socket]
-  }
-  next
-}
-Connection instproc translation {translation} {
-  #showCall
-  ::fconfigure [my socket] -translation $translation
-}    
-Connection instproc importSSL args {
-  #my showCall
-  package require tls
-  eval tls::import [my socket] $args
-}
-Connection instproc fconfigure args {
-  #my showCall
-  eval ::fconfigure [my socket] $args
-}    
-Connection instproc event {type r method} {
-  #my showCall
-  my instvar req blocked
-  # is the request in the argument list the currently active request?
-  if {[info exists req] && $r == $req} {
-    # a request can overwrite its active request
-    if {$method == ""} {
-      ::fileevent [my socket] $type ""
-      #my showMsg "CONNECTION clear for [my socket]"
-    } else {
-      #my showMsg "CONNECTION register for [my socket]"
-      ::fileevent [my socket] $type [list $r $method]
+    Connection instproc init args {  ;# the constructor creates the socket
+	my set blocked {}
+	next
+	if {[my exists socket]} {
+	    my set keepOpen 1
+	} else {
+	    my set keepOpen 0
+	    if {[catch {my socket [socket -async [my host] [my port]]} msg]} {
+		my set error $msg
+		return
+	    }
+	}
+	::fconfigure [my socket] -blocking false -buffersize 16384
     }
-  } else {
-    #my showMsg "event BLOCKING current request=$req, new=$r $method"
-    #my showMsg "event BLOCKING rd=[::fileevent [my socket] readable]"
-    #my showMsg "event BLOCKING wr=[::fileevent [my socket] writable]"
-    #my showMsg "event BLOCKING bl=$blocked"
-    ::lappend blocked $r $type $method
-  }
-}
-Connection instproc hold {} {
-  my set continueCmd [list ::fileevent [my socket] readable \
-			  [::fileevent [my socket] readable]]
-  ::fileevent $socket readable {}
-  #my showVars continueCmd
-}
-Connection instproc resume {} {
-  #my showCall
-  if {[my exists continueCmd]} {
-    eval [my set continueCmd]
-    my unset continueCmd
-  }
-}
+    #Connection instproc STATUS {ctx} {
+    #  my instvar socket
+    #  ::puts stderr "*** $ctx: $socket blocking=[::fconfigure $socket -blocking]"
+    #}
+    Connection instproc destroy {} { ;# the destructor closes the socket
+	#my showCall
+	if {[my exists handle]} {
+	    #my showVars handle
+	    # the connection was created via make
+	    [self class] removeHandle [my handle]
+	    #::puts stderr "my CONNECTION close and destroy [my handle]"
+	} else {
+	    #::puts stderr "my CONNECTION close and destroy"
+	}
+	# in cases of errors we might not have a socket yet
+	if {[my exists socket]} {
+	    close [my socket]
+	}
+	next
+    }
+    Connection instproc translation {translation} {
+	#showCall
+	::fconfigure [my socket] -translation $translation
+    }    
+    Connection instproc importSSL args {
+	#my showCall
+	package require tls
+	eval tls::import [my socket] $args
+    }
+    Connection instproc fconfigure args {
+	#my showCall
+	eval ::fconfigure [my socket] $args
+    }    
+    Connection instproc event {type r method} {
+	#my showCall
+	my instvar req blocked
+	# is the request in the argument list the currently active request?
+	if {[info exists req] && $r == $req} {
+	    # a request can overwrite its active request
+	    if {$method == ""} {
+		::fileevent [my socket] $type ""
+		#my showMsg "CONNECTION clear for [my socket]"
+	    } else {
+		#my showMsg "CONNECTION register for [my socket]"
+		::fileevent [my socket] $type [list $r $method]
+	    }
+	} else {
+	    #my showMsg "event BLOCKING current request=$req, new=$r $method"
+	    #my showMsg "event BLOCKING rd=[::fileevent [my socket] readable]"
+	    #my showMsg "event BLOCKING wr=[::fileevent [my socket] writable]"
+	    #my showMsg "event BLOCKING bl=$blocked"
+	    ::lappend blocked $r $type $method
+	}
+    }
+    Connection instproc hold {} {
+	my set continueCmd [list ::fileevent [my socket] readable \
+				[::fileevent [my socket] readable]]
+	::fileevent $socket readable {}
+	#my showVars continueCmd
+    }
+    Connection instproc resume {} {
+	#my showCall
+	if {[my exists continueCmd]} {
+	    eval [my set continueCmd]
+	    my unset continueCmd
+	}
+    }
 
-
-
-Connection instproc puts {string} {
-  #my showCall
-  if {[catch {::puts [my socket] $string} msg]} {
-    ::puts stderr message=$msg
-  }
-}
-Connection instproc puts-nonewline {string} {
-  #my showCall
-  if {[catch {::puts -nonewline [my socket] $string} msg]} {
-    ::puts stderr message=$msg
-  }
-}
-Connection instproc gets {var} {
-  #my showCall
-  upvar [self callinglevel] $var result
-  if {[catch {set n [::gets [my socket] result]} msg]} {
-    my set error $msg 
-    #my showMsg "CONNECTION error"
-    return 0
-  }
-  #my showMsg "n=$n, result=<$result>"
-  return $n
-}
-Connection instproc read {} {
-  #my showCall
-  my instvar socket
-  if {[catch {set result [::read $socket [::fconfigure $socket -buffersize]]} msg]} {
-    my set error $msg 
-    return ""
-  }
-  #my showMsg Done
-  return $result
-}
-Connection instproc readSize {length} {
-  if {[catch {set result [::read [my socket] $length]} msg]} {
-    my set error $msg 
-    return 0
-  }
-  return $result
-}
-Connection instproc flush {} {
-  #my showCall
-  if {[catch {::flush [my socket]} msg]} {
-    my set error $msg 
-  }
-}
-Connection instproc eof {} {
-  #my showCall
-  if {[my exists error]} {
-    return 1
-  } else {
-    return [::eof [my socket]]
-  }
-}
-Connection instproc close {} {
-  #my showCall
-  my instvar req socket blocked
-  if {![info exists socket]} return ;# error during connection open
-  ::fileevent $socket readable ""
-  ::fileevent $socket writable ""
-  $req freeConnection
-  if {[my exists persistent]} {
-    my flush
-    #::puts stderr "[self] PERSISTENT CONNECTION wanna close"
-    if {$blocked == ""} {
-      ::fileevent $socket readable [list [self] destroy]
-      unset req
-    } else {
-      #my showVars blocked
-      set req [lindex $blocked 0]
-      set type [lindex $blocked 1]
-      set method [lindex $blocked 2]
-      set blocked [lrange $blocked 3 end]
-      #my showMsg "in persistent connection unblock $type [list $req $method]"
-      ::fileevent $socket $type [list $req $method]
+    Connection instproc puts {string} {
+	#my showCall
+	if {[catch {::puts [my socket] $string} msg]} {
+	    ::puts stderr message=$msg
+	}
     }
-  } else {
-    #my showMsg "in nonpersistent connection blocked=$blocked"
-    if {$blocked != ""} {
-      set req [lindex $blocked 0]
-      set type [lindex $blocked 1]
-      set method [lindex $blocked 2]
-      set nblocked [lrange $blocked 3 end]
-      close $socket
-      unset socket
-      if {[my exists handle]} {
-	[self class] removeHandle [my handle]
-      }
-      if {[my exists error]} {
-	#my showMsg "UNSETTING ERROR -----------"
-	my unset error
-      }
-      my init
-      set blocked $nblocked
-      ::fileevent $socket $type [list $req $method]
-      #my showMsg "REANIMATE $socket $type [list $req $method]"
-      #my showVars
-    } else {
-      #my showMsg "Nothing blocked: readable=[::fileevent $socket readable]"
+    Connection instproc puts-nonewline {string} {
+	#my showCall
+	if {[catch {::puts -nonewline [my socket] $string} msg]} {
+	    ::puts stderr message=$msg
+	}
+    }
+    Connection instproc gets {var} {
+	#my showCall
+	upvar [self callinglevel] $var result
+	if {[catch {set n [::gets [my socket] result]} msg]} {
+	    my set error $msg 
+	    #my showMsg "CONNECTION error"
+	    return 0
+	}
+	#my showMsg "n=$n, result=<$result>"
+	return $n
+    }
+    Connection instproc read {} {
+	#my showCall
+	my instvar socket
+	if {[catch {set result [::read $socket [::fconfigure $socket -buffersize]]} msg]} {
+	    my set error $msg 
+	    return ""
+	}
+	#my showMsg Done
+	return $result
+    }
+    Connection instproc readSize {length} {
+	if {[catch {set result [::read [my socket] $length]} msg]} {
+	    my set error $msg 
+	    return 0
+	}
+	return $result
+    }
+    Connection instproc flush {} {
+	#my showCall
+	if {[catch {::flush [my socket]} msg]} {
+	    my set error $msg 
+	}
+    }
+    Connection instproc eof {} {
+	#my showCall
+	if {[my exists error]} {
+	    return 1
+	} else {
+	    return [::eof [my socket]]
+	}
+    }
+    Connection instproc close {} {
+	#my showCall
+	my instvar req socket blocked
+	if {![info exists socket]} return ;# error during connection open
+	::fileevent $socket readable ""
+	::fileevent $socket writable ""
+	$req freeConnection
+	if {[my exists persistent]} {
+	    my flush
+	    #::puts stderr "[self] PERSISTENT CONNECTION wanna close"
+	    if {$blocked == ""} {
+		::fileevent $socket readable [list [self] destroy]
+		unset req
+	    } else {
+		#my showVars blocked
+		set req [lindex $blocked 0]
+		set type [lindex $blocked 1]
+		set method [lindex $blocked 2]
+		set blocked [lrange $blocked 3 end]
+		#my showMsg "in persistent connection unblock $type [list $req $method]"
+		::fileevent $socket $type [list $req $method]
+	    }
+	} else {
+	    #my showMsg "in nonpersistent connection blocked=$blocked"
+	    if {$blocked != ""} {
+		set req [lindex $blocked 0]
+		set type [lindex $blocked 1]
+		set method [lindex $blocked 2]
+		set nblocked [lrange $blocked 3 end]
+		close $socket
+		unset socket
+		if {[my exists handle]} {
+		    [self class] removeHandle [my handle]
+		}
+		if {[my exists error]} {
+		    #my showMsg "UNSETTING ERROR -----------"
+		    my unset error
+		}
+		my init
+		set blocked $nblocked
+		::fileevent $socket $type [list $req $method]
+		#my showMsg "REANIMATE $socket $type [list $req $method]"
+		#my showVars
+	    } else {
+		#my showMsg "Nothing blocked: readable=[::fileevent $socket readable]"
 
-      my destroy
+		my destroy
+	    }
+	}
     }
-  }
-}
-Connection instproc makePersistent {p} {
-  if {$p} {
-    my set persistent 1
-  } else {
-    if {[my exists persistent]} {
-      my unset persistent
-      #my showMsg "no longer persistent"
+    Connection instproc makePersistent {p} {
+	if {$p} {
+	    my set persistent 1
+	} else {
+	    if {[my exists persistent]} {
+		my unset persistent
+		#my showMsg "no longer persistent"
+	    }
+	}
     }
-  }
+
+    namespace export Connection
 }
 
+namespace import ::xotcl::comm::connection::*
 
 if {[info command bgerror] == ""} {
     proc bgerror {msg} { puts stderr "******* bgerror $msg $::errorInfo*****"}
 }
-
Index: xotcl/library/comm/Dav.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/comm/Dav.xotcl	(.../Dav.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/comm/Dav.xotcl	(.../Dav.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,162 +1,174 @@
-# $Id: Dav.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: Dav.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::comm::dav 0.9
 
-Class Dav -superclass Http
-Dav instproc initialize args {
-  my instvar contentType 
-  #showCall
-  set contentType text/xml
-  next
-}
+package require XOTcl
 
-Dav instproc PROPFIND {} {
-  #showCall
-  # extra dav headers
-  # Depth: ("0" | "1" | "infinity") [infinity is the default]
-  
-  # body is a propfind XML-Element
-  # <!ELEMENT propfind (allprop | propname | prop) >
-  #     <!ELEMENT allprop EMPTY >
-  #     <!ELEMENT propname EMPTY >
-  #     <!ELEMENT prop ANY>
+namespace eval ::xotcl::comm::dav {
+    namespace import ::xotcl::*
 
-  # this should be set by the clients
-  #<?xml version="1.0" encoding="utf-8" ?>
-  #             <D:propfind xmlns:D='DAV:'>
-  #                  <D:allprop/>
-  #             </D:propfind>
-  my open
-}
-Dav instproc PROPPATCH {} {
-  #showCall
-  # body is a propertyupdate XML-Element
-  # <!ELEMENT propertyupdate (remove | set)+ >
-  #     <!ELEMENT remove (prop) >
-  #     <!ELEMENT set (prop) >
-  
-  #   set xmlReqBody($method) "<?xml version=\"1.0\" encoding=\"utf-8\" ?>
-  #             <D:propertyupdate xmlns:D=\"DAV:\">
-  #                 <D:remove>
-  #                    <D:prop> 
-  #                        <D:displayname/>
-  #                    </D:prop>                    
-  #                  </D:remove>
-  #             </D:propertyupdate>"
-  my open
-}
-Dav instproc MKCOL {} {
-  #showCall
-  # invoked without a request body (may contain a message body?)
-  my open
-}
-Dav instproc GET {} {
-  #showCall
-  # invoked without a request body and without extra header
-  # back to HTTP class
-  next
-}
-Dav instproc HEAD {} {
-  #showCall
-  # invoked without a request bodyand without extra header
-  # back to HTTP class
-  next
-}
-Dav instproc POST {} {
-  #showCall
-  # the same as in  RFC2068
-  # back to HTTP class
-  next
-}
-Dav instproc DELETE {} {
-  #showCall
-  # extra dav headers
-  # Depth: ("0" | "1" | "infinity")
+    Class Dav -superclass Http
+    Dav instproc initialize args {
+	my instvar contentType 
+	#showCall
+	set contentType text/xml
+	next
+    }
 
-  # invoked without a request body
-  my open
-}
-Dav instproc PUT {} {
-  #showCall
-  # PUT for Non-Collection Resources --> RFC2068
-  # PUT for Collections --> MKCOL
-  # next
-}
-Dav instproc COPY {} {
-  #showCall
-  # extra dav headers
-  # If: [see 9.4 WebDAV]
-  # Destination: <absolutURI> [see RFC2396 for the definition of absolutURI]
-  # Depth: ("0" | "1" | "infinity")
-  # Overwrite: ("T" | "F")
-  
+    Dav instproc PROPFIND {} {
+	#showCall
+	# extra dav headers
+	# Depth: ("0" | "1" | "infinity") [infinity is the default]
+	
+	# body is a propfind XML-Element
+	# <!ELEMENT propfind (allprop | propname | prop) >
+	#     <!ELEMENT allprop EMPTY >
+	#     <!ELEMENT propname EMPTY >
+	#     <!ELEMENT prop ANY>
 
-  # body is a propertybehavior XML-Element
-  # <!ELEMENT propertybehavior (omit | keepalive) >
-  #     <!ELEMENT omit EMPTY >
-  #     <!ELEMENT keepalive (#PCDATA | href+) >
-  #         <!ELEMENT href (#PCDATA) >
-  my open
-}
-Dav instproc MOVE {} {
-  #showCall
-  # extra dav headers
-  # If: [see 9.4 WebDAV]
-  # Destination: <absolutURI> [see RFC2396 for the definition of absolutURI]
-  # Depth: "infinity" [see 8.9.2]
-  # Overwrite: ("T" | "F")
+	# this should be set by the clients
+	#<?xml version="1.0" encoding="utf-8" ?>
+	#             <D:propfind xmlns:D='DAV:'>
+	#                  <D:allprop/>
+	#             </D:propfind>
+	my open
+    }
+    Dav instproc PROPPATCH {} {
+	#showCall
+	# body is a propertyupdate XML-Element
+	# <!ELEMENT propertyupdate (remove | set)+ >
+	#     <!ELEMENT remove (prop) >
+	#     <!ELEMENT set (prop) >
+	
+	#   set xmlReqBody($method) "<?xml version=\"1.0\" encoding=\"utf-8\" ?>
+	#             <D:propertyupdate xmlns:D=\"DAV:\">
+	#                 <D:remove>
+	#                    <D:prop> 
+	#                        <D:displayname/>
+	#                    </D:prop>                    
+	#                  </D:remove>
+	#             </D:propertyupdate>"
+	my open
+    }
+    Dav instproc MKCOL {} {
+	#showCall
+	# invoked without a request body (may contain a message body?)
+	my open
+    }
+    Dav instproc GET {} {
+	#showCall
+	# invoked without a request body and without extra header
+	# back to HTTP class
+	next
+    }
+    Dav instproc HEAD {} {
+	#showCall
+	# invoked without a request bodyand without extra header
+	# back to HTTP class
+	next
+    }
+    Dav instproc POST {} {
+	#showCall
+	# the same as in  RFC2068
+	# back to HTTP class
+	next
+    }
+    Dav instproc DELETE {} {
+	#showCall
+	# extra dav headers
+	# Depth: ("0" | "1" | "infinity")
 
-  # body is a propertybehavior XML-Element
-  # see COPY
-  my open
-}
-Dav instproc LOCK {} {
-  #showCall
-  # extra dav headers
-  # If: [see 9.4 WebDAV]
-  # Destination: <absolutURI> [see RFC2396 for the definition of absolutURI]
-  # Depth: ("0" | "1" | "infinity")
-  # Timeout: [see 9.8 WebDAV]
-  # Authorization: (defined in HTTP1.1 in 14.8)
+	# invoked without a request body
+	my open
+    }
+    Dav instproc PUT {} {
+	#showCall
+	# PUT for Non-Collection Resources --> RFC2068
+	# PUT for Collections --> MKCOL
+	# next
+    }
+    Dav instproc COPY {} {
+	#showCall
+	# extra dav headers
+	# If: [see 9.4 WebDAV]
+	# Destination: <absolutURI> [see RFC2396 for the definition of absolutURI]
+	# Depth: ("0" | "1" | "infinity")
+	# Overwrite: ("T" | "F")
+	
 
-  # body is a lockinfo XML-Element
-  # <!ELEMENT lockinfo (lockscope, locktype, owner?) >
-  #    <!ELEMENT lockscope (exclusive | shared) >
-  #        <!ELEMENT exclusive EMPTY >
-  #        <!ELEMENT shared EMPTY >
-  #    <!ELEMENT locktype (write) >
-  #        <!ELEMENT write EMPTY >
-  #    <!ELEMENT owner ANY>
-  my open
-}
+	# body is a propertybehavior XML-Element
+	# <!ELEMENT propertybehavior (omit | keepalive) >
+	#     <!ELEMENT omit EMPTY >
+	#     <!ELEMENT keepalive (#PCDATA | href+) >
+	#         <!ELEMENT href (#PCDATA) >
+	my open
+    }
+    Dav instproc MOVE {} {
+	#showCall
+	# extra dav headers
+	# If: [see 9.4 WebDAV]
+	# Destination: <absolutURI> [see RFC2396 for the definition of absolutURI]
+	# Depth: "infinity" [see 8.9.2]
+	# Overwrite: ("T" | "F")
 
-# The Lock-Token request header is used with the UNLOCK method to
-# identify the lock to be removed.
-Dav instproc UNLOCK {} {
-  my instvar headers 
-  #showCall
-  # extra dav headers
-  # Lock-Token: <Coded-URL> [see 8.11 in WebDAV]
+	# body is a propertybehavior XML-Element
+	# see COPY
+	my open
+    }
+    Dav instproc LOCK {} {
+	#showCall
+	# extra dav headers
+	# If: [see 9.4 WebDAV]
+	# Destination: <absolutURI> [see RFC2396 for the definition of absolutURI]
+	# Depth: ("0" | "1" | "infinity")
+	# Timeout: [see 9.8 WebDAV]
+	# Authorization: (defined in HTTP1.1 in 14.8)
 
-  # invoked without a request body
-  my open
-}
+	# body is a lockinfo XML-Element
+	# <!ELEMENT lockinfo (lockscope, locktype, owner?) >
+	#    <!ELEMENT lockscope (exclusive | shared) >
+	#        <!ELEMENT exclusive EMPTY >
+	#        <!ELEMENT shared EMPTY >
+	#    <!ELEMENT locktype (write) >
+	#        <!ELEMENT write EMPTY >
+	#    <!ELEMENT owner ANY>
+	my open
+    }
 
-#---------------------
-# Utility            #
-#---------------------
+    # The Lock-Token request header is used with the UNLOCK method to
+    # identify the lock to be removed.
+    Dav instproc UNLOCK {} {
+	my instvar headers 
+	#showCall
+	# extra dav headers
+	# Lock-Token: <Coded-URL> [see 8.11 in WebDAV]
 
-#?
-Object xmlReqBodyManager 
-xmlReqBodyManager proc requireXmlReqBody {request} {
-}
+	# invoked without a request body
+	my open
+    }
 
-#? 
-Object davHeaderManager 
-davHeaderManager proc requireDavHeader {request} {
-}
+    #---------------------
+    # Utility            #
+    #---------------------
 
+    #?
+    Object xmlReqBodyManager 
+    xmlReqBodyManager proc requireXmlReqBody {request} {
+    }
 
+    #? 
+    Object davHeaderManager 
+    davHeaderManager proc requireDavHeader {request} {
+    }
 
-#LOCK /DAV/welcome.html HTTP/1.1  
-#Host: wawog
-#Connection: close
+
+
+    #LOCK /DAV/welcome.html HTTP/1.1  
+    #Host: wawog
+    #Connection: close
+
+    namespace export Dav \
+	xmlReqBodyManager davHeaderManager 
+}
+
+namespace import ::xotcl::comm::dav::*
Index: xotcl/library/comm/Ftp.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/comm/Ftp.xotcl	(.../Ftp.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/comm/Ftp.xotcl	(.../Ftp.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,164 +1,175 @@
-# $Id: Ftp.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: Ftp.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::comm::ftp 0.9
 package require xotcl::comm::httpAccess
 
-Class Ftp -superclass NetAccess -parameter {user passwd}
-Ftp instproc initialize args {
-  #my showCall
-  my instvar port caching user passwd loginMsg resp blocksize
-  set port 21
-  set blocksize 1024
-  set caching 0
-  set user ftp
-  set passwd cineast@
-  set loginMsg {}
-  set resp(connect)       {220 provideUser}
-  set resp(provideUser)   {331 providePasswd}
-  set resp(providePasswd) {230 loginFinished}
-  set resp(loginFinished) {227 pasv}
-  set resp(pasv)          {200 type}
-  set resp(type-list)     {150 list}
-  set resp(type-retr)     {150 retr 550 retry-retrieve}
-  set resp(transfer)      {226 transferDone}
-  next
-}
-Ftp instproc err {state reply} {
-  my abort "Error in $state: $reply"
-}
-Ftp instproc queryServer {query state} {
-  my instvar S
-  puts $S $query
-  flush $S
-  fileevent $S readable [::list [self] response $state]
-}
-Ftp instproc response {state} {
-  #my showCall
-  my instvar S code msg
-  set reply [gets $S]
-  #my showVars reply
-  if {[regexp {^([0-9]+)[-](.*)$} $reply _ code msg]} {
-    fileevent $S readable [::list [self] responseMulti $state]
-  } else {
-    regexp {^([0-9]+) (.*)$} $reply _ code msg 
-    my responseEnd $state
-  }
-}
-Ftp instproc responseMulti {state} {
-  # multi line response
-  my instvar S code msg 
-  set m [gets $S]
-  if {[regexp "^$code " $m]} { 
-    my responseEnd $state
-  } else {
-    # try to strip code and dash
-    regexp "^$code-(.*)\$" $m _ m
-    append msg \n$m
-  }
-}
-Ftp instproc responseEnd {state} {
-  my instvar S code msg resp
-  fileevent $S readable {}
-  #puts stderr "code=$code, msg=<$msg>"
-  foreach {c newState} $resp($state) {
-    if {$c == $code} { return [my $newState] }
-  }
-  my err $state "expected=$resp($state), got $code $msg"
-}
-Ftp instproc GET {} {
-  my instvar S  host port url
-  regexp {^(.*):([0-9]+)$} $host _ host port
-  my running
-  # rb running my $url ;# ???
-  # proxy ?
-  set S [socket -async $host $port]
-  fconfigure $S -blocking false -translation {auto crlf}
-  fileevent $S readable [::list [self] response connect]
-}
-Ftp instproc provideUser {} {
-  my instvar user msg loginMsg
-  set loginMsg $msg
-  my queryServer "USER $user" provideUser
-}
-Ftp instproc providePasswd {} {
-  my instvar passwd
-#  if {[pwdManager requirePasswd "Ftp $user\@$host" $user password]} {
-#    my queryServer "PASS $password" providePasswd
-#  }
-  my queryServer "PASS $passwd" providePasswd
-}
-Ftp instproc loginFinished {} {  
-  my instvar msg loginMsg
-  append  loginMsg \n$msg
-  my queryServer "PASV" loginFinished
-}
-Ftp instproc pasv {} {
-  my instvar S D msg
-  set d {([0-9]+)}
-  if {[regexp "\[(]$d,$d,$d,$d,$d,$d" $msg _ 1 2 3 4 p1 p2]} {
-    if {[catch {set D [socket -async $1.$2.$3.$4 [expr {$p1*256 + $p2}]]} err
-	]} {
-      return [my err $proc $err] 
+package require XOTcl
+
+namespace eval ::xotcl::comm::ftp {
+    namespace import ::xotcl::*
+
+    Class Ftp -superclass NetAccess -parameter {user passwd}
+    Ftp instproc initialize args {
+	#my showCall
+	my instvar port caching user passwd loginMsg resp blocksize
+	set port 21
+	set blocksize 1024
+	set caching 0
+	set user ftp
+	set passwd cineast@
+	set loginMsg {}
+	set resp(connect)       {220 provideUser}
+	set resp(provideUser)   {331 providePasswd}
+	set resp(providePasswd) {230 loginFinished}
+	set resp(loginFinished) {227 pasv}
+	set resp(pasv)          {200 type}
+	set resp(type-list)     {150 list}
+	set resp(type-retr)     {150 retr 550 retry-retrieve}
+	set resp(transfer)      {226 transferDone}
+	next
     }
-    fconfigure $D -blocking no -translation binary
-  } else {
-    return [my err $proc $msg] 
-  }
-  my queryServer "TYPE I" pasv
+    Ftp instproc err {state reply} {
+	my abort "Error in $state: $reply"
+    }
+    Ftp instproc queryServer {query state} {
+	my instvar S
+	puts $S $query
+	flush $S
+	fileevent $S readable [::list [self] response $state]
+    }
+    Ftp instproc response {state} {
+	#my showCall
+	my instvar S code msg
+	set reply [gets $S]
+	#my showVars reply
+	if {[regexp {^([0-9]+)[-](.*)$} $reply _ code msg]} {
+	    fileevent $S readable [::list [self] responseMulti $state]
+	} else {
+	    regexp {^([0-9]+) (.*)$} $reply _ code msg 
+	    my responseEnd $state
+	}
+    }
+    Ftp instproc responseMulti {state} {
+	# multi line response
+	my instvar S code msg 
+	set m [gets $S]
+	if {[regexp "^$code " $m]} { 
+	    my responseEnd $state
+	} else {
+	    # try to strip code and dash
+	    regexp "^$code-(.*)\$" $m _ m
+	    append msg \n$m
+	}
+    }
+    Ftp instproc responseEnd {state} {
+	my instvar S code msg resp
+	fileevent $S readable {}
+	#puts stderr "code=$code, msg=<$msg>"
+	foreach {c newState} $resp($state) {
+	    if {$c == $code} { return [my $newState] }
+	}
+	my err $state "expected=$resp($state), got $code $msg"
+    }
+    Ftp instproc GET {} {
+	my instvar S  host port url
+	regexp {^(.*):([0-9]+)$} $host _ host port
+	my running
+	# rb running my $url ;# ???
+	# proxy ?
+	set S [socket -async $host $port]
+	fconfigure $S -blocking false -translation {auto crlf}
+	fileevent $S readable [::list [self] response connect]
+    }
+    Ftp instproc provideUser {} {
+	my instvar user msg loginMsg
+	set loginMsg $msg
+	my queryServer "USER $user" provideUser
+    }
+    Ftp instproc providePasswd {} {
+	my instvar passwd
+	#  if {[pwdManager requirePasswd "Ftp $user\@$host" $user password]} {
+	#    my queryServer "PASS $password" providePasswd
+	#  }
+	my queryServer "PASS $passwd" providePasswd
+    }
+    Ftp instproc loginFinished {} {  
+	my instvar msg loginMsg
+	append  loginMsg \n$msg
+	my queryServer "PASV" loginFinished
+    }
+    Ftp instproc pasv {} {
+	my instvar S D msg
+	set d {([0-9]+)}
+	if {[regexp "\[(]$d,$d,$d,$d,$d,$d" $msg _ 1 2 3 4 p1 p2]} {
+	    if {[catch {set D [socket -async $1.$2.$3.$4 [expr {$p1*256 + $p2}]]} err
+		]} {
+		return [my err $proc $err] 
+	    }
+	    fconfigure $D -blocking no -translation binary
+	} else {
+	    return [my err $proc $msg] 
+	}
+	my queryServer "TYPE I" pasv
+    }
+    Ftp instproc type {} {
+	my instvar path
+	if {$path=={}} {
+	    my queryServer "LIST" type-list
+	} elseif {[regexp /$ $path]} { 
+	    my queryServer "LIST $path" type-list
+	} else {
+	    my queryServer "RETR $path" type-retr
+	}
+    }
+    Ftp instproc retry-retrieve {} {
+	my instvar path url
+	append url /
+	my queryServer "LIST $path/" type-list
+    }
+    Ftp instproc list {} {
+	my instvar S D contentType
+	set contentType text/dirlist
+	my headerDone
+	fileevent $S readable [::list [self] response transfer]
+	fileevent $D readable [::list [self] readData]
+    }
+    Ftp instproc read {} {
+	# the method read is called by the more general method readData
+	my instvar D block blocksize
+	if {[::eof $D]} {
+	    set block ""
+	    close $D
+	    unset D
+	} else {
+	    #puts stderr blocksize=$blocksize
+	    set block [::read $D $blocksize]
+	    #puts stderr read:[string length $block]bytes
+	}
+    }
+    Ftp instproc transferDone {} {
+	my instvar D S
+	if {[info exists D]} {
+	    fileevent $S readable {}
+	    set block ""
+	    close $D
+	    unset D
+	} 
+	my finish
+    }
+    Ftp instproc retr {} {
+	my instvar S D msg totalsize contentType path
+	regexp {[(]([0-9]+)[ ]+[Bb]ytes} $msg _ totalsize
+	set contentType [Mime guessContentType $path]
+	my headerDone
+	if {[info exists S]} {
+	    # file dialog was not canceled
+	    fileevent $S readable [::list [self] response transfer]
+	    fileevent $D readable [::list [self] readData]
+	    fconfigure $D -translation binary
+	}
+    }
+
+    namespace export Ftp
 }
-Ftp instproc type {} {
-  my instvar path
-  if {$path=={}} {
-    my queryServer "LIST" type-list
-  } elseif {[regexp /$ $path]} { 
-    my queryServer "LIST $path" type-list
-  } else {
-    my queryServer "RETR $path" type-retr
-  }
-}
-Ftp instproc retry-retrieve {} {
-  my instvar path url
-  append url /
-  my queryServer "LIST $path/" type-list
-}
-Ftp instproc list {} {
-  my instvar S D contentType
-  set contentType text/dirlist
-  my headerDone
-  fileevent $S readable [::list [self] response transfer]
-  fileevent $D readable [::list [self] readData]
-}
-Ftp instproc read {} {
-  # the method read is called by the more general method readData
-  my instvar D block blocksize
-  if {[::eof $D]} {
-    set block ""
-    close $D
-    unset D
-  } else {
-    #puts stderr blocksize=$blocksize
-    set block [::read $D $blocksize]
-    #puts stderr read:[string length $block]bytes
-  }
-}
-Ftp instproc transferDone {} {
-  my instvar D S
-  if {[info exists D]} {
-    fileevent $S readable {}
-    set block ""
-    close $D
-    unset D
-  } 
-  my finish
-}
-Ftp instproc retr {} {
-  my instvar S D msg totalsize contentType path
-  regexp {[(]([0-9]+)[ ]+[Bb]ytes} $msg _ totalsize
-  set contentType [Mime guessContentType $path]
-  my headerDone
-  if {[info exists S]} {
-    # file dialog was not canceled
-    fileevent $S readable [::list [self] response transfer]
-    fileevent $D readable [::list [self] readData]
-    fconfigure $D -translation binary
-  }
-}
+
+namespace import ::xotcl::comm::ftp::*
Index: xotcl/library/comm/Httpd.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/comm/Httpd.xotcl	(.../Httpd.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/comm/Httpd.xotcl	(.../Httpd.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,4 +1,4 @@
-# -*- tcl -*- $Id: Httpd.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# -*- tcl -*- $Id: Httpd.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
 #
 # The XOTcl class Httpd implements an HTTP/1.0 and HTTP/1.1 server with  
 # basic functionality.
@@ -8,791 +8,830 @@
 set VERSION 1.1
 package provide xotcl::comm::httpd $VERSION
 
+package require XOTcl
+
 #package require xotcl::comm::httpAccess
-package require xotcl::comm::mime
+
 package require xotcl::comm::connection
 package require xotcl::trace
+package require xotcl::comm::mime
 
-Class Httpd -parameter {
-  {port 80} 
-  ipaddr 
-  {root ./} 
-  {logdir $::xotcl::logdir} 
-  {httpdWrk Httpd::Wrk}
-  {redirects [list]}
-  {workerTimeout 10000}
-}
-Httpd proc Date seconds {clock format $seconds -format {%a, %d %b %Y %T %Z}}
-Httpd instproc checkRoot {} {
-  my instvar root
-  set root [string trimright $root /]
-  if {![file isdir $root]} {
-    puts stderr "Warning: create root directory '$root'"
-    file mkdir $root
-  } 
-  # make directory absolute
-  set currentdir [pwd]
-  cd $root
-  set root [pwd]
-  #puts stderr "[self] root=$root"
-  cd $currentdir
-}
-Httpd instproc init args {
-  my instvar port logdir logfile redirects
-  if {![my exists workerMixins]} {
-    my set workerMixins {}
-    #puts stderr "resetting workermixins of [self]"
+namespace eval ::xotcl::comm::httpd {
+  namespace import ::xotcl::*
+
+  Class Httpd -parameter {
+    {port 80} 
+    ipaddr 
+    {root ./} 
+    {logdir $::xotcl::logdir} 
+    {httpdWrk Httpd::Wrk}
+    {redirects [list]}
+    {workerTimeout 10000}
   }
-  next
-  set proto [string trim [my info class] :d]
-  puts stderr "Starting XOTcl [string toupper $proto] server $::VERSION\
+  Httpd proc Date seconds {clock format $seconds -format {%a, %d %b %Y %T %Z}}
+  Httpd instproc checkRoot {} {
+    my instvar root
+    set root [string trimright $root /]
+    if {![file isdir $root]} {
+      puts stderr "Warning: create root directory '$root'"
+      file mkdir $root
+    } 
+    # make directory absolute
+    set currentdir [pwd]
+    cd $root
+    set root [pwd]
+    #puts stderr "[self] root=$root"
+    cd $currentdir
+  }
+
+  proc ! string {
+    set f [open /tmp/log w+]; 
+    puts $f "[clock format [clock seconds]] $string"
+    close $f}
+
+  Httpd instproc init args {
+    my instvar port logdir logfile redirects
+    if {![my exists workerMixins]} {
+      my set workerMixins {}
+      #puts stderr "resetting workermixins of [self]"
+    }
+    next
+    set proto [string trim [namespace tail [my info class]] :d]
+    puts stderr "Starting XOTcl [string toupper $proto] server $::VERSION\
 	[string tolower $proto]://[info hostname]:$port/"
 
-  # Start a server by listening on the port
-  if {[my exists ipaddr]} {set ip "-myaddr [my set ipaddr]"} {set ip ""}
-  my set listen [eval [list socket -server [list [self] accept]] $ip $port]
-  #my set listen [socket -server [list [self] accept] $port]
+    # Start a server by listening on the port
+    if {[my exists ipaddr]} {set ip "-myaddr [my set ipaddr]"} {set ip ""}
+    my set listen [eval [list socket -server [list [self] accept]] $ip $port]
+    #my set listen [socket -server [list [self] accept] $port]
 
-  my checkRoot
-  if {![file isdir $logdir]} {file mkdir $logdir}
-  set logfile [open $logdir/serverlog-$port a+]
-  my array set requiresBody \
-      {GET 0 HEAD 0 POST 1 PUT 1 DELETE 0 OPTIONS 0 TRACE 0}
-}
-Httpd instproc destroy {} {			# destructor
-  catch {close [my set listen]}
-  catch {close [my set logfile]}
-  next
-}
-Httpd instproc accept {socket ipaddr port} {	# Accept a new connection and set up a handler
-  #puts stderr "using workermixins of [self] {[my set workerMixins]}"
-  [my set httpdWrk] new -childof [self] -socket $socket -ipaddr $ipaddr \
-      -port $port -mixin [my set workerMixins]
-}
-Httpd instproc redirect list {
-  foreach {pattern hostport} $list {
-    my lappend redirects $pattern $hostport
+    my checkRoot
+    if {![file isdir $logdir]} {file mkdir $logdir}
+    set logfile [open $logdir/serverlog-$port a+]
+    my array set requiresBody \
+	{GET 0 HEAD 0 POST 1 PUT 1 DELETE 0 OPTIONS 0 TRACE 0}
   }
-}
+  Httpd instproc destroy {} {			# destructor
+    catch {close [my set listen]}
+    catch {close [my set logfile]}
+    next
+  }
+  Httpd instproc accept {socket ipaddr port} {	# Accept a new connection and set up a handler
+    #puts stderr "using workermixins of [self] {[my set workerMixins]}"
 
-
-Class Httpd::Wrk -parameter {socket port ipaddr}
-Httpd::Wrk array set codes {
-  200 {Data follows}          201 {Created}         204 {No Content}
-  302 {Moved Temporarily}     304 {Not Modified}
-  400 {Bad Request}           401 {Unauthorized}    402 {Payment Required}
-  403 {Forbidden}             404 {Not Found}       405 {Method Not Allowed}
-  406 {Not Acceptable}        408 {Request Timeout} 411 {Length Required}
-  500 {Internal Server Error} 503 {Service Unavailable}  504 {Service Temporarily Unavailable}
-}
-Httpd::Wrk instproc formData {} {my set formData}
-Httpd::Wrk instproc init args {		# Constructor 
-  my instvar socket port ipaddr
-  my set formData [list]
-  my set replyHeaderFields [list]
-  next
-  my makeConnection $socket
-  my log Connect "$ipaddr $port"
-  my connection translation {auto crlf}
-  my connection event readable [self] firstLine
-}
-Httpd::Wrk instproc makeConnection {socket} {
-  Connection create [self]::connection -socket $socket -req [self]
-}
-Httpd::Wrk instproc close {} {		# logical close of a single request
-  #my showCall
-  my instvar version timeout meta
-  set eof [my connection eof]
-  if {$version > 1.0 && !$eof} {
-    #my showMsg "!EOF in http/$version"
-    my connection flush
-    set timeout [after [[my info parent] workerTimeout] [self] destroy]
-    ### reset parameters, worker will be potentially reused
-    if {[array exists meta]} {
-      unset meta
-      array set meta {}
+    [my set httpdWrk] new -childof [self] -socket $socket -ipaddr $ipaddr \
+	-port $port -mixin [my set workerMixins]
+  }
+  Httpd instproc redirect list {
+    foreach {pattern hostport} $list {
+      my lappend redirects $pattern $hostport
     }
-    unset version
-    if {[my exists user]} {
-      my unset user
-      my unset realm
-    }
-    foreach c [my set formData] { $c destroy }
+  }
+
+
+  Class Httpd::Wrk -parameter {socket port ipaddr}
+  Httpd::Wrk array set codes {
+    200 {Data follows}          201 {Created}         204 {No Content}
+    302 {Moved Temporarily}     304 {Not Modified}
+    400 {Bad Request}           401 {Unauthorized}    402 {Payment Required}
+    403 {Forbidden}             404 {Not Found}       405 {Method Not Allowed}
+    406 {Not Acceptable}        408 {Request Timeout} 411 {Length Required}
+    500 {Internal Server Error} 503 {Service Unavailable}  504 {Service Temporarily Unavailable}
+  }
+  Httpd::Wrk instproc formData {} {my set formData}
+  Httpd::Wrk instproc init args {		# Constructor 
+    my instvar socket port ipaddr
+    my set formData [list]
     my set replyHeaderFields [list]
-    my set formData {}
-    #my showVars
+    next
+    my makeConnection $socket
+    my log Connect "$ipaddr $port"
     my connection translation {auto crlf}
     my connection event readable [self] firstLine
-  } elseif {$eof} {
-    #my showMsg "Destroy in http/$version"
-    # the client side has closed the connection
-    my destroy
-  } else {
-    #my showMsg "!EOF in http/$version ???"
-    # we close the conneciton actively (e.g. forced by an error)
-    my connection flush
-    #puts stderr "DESTROY----this line should never show up"
-    my destroy
   }
-}
-Httpd::Wrk instproc destroy {} {
-  #my showCall
-  if {[my isobject [self]::connection]} {
-    my connection close
+  Httpd::Wrk instproc makeConnection {socket} {
+    Connection create [self]::connection -socket $socket -req [self]
   }
-  next
-}
-Httpd::Wrk instproc freeConnection {} {
-}
-Httpd::Wrk instproc firstLine {} {	# Read the first line of the request
-  #my showCall
-  my instvar method resourceName hasFormData query fileName \
-      version timeout 
-  if {[info exists timeout]} {
-    after cancel $timeout
-    unset timeout
+  Httpd::Wrk instproc close {} {		# logical close of a single request
+    #my showCall
+    my instvar version timeout meta
+    set eof [my connection eof]
+    if {$version > 1.0 && !$eof} {
+      #my showMsg "!EOF in http/$version"
+      my connection flush
+      set timeout [after [[my info parent] workerTimeout] [self] destroy]
+      ### reset parameters, worker will be potentially reused
+      if {[array exists meta]} {
+	unset meta
+	array set meta {}
+      }
+      unset version
+      if {[my exists user]} {
+	my unset user
+	my unset realm
+      }
+      foreach c [my set formData] { $c destroy }
+      my set replyHeaderFields [list]
+      my set formData {}
+      #my showVars
+      my connection translation {auto crlf}
+      my connection event readable [self] firstLine
+    } elseif {$eof} {
+      #my showMsg "Destroy in http/$version"
+      # the client side has closed the connection
+      my destroy
+    } else {
+      #my showMsg "!EOF in http/$version ???"
+      # we close the conneciton actively (e.g. forced by an error)
+      my connection flush
+      #puts stderr "DESTROY----this line should never show up"
+      my destroy
+    }
   }
-  my lappend replyHeaderFields Date [Httpd Date [clock seconds]]
-  set n [my connection gets firstLine]
-  if {$n > 0} {
-    #::puts stderr "[self] firstline=<$firstLine>"
-    # parse request line, ignore HTTP version for now
-    if {[regexp {^(POST|GET|PUT|HEAD|OPTIONS) ([^?]+)(\??)([^ ]*) *HTTP/(.*)$} \
-	     $firstLine _ method resourceName hasFormData query version]} {
-      set resourceName [string trimright [string trimleft $resourceName ./] " "]
-      # construct filename
-      [my info parent] instvar root
-      set fileName $root/[url decodeName $resourceName]
-      #puts stderr ---[encoding convertfrom utf-8 $fileName]----
-      set fileName [encoding convertfrom utf-8 $fileName]
-      #
-      my decode-formData $query
-      my log Query $firstLine
-      if {[my exists forceVersion1.0]} {
+  Httpd::Wrk instproc destroy {} {
+    #my showCall
+    if {[my isobject [self]::connection]} {
+      my connection close
+    }
+    next
+  }
+  Httpd::Wrk instproc freeConnection {} {
+  }
+  Httpd::Wrk instproc firstLine {} {	# Read the first line of the request
+    #my showCall
+    my instvar method resourceName hasFormData query fileName \
+	version timeout 
+    if {[info exists timeout]} {
+      after cancel $timeout
+      unset timeout
+    }
+    my lappend replyHeaderFields Date [Httpd Date [clock seconds]]
+    set n [my connection gets firstLine]
+    if {$n > 0} {
+      #::puts stderr "[self] firstline=<$firstLine>"
+      # parse request line, ignore HTTP version for now
+      if {[regexp {^(POST|GET|PUT|HEAD|OPTIONS) ([^?]+)(\??)([^ ]*) *HTTP/(.*)$} \
+	       $firstLine _ method resourceName hasFormData query version]} {
+	set resourceName [string trimright [string trimleft $resourceName ./] " "]
+	# construct filename
+	[my info parent] instvar root
+	set fileName $root/[url decodeName $resourceName]
+	#puts stderr ---[encoding convertfrom utf-8 $fileName]----
+	set fileName [encoding convertfrom utf-8 $fileName]
+	#
+	my decode-formData $query
+	my log Query $firstLine
+	if {[my exists forceVersion1.0]} {
+	  set version 1.0
+	}
+	my connection makePersistent [expr {$version > 1.0}]
+	my connection event readable [self] header
+      } else {
 	set version 1.0
+	set resourceName ???
+	set method ???
+	my log Error "bad first line:$firstLine"
+	my replyCode 400
+	my replyErrorMsg
       }
-      my connection makePersistent [expr {$version > 1.0}]
-      my connection event readable [self] header
+    } elseif {![my connection eof]} {
+      #my showMsg "+++ not completed EOF=[my connection eof]"
     } else {
       set version 1.0
-      set resourceName ???
-      set method ???
-      my log Error "bad first line:$firstLine"
-      my replyCode 400
-      my replyErrorMsg
+      #my showMsg "+++ n=negative ($n) EOF=[my connection eof] version set to 1.0"
+      my close
     }
-  } elseif {![my connection eof]} {
-    #my showMsg "+++ not completed EOF=[my connection eof]"
-  } else {
-    set version 1.0
-    #my showMsg "+++ n=negative ($n) EOF=[my connection eof] version set to 1.0"
-    my close
   }
-}
-Httpd::Wrk instproc header {} {			# Read the header
-  #my showCall
-  my instvar method data
-  if {[my connection gets line] > 0} {
-    #puts stderr line=$line
-    if {[regexp -nocase {^([^:]+): *(.+)$} $line _ key value]} {
-      my set meta([string tolower $key]) $value
-    }
-  } else {
-    #puts stderr line-EMPTY
-    if {[my exists meta(content-length)] && [my set meta(content-length)]>0} {
-      #puts stderr "we have content-length [my set meta(content-length)]"
-      set data ""
-      my connection translation binary
-      my connection event readable [self] receive-body
-    } elseif {[my exists meta(content-type)] &&
-	      [regexp -nocase {multipart/form-data; *boundary=} \
-		   [my set meta(content-type)]]} {
-      #puts stderr "formdata"
-      set data ""
-      my connection event readable [self] receive-body
+  Httpd::Wrk instproc header {} {			# Read the header
+    #my showCall
+    my instvar method data
+    if {[my connection gets line] > 0} {
+      #puts stderr line=$line
+      if {[regexp -nocase {^([^:]+): *(.+)$} $line _ key value]} {
+	my set meta([string tolower $key]) $value
+      }
     } else {
-      #puts stderr "no-content-length, triggering respond"
+      #puts stderr line-EMPTY
+      if {[my exists meta(content-length)] && [my set meta(content-length)]>0} {
+	#puts stderr "we have content-length [my set meta(content-length)]"
+	set data ""
+	my connection translation binary
+	my connection event readable [self] receive-body
+      } elseif {[my exists meta(content-type)] &&
+		[regexp -nocase {multipart/form-data; *boundary=} \
+		     [my set meta(content-type)]]} {
+	#puts stderr "formdata"
+	set data ""
+	my connection event readable [self] receive-body
+      } else {
+	#puts stderr "no-content-length, triggering respond"
+	my connection event readable [self] ""
+	[my info parent] instvar requiresBody
+	if {$requiresBody($method)} {
+	  my replyCode 411
+	  my replyErrorMsg
+	} else {
+	  my check-redirect
+	}
+      }
+    }
+  }
+  Httpd::Wrk instproc receive-body {} {	;# ... now we have to read the body
+    #my showCall
+    my instvar method data meta
+    set d [my connection read]
+    if {[string length $d] > 0} {
+      append data $d
+      #my showMsg "datal=[string length $data], cl=$meta(content-length)"
+      if {[string length $data] >= $meta(content-length)} {
+	my connection event readable [self] ""
+	if {$method == "POST"} { my decode-POST-query  }
+	my check-redirect
+      }
+    } else {   ;# 0 byte, must be eof...
+      my showMsg "received 0 bytes"
       my connection event readable [self] ""
-      [my info parent] instvar requiresBody
-      if {$requiresBody($method)} {
-	my replyCode 411
+      if {[string length $data] < $meta(content-length)} {
+	my replyCode 404
 	my replyErrorMsg
       } else {
 	my check-redirect
       }
     }
   }
-}
-Httpd::Wrk instproc receive-body {} {	;# ... now we have to read the body
-  #my showCall
-  my instvar method data meta
-  set d [my connection read]
-  if {[string length $d] > 0} {
-    append data $d
-    #my showMsg "datal=[string length $data], cl=$meta(content-length)"
-    if {[string length $data] >= $meta(content-length)} {
-      my connection event readable [self] ""
-      if {$method == "POST"} { my decode-POST-query  }
-      my check-redirect
+  Httpd::Wrk instproc unmodified mtime {
+    my instvar meta
+    if {[info exists meta(if-modified-since)]} {
+      set ms $meta(if-modified-since)
+      regexp {^([^;]+);(.*)$} $ms _ ms options
+      if {[catch {set mss [clock scan $ms]}]} {
+	regsub -all -- {-} $ms " " ms
+	if {[catch {set mss [clock scan $ms]}]} {
+	  set ms [lreplace $ms end end]
+	  set mss [clock scan $ms]
+	}
+      }
+      return [expr {$mtime <= $mss}]
     }
-  } else {   ;# 0 byte, must be eof...
-    my showMsg "received 0 bytes"
-    my connection event readable [self] ""
-    if {[string length $data] < $meta(content-length)} {
-      my replyCode 404
-      my replyErrorMsg
-    } else {
-      my check-redirect
-    }
+    return 0
   }
-}
-Httpd::Wrk instproc unmodified mtime {
-  my instvar meta
-  if {[info exists meta(if-modified-since)]} {
-    set ms $meta(if-modified-since)
-    regexp {^([^;]+);(.*)$} $ms _ ms options
-    if {[catch {set mss [clock scan $ms]}]} {
-      regsub -all -- {-} $ms " " ms
-      if {[catch {set mss [clock scan $ms]}]} {
-	set ms [lreplace $ms end end]
-	set mss [clock scan $ms]
+  Httpd::Wrk instproc check-redirect {} {	
+    [my info parent] instvar redirects
+    my instvar resourceName hasFormData query
+    set resource $resourceName$hasFormData$query
+    foreach {pattern hostport} $redirects {
+      #puts stderr "match <$pattern> <$resource> [regexp $pattern $resource]"
+      if {[regexp $pattern $resource]} {
+	#puts stderr "do redirect to $hostport/$resource"
+	my replyCode 302 location $hostport/$resource
+	my replyErrorMsg
+	return
       }
     }
-    return [expr {$mtime <= $mss}]
+    my respond
   }
-  return 0
-}
-Httpd::Wrk instproc check-redirect {} {	
-  [my info parent] instvar redirects
-  my instvar resourceName hasFormData query
-  set resource $resourceName$hasFormData$query
-  foreach {pattern hostport} $redirects {
-    #puts stderr "match <$pattern> <$resource> [regexp $pattern $resource]"
-    if {[regexp $pattern $resource]} {
-      #puts stderr "do redirect to $hostport/$resource"
-      my replyCode 302 location $hostport/$resource
+  Httpd::Wrk instproc respond {} {			# Respond to the query
+    # the request was read completely...   This method is wellsuited for mixins!
+    my respond-[my set method]
+  }
+
+  Httpd::Wrk instproc respond-GET {} {
+    #my showCall
+    my instvar fileName
+    my sendFile $fileName
+  }
+  Httpd::Wrk instproc respond-HEAD {} {			# Respond to the query
+    my instvar fileName
+    if {[file readable $fileName]} {
+      my replyCode 200 \
+	  Last-Modified [Httpd Date [file mtime $fileName]] \
+	  Content-Type [Mime guessContentType $fileName] \
+	  Content-Length [file size $fileName]
+      my connection puts ""
+      #my log Done "$fileName [Mime guessContentType $fileName]"
+      my close
+    } else {
+      my replyCode 404
       my replyErrorMsg
-      return
     }
   }
-  my respond
-}
-Httpd::Wrk instproc respond {} {			# Respond to the query
-  # the request was read completely...   This method is wellsuited for mixins!
-  my respond-[my set method]
-}
-
-Httpd::Wrk instproc respond-GET {} {
-  #my showCall
-  my instvar fileName
-  my sendFile $fileName
-}
-Httpd::Wrk instproc respond-HEAD {} {			# Respond to the query
-  my instvar fileName
-  if {[file readable $fileName]} {
+  Httpd::Wrk instproc respond-OPTIONS {} {			# Respond to the query
     my replyCode 200 \
-	Last-Modified [Httpd Date [file mtime $fileName]] \
-	Content-Type [Mime guessContentType $fileName] \
-	Content-Length [file size $fileName]
+	Allow "OPTIONS, GET, HEAD, POST" \
+	Public "OPTIONS, GET, HEAD, POST"
     my connection puts ""
-    #my log Done "$fileName [Mime guessContentType $fileName]"
     my close
-  } else {
-    my replyCode 404
-    my replyErrorMsg
   }
-}
-Httpd::Wrk instproc respond-OPTIONS {} {			# Respond to the query
-  my replyCode 200 \
-      Allow "OPTIONS, GET, HEAD, POST" \
-      Public "OPTIONS, GET, HEAD, POST"
-  my connection puts ""
-  my close
-}
-Httpd::Wrk instproc respond-PUT {} {
-  my instvar data method fileName
-  my replyCode [expr {[file writable $fileName] ? 200 : 201}]
-  my connection puts ""
-  set out [open $fileName w]
-  fconfigure $out -translation binary
-  puts -nonewline $out $data
-  my log Done "$fileName [Mime guessContentType $fileName]"
-  close $out
-  my close
-}
-Httpd::Wrk instproc respond-CGI {} {
-  my instvar fileName
-  if {[file executable $fileName]} {
-    my replyCode 200
-    my connection puts [exec $fileName]      ;# no parameter handling yet
+  Httpd::Wrk instproc respond-PUT {} {
+    my instvar data method fileName
+    my replyCode [expr {[file writable $fileName] ? 200 : 201}]
+    my connection puts ""
+    set out [open $fileName w]
+    fconfigure $out -translation binary
+    puts -nonewline $out $data
+    my log Done "$fileName [Mime guessContentType $fileName]"
+    close $out
     my close
-  } else {
-    my replyCode 403
-    my replyErrorMsg
   }
-}
-Httpd::Wrk instproc new-formData {} {
-  set arg [Object create [self]::[my autoname formData]]
-  my lappend formData $arg
-  return $arg
-}
-Httpd::Wrk instproc decode-formData {query} {
-  #my showCall
-  foreach pair [split [string trimleft $query \n] &] {
-    set arg [my new-formData]
-    if {[regexp {^(.+)=(.*)$} $pair _ name content]} {
-      $arg set name [url decodeItem $name]
-      $arg set content [url decodeItem $content]
+  Httpd::Wrk instproc respond-CGI {} {
+    my instvar fileName
+    if {[file executable $fileName]} {
+      my replyCode 200
+      my connection puts [exec $fileName]      ;# no parameter handling yet
+      my close
     } else {
-      $arg set content [url decodeItem $pair]
+      my replyCode 403
+      my replyErrorMsg
     }
   }
-}
-Httpd::Wrk instproc decode-POST-query {} {
-  if {[my exists meta(content-type)]} {
-    set ct [my set meta(content-type)]
-    if {[regexp -nocase {application/x-www-form-urlencoded} $ct]} {
-      #my showMsg "ordinary FORM"
-      my decode-formData [my set data]
-      return
-    } elseif {[regexp -nocase {multipart/form-data; *boundary=(.*)$} $ct \
-		   _ boundary]} {
-      #my showMsg "multipart FORM"
-      set parts [my set data]
-      set bl [expr {[string length $boundary]+2}]
-      while {[set endIDX [string first --$boundary $parts]] > -1} {
-	set part [string range $parts $bl [expr {$endIDX-1}]]
-	if {[set endHD [string first \r\n\r\n $part]] > -1} {
-	  set arg [my new-formData]
-	  if {[catch {Mime multipart-decode-header \
-			  [string range $part 0 [expr {$endHD-1}]] \
-			  $arg} msg]} {
-	    my replyCode 406
-	    my replyErrorMsg $msg
-	    return 0
+  Httpd::Wrk instproc new-formData {} {
+    set arg [Object create [self]::[my autoname formData]]
+    my lappend formData $arg
+    return $arg
+  }
+  Httpd::Wrk instproc decode-formData {query} {
+    #my showCall
+    foreach pair [split [string trimleft $query \n] &] {
+      set arg [my new-formData]
+      if {[regexp {^(.+)=(.*)$} $pair _ name content]} {
+	$arg set name [url decodeItem $name]
+	$arg set content [url decodeItem $content]
+      } else {
+	$arg set content [url decodeItem $pair]
+      }
+    }
+  }
+  Httpd::Wrk instproc decode-POST-query {} {
+    if {[my exists meta(content-type)]} {
+      set ct [my set meta(content-type)]
+      if {[regexp -nocase {application/x-www-form-urlencoded} $ct]} {
+	#my showMsg "ordinary FORM"
+	my decode-formData [my set data]
+	return
+      } elseif {[regexp -nocase {multipart/form-data; *boundary=(.*)$} $ct \
+		     _ boundary]} {
+	#my showMsg "multipart FORM"
+	set parts [my set data]
+	set bl [expr {[string length $boundary]+2}]
+	while {[set endIDX [string first --$boundary $parts]] > -1} {
+	  set part [string range $parts $bl [expr {$endIDX-1}]]
+	  if {[set endHD [string first \r\n\r\n $part]] > -1} {
+	    set arg [my new-formData]
+	    if {[catch {Mime multipart-decode-header \
+			    [string range $part 0 [expr {$endHD-1}]] \
+			    $arg} msg]} {
+	      my replyCode 406
+	      my replyErrorMsg $msg
+	      return 0
+	    }
+	    $arg set content [string range $part \
+				  [expr {$endHD + 4}] \
+				  [expr {[string length $part] -3}]]
+	    #$arg showVars
 	  }
-	  $arg set content [string range $part \
-				[expr {$endHD + 4}] \
-				[expr {[string length $part] -3}]]
-	  #$arg showVars
+	  set parts [string range $parts [expr {$endIDX+2}] end]
 	}
-	set parts [string range $parts [expr {$endIDX+2}] end]
       }
     }
   }
-}
-Httpd::Wrk instproc respond-POST {} {
-  my replyCode 405
-  my replyErrorMsg
-  #my respond-CGI
-}
+  Httpd::Wrk instproc respond-POST {} {
+    my replyCode 405
+    my replyErrorMsg
+    #my respond-CGI
+  }
 
-Httpd::Wrk instproc replyErrorMsg {{msg ""} args} {
-  my instvar replyCode
-  [self class] instvar codes
-  foreach {tag value} $args {my connection puts "$tag: $value"}
-  my sendText "\n<HTML><title>Status Code: $replyCode</title>\n\
+  Httpd::Wrk instproc replyErrorMsg {{msg ""} args} {
+    my instvar replyCode
+    [self class] instvar codes
+    foreach {tag value} $args {my connection puts "$tag: $value"}
+    my sendText "\n<HTML><title>Status Code: $replyCode</title>\n\
       <BODY>$msg<p>\n\
       Status Code $replyCode: <b>$codes($replyCode)</b><br>\n\
       Resource Name: [my set resourceName]</BODY></HTML>\n"
-  my close  ;# close must be last call
-}
-Httpd::Wrk instproc replyCode {code args} {
-  #my showCall
-  my instvar version
-  [self class] instvar codes
-  my set replyCode $code
-  my connection puts "HTTP/$version $code $codes($code)"
-  foreach {tag value} [my set replyHeaderFields] {my connection puts "$tag: $value"}
-  foreach {tag value} $args {my connection puts "$tag: $value"}
-  if {$code >= 400} {
-    my log Error "$code $codes($code)\tmeta: [my array get meta]"
-  }  else {
-    my log Done "$code $codes($code)"
+    my close  ;# close must be last call
   }
-}
-Httpd::Wrk instproc sendText {response {type text/html}} {
-  #my showCall
-  my connection puts "Content-Type: $type"
-  # bei einer leeren Responses blockieren Klienten und melden Fehler
-  if {$response == ""} { set response " " }
-  my connection puts "Content-Length: [string length $response]\n"
-  if {[my set method] != "HEAD"} {
-    my connection fconfigure -translation {auto binary}
-    my connection puts-nonewline $response
-  } else {
-    my showMsg HEAD!
+  Httpd::Wrk instproc replyCode {code args} {
+    #my showCall
+    my instvar version
+    [self class] instvar codes
+    my set replyCode $code
+    my connection puts "HTTP/$version $code $codes($code)"
+    foreach {tag value} [my set replyHeaderFields] {my connection puts "$tag: $value"}
+    foreach {tag value} $args {my connection puts "$tag: $value"}
+    if {$code >= 400} {
+      my log Error "$code $codes($code)\tmeta: [my array get meta]"
+    }  else {
+      my log Done "$code $codes($code)"
+    }
   }
-}
-Httpd::Wrk instproc sendMsg {response {type text/html}} {
-  # my showCall
-  my replyCode 200
-  my sendText $response $type 
-  my close
-}
-Httpd::Wrk instproc sendDir {dirName} {
-  [my info parent] instvar root
-  set title "Directory listing"
-  set reply "<HTML><TITLE>$title</TITLE><BODY><H1>$title</H1>\n<TABLE>\n"
-  set oldpwd [pwd]
-  cd $root
-  set dirs ""; set files ""
-  foreach f [lsort -dictionary [glob -nocomplain ./$dirName/*]] {
-    set full [file join $root $f]
-    set pname [string trimleft $f ./]
-    if {[file isdir $full]} {
-      append pname /
+  Httpd::Wrk instproc sendText {response {type text/html}} {
+    #my showCall
+    my connection puts "Content-Type: $type"
+    # bei einer leeren Responses blockieren Klienten und melden Fehler
+    if {$response == ""} { set response " " }
+    my connection puts "Content-Length: [string length $response]\n"
+    if {[my set method] != "HEAD"} {
+      my connection fconfigure -translation {auto binary}
+      my connection puts-nonewline $response
+    } else {
+      my showMsg HEAD!
     }
-    if {![catch {set size [file size $full]}]} {
-      # it is not a broken link
-      set entry ""
-      append entry <tr> \
-	  <td> "<A href='/$pname'>$pname</a>"    </td> \
-	  "<td align='right'>" $size </td> \
-	  "<td align='right'>" [clock format [file mtime $full]] </td> \
-	  </tr>\n
-      if {[string match */ $pname]} {append dirs $entry} else {append files $entry}
+  }
+  Httpd::Wrk instproc sendMsg {response {type text/html}} {
+    # my showCall
+    my replyCode 200
+    my sendText $response $type 
+    my close
+  }
+  Httpd::Wrk instproc sendDir {dirName} {
+    [my info parent] instvar root
+    set title "Directory listing"
+    set reply "<HTML><TITLE>$title</TITLE><BODY><H1>$title</H1>\n<TABLE>\n"
+    set oldpwd [pwd]
+    cd $root
+    set dirs ""; set files ""
+    foreach f [lsort -dictionary [glob -nocomplain ./$dirName/*]] {
+      set full [file join $root $f]
+      set pname [string trimleft $f ./]
+      if {[file isdir $full]} {
+	append pname /
+      }
+      if {![catch {set size [file size $full]}]} {
+	# it is not a broken link
+	set entry ""
+	append entry <tr> \
+	    <td> "<A href='/$pname'>$pname</a>"    </td> \
+	    "<td align='right'>" $size </td> \
+	    "<td align='right'>" [clock format [file mtime $full]] </td> \
+	    </tr>\n
+	if {[string match */ $pname]} {append dirs $entry} else {append files $entry}
+      }
     }
+    append reply $dirs $files "</TABLE></HTML>\n"
+    cd $oldpwd
+    my sendMsg $reply
+    return
   }
-  append reply $dirs $files "</TABLE></HTML>\n"
-  cd $oldpwd
-  my sendMsg $reply
-  return
-}
 
-Httpd::Wrk instproc sendFile {fn {type ""}} {
-  #my showCall
-  if {[file isdirectory $fn]} {
-    set full [file join $fn index.html]
-    if {[file readable $full]} {
-      set fn $full
-    } else {
-      my sendDir [my set resourceName]
-      return
+  Httpd::Wrk instproc sendFile {fn {type ""}} {
+    #my showCall
+    if {[file isdirectory $fn]} {
+      set full [file join $fn index.html]
+      if {[file readable $full]} {
+	set fn $full
+      } else {
+	my sendDir [my set resourceName]
+	return
+      }
     }
-  }
-  #puts stderr "readable '$fn' [file readable $fn]"
-  if {[file readable $fn]} {
-    set mtime [file mtime $fn]
-    if {[my unmodified $mtime]} { 
-      my replyCode 304
+    #puts stderr "readable '$fn' [file readable $fn]"
+    if {[file readable $fn]} {
+      set mtime [file mtime $fn]
+      if {[my unmodified $mtime]} { 
+	my replyCode 304
+	my replyErrorMsg
+	return 
+      }
+      if {$type == ""} {set type [Mime guessContentType $fn]}
+      my replyCode 200 \
+	  Last-Modified [Httpd Date $mtime] \
+	  Content-Type $type \
+	  Content-Length [file size $fn]
+      my connection puts ""
+      my connection fconfigure -translation binary ;#-buffersize 65536
+      set localFile [open $fn]
+      fconfigure $localFile -translation binary -buffersize 65536
+      fcopy $localFile [my connection set socket] \
+	  -command [list [self] fcopy-end $localFile]
+    } else {
+      my replyCode 404
       my replyErrorMsg
-      return 
     }
-    if {$type == ""} {set type [Mime guessContentType $fn]}
-    my replyCode 200 \
-	Last-Modified [Httpd Date $mtime] \
-	Content-Type $type \
-	Content-Length [file size $fn]
-    my connection puts ""
-    my connection fconfigure -translation binary ;#-buffersize 65536
-    set localFile [open $fn]
-    fconfigure $localFile -translation binary -buffersize 65536
-    fcopy $localFile [my connection set socket] \
-	-command [list [self] fcopy-end $localFile]
-  } else {
-    my replyCode 404
-    my replyErrorMsg
   }
-}
-Httpd::Wrk instproc fcopy-end {localFile args} {	# End of fcopy
-  close $localFile
-  my connection fconfigure -blocking false ;# fconfigure changes blocking in 8.3.2!
-  my close
-}
-Httpd::Wrk instproc log {reason arg} {			# trivial logging
-  my instvar port ipaddr
-  if {[my exists user]} {
-    set user [my set user]/[my set realm]
-  } {set user -}
-  [my info parent] instvar logfile
-  puts $logfile "[clock format [clock seconds]] $user $ipaddr:$port\t$reason\t$arg"
-  flush $logfile
-}
+  Httpd::Wrk instproc fcopy-end {localFile args} {	# End of fcopy
+    close $localFile
+    my connection fconfigure -blocking false ;# fconfigure changes blocking in 8.3.2!
+    my close
+  }
+  Httpd::Wrk instproc log {reason arg} {			# trivial logging
+    my instvar port ipaddr
+    if {[my exists user]} {
+      set user [my set user]/[my set realm]
+    } {set user -}
+    [my info parent] instvar logfile
+    puts $logfile "[clock format [clock seconds]] $user $ipaddr:$port\t$reason\t$arg"
+    flush $logfile
+  }
 
 
-#########################################################################
-Class Httpsd -superclass Httpd -parameter {
-  {port 443}
-  {httpdWrk Httpsd::Wrk}
-  {requestCert 0}
-  {requireValidCert 0}
-  {certfile filename.crt}
-  {keyfile filename.key}
-  {cafile cacert.pem}
-  {infoCb {}}
-}
-Httpsd instproc init args {
-  package require tls
-  proc tls::password {} {
-    puts stderr "getting passwd"
-    return pemp
+  #########################################################################
+  Class Httpsd -superclass Httpd -parameter {
+    {port 443}
+    {httpdWrk Httpsd::Wrk}
+    {requestCert 0}
+    {requireValidCert 0}
+    {certfile filename.crt}
+    {keyfile filename.key}
+    {cafile cacert.pem}
+    {infoCb {}}
   }
-  next
-}
+  Httpsd instproc init args {
+    package require tls
+    proc tls::password {} {
+      puts stderr "getting passwd"
+      return pemp
+    }
+    next
+  }
 
-Class Httpsd::Wrk -superclass Httpd::Wrk
-Httpsd::Wrk instproc firstLine {} {
-  my set forceVersion1.0 1
-  my lappend replyHeaderFields Connection close
-  next
-}
-Httpsd::Wrk instproc makeConnection {socket} {
-  Connection create [self]::connection -socket $socket -req [self]
-  [my info parent] instvar \
-      keyfile certfile cafile infoCb requestCert requireValidCert
-  # SSL-enable a regular Tcl channel - it need not be a socket, but
-  # must provide bi-directional flow. Also setting session parameters
-  # for SSL handshake. www.sensus.org/tcl/tls.htm
-  
-  # -request bool --> Request a certificate from peer during SSL
-  # handshake. (default: true)
-  
-  # -require bool --> Require a valid certificate from peer during SSL
-  # handshake. If this is set to true then -request must also be set
-  # to true. (default: false)
-       
-  # -server bool --> Handshake as server if true, else handshake as
-  # client.(default: false)
-  my connection importSSL -server 1 \
-       -certfile  $certfile \
-      -keyfile  $keyfile \
-      -cafile    $cafile \
-      -request   $requestCert \
-      -require   $requireValidCert \
-      -command   $infoCb
-}
-#########################################################################
+  Class Httpsd::Wrk -superclass Httpd::Wrk
+  Httpsd::Wrk instproc firstLine {} {
+    my set forceVersion1.0 1
+    my lappend replyHeaderFields Connection close
+    next
+  }
+  Httpsd::Wrk instproc makeConnection {socket} {
+    Connection create [self]::connection -socket $socket -req [self]
+    [my info parent] instvar \
+	keyfile certfile cafile infoCb requestCert requireValidCert
+    # SSL-enable a regular Tcl channel - it need not be a socket, but
+    # must provide bi-directional flow. Also setting session parameters
+    # for SSL handshake. www.sensus.org/tcl/tls.htm
+    
+    # -request bool --> Request a certificate from peer during SSL
+    # handshake. (default: true)
+    
+    # -require bool --> Require a valid certificate from peer during SSL
+    # handshake. If this is set to true then -request must also be set
+    # to true. (default: false)
+    
+    # -server bool --> Handshake as server if true, else handshake as
+    # client.(default: false)
+    my connection importSSL -server 1 \
+	-certfile  $certfile \
+	-keyfile  $keyfile \
+	-cafile    $cafile \
+	-request   $requestCert \
+	-require   $requireValidCert \
+	-command   $infoCb
+  }
+  #########################################################################
 
 
 
-###
-### Mixin-Classes for respond patterns
-### mixes into Http and Httpd::Wrk 
-###
-Class Responder
-Responder instproc init args {
-  next
-  my lappend workerMixins Responder::Wrk
-  my set respondpatterns {}
-  # Example how to register new methods: regexp is matched with the triple
-  # (HTTP-METHOD URL HASFORMDATA) where HASFORMDATA is empty when no
-  # parameters are given. The parsed components of the url etc. are
-  # available as instvars
-  my actions {^GET cgi[-]bin [?]} respond-CGI
-}
-Responder instproc actions {regexp method} {
-  my lappend respondpatterns $regexp $method
-}
-Class Responder::Wrk
-Responder::Wrk instproc respond {} {
-  my instvar fileName method resourceName hasFormData
-  [my info parent] instvar respondpatterns
-  ### auch das ist ein kandidat fuer eine chain of responsibility
-  foreach {pattern action} $respondpatterns {
-    if {[regexp $pattern "$method $resourceName $hasFormData"]} {
-      my $action
-      return
+  ###
+  ### Mixin-Classes for respond patterns
+  ### mixes into Http and Httpd::Wrk 
+  ###
+  Class Httpd::Responder
+  Httpd::Responder instproc init args {
+    next
+    my lappend workerMixins Httpd::Responder::Wrk
+    my set respondpatterns {}
+    # Example how to register new methods: regexp is matched with the triple
+    # (HTTP-METHOD URL HASFORMDATA) where HASFORMDATA is empty when no
+    # parameters are given. The parsed components of the url etc. are
+    # available as instvars
+    my actions {^GET cgi[-]bin [?]} respond-CGI
+  }
+  Httpd::Responder instproc actions {regexp method} {
+    my lappend respondpatterns $regexp $method
+  }
+  Class Httpd::Responder::Wrk
+  Httpd::Responder::Wrk instproc respond {} {
+    my instvar fileName method resourceName hasFormData
+    [my info parent] instvar respondpatterns
+    ### auch das ist ein kandidat fuer eine chain of responsibility
+    foreach {pattern action} $respondpatterns {
+      if {[regexp $pattern "$method $resourceName $hasFormData"]} {
+	my $action
+	return
+      }
     }
+    next
   }
-  next
-}
 
-###
-### Mixin-Classes for Access Control
-### mixes into Http and Httpd::Wrk
-###
-Class AccessControl
-AccessControl abstract instproc protectedResource {fn method varAuthMethod varRealm}
-AccessControl abstract instproc credentialsNotOk {wrk credentials authMethod realm}
-AccessControl abstract instproc addRealmFile {realm authFile}
-AccessControl abstract instproc addRealmEntry {realm passwds}
-AccessControl abstract instproc protectDir {realm path methods}
+  ###
+  ### Mixin-Classes for Access Control
+  ### mixes into Http and Httpd::Wrk
+  ###
+  Class Httpd::AccessControl
+  Httpd::AccessControl abstract instproc protectedResource {fn method varAuthMethod varRealm}
+  Httpd::AccessControl abstract instproc credentialsNotOk {wrk credentials authMethod realm}
+  Httpd::AccessControl abstract instproc addRealmFile {realm authFile}
+  Httpd::AccessControl abstract instproc addRealmEntry {realm passwds}
+  Httpd::AccessControl abstract instproc protectDir {realm path methods}
 
-Class AccessControl::Wrk
-AccessControl::Wrk instproc respond {} {
-  my instvar fileName method digestChallengeData
-  set controller [my info parent]
-  if {[$controller protectedResource $fileName $method authMethod realm]} {
-    #my showMsg "*** Protected resource: $fileName $method"
-    if {![my exists meta(authorization)] ||
-	[$controller credentialsNotOk [self] \
-	     [my set meta(authorization)] $authMethod $realm]} {
-      my unauthorizedAccess $realm
-      return
+  Class Httpd::AccessControl::Wrk
+  Httpd::AccessControl::Wrk instproc respond {} {
+    my instvar fileName method digestChallengeData
+    set controller [my info parent]
+    if {[$controller protectedResource $fileName $method authMethod realm]} {
+      #my showMsg "*** Protected resource: $fileName $method"
+      if {![my exists meta(authorization)] ||
+	  [$controller credentialsNotOk [self] \
+	       [my set meta(authorization)] $authMethod $realm]} {
+	my unauthorizedAccess $realm
+	return
+      }
     }
+    next
   }
-  next
-}
 
-###########################################################################
-## Basic Access Control
-###########################################################################
-Class BasicAccessControl -superclass AccessControl
+  ###########################################################################
+  ## Basic Access Control
+  ###########################################################################
+  Class Httpd::BasicAccessControl -superclass Httpd::AccessControl
 
-BasicAccessControl instproc initWorkerMixins {} {
-  my lappend workerMixins [self class]::Wrk
-}
+  Httpd::BasicAccessControl instproc initWorkerMixins {} {
+    my lappend workerMixins [self class]::Wrk
+  }
 
-BasicAccessControl instproc init args {
-  next
-  my initWorkerMixins
-}
+  Httpd::BasicAccessControl instproc init args {
+    next
+    my initWorkerMixins
+  }
 
-BasicAccessControl instproc protectedResource {fn method varAuthMethod varRealm} {
-  #my showCall
-  # check whether access to $fn via $method is protected
-  upvar [self callinglevel] $varAuthMethod authMethod $varRealm realm
-  # we check only the current directory, not the parent directories
-  if {[string match */ $fn]} {
-    set path $fn
-  } else {
-    set path [file dirname $fn]/
-  } 
-  foreach i [list $path $path:$method] {
-    if {[my exists protected($i)]} {
-      set realm [my set protected($i)]
-      set authMethod Basic
-      return 1
+  Httpd::BasicAccessControl instproc protectedResource {fn method varAuthMethod varRealm} {
+    #my showCall
+    # check whether access to $fn via $method is protected
+    upvar [self callinglevel] $varAuthMethod authMethod $varRealm realm
+    # we check only the current directory, not the parent directories
+    if {[string match */ $fn]} {
+      set path $fn
+    } else {
+      set path [file dirname $fn]/
+    } 
+    foreach i [list $path $path:$method] {
+      if {[my exists protected($i)]} {
+	set realm [my set protected($i)]
+	set authMethod Basic
+	return 1
+      }
     }
+    return 0
   }
-  return 0
-}
 
-BasicAccessControl instproc credentialsNotOk {wrk credentials authMethod realm} {
-  # check whether $credentials are sufficient for $realm
-  regexp {^(.*):(.*)$} [base64 decode [lindex $credentials 1]] _ user pwd
-  #puts stderr "passwd($realm:$user)=[my exists passwd($realm:$user)]"
-  $wrk set user $user
-  $wrk set realm $realm
-  if {[my exists passwd($realm:$user)]} {
-    return [expr {[my set passwd($realm:$user)] != $pwd}]
+  Httpd::BasicAccessControl instproc credentialsNotOk {wrk credentials authMethod realm} {
+    # check whether $credentials are sufficient for $realm
+    regexp {^(.*):(.*)$} [base64 decode [lindex $credentials 1]] _ user pwd
+    #puts stderr "passwd($realm:$user)=[my exists passwd($realm:$user)]"
+    $wrk set user $user
+    $wrk set realm $realm
+    if {[my exists passwd($realm:$user)]} {
+      return [expr {[my set passwd($realm:$user)] != $pwd}]
+    }
+    return 1
   }
-  return 1
-}
 
-BasicAccessControl instproc addRealmEntry {realm passwds} {
-  if {[llength $passwds] == 1} {
-    my addRealmFile [lindex $passwds 0]
-  } else {
-    foreach {name pwd} $passwds {
-      #puts stderr "realm='$realm' adding user: $name pw: $pwd"
-      my set passwd($realm:$name) $pwd
+  Httpd::BasicAccessControl instproc addRealmEntry {realm passwds} {
+    if {[llength $passwds] == 1} {
+      my addRealmFile [lindex $passwds 0]
+    } else {
+      foreach {name pwd} $passwds {
+	#puts stderr "realm='$realm' adding user: $name pw: $pwd"
+	my set passwd($realm:$name) $pwd
+      }
     }
   }
-}
-BasicAccessControl instproc addRealmFile {realm authFile} {
-  set FILE [open $authFile r]
-  while {![eof $FILE]} {
-    foreach {name pwd} [split [gets $FILE] :] {
-      my addRealmEntry $realm [list $name $pwd]
+  Httpd::BasicAccessControl instproc addRealmFile {realm authFile} {
+    set FILE [open $authFile r]
+    while {![eof $FILE]} {
+      foreach {name pwd} [split [gets $FILE] :] {
+	my addRealmEntry $realm [list $name $pwd]
+      }
     }
+    close $FILE
   }
-  close $FILE
-}
 
-BasicAccessControl instproc protectDir {realm path methods} {
-  my instvar root
-  my checkRoot
-  set resource $root/$path      ;# resources are currently directories
-  if {$methods == {}} {
-    my set protected($resource) $realm       ;#for every method
-  } else {
-    foreach m $methods {
-      my set protected($resource:$m) $realm  ;#for selected methods
+  Httpd::BasicAccessControl instproc protectDir {realm path methods} {
+    my instvar root
+    my checkRoot
+    set resource $root/$path      ;# resources are currently directories
+    if {$methods == {}} {
+      my set protected($resource) $realm       ;#for every method
+    } else {
+      foreach m $methods {
+	my set protected($resource:$m) $realm  ;#for selected methods
+      }
     }
   }
-}
-Class BasicAccessControl::Wrk -superclass AccessControl::Wrk
-BasicAccessControl::Wrk instproc unauthorizedAccess {realm} {
-  my set digestChallengeData(realm) $realm
-  my replyCode 401 www-authenticate "Basic realm=\"$realm\""
-  my replyErrorMsg "Unauthorized request for realm '$realm'" 
-}
+  Class Httpd::BasicAccessControl::Wrk -superclass Httpd::AccessControl::Wrk
+  Httpd::BasicAccessControl::Wrk instproc unauthorizedAccess {realm} {
+    my set digestChallengeData(realm) $realm
+    my replyCode 401 www-authenticate "Basic realm=\"$realm\""
+    my replyErrorMsg "Unauthorized request for realm '$realm'" 
+  }
 
 
 
-###########################################################################
-## Digest Access Control
-###########################################################################
-Class DigestAccessControl -superclass BasicAccessControl
-DigestAccessControl instproc init args {
-  package require tcu
-  next
-  my lappend workerMixins [self class]::Wrk
-}
-DigestAccessControl instproc credentialsNotOk {wrk credentials authMethod realm} {
-  # check whether $credentials are sufficient for $realm
-  my showMsg "Digest Authentication ..."
-  # HELP FD: hier muss ich noch �berpr�fen, ob die digest-header
-  # (credentials) ok sind. Hier habe ich probleme auf die sachen,
-  # die der worker gesendet (bspw. nonce) hat zu kommen. Ich
-  # wei�, man kann mit [my info children] daran kommen. Aber,
-  # was ist, wenn man mehrere Worker hat?
+  ###########################################################################
+  ## Digest Access Control
+  ###########################################################################
+  Class Httpd::DigestAccessControl -superclass Httpd::BasicAccessControl
+  Httpd::DigestAccessControl instproc init args {
+    package require tcu
+    next
+    my lappend workerMixins [self class]::Wrk
+  }
+  Httpd::DigestAccessControl instproc credentialsNotOk {wrk credentials authMethod realm} {
+    # check whether $credentials are sufficient for $realm
+    my showMsg "Digest Authentication ..."
+    # HELP FD: hier muss ich noch �berpr�fen, ob die digest-header
+    # (credentials) ok sind. Hier habe ich probleme auf die sachen,
+    # die der worker gesendet (bspw. nonce) hat zu kommen. Ich
+    # wei�, man kann mit [my info children] daran kommen. Aber,
+    # was ist, wenn man mehrere Worker hat?
 
-  ## Fredj, das sollte kein Problem sein: das credentialsNotOk wird
-  ## vom aktuellen worker (respond) aufgerufen. man kann dem *NotOk
-  ## den worker mitgeben, oder die beiden Methoden etwas umorganisieren.
-  return
-}
-Class DigestAccessControl::Wrk -superclass BasicAccessControl::Wrk
-DigestAccessControl::Wrk instproc unauthorizedAccess {realm} {
-  my set digestChallengeData(realm) $realm
-  my replyCode 401 www-authenticate "Digest [my digestChallenge]"
-  my replyErrorMsg "Unauthorized request for realm '$realm'"
-}
-DigestAccessControl::Wrk instproc digestChallenge {} {
-  my showCall
-  my instvar digestChallengeData
-  my mkDigestChallengeData
-  set digestResponse {}
-  foreach {t v} [array get digestChallengeData] {
-    append digestResponse "$t = \"$v\", "
+    ## Fredj, das sollte kein Problem sein: das credentialsNotOk wird
+    ## vom aktuellen worker (respond) aufgerufen. man kann dem *NotOk
+    ## den worker mitgeben, oder die beiden Methoden etwas umorganisieren.
+    return
   }
-  regsub {, $} $digestResponse {} digestResponse
-  return $digestResponse
-}
-DigestAccessControl::Wrk instproc mkDigestChallengeData {} {
-  my showCall
-  my instvar digestChallengeData
+  Class Httpd::DigestAccessControl::Wrk -superclass Httpd::BasicAccessControl::Wrk
+  Httpd::DigestAccessControl::Wrk instproc unauthorizedAccess {realm} {
+    my set digestChallengeData(realm) $realm
+    my replyCode 401 www-authenticate "Digest [my digestChallenge]"
+    my replyErrorMsg "Unauthorized request for realm '$realm'"
+  }
+  Httpd::DigestAccessControl::Wrk instproc digestChallenge {} {
+    my showCall
+    my instvar digestChallengeData
+    my mkDigestChallengeData
+    set digestResponse {}
+    foreach {t v} [array get digestChallengeData] {
+      append digestResponse "$t = \"$v\", "
+    }
+    regsub {, $} $digestResponse {} digestResponse
+    return $digestResponse
+  }
+  Httpd::DigestAccessControl::Wrk instproc mkDigestChallengeData {} {
+    my showCall
+    my instvar digestChallengeData
 
-  # RFC 2617
-  #   challenge         =  "Digest" digest-challenge
-  #   digest-challenge  = 1#( realm | [ domain ] | nonce |
-  #                       [ opaque ] |[ stale ] | [ algorithm ] |
-  #                       [ qop-options ] | [auth-param] )
-  #   domain            = "domain" "=" <"> URI ( 1*SP URI ) <">
-  #   URI               = absoluteURI | abs_path
-  #   nonce             = "nonce" "=" nonce-value
-  #   nonce-value       = quoted-string
-  #   opaque            = "opaque" "=" quoted-string
-  #   stale             = "stale" "=" ( "true" | "false" )
-  #   algorithm         = "algorithm" "=" ( "MD5" | "MD5-sess" | token )
-  #   qop-options       = "qop" "=" <"> 1#qop-value <">
-  #   qop-value         = "auth" | "auth-int" | token
+    # RFC 2617
+    #   challenge         =  "Digest" digest-challenge
+    #   digest-challenge  = 1#( realm | [ domain ] | nonce |
+    #                       [ opaque ] |[ stale ] | [ algorithm ] |
+    #                       [ qop-options ] | [auth-param] )
+    #   domain            = "domain" "=" <"> URI ( 1*SP URI ) <">
+    #   URI               = absoluteURI | abs_path
+    #   nonce             = "nonce" "=" nonce-value
+    #   nonce-value       = quoted-string
+    #   opaque            = "opaque" "=" quoted-string
+    #   stale             = "stale" "=" ( "true" | "false" )
+    #   algorithm         = "algorithm" "=" ( "MD5" | "MD5-sess" | token )
+    #   qop-options       = "qop" "=" <"> 1#qop-value <">
+    #   qop-value         = "auth" | "auth-int" | token
 
-  # FD: hier w�rde man die n�tigen parametern (nonce,domain,opaque,
-  # etc.) berechnen und in dem asso. Array speichern.
-  # FD: minimale Anforderung
-  set digestChallengeData(nonce)  [my genNonce]
-  set digestChallengeData(opaque) [base64 encode [self]:my-self-spcified-string]
-  set digestChallengeData(algorithm) "MD5" ;#default
-  set digestChallengeData(qop) "auth"
-  set digestChallengeData(domain) [array names [my info parent]::protected]
-}
+    # FD: hier w�rde man die n�tigen parametern (nonce,domain,opaque,
+    # etc.) berechnen und in dem asso. Array speichern.
+    # FD: minimale Anforderung
+    set digestChallengeData(nonce)  [my genNonce]
+    set digestChallengeData(opaque) [base64 encode [self]:my-self-spcified-string]
+    set digestChallengeData(algorithm) "MD5" ;#default
+    set digestChallengeData(qop) "auth"
+    set digestChallengeData(domain) [array names [my info parent]::protected]
+  }
 
-DigestAccessControl::Wrk instproc genNonce {} {
-  my showCall
-  my instvar digestChallengeData
-  set timeStamp [clock seconds]
-  set nonce [base64 encode [md5 $timeStamp:[self]]]
-  return $nonce
-}
+  Httpd::DigestAccessControl::Wrk instproc genNonce {} {
+    my showCall
+    my instvar digestChallengeData
+    set timeStamp [clock seconds]
+    set nonce [base64 encode [md5 $timeStamp:[self]]]
+    return $nonce
+  }
 
-#Httpd h1 -port 8081 -root [glob ~/wafe]
-#Httpd h2 -port 9086 -root $root \
-    -mixin {Responder BasicAccessControl} \
-    -addRealmEntry test {test test} -protectDir test "" {} \
-    -redirect {^(mailman|pipermail|cgi-bin) http://alice.wu-wien.ac.at:80}
 
+  #
+  # example usage:
 
+  #Httpd h1 -port 8081 -root [glob ~/wafe]
+  #Httpd h2 -port 9086 -root $root \
+      -mixin {Httpd::Responder Httdp::BasicAccessControl} \
+      -addRealmEntry test {test test} -protectDir test "" {} \
+      -redirect {^(mailman|pipermail|cgi-bin) http://alice.wu-wien.ac.at:80}
+
+
+  namespace export Httpd Httpsd 
+  namespace eval Httpd               {
+    namespace export Wrk \
+	AccessControl BasicAccessControl DigestAccessControl \
+	Responder
+  }
+  namespace eval Httpsd              {
+    namespace export Wrk
+  }
+  #namespace eval Responder           {namespace export Wrk}
+  #namespace eval AccessControl       {namespace export Wrk}
+  #namespace eval BasicAccessControl  {namespace export Wrk}
+  #namespace eval DigestAccessControl {namespace export Wrk}
+}
+
+namespace import ::xotcl::comm::httpd::*
+namespace eval Httpd               {namespace import ::xotcl::comm::httpd::Httpd::*}
+namespace eval Httpsd              {namespace import ::xotcl::comm::httpd::Httpsd::*}
+#namespace eval Responder           {namespace import ::xotcl::comm::httpd::Responder::*}
+#namespace eval AccessControl       {namespace import ::xotcl::comm::httpd::AccessControl::*}
+#namespace eval BasicAccessControl  {namespace import ::xotcl::comm::httpd::BasicAccessControl::*}
+#namespace eval DigestAccessControl {namespace import ::xotcl::comm::httpd::DigestAccessControl::*}
Index: xotcl/library/comm/Imap.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/comm/Imap.xotcl	(.../Imap.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/comm/Imap.xotcl	(.../Imap.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,163 +1,174 @@
-# $Id: Imap.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: Imap.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::comm::imap 0.9
 
-Class Imap -superclass NetAccess -parameter {user}
-Imap instproc initialize args {
-  my instvar port caching tokenCounter resp token
-  set port 143
-  set caching 1
-  set resp(connect)       {"[*] OK" login}
-  set resp(login)         {"A[0-9]+ OK" loginFinished  "A[0-9]+ NO" login}
-  set resp(loginFinished) {"[*] [0-9]+" inboxSize "[*] OK" inboxSelected}
-  set resp(mailSelected)  {"[*] [0-9]+ FETCH" fetchBody 
-                           "A[0-9]+ OK " ignoreLine
-                           "[*] " ignoreLine}
-  set resp(heads)         {"[*] [0-9]+ FETCH" fetchHeaders 
-                           "A[0-9]+ OK " ignoreLine
-                           "[*] " ignoreLine}
-  set tokenCounter 0
-  next
-  set token NONE
-}
-Imap instproc err {state reply} {
-  my abort "Error in $state: $reply"
-}
-Imap instproc token {} {
-  my instvar tokenCounter
-  return [format {A%.4d} [incr tokenCounter]]
-}
-Imap instproc imapString {input} {
-  regsub -all {(["\])} $input {\\\1} output ;#"
-  return \"$output\"
-}
-Imap instproc queryServer {query state} {
-  #my showCall
-  my instvar S token
-  set token [my token]
-  puts $S "$token $query"
-  #puts stderr "$token $query"
-  flush $S
-  fileevent $S readable [list [self] response $state]
-}
-Imap instproc response {state} {
-  my instvar S resp msg token
-  set msg [gets $S]
-  #my showVars msg token
-  foreach {c newState} $resp($state) {
-    if {![regexp {^[*]} $msg] && ![regexp ^$token $msg]} {
-      my showMsg "$state: token=$token IGNORING $msg"
-      return
+package require XOTcl
+
+namespace eval ::xotcl::comm::imap {
+    namespace import ::xotcl::*
+
+    Class Imap -superclass NetAccess -parameter {user}
+    Imap instproc initialize args {
+	my instvar port caching tokenCounter resp token
+	set port 143
+	set caching 1
+	set resp(connect)       {"[*] OK" login}
+	set resp(login)         {"A[0-9]+ OK" loginFinished  "A[0-9]+ NO" login}
+	set resp(loginFinished) {"[*] [0-9]+" inboxSize "[*] OK" inboxSelected}
+	set resp(mailSelected)  {"[*] [0-9]+ FETCH" fetchBody 
+	    "A[0-9]+ OK " ignoreLine
+	    "[*] " ignoreLine}
+	set resp(heads)         {"[*] [0-9]+ FETCH" fetchHeaders 
+	    "A[0-9]+ OK " ignoreLine
+	    "[*] " ignoreLine}
+	set tokenCounter 0
+	next
+	set token NONE
     }
-    if {[regexp ^$c $msg]} {
-      #my showMsg "$state NEWSTATE $newState"
-      return [my $newState] 
+    Imap instproc err {state reply} {
+	my abort "Error in $state: $reply"
     }
-  }
-  my err $state "expected=$resp($state), got $msg"
-}
-Imap instproc GET {} {
-  my instvar state S path host port user inbox mailNr
-  # number at end of path is the message number in the mailbox
-  if {[regexp {^([^/]+)/([^/]+)/([0-9]+)$} $path _ user inbox mailNr]} {
-  } elseif {[regexp {^([^/]+)/([^/]+)/?$} $path _ user inbox]} {
-  } else {
-    my abort "invalid imap path $path"
-  }
-  regexp {^(.*):([0-9]+)$} $host _ host port
-  # proxy ?
-  if {[catch {set S [socket -async $host $port]} err]} {
-    my abort "Could not open connection to host '$host:$port'\n    $err"
-  } else {
-    fconfigure $S -blocking false 
-    fileevent $S readable [list [self] response connect]
-  }
-}
-Imap instproc login {} {
-  my instvar user host password
-  if {[pwdManager requirePasswd "Imap $user\@$host" $user password]} {
-    my queryServer "login $user [my imapString $password]" login
-  } else {
-    what now?
-  }
-}
-Imap instproc loginFinished {} {
-  my instvar user host password inbox
-  pwdManager storePasswd "Imap $user\@$host" $user $password
-  my queryServer "select $inbox" loginFinished
-}
-Imap instproc inboxSize {} {
-  my instvar msg nrMails
-  regexp {^[*] ([0-9]+) EXISTS} $msg _ nrMails
-}
-Imap instproc inboxSelected {} {
-  my instvar msg contentType nrMails mailNr
-  if {[info exists mailNr]} {
-    set contentType text/plain
-    my body-state
-    my queryServer "fetch $mailNr rfc822" mailSelected
-  } else {
-    my instvar header inbox block host user block
-    set contentType text/html
-    my body-state
-    set what "Mailbox $inbox of $user@$host"
-    set block "<HTML><HEAD><TITLE>$what</TITLE></HEAD>\n"
-    append block "<BODY><H1>$what</H1>\n" \
-	"The following <i>$nrMails</i> messages are in this mailbox:" \
-	"<p>\n<UL>\n"
-    my pushBlock
-    catch {unset header}
-    set mailNr $nrMails
-    my queryServer "fetch $nrMails body\[header\]" heads
-  }
-}
-Imap instproc ignoreLine {} {;}
-Imap instproc fetchBody {} {
-  my instvar S
-  fileevent $S readable [list [self] bodyContent]
-}
-Imap instproc bodyContent {} {
-  my instvar S block msg
-  set msg [gets $S]
-  if {$msg == ")"} {
-    my set state 4
-    my finish
-  } else {
-    set block $msg\n
-    my pushBlock
-  }
-}
-Imap instproc fetchHeaders {} {
-  my instvar S
-  fileevent $S readable [list [self] headContent]
-}
-Imap instproc headContent {} {
-  my instvar S token header nrMails mailNr block host user inbox
-  set msg [gets $S]
-  if {[regexp -nocase {^([^:]+): *(.+)$} $msg _ key value]} {
-    set key [string tolower $key]
-    set header($mailNr,$key) $value
-  } elseif {$msg == ")"} {
-    # mail header finished
-    set block "<LI> Message $mailNr from $header($mailNr,date)<br>\ 
-	<A HREF=\"imap://$host/$user/$inbox/$mailNr\">"
-    if {[catch {set from $header($mailNr,from)}]} {
-      if {[catch {set from $header($mailNr,sender)}]} {	set from UNKNOWN }
+    Imap instproc token {} {
+	my instvar tokenCounter
+	return [format {A%.4d} [incr tokenCounter]]
     }
-    if {[regexp {[(](.*)[)]} $from _ x]} { 
-    } elseif {[regexp {[<](.*)[>]} $from _ x]} { 
-    } else  { set x $from }
-    append block $x ": "
-    if {[info exists header($mailNr,subject)]} { append block $header($mailNr,subject) }
-    append block </A><P>
-    my pushBlock
-    if {$mailNr > 1} {
-      incr mailNr -1
-      my queryServer "fetch $mailNr body\[header\]" heads
-    } else {
-      set block "</UL></BODY></HTML>\n"
-      my pushBlock
-      my set state 4
-      my finish
+    Imap instproc imapString {input} {
+	regsub -all {(["\])} $input {\\\1} output ;#"
+	return \"$output\"
     }
-  }
+    Imap instproc queryServer {query state} {
+	#my showCall
+	my instvar S token
+	set token [my token]
+	puts $S "$token $query"
+	#puts stderr "$token $query"
+	flush $S
+	fileevent $S readable [list [self] response $state]
+    }
+    Imap instproc response {state} {
+	my instvar S resp msg token
+	set msg [gets $S]
+	#my showVars msg token
+	foreach {c newState} $resp($state) {
+	    if {![regexp {^[*]} $msg] && ![regexp ^$token $msg]} {
+		my showMsg "$state: token=$token IGNORING $msg"
+		return
+	    }
+	    if {[regexp ^$c $msg]} {
+		#my showMsg "$state NEWSTATE $newState"
+		return [my $newState] 
+	    }
+	}
+	my err $state "expected=$resp($state), got $msg"
+    }
+    Imap instproc GET {} {
+	my instvar state S path host port user inbox mailNr
+	# number at end of path is the message number in the mailbox
+	if {[regexp {^([^/]+)/([^/]+)/([0-9]+)$} $path _ user inbox mailNr]} {
+	} elseif {[regexp {^([^/]+)/([^/]+)/?$} $path _ user inbox]} {
+	} else {
+	    my abort "invalid imap path $path"
+	}
+	regexp {^(.*):([0-9]+)$} $host _ host port
+	# proxy ?
+	if {[catch {set S [socket -async $host $port]} err]} {
+	    my abort "Could not open connection to host '$host:$port'\n    $err"
+	} else {
+	    fconfigure $S -blocking false 
+	    fileevent $S readable [list [self] response connect]
+	}
+    }
+    Imap instproc login {} {
+	my instvar user host password
+	if {[pwdManager requirePasswd "Imap $user\@$host" $user password]} {
+	    my queryServer "login $user [my imapString $password]" login
+	} else {
+	    what now?
+	}
+    }
+    Imap instproc loginFinished {} {
+	my instvar user host password inbox
+	pwdManager storePasswd "Imap $user\@$host" $user $password
+	my queryServer "select $inbox" loginFinished
+    }
+    Imap instproc inboxSize {} {
+	my instvar msg nrMails
+	regexp {^[*] ([0-9]+) EXISTS} $msg _ nrMails
+    }
+    Imap instproc inboxSelected {} {
+	my instvar msg contentType nrMails mailNr
+	if {[info exists mailNr]} {
+	    set contentType text/plain
+	    my body-state
+	    my queryServer "fetch $mailNr rfc822" mailSelected
+	} else {
+	    my instvar header inbox block host user block
+	    set contentType text/html
+	    my body-state
+	    set what "Mailbox $inbox of $user@$host"
+	    set block "<HTML><HEAD><TITLE>$what</TITLE></HEAD>\n"
+	    append block "<BODY><H1>$what</H1>\n" \
+		"The following <i>$nrMails</i> messages are in this mailbox:" \
+		"<p>\n<UL>\n"
+	    my pushBlock
+	    catch {unset header}
+	    set mailNr $nrMails
+	    my queryServer "fetch $nrMails body\[header\]" heads
+	}
+    }
+    Imap instproc ignoreLine {} {;}
+    Imap instproc fetchBody {} {
+	my instvar S
+	fileevent $S readable [list [self] bodyContent]
+    }
+    Imap instproc bodyContent {} {
+	my instvar S block msg
+	set msg [gets $S]
+	if {$msg == ")"} {
+	    my set state 4
+	    my finish
+	} else {
+	    set block $msg\n
+	    my pushBlock
+	}
+    }
+    Imap instproc fetchHeaders {} {
+	my instvar S
+	fileevent $S readable [list [self] headContent]
+    }
+    Imap instproc headContent {} {
+	my instvar S token header nrMails mailNr block host user inbox
+	set msg [gets $S]
+	if {[regexp -nocase {^([^:]+): *(.+)$} $msg _ key value]} {
+	    set key [string tolower $key]
+	    set header($mailNr,$key) $value
+	} elseif {$msg == ")"} {
+	    # mail header finished
+	    set block "<LI> Message $mailNr from $header($mailNr,date)<br>\ 
+	<A HREF=\"imap://$host/$user/$inbox/$mailNr\">"
+	    if {[catch {set from $header($mailNr,from)}]} {
+		if {[catch {set from $header($mailNr,sender)}]} {	set from UNKNOWN }
+	    }
+	    if {[regexp {[(](.*)[)]} $from _ x]} { 
+	    } elseif {[regexp {[<](.*)[>]} $from _ x]} { 
+	    } else  { set x $from }
+	    append block $x ": "
+	    if {[info exists header($mailNr,subject)]} { append block $header($mailNr,subject) }
+	    append block </A><P>
+	    my pushBlock
+	    if {$mailNr > 1} {
+		incr mailNr -1
+		my queryServer "fetch $mailNr body\[header\]" heads
+	    } else {
+		set block "</UL></BODY></HTML>\n"
+		my pushBlock
+		my set state 4
+		my finish
+	    }
+	}
+    }
+
+    namespace export Imap
 }
+
+namespace import ::xotcl::comm::imap::*
Index: xotcl/library/comm/Mime.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/comm/Mime.xotcl	(.../Mime.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/comm/Mime.xotcl	(.../Mime.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,233 +1,239 @@
-# $Id: Mime.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: Mime.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::comm::mime 0.9
 
-#######################################################################
-Class MimeTypeLoader
-MimeTypeLoader instproc loadMimeTypes {file} {
-  if {![file exists $file]} return
+package require XOTcl
 
-  puts stderr "Loading Mime types from $file"
-  set f [open $file r]
-  set content [read $f]
-  close $f
-  regsub -all "\\\\ *\n" $content " " content
-  foreach line [split $content \n] {
-    set line [string trim $line]
-    if {[regexp ^\# $line]} continue
-    if {$line == ""} continue
-    regsub -all "  +" $line " " line
-    #puts stderr <$line>
-    while {$line != ""} {
-      if {[regexp {^ *([^ ]+)=\"([^\"]+)\" *(.*)$} $line _ key value line]} {
-	set v([string tolower $key]) $value
-      } elseif {[regexp {^ *([^ ]+)=([^ ]+) *(.*)$} $line _ key value line]} {
-	set v([string tolower $key]) $value
-      } else {
-	set tokens [split $line]
-	if {![regexp / [lindex $line 0]]} {
-	  puts stderr "Mime: cannot parse line '$line' in $file"
+namespace eval ::xotcl::comm::mime {
+  namespace import ::xotcl::*
+
+  #######################################################################
+  Class MimeTypeLoader
+  MimeTypeLoader instproc loadMimeTypes {file} {
+    if {![file exists $file]} return
+
+    puts stderr "Loading Mime types from $file"
+    set f [open $file r]
+    set content [read $f]
+    close $f
+    regsub -all "\\\\ *\n" $content " " content
+    foreach line [split $content \n] {
+      set line [string trim $line]
+      if {[regexp ^\# $line]} continue
+      if {$line == ""} continue
+      regsub -all "  +" $line " " line
+      #puts stderr <$line>
+      while {$line != ""} {
+	if {[regexp {^ *([^ ]+)=\"([^\"]+)\" *(.*)$} $line _ key value line]} {
+	  set v([string tolower $key]) $value
+	} elseif {[regexp {^ *([^ ]+)=([^ ]+) *(.*)$} $line _ key value line]} {
+	  set v([string tolower $key]) $value
 	} else {
-	  set v(exts) [join [lrange $tokens 1 end] ,]
-	  set v(type) [lindex $tokens 0]
+	  set tokens [split $line]
+	  if {![regexp / [lindex $line 0]]} {
+	    puts stderr "Mime: cannot parse line '$line' in $file"
+	  } else {
+	    set v(exts) [join [lrange $tokens 1 end] ,]
+	    set v(type) [lindex $tokens 0]
+	  }
+	  break
 	}
-	break
       }
+      if {[info exists v(exts)] && [info exists v(type)]} {
+	set v(exts) [string tolower $v(exts)]
+	set v(type) [string tolower $v(type)]
+	foreach ext [split $v(exts) ,] {
+	  set ext [string trimleft $ext .]
+	  #puts stderr "ext '$ext', contentType = '$v(type)'"
+	  my set extTable($ext) $v(type)
+	}
+	unset v(exts) v(type)
+      } else {
+	puts stderr "invalid mime entry in $file"
+      }
+    } 
+  }
+  MimeTypeLoader instproc guessContentType {name} {
+    my loadMimeTypes ~/.mime.types
+    my mixin {}
+    return [next]
+  }
+
+  Class MIME
+  MIME instproc guessContentType {name} {
+    my instvar extTable nameTable
+    if {[regexp {\.([a-zA-Z0-9]+)$} $name _ ext]} {
+      catch {set contentType $extTable([string tolower $ext])}
     }
-    if {[info exists v(exts)] && [info exists v(type)]} {
-      set v(exts) [string tolower $v(exts)]
-      set v(type) [string tolower $v(type)]
-      foreach ext [split $v(exts) ,] {
-	set ext [string trimleft $ext .]
-	#puts stderr "ext '$ext', contentType = '$v(type)'"
-	my set extTable($ext) $v(type)
+    if {![info exists contentType]} {
+      foreach namePattern [array names nameTable] {
+	if {[regexp $namePattern $name]} {
+	  set contentType text/plain
+	  break
+	}
       }
-      unset v(exts) v(type)
-    } else {
-      puts stderr "invalid mime entry in $file"
     }
-  } 
-}
-MimeTypeLoader instproc guessContentType {name} {
-  my loadMimeTypes ~/.mime.types
-  my mixin {}
-  return [next]
-}
-
-Class MIME
-MIME instproc guessContentType {name} {
-  my instvar extTable nameTable
-  if {[regexp {\.([a-zA-Z0-9]+)$} $name _ ext]} {
-    catch {set contentType $extTable([string tolower $ext])}
+    if {![info exists contentType]} {
+      set contentType unknown/unknown
+    }
+    return $contentType
   }
-  if {![info exists contentType]} {
-    foreach namePattern [array names nameTable] {
-      if {[regexp $namePattern $name]} {
-	set contentType text/plain
-	break
+  MIME instproc multipart-decode-header {header obj} {
+    $obj instvar name filename contentType
+    foreach line [split $header \r] {
+      set line [string trim $line \n]
+      #puts stderr line=$line
+      if {[regexp -nocase {^Content-Disposition: *([^;]+);(.*)$} $line _ \
+	       dispo detail]} {
+	if {$dispo != "form-data"} {
+	  error "Unknown Content Disposition '$line'"
+	}
+	if {![regexp -nocase { name *= *"([^\"]+)"} $line _ name]} {
+	  error "can't parse form-data name '$line'"
+	}
+	regexp -nocase {filename *= *"([^\"]+)"} $line _ filename
+      } elseif {[regexp -nocase {^Content-Type: *([^; ]+)} $line _ contentType]} {
+      } else {
+	my showMsg "ignoring '$line'"
       }
     }
   }
-  if {![info exists contentType]} {
-    set contentType unknown/unknown
+
+  MIME create Mime -mixin MimeTypeLoader
+  Mime array set nameTable {
+    README text/plain
   }
-  return $contentType
-}
-MIME instproc multipart-decode-header {header obj} {
-  $obj instvar name filename contentType
-  foreach line [split $header \r] {
-    set line [string trim $line \n]
-    #puts stderr line=$line
-    if {[regexp -nocase {^Content-Disposition: *([^;]+);(.*)$} $line _ \
-	     dispo detail]} {
-      if {$dispo != "form-data"} {
-	error "Unknown Content Disposition '$line'"
-      }
-      if {![regexp -nocase { name *= *"([^\"]+)"} $line _ name]} {
-	error "can't parse form-data name '$line'"
-      }
-      regexp -nocase {filename *= *"([^\"]+)"} $line _ filename
-    } elseif {[regexp -nocase {^Content-Type: *([^; ]+)} $line _ contentType]} {
-    } else {
-      my showMsg "ignoring '$line'"
-    }
+  Mime array set extTable {
+    gif  image/gif
+    xpm  image/x-xpixmap
+    xbm  image/x-xbitmap
+    jpg  image/jpeg
+    png  image/x-png
+    html text/html
+    htm  text/html
+    xml  text/xml
+    css  text/css
+    ps   application/postscript
+    pdf  application/pdf
+    doc  application/msword
+    xls  application/msexel
   }
-}
 
-MIME Mime -mixin MimeTypeLoader
-Mime array set nameTable {
-  README text/plain
-}
-Mime array set extTable {
-  gif  image/gif
-  xpm  image/x-xpixmap
-  xbm  image/x-xbitmap
-  jpg  image/jpeg
-  png  image/x-png
-  html text/html
-  htm  text/html
-  xml  text/xml
-  css  text/css
-  ps   application/postscript
-  pdf  application/pdf
-  doc  application/msword
-  xls  application/msexel
-}
 
-
-##################################################################
-Class FormData
-FormData instproc encode list {;#RFC 1867
-  my showCall
-}
-FormData formData
-##################################################################
-Class Base64
-Base64 instproc init args {
-  my instvar base64 base64_en
-  # Emit base64 encoding for a string
-  set i 0
-  foreach char {A B C D E F G H I J K L M N O P Q R S T U V W X Y Z \
-		    a b c d e f g h i j k l m n o p q r s t u v w x y z \
-		    0 1 2 3 4 5 6 7 8 9 + /} {
-    set base64($char) $i
-    set base64_en($i) $char
-    incr i
+  ##################################################################
+  Class FormData
+  FormData instproc encode list {;#RFC 1867
+    my showCall
   }
-  next
-}
-Base64 instproc encode string {
-  my instvar base64_en
-  set result {}
-  set length 0
-  foreach {a b c} [split $string {}] {
-    scan $a %c x
-    if {$c != ""} {
-      scan $b %c y
-      scan $c %c z
-      append result \
-	  $base64_en([expr {($x>>2) & 0x3F}]) \
-	  $base64_en([expr {(($x<<4) & 0x30) | (($y>>4) & 0xF)}]) \
-	  $base64_en([expr {(($y<<2) & 0x3C) | (($z>>6) & 0x3)}]) \
-	  $base64_en([expr {$z & 0x3F}])
-    } elseif {$b != ""} {
-      scan $b %c y
-      append result \
-	  $base64_en([expr {($x>>2) & 0x3F}]) \
-	  $base64_en([expr {(($x<<4) & 0x30) | (($y>>4) & 0xF)}]) \
-	  $base64_en([expr {($y<<2) & 0x3C}]) \
-	  =
-    } else {
-      append result \
-	  $base64_en([expr {($x>>2) & 0x3F}]) \
-	  $base64_en([expr {($x<<4) & 0x30}]) \
-	  ==
+  FormData formData
+  ##################################################################
+  Class Base64
+  Base64 instproc init args {
+    my instvar base64 base64_en
+    # Emit base64 encoding for a string
+    set i 0
+    foreach char {A B C D E F G H I J K L M N O P Q R S T U V W X Y Z \
+		      a b c d e f g h i j k l m n o p q r s t u v w x y z \
+		      0 1 2 3 4 5 6 7 8 9 + /} {
+      set base64($char) $i
+      set base64_en($i) $char
+      incr i
     }
-    if {[incr length 4] >= 72} {
-      append result \n
-      set length 0
-    }
+    next
   }
-  return $result
-}
-Base64 instproc decode string {
-  my instvar base64
-  set output {}
-  set group 0
-  set j 18
-  foreach char [split $string {}] {
-    if {$char != "="} {
-      set group [expr {$group | ($base64($char) << $j)}]
-      if {[incr j -6] < 0} {
-	scan [format %06x $group] %2x%2x%2x a b c
-	append output [format %c%c%c $a $b $c]
-	set group 0
-	set j 18
-      }
-    } else {
-      scan [format %04x $group] %2x%2x a b
-      if {$j==6} {
-	append output [format %c $a]
+  Base64 instproc encode string {
+    my instvar base64_en
+    set result {}
+    set length 0
+    foreach {a b c} [split $string {}] {
+      scan $a %c x
+      if {$c != ""} {
+	scan $b %c y
+	scan $c %c z
+	append result \
+	    $base64_en([expr {($x>>2) & 0x3F}]) \
+	    $base64_en([expr {(($x<<4) & 0x30) | (($y>>4) & 0xF)}]) \
+	    $base64_en([expr {(($y<<2) & 0x3C) | (($z>>6) & 0x3)}]) \
+	    $base64_en([expr {$z & 0x3F}])
+      } elseif {$b != ""} {
+	scan $b %c y
+	append result \
+	    $base64_en([expr {($x>>2) & 0x3F}]) \
+	    $base64_en([expr {(($x<<4) & 0x30) | (($y>>4) & 0xF)}]) \
+	    $base64_en([expr {($y<<2) & 0x3C}]) \
+	    =
       } else {
-	append output [format %c%c $a $b]
+	append result \
+	    $base64_en([expr {($x>>2) & 0x3F}]) \
+	    $base64_en([expr {($x<<4) & 0x30}]) \
+	    ==
       }
-      break
+      if {[incr length 4] >= 72} {
+	append result \n
+	set length 0
+      }
     }
+    return $result
   }
-  return $output
-}
-Base64 base64
-##################################################################
-Class Url
-Url instproc encode list {
-  set result ""
-  set sep ""
-  foreach i $list {
-    append result $sep [my encodeItem $i]
-    if {$sep != "="} {
-      set sep =
-    } else {
-      set sep &
+  Base64 instproc decode string {
+    my instvar base64
+    set output {}
+    set group 0
+    set j 18
+    foreach char [split $string {}] {
+      if {$char != "="} {
+	set group [expr {$group | ($base64($char) << $j)}]
+	if {[incr j -6] < 0} {
+	  scan [format %06x $group] %2x%2x%2x a b c
+	  append output [format %c%c%c $a $b $c]
+	  set group 0
+	  set j 18
+	}
+      } else {
+	scan [format %04x $group] %2x%2x a b
+	if {$j==6} {
+	  append output [format %c $a]
+	} else {
+	  append output [format %c%c $a $b]
+	}
+	break
+      }
     }
+    return $output
   }
-  return $result
-}
-Url instproc encodeItem string {
-  my instvar httpFormMap
-  set alphanumeric    a-zA-Z0-9.
-  if {![info exists httpFormMap]} {
-    for {set i 1} {$i <= 256} {incr i} {
-      set c [format %c $i]
-      if {![string match \[$alphanumeric\] $c]} {
-	set httpFormMap($c) %[format %.2x $i]
+  Base64 base64
+  ##################################################################
+  Class Url
+  Url instproc encode list {
+    set result ""
+    set sep ""
+    foreach i $list {
+      append result $sep [my encodeItem $i]
+      if {$sep != "="} {
+	set sep =
+      } else {
+	set sep &
       }
     }
-    # these are handled specially
-    array set httpFormMap { " " +   \n %0d%0a }
+    return $result
   }
-  regsub -all \[^$alphanumeric\] $string {$httpFormMap(&)} string
-  regsub -all \n $string {\\n} string
-  regsub -all \t $string {\\t} string
-  regsub -all {[][{})\\]\)} $string {\\&} string
+  Url instproc encodeItem string {
+    my instvar httpFormMap
+    set alphanumeric    a-zA-Z0-9.
+    if {![info exists httpFormMap]} {
+      for {set i 1} {$i <= 256} {incr i} {
+	set c [format %c $i]
+	if {![string match \[$alphanumeric\] $c]} {
+	  set httpFormMap($c) %[format %.2x $i]
+	}
+      }
+      # these are handled specially
+      array set httpFormMap { " " +   \n %0d%0a }
+    }
+    regsub -all \[^$alphanumeric\] $string {$httpFormMap(&)} string
+    regsub -all \n $string {\\n} string
+    regsub -all \t $string {\\t} string
+    regsub -all {[][{})\\]\)} $string {\\&} string
   return [subst $string]
 }
 Url instproc hexToChar hex {
@@ -260,3 +266,9 @@
   return $result
 }
 Url url
+
+namespace export Mime url base64
+}
+
+namespace import ::xotcl::comm::mime::*
+#puts stderr "importing ::xotcl::comm::mime::* to [namespace current]"
Index: xotcl/library/comm/PCache.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/comm/PCache.xotcl	(.../PCache.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/comm/PCache.xotcl	(.../PCache.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,4 +1,4 @@
-# -*- Tcl -*- $Id: PCache.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# -*- Tcl -*- $Id: PCache.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
 # Persistent Cache object, using gdbm
 
 # Configuration:
@@ -19,228 +19,241 @@
 package provide xotcl::comm::pcache 0.9
 #package require xotcl::package
 
-if {![info exists CACHE_DIR]} {
-  if {![info exists homeDir]} {
-    set homeDir /tmp
-  }
-  set CACHE_DIR $homeDir/cache2
-}
+package require XOTcl
 
-Object persistentCache
-persistentCache set dir $CACHE_DIR
-persistentCache proc flush { {cmd {}} } {
-  my instvar DBID
-  if {[info exists DBID]} { $DBID close }
-  if {[string compare {} $cmd]} {
-    if {[catch {eval $cmd} err]} {puts stderr err=$err}
-  }
-  my open  ;# UZ: wenn hier das self weggenommen wird, crashed das lintFilter
-  #open  ;# UZ: wenn hier das self weggenommen wird, crashed das lintFilter
+namespace eval ::xotcl::comm::pcache {
+    namespace import ::xotcl::*
 
-}
-# the open method for the first invocation
-persistentCache proc open {} {
-  my instvar dir DBID 
-  package require xotcl::store
-  set DBID [Storage someNewChildStore]
-  if {![file isdirectory $dir]} {
-    # if the cache directory does not exist, create it..
-    file mkdir $dir
-  }
-  # the open method for later invocations, doing the real work
-  my proc open {} {
-    my instvar dir DBID
-    $DBID open $dir/index
-  }
-  # invoke the method
-  open
-}
-persistentCache proc clear {} {
-  my instvar cacheFileName contentType meta entry validated dir
-  my flush [list eval file delete -force  $dir/index \
-		    [glob -nocomplain $dir/\[0-9\]*::*]]
-  foreach var {cacheFileName contentType meta entry validated} {
-    catch {unset $var}
-  }
-}
-persistentCache proc clearEntry {url} {
-  my instvar DBID cacheFileName contentType meta entry validated
-  my inCache $url
-  if {[info exists cacheFileName($url)]} {
-    my flush [list eval file delete -force $cacheFileName($url)]
-    foreach var {cacheFileName contentType meta entry validated} {
-      my showMsg "unset ${var}($url)"
-      catch {unset ${var}($url)}
+    variable CACHE_DIR
+    variable homeDir
+
+    if {![info exists CACHE_DIR]} {
+	if {![info exists homeDir]} {
+	    set homeDir /tmp
+	}
+	set CACHE_DIR $homeDir/cache2
     }
-    catch {$DBID unset $url}
-  }
-}
-persistentCache proc lazyFlush {} {
-  my instvar flushPending
-  if {[info exists flushPending]} { after cancel $flushPending }
-  set flushPending [after 100 [self] flush]
-}
-persistentCache proc newEntry {url access doCache name} {
-  my instvar cacheFileName contentType meta dir
-  if {$name != ""} {
-    #$access set caching 0
-    return $name
-  } elseif {$doCache} {
-    set cacheFileName($url) $dir/[pid]-$access
-    set contentType($url)   [$access set contentType]
-    set meta($url)          [$access set meta]
-    return $cacheFileName($url)
-  } else {
-    # we use the Memory cache only for non-persistent cache entries
-    # which are deleted when the program terminates
-    set fileName $dir/v[pid]-$access
-    MemoryCache + $url $fileName
-    return $fileName
-  }
-}
-persistentCache proc entryDone {url} {
-  my instvar entry cacheFileName contentType DBID meta
-  if {![info exists DBID]} { open }
-  $DBID set $url [list \
-		      cacheFileName $cacheFileName($url) \
-		      contentType   $contentType($url)   \
-		      meta          $meta($url)          ]
-  my lazyFlush
-  #my showMsg "size=[file size $cacheFileName($url)]"
-  set entry($url) 1
-  my set validated($url) 1
-}
-persistentCache proc inCache {url} {
-  my instvar entry
-  if {[info exists entry($url)]} {
-    set result 1
-  } else {
-    my instvar cacheFileName contentType meta DBID
-    if {![info exists DBID]} { open }
-    set result [$DBID set $url]
-    my lazyFlush
-    if {[string compare "" $result]} {
-      set entry($url) 1
-      array set r $result
-      set cacheFileName($url) $r(cacheFileName)
-      set contentType($url)   $r(contentType)
-      set meta($url)          $r(meta)
-      set result 1
-    } else {
-      set result 0
+
+    Object persistentCache
+    persistentCache set dir $CACHE_DIR
+    persistentCache proc flush { {cmd {}} } {
+	my instvar DBID
+	if {[info exists DBID]} { $DBID close }
+	if {[string compare {} $cmd]} {
+	    if {[catch {eval $cmd} err]} {puts stderr err=$err}
+	}
+	my open  ;# UZ: wenn hier das self weggenommen wird, crashed das lintFilter
+	#open  ;# UZ: wenn hier das self weggenommen wird, crashed das lintFilter
+
     }
-  }
-  return $result
-}
-persistentCache proc validated {url} {
-  my set validated($url) 1
-}
-persistentCache proc invalidate {url} {
-  if {[my exists validated($url)]} {
-    my unset validated($url)
-  }
-}
-persistentCache proc isValidated {url} {
-  if {[my exists validated($url)]} {
-    return 1
-  }
-  return 0
-}
-persistentCache proc ifModifiedHeader {url ifModVar} {
-  set result 0
-  if {[my inCache $url]} {
-    #puts stderr inCache:$url
-    upvar [self callinglevel] $ifModVar ifModifiedHeader
-    my instvar meta
-    array set m $meta($url)
-    if {[info exists m(last-modified)]} {
-      set ifModifiedHeader [list If-Modified-Since $m(last-modified)]
-      set result 1
+    # the open method for the first invocation
+    persistentCache proc open {} {
+	my instvar dir DBID 
+	package require xotcl::store
+	set DBID [Storage someNewChildStore]
+	if {![file isdirectory $dir]} {
+	    # if the cache directory does not exist, create it..
+	    file mkdir $dir
+	}
+	# the open method for later invocations, doing the real work
+	my proc open {} {
+	    my instvar dir DBID
+	    $DBID open $dir/index
+	}
+	# invoke the method
+	open
     }
-  } else {
-    #puts stderr "url=$url is not in cache"
-  }
-  return $result
-}
-persistentCache proc dump {} {
-  my instvar DBID
-  puts stderr DUMP:
-  foreach k [$DBID names] {
-    puts stderr $k
-    puts stderr "    [$DBID set $k]"
-  }
-}
-persistentCache proc cacheFileName {url} {
-  my instvar cacheFileName
-  return $cacheFileName($url)
-}
-persistentCache proc contentType {url} {
-  my instvar contentType
-  return $contentType($url)
-}
-persistentCache proc meta {url} {
-  my instvar meta
-  return $meta($url)
-}
-persistentCache proc destroy {} {
-  #my showCall
-  next
-}
-#persistentCache flush
+    persistentCache proc clear {} {
+	my instvar cacheFileName contentType meta entry validated dir
+	my flush [list eval file delete -force  $dir/index \
+		      [glob -nocomplain $dir/\[0-9\]*::*]]
+	foreach var {cacheFileName contentType meta entry validated} {
+	    catch {unset $var}
+	}
+    }
+    persistentCache proc clearEntry {url} {
+	my instvar DBID cacheFileName contentType meta entry validated
+	my inCache $url
+	if {[info exists cacheFileName($url)]} {
+	    my flush [list eval file delete -force $cacheFileName($url)]
+	    foreach var {cacheFileName contentType meta entry validated} {
+		my showMsg "unset ${var}($url)"
+		catch {unset ${var}($url)}
+	    }
+	    catch {$DBID unset $url}
+	}
+    }
+    persistentCache proc lazyFlush {} {
+	my instvar flushPending
+	if {[info exists flushPending]} { after cancel $flushPending }
+	set flushPending [after 100 [self] flush]
+    }
+    persistentCache proc newEntry {url access doCache name} {
+	my instvar cacheFileName contentType meta dir
+	if {$name != ""} {
+	    #$access set caching 0
+	    return $name
+	} elseif {$doCache} {
+	    set cacheFileName($url) $dir/[pid]-$access
+	    set contentType($url)   [$access set contentType]
+	    set meta($url)          [$access set meta]
+	    return $cacheFileName($url)
+	} else {
+	    # we use the Memory cache only for non-persistent cache entries
+	    # which are deleted when the program terminates
+	    set fileName $dir/v[pid]-$access
+	    MemoryCache + $url $fileName
+	    return $fileName
+	}
+    }
+    persistentCache proc entryDone {url} {
+	my instvar entry cacheFileName contentType DBID meta
+	if {![info exists DBID]} { open }
+	$DBID set $url [list \
+			    cacheFileName $cacheFileName($url) \
+			    contentType   $contentType($url)   \
+			    meta          $meta($url)          ]
+	my lazyFlush
+	#my showMsg "size=[file size $cacheFileName($url)]"
+	set entry($url) 1
+	my set validated($url) 1
+    }
+    persistentCache proc inCache {url} {
+	my instvar entry
+	if {[info exists entry($url)]} {
+	    set result 1
+	} else {
+	    my instvar cacheFileName contentType meta DBID
+	    if {![info exists DBID]} { open }
+	    set result [$DBID set $url]
+	    my lazyFlush
+	    if {[string compare "" $result]} {
+		set entry($url) 1
+		array set r $result
+		set cacheFileName($url) $r(cacheFileName)
+		set contentType($url)   $r(contentType)
+		set meta($url)          $r(meta)
+		set result 1
+	    } else {
+		set result 0
+	    }
+	}
+	return $result
+    }
+    persistentCache proc validated {url} {
+	my set validated($url) 1
+    }
+    persistentCache proc invalidate {url} {
+	if {[my exists validated($url)]} {
+	    my unset validated($url)
+	}
+    }
+    persistentCache proc isValidated {url} {
+	if {[my exists validated($url)]} {
+	    return 1
+	}
+	return 0
+    }
+    persistentCache proc ifModifiedHeader {url ifModVar} {
+	set result 0
+	if {[my inCache $url]} {
+	    #puts stderr inCache:$url
+	    upvar [self callinglevel] $ifModVar ifModifiedHeader
+	    my instvar meta
+	    array set m $meta($url)
+	    if {[info exists m(last-modified)]} {
+		set ifModifiedHeader [list If-Modified-Since $m(last-modified)]
+		set result 1
+	    }
+	} else {
+	    #puts stderr "url=$url is not in cache"
+	}
+	return $result
+    }
+    persistentCache proc dump {} {
+	my instvar DBID
+	puts stderr DUMP:
+	foreach k [$DBID names] {
+	    puts stderr $k
+	    puts stderr "    [$DBID set $k]"
+	}
+    }
+    persistentCache proc cacheFileName {url} {
+	my instvar cacheFileName
+	return $cacheFileName($url)
+    }
+    persistentCache proc contentType {url} {
+	my instvar contentType
+	return $contentType($url)
+    }
+    persistentCache proc meta {url} {
+	my instvar meta
+	return $meta($url)
+    }
+    persistentCache proc destroy {} {
+	#my showCall
+	next
+    }
+    #persistentCache flush
 
 
 
-########################################################### Cache
-Object MemoryCache
-MemoryCache proc query {url entry} {
-  my instvar cache
-  if {[info exists cache($url)]} {
-    upvar [self callinglevel] $entry e
-    #puts stderr "-->[self] [self proc] finds: $url"
-    set e $cache($url)
-    return 1
-  }
-  return 0
-}
-MemoryCache proc + {url entry} {
-  #puts stderr "-->[self class]:[self] [self proc] $url"
-  my set cache($url) $entry
-}
-MemoryCache proc - {url} {
-  #puts stderr "-->[self class]:[self] [self proc] $url"
-  catch {my unset cache($url)}
-}
-MemoryCache proc destroy {} {
-  my instvar cache
-  foreach url [array names cache] {
-    set f $cache($url)
-    if {[regexp ^/ $f]} {
-      #my showMsg "trying to remove $f [file exists $f]"
-      file delete -force $f
+    ########################################################### Cache
+    Object MemoryCache
+    MemoryCache proc query {url entry} {
+	my instvar cache
+	if {[info exists cache($url)]} {
+	    upvar [self callinglevel] $entry e
+	    #puts stderr "-->[self] [self proc] finds: $url"
+	    set e $cache($url)
+	    return 1
+	}
+	return 0
     }
-  }
-  next
-}
+    MemoryCache proc + {url entry} {
+	#puts stderr "-->[self class]:[self] [self proc] $url"
+	my set cache($url) $entry
+    }
+    MemoryCache proc - {url} {
+	#puts stderr "-->[self class]:[self] [self proc] $url"
+	catch {my unset cache($url)}
+    }
+    MemoryCache proc destroy {} {
+	my instvar cache
+	foreach url [array names cache] {
+	    set f $cache($url)
+	    if {[regexp ^/ $f]} {
+		#my showMsg "trying to remove $f [file exists $f]"
+		file delete -force $f
+	    }
+	}
+	next
+    }
 
 
-Object instproc allInstances {} {
-  # Diese Methode ermittelt rekursiv alle direkten und indirekten
-  # Instanzen einer Klasse
-  ::set inst [my info instances]
-  foreach s [my info subclass] {
-    foreach i [$s allInstances] { ::lappend inst $i }
-  }
-  return $inst
-}
+    Object instproc allInstances {} {
+	# Diese Methode ermittelt rekursiv alle direkten und indirekten
+	# Instanzen einer Klasse
+	::set inst [my info instances]
+	foreach s [my info subclass] {
+	    foreach i [$s allInstances] { ::lappend inst $i }
+	}
+	return $inst
+    }
 
-# onExit is automatically called when wafe terminates
-proc onExit {} {
-  #puts stderr "allinstances of Access: [Access allInstances]"
-  #foreach i [Access allInstances] {
-  #  if {[info command $i] == ""} continue
-  #  $i destroy
-  #}
-  #MemoryCache clear
-  persistentCache flush
-  #Trace statReport
+    # onExit is automatically called when wafe terminates
+    proc onExit {} {
+	#puts stderr "allinstances of Access: [Access allInstances]"
+	#foreach i [Access allInstances] {
+	#  if {[info command $i] == ""} continue
+	#  $i destroy
+	#}
+	#MemoryCache clear
+	persistentCache flush
+	#Trace statReport
+    }
+
+    namespace export persistentCache MemoryCache
 }
+
+namespace import ::xotcl::comm::pcache::*
Index: xotcl/library/lib/Script.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/lib/Script.xotcl	(.../Script.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/lib/Script.xotcl	(.../Script.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,30 +1,40 @@
-#$Id: Script.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+#$Id: Script.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::script 0.9
+package require XOTcl
 
-@ @File {description {
-  A small package to instantiate an object, that 
-  represents a script.
-  }
-}
-@ Class Script {
-  description {
-    An object of type Script becomes automatically the command
-    line arguments evaluated as "-" method calls during creation, e.g.
-    <@pre>
-      Script s -set r 5
-    </@pre>
-    and a call with cmd-line "-set v 6" of the script, results in an
-    object s with two vars set: r to 5, and v to 6.
-  }
-}
+namespace eval ::xotcl::script {
+    namespace import ::xotcl::*
 
+    @ @File {description {
+	A small package to instantiate an object, that 
+	represents a script.
+    }
+    }
+    @ Class Script {
+	description {
+	    An object of type Script becomes automatically the command
+	    line arguments evaluated as "-" method calls during creation, e.g.
+	    <@pre>
+	    Script s -set r 5
+	    </@pre>
+	    and a call with cmd-line "-set v 6" of the script, results in an
+	    object s with two vars set: r to 5, and v to 6.
+	}
+    }
 
 
-Class Script
-Script proc create args {
-  eval lappend args $::argv
-  eval next $args
+
+    Class Script
+    Script proc create args {
+	eval lappend args $::argv
+	eval next $args
+    }
+    Script instproc unknown args {
+	puts stderr "$::argv0: Unknown option �-$args� provided"
+    }
+
+    namespace export Script
 }
-Script instproc unknown args {
-  puts stderr "$::argv0: Unknown option �-$args� provided"
-}
+
+namespace import ::xotcl::script::*
Index: xotcl/library/lib/htmllib.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/lib/htmllib.xotcl	(.../htmllib.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/lib/htmllib.xotcl	(.../htmllib.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,4 +1,4 @@
-## $Header: /home/neumann/cvs/xotcl/xotcl/library/lib/htmllib.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+## $Header: /home/neumann/cvs/xotcl/xotcl/library/lib/htmllib.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
 
 #
 # htmllib.xotcl
@@ -36,636 +36,642 @@
 # 
 
 package provide xotcl::htmllib 0.1
-
 package require XOTcl
 
+namespace eval ::xotcl::htmllib {
+    namespace import ::xotcl::*
 
-@ @File {
-    description {
-        This package provides the class HtmlBuilder, which can be used to 
-        generate HTML documents, or a part of a document.
+    @ @File {
+	description {
+	    This package provides the class HtmlBuilder, which can be used to 
+	    generate HTML documents, or a part of a document.
+	}
+	authors {
+	    Antti Salonen, as@fishpool.fi
+	}
+	date {
+	    $Date: 2005/09/09 21:07:23 $
+	}
     }
-    authors {
-        Antti Salonen, as@fishpool.fi
+    
+    #
+    # the compressed parameter means that minimal HTML page are created
+    # i.e. that space indentation is turned off
+    #
+    Class HtmlBuilder -parameter {
+	{compressed 0}
     }
-    date {
-        $Date: 2004/05/23 22:50:39 $
-    }
-}
-	
-#
-# the compressed parameter means that minimal HTML page are created
-# i.e. that space indentation is turned off
-#
-Class HtmlBuilder -parameter {
-  {compressed 0}
-}
 
-## The constructor.
-##
-## The HtmlBuilder object has two instance variables. The document Tcl list
-## contains the document as a list of strings. The document is stored as a list
-## rather than a single string to allow further indentation of the whole
-## document when necessary.
-##   The indentLevel variable is the level of indentation, which is generally
-## increased for the contents of any HTML element that may contain block-level
-## elements. Typical examples would be <ul>, <li>, <td> and so forth.
+    ## The constructor.
+    ##
+    ## The HtmlBuilder object has two instance variables. The document Tcl list
+    ## contains the document as a list of strings. The document is stored as a list
+    ## rather than a single string to allow further indentation of the whole
+    ## document when necessary.
+    ##   The indentLevel variable is the level of indentation, which is generally
+    ## increased for the contents of any HTML element that may contain block-level
+    ## elements. Typical examples would be <ul>, <li>, <td> and so forth.
 
-HtmlBuilder instproc init {} {
-    my instvar document indentLevel
-    set document [list] 
-    set indentLevel 0
-    return
-}
+    HtmlBuilder instproc init {} {
+	my instvar document indentLevel
+	set document [list] 
+	set indentLevel 0
+	return
+    }
 
 
-HtmlBuilder instproc clear {} {
-    my instvar document indentLevel
+    HtmlBuilder instproc clear {} {
+	my instvar document indentLevel
 
-    set document [list]
-    set indentLevel 0
-    return
-}
+	set document [list]
+	set indentLevel 0
+	return
+    }
 
 
-HtmlBuilder instproc getDocument {} {
-    my instvar document
-    return $document
-}
+    HtmlBuilder instproc getDocument {} {
+	my instvar document
+	return $document
+    }
 
 
-HtmlBuilder instproc toString {} {
-    my instvar document compressed
-    set rvalue ""
-    foreach line $document {
-      if {$compressed == "0"} {
-        append rvalue "$line\n"
-      } else {
-	## only new line for closing tags at the beginnig 
-	## of a document element
-	if {[string equal -length 2 "</" $line]} {
-	  append rvalue "$line\n"
-	} else {
-	  append rvalue "$line "
+    HtmlBuilder instproc toString {} {
+	my instvar document compressed
+	set rvalue ""
+	foreach line $document {
+	    if {$compressed == "0"} {
+		append rvalue "$line\n"
+	    } else {
+		## only new line for closing tags at the beginnig 
+		## of a document element
+		if {[string equal -length 2 "</" $line]} {
+		    append rvalue "$line\n"
+		} else {
+		    append rvalue "$line "
+		}
+	    }
 	}
-      }
+	return $rvalue
     }
-    return $rvalue
-}
 
 
-## parseArguments - Parses the arguments in argList as described in the two
-## additional Tcl lists. In addition to the arguments listed in the two 
-## additional lists, the procedure also accepts arguments common to all
-## HTML elements.
-## Arguments:
-##   argList - List of arguments to be parsed
-##   argParamList - List of arguments that take a parameter
-##   argNoParamList - List of arguments that don't take a parameter
-## Returns:
-##   A string with arguments to an HTML element.
+    ## parseArguments - Parses the arguments in argList as described in the two
+    ## additional Tcl lists. In addition to the arguments listed in the two 
+    ## additional lists, the procedure also accepts arguments common to all
+    ## HTML elements.
+    ## Arguments:
+    ##   argList - List of arguments to be parsed
+    ##   argParamList - List of arguments that take a parameter
+    ##   argNoParamList - List of arguments that don't take a parameter
+    ## Returns:
+    ##   A string with arguments to an HTML element.
 
-HtmlBuilder proc parseArguments {argList argParamList argNoParamList} {
-    set rvalue ""
-    set argParamList [concat $argParamList [list "ID" "CLASS" "STYLE" "TITLE" "LANG" "DIR"]]
-    set param 0
-    foreach arg $argList {
-        if {$param} {
-            append rvalue "=\"$arg\""
-            set param 0
-        } else {
-            set arg2 [string toupper [string trimleft $arg "-"]]
-            if {[lsearch -exact $argParamList $arg2] != -1} {
-                append rvalue " $arg2"
-                set param 1
-            } elseif {[lsearch -exact $argNoParamList $arg2] != -1} {
-                append rvalue " $arg2"
-            } else {
-                error "HTML syntax error: Invalid argument $arg2 to element"
-            }
-        }
+    HtmlBuilder proc parseArguments {argList argParamList argNoParamList} {
+	set rvalue ""
+	set argParamList [concat $argParamList [list "ID" "CLASS" "STYLE" "TITLE" "LANG" "DIR"]]
+	set param 0
+	foreach arg $argList {
+	    if {$param} {
+		append rvalue "=\"$arg\""
+		set param 0
+	    } else {
+		set arg2 [string toupper [string trimleft $arg "-"]]
+		if {[lsearch -exact $argParamList $arg2] != -1} {
+		    append rvalue " $arg2"
+		    set param 1
+		} elseif {[lsearch -exact $argNoParamList $arg2] != -1} {
+		    append rvalue " $arg2"
+		} else {
+		    error "HTML syntax error: Invalid argument $arg2 to element"
+		}
+	    }
+	}
+	if {$param} {
+	    error "HTML syntax error: Missing parameter to argument $arg2"
+	}
+	return $rvalue
     }
-    if {$param} {
-        error "HTML syntax error: Missing parameter to argument $arg2"
-    }
-    return $rvalue
-}
 
 
-##############################################################################
-## Low-level modification methods:
-##
-## The efficiency of these is of utmost importance if efficiency is an issue
-## in the first place.
-##
-## addString
-## addStringIncr
-## addStringDecr
-## addWhiteSpace
-## addDocument
-## mergeDocument
+    ##############################################################################
+    ## Low-level modification methods:
+    ##
+    ## The efficiency of these is of utmost importance if efficiency is an issue
+    ## in the first place.
+    ##
+    ## addString
+    ## addStringIncr
+    ## addStringDecr
+    ## addWhiteSpace
+    ## addDocument
+    ## mergeDocument
 
 
-## Add a new arbitrary string to the document. This method is used by other
-## modification methods, as well as the user directly to add content other than
-## HTML elements. The string str is appended to the document with proper
-## indentation.
+    ## Add a new arbitrary string to the document. This method is used by other
+    ## modification methods, as well as the user directly to add content other than
+    ## HTML elements. The string str is appended to the document with proper
+    ## indentation.
 
-HtmlBuilder instproc addString {str} {
-    my instvar document indentLevel compressed
-    
-    if {$compressed == "0"} {
-      for {set n 0} {$n < $indentLevel} {incr n} {
-          append newLine "  "
-      }
+    HtmlBuilder instproc addString {str} {
+	my instvar document indentLevel compressed
+	
+	if {$compressed == "0"} {
+	    for {set n 0} {$n < $indentLevel} {incr n} {
+		append newLine "  "
+	    }
+	}
+	append newLine $str
+	lappend document $newLine
+	
+	return
     }
-    append newLine $str
-    lappend document $newLine
-    
-    return
-}
 
-## Add a string to the document and increase the indentation level.
+    ## Add a string to the document and increase the indentation level.
 
-HtmlBuilder instproc addStringIncr {str} {
-    my instvar indentLevel
-    my addString $str
-    incr indentLevel
-    return
-}
+    HtmlBuilder instproc addStringIncr {str} {
+	my instvar indentLevel
+	my addString $str
+	incr indentLevel
+	return
+    }
 
 
-## Decrease the indentation level and add a string to the document.
+    ## Decrease the indentation level and add a string to the document.
 
-HtmlBuilder instproc addStringDecr {str} {
-    my instvar indentLevel
-    incr indentLevel -1
-    my addString $str
-    return
-}
+    HtmlBuilder instproc addStringDecr {str} {
+	my instvar indentLevel
+	incr indentLevel -1
+	my addString $str
+	return
+    }
 
-#
-# add the string and replace all line breaks in the
-# string with addLineBreak calls so that given plain text 
-# appears similar in HTML output
+    #
+    # add the string and replace all line breaks in the
+    # string with addLineBreak calls so that given plain text 
+    # appears similar in HTML output
 
-HtmlBuilder instproc addStringWithLineBreaks {str} {
-  while {[set idx [string first "\n" $str]] != -1} {
-    my addString [string range $str 0 [expr $idx - 1]]
-    my addLineBreak
-    set str [string range $str [expr $idx + 1] end]
-  }
-  my addString $str
-}
- 
-## Add a single line of white space to the HTML document.
-   
-HtmlBuilder instproc addWhiteSpace {} {
-    my addString ""
-    return
-}
+    HtmlBuilder instproc addStringWithLineBreaks {str} {
+	while {[set idx [string first "\n" $str]] != -1} {
+	    my addString [string range $str 0 [expr $idx - 1]]
+	    my addLineBreak
+	    set str [string range $str [expr $idx + 1] end]
+	}
+	my addString $str
+    }
+    
+    ## Add a single line of white space to the HTML document.
+    
+    HtmlBuilder instproc addWhiteSpace {} {
+	my addString ""
+	return
+    }
 
-## Add the content of the document given as parameter.
+    ## Add the content of the document given as parameter.
 
-HtmlBuilder instproc addDocument {document} {
-    set documentList [$document getDocument]
-    
-    foreach line $documentList {
-        my addString $line
+    HtmlBuilder instproc addDocument {document} {
+	set documentList [$document getDocument]
+	
+	foreach line $documentList {
+	    my addString $line
+	}
+	return
     }
-    return
-}
 
-## Merge the content of the document given as a parameter. The difference
-## to addDocument is that the document merged is destroyed.
+    ## Merge the content of the document given as a parameter. The difference
+    ## to addDocument is that the document merged is destroyed.
 
-HtmlBuilder instproc mergeDocument {document} {
-    set documentList [$document getDocument]
-    
-    foreach line $documentList {
-        my addString $line
+    HtmlBuilder instproc mergeDocument {document} {
+	set documentList [$document getDocument]
+	
+	foreach line $documentList {
+	    my addString $line
+	}
+	$document destroy
+	return
     }
-    $document destroy
-    return
-}
 
 
 
 
-##############################################################################
-## HTML generation methods:                                                
-##              
-## The methods for generating various HTML structures are either a pair of 
-## start and end methods, such as startParagraph and endParagraph, or a single
-## method such as addListItem. Even if the the closing tag for <p>, for
-## example, is not required by the HTML specification, using the closing method
-## is necessary to have the document properly indented.
+    ##############################################################################
+    ## HTML generation methods:                                                
+    ##              
+    ## The methods for generating various HTML structures are either a pair of 
+    ## start and end methods, such as startParagraph and endParagraph, or a single
+    ## method such as addListItem. Even if the the closing tag for <p>, for
+    ## example, is not required by the HTML specification, using the closing method
+    ## is necessary to have the document properly indented.
 
 
-# Add a string to the document within <strong>...</strong>
+    # Add a string to the document within <strong>...</strong>
 
-HtmlBuilder instproc addStringStrong {str} {
-    my addString "<STRONG>$str</STRONG>"
-    return
-}
+    HtmlBuilder instproc addStringStrong {str} {
+	my addString "<STRONG>$str</STRONG>"
+	return
+    }
 
-# Add a string to the document within <em>...</em>
+    # Add a string to the document within <em>...</em>
 
-HtmlBuilder instproc addStringEmphasized {str} {
-    my addString "<EM>$str</EM>"
-    return
-}
+    HtmlBuilder instproc addStringEmphasized {str} {
+	my addString "<EM>$str</EM>"
+	return
+    }
 
-# Add a comment to the document <!-- ... -->
+    # Add a comment to the document <!-- ... -->
 
-HtmlBuilder instproc addComment {str} {
-    my addString "<!-- $str -->"
-    return
-}
+    HtmlBuilder instproc addComment {str} {
+	my addString "<!-- $str -->"
+	return
+    }
 
-HtmlBuilder instproc addLineBreak {} {
-    my addString "<BR>"
-    return
-}
+    HtmlBuilder instproc addLineBreak {} {
+	my addString "<BR>"
+	return
+    }
 
-## startDocument - Start an HTML document. Currently all documents are HTML 4.0
-## Transitional. HTML, BODY, HEAD and TITLE elements are added/started here.
-## Optional arguments:
-##   -title documentTitle (empty if not given)
-##   -stylesheet externalStyleSheet
-##   -bgcolor backgroundColour (deprecated in HTML 4.0)
+    ## startDocument - Start an HTML document. Currently all documents are HTML 4.0
+    ## Transitional. HTML, BODY, HEAD and TITLE elements are added/started here.
+    ## Optional arguments:
+    ##   -title documentTitle (empty if not given)
+    ##   -stylesheet externalStyleSheet
+    ##   -bgcolor backgroundColour (deprecated in HTML 4.0)
 
-HtmlBuilder instproc startDocument {args} {
-    set title ""
-    foreach {name value} $args {
-        switch -- $name {
-            -title {
-                set title $value
-            }
-            -stylesheet {
-                set stylesheet $value
-            }
-            -bgcolor {
-                set bgcolor $value
+    HtmlBuilder instproc startDocument {args} {
+	set title ""
+	foreach {name value} $args {
+	    switch -- $name {
+		-title {
+		    set title $value
+		}
+		-stylesheet {
+		    set stylesheet $value
+		}
+		-bgcolor {
+		    set bgcolor $value
+		}
 	    }
-        }
+	}
+	my addString {<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/frameset.dtd">}
+	my addWhiteSpace
+	my addString {<HTML>}
+	my addStringIncr {<HEAD>}
+	my addString "<TITLE>$title</TITLE>"
+	if {[info exists stylesheet]} {
+	    my addString "<LINK REL=\"StyleSheet\" HREF=\"$stylesheet\" TYPE=\"text/css\">"
+	}
+	my addStringDecr {</HEAD>}
+	my addWhiteSpace
+	if {[info exists bgcolor]} {
+	    my addStringIncr "<BODY BGCOLOR=\"$bgcolor\">"
+	} else {
+	    my addStringIncr {<BODY>}
+	}
+	return
     }
-    my addString {<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/frameset.dtd">}
-    my addWhiteSpace
-    my addString {<HTML>}
-    my addStringIncr {<HEAD>}
-    my addString "<TITLE>$title</TITLE>"
-    if {[info exists stylesheet]} {
-        my addString "<LINK REL=\"StyleSheet\" HREF=\"$stylesheet\" TYPE=\"text/css\">"
-    }
-    my addStringDecr {</HEAD>}
-    my addWhiteSpace
-    if {[info exists bgcolor]} {
-        my addStringIncr "<BODY BGCOLOR=\"$bgcolor\">"
-    } else {
-        my addStringIncr {<BODY>}
-    }
-    return
-}
 
-## endDocument - end an HTML document
+    ## endDocument - end an HTML document
 
-HtmlBuilder instproc endDocument {} {
-    my addStringDecr {</BODY>}
-    my addString {</HTML>}
-    return
-}
+    HtmlBuilder instproc endDocument {} {
+	my addStringDecr {</BODY>}
+	my addString {</HTML>}
+	return
+    }
 
-## startParagraph - start a P element
-## Optional arguments:
-##   Common HTML arguments
+    ## startParagraph - start a P element
+    ## Optional arguments:
+    ##   Common HTML arguments
 
-HtmlBuilder instproc startParagraph {args} {
-    set attributes [HtmlBuilder parseArguments $args [list] [list]]
-    my addStringIncr "<P$attributes>"
-    return
-}
+    HtmlBuilder instproc startParagraph {args} {
+	set attributes [HtmlBuilder parseArguments $args [list] [list]]
+	my addStringIncr "<P$attributes>"
+	return
+    }
 
-## endParagraph - end a P element
+    ## endParagraph - end a P element
 
-HtmlBuilder instproc endParagraph {} {
-    my addStringDecr {</P>}
-    return
-}
+    HtmlBuilder instproc endParagraph {} {
+	my addStringDecr {</P>}
+	return
+    }
 
-## startAnchor - start an A element
-## Optional arguments:
-##   -href URI
-##   -name cdata
-##   -target frameTarget
-##   Common HTML arguments
+    ## startAnchor - start an A element
+    ## Optional arguments:
+    ##   -href URI
+    ##   -name cdata
+    ##   -target frameTarget
+    ##   Common HTML arguments
 
-HtmlBuilder instproc startAnchor {args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "HREF" "NAME" "TARGET"] [list]]
-    my addStringIncr "<A$attributes>"
-    return
-}
+    HtmlBuilder instproc startAnchor {args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "HREF" "NAME" "TARGET"] [list]]
+	my addStringIncr "<A$attributes>"
+	return
+    }
 
-## endAnchor - end an A element
+    ## endAnchor - end an A element
 
-HtmlBuilder instproc endAnchor {args} {
-    my addStringDecr {</A>}
-    return
-}
+    HtmlBuilder instproc endAnchor {args} {
+	my addStringDecr {</A>}
+	return
+    }
 
-## addAnchor - add an A element, using content as the visible link.
-## Optional arguments:
-##   -href URI
-##   -name cdata
-##   -target frameTarget
-##   Common HTML arguments
+    ## addAnchor - add an A element, using content as the visible link.
+    ## Optional arguments:
+    ##   -href URI
+    ##   -name cdata
+    ##   -target frameTarget
+    ##   Common HTML arguments
 
-HtmlBuilder instproc addAnchor {content args} {
-    eval my startAnchor $args
-    my addString $content
-    my endAnchor
-    return
-}
+    HtmlBuilder instproc addAnchor {content args} {
+	eval my startAnchor $args
+	my addString $content
+	my endAnchor
+	return
+    }
 
-## startUnorderedList - start a UL element
-## Optional arguments:
-##   Commmon HTML arguments
+    ## startUnorderedList - start a UL element
+    ## Optional arguments:
+    ##   Commmon HTML arguments
 
-HtmlBuilder instproc startUnorderedList {args} {
-    set attributes [HtmlBuilder parseArguments $args [list] [list]]
-    my addStringIncr "<UL$attributes>"
-    return
-}
+    HtmlBuilder instproc startUnorderedList {args} {
+	set attributes [HtmlBuilder parseArguments $args [list] [list]]
+	my addStringIncr "<UL$attributes>"
+	return
+    }
 
-## endUnorderedList - end a UL element
+    ## endUnorderedList - end a UL element
 
-HtmlBuilder instproc endUnorderedList {} {
-    my addStringDecr {</UL>}
-    return
-}
+    HtmlBuilder instproc endUnorderedList {} {
+	my addStringDecr {</UL>}
+	return
+    }
 
-## startListItem - start an LI element
-## Optional arguments:
-##   Common HTML arguments
+    ## startListItem - start an LI element
+    ## Optional arguments:
+    ##   Common HTML arguments
 
-HtmlBuilder instproc startListItem {args} {
-    set attributes [HtmlBuilder parseArguments $args [list] [list]]
-    my addStringIncr "<LI$attributes>"
-    return
-}
+    HtmlBuilder instproc startListItem {args} {
+	set attributes [HtmlBuilder parseArguments $args [list] [list]]
+	my addStringIncr "<LI$attributes>"
+	return
+    }
 
-## endListItem - end an LI element
+    ## endListItem - end an LI element
 
-HtmlBuilder instproc endListItem {} {
-    my addStringDecr {</LI>}
-    return
-}
+    HtmlBuilder instproc endListItem {} {
+	my addStringDecr {</LI>}
+	return
+    }
 
-## add a simple list item
-HtmlBuilder instproc addListItem {content} {
-  my startListItem
-  my addString $content
-  my endListItem
-}
+    ## add a simple list item
+    HtmlBuilder instproc addListItem {content} {
+	my startListItem
+	my addString $content
+	my endListItem
+    }
 
-## startTable - start a TABLE element. Note that if the -border argument isn't
-## used, by default the table are created with borders (<TABLE BORDER>).
+    ## startTable - start a TABLE element. Note that if the -border argument isn't
+    ## used, by default the table are created with borders (<TABLE BORDER>).
 
-## Optional arguments:
-##   -border pixels
-##   -cellpadding length
-##   -cellspacing length
-##   -summary text
-##   -width length
-##   -bgcolor  color spec
-##   Common HTML arguments
+    ## Optional arguments:
+    ##   -border pixels
+    ##   -cellpadding length
+    ##   -cellspacing length
+    ##   -summary text
+    ##   -width length
+    ##   -bgcolor  color spec
+    ##   Common HTML arguments
 
-HtmlBuilder instproc startTable {args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "BORDER" "CELLPADDING" "CELLSPACING" "SUMMARY" \
-                     "WIDTH" "BGCOLOR"] [list]]
-    if {[lsearch $args "-border"] == -1} {
-        append attributes " BORDER"
+    HtmlBuilder instproc startTable {args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "BORDER" "CELLPADDING" "CELLSPACING" "SUMMARY" \
+				 "WIDTH" "BGCOLOR"] [list]]
+	if {[lsearch $args "-border"] == -1} {
+	    append attributes " BORDER"
+	}
+	my addStringIncr "<TABLE$attributes>"
+	return
     }
-    my addStringIncr "<TABLE$attributes>"
-    return
-}
 
-## endTable - end a TABLE element
+    ## endTable - end a TABLE element
 
-HtmlBuilder instproc endTable {} {
-    my addStringDecr {</TABLE>}
-    return
-}
+    HtmlBuilder instproc endTable {} {
+	my addStringDecr {</TABLE>}
+	return
+    }
 
-## startTableRow - start a TR element
-## Optional arguments:
-##   Common HTML arguments
-HtmlBuilder instproc startTableRow {args} {
-    set attributes [HtmlBuilder parseArguments $args [list "VALIGN"] [list]]
-    my addStringIncr "<TR$attributes>"
-    return
-}
+    ## startTableRow - start a TR element
+    ## Optional arguments:
+    ##   Common HTML arguments
+    HtmlBuilder instproc startTableRow {args} {
+	set attributes [HtmlBuilder parseArguments $args [list "VALIGN"] [list]]
+	my addStringIncr "<TR$attributes>"
+	return
+    }
 
-## endTableRow - end a TR element
+    ## endTableRow - end a TR element
 
-HtmlBuilder instproc endTableRow {} {
-    my addStringDecr {</TR>}
-    return
-}
+    HtmlBuilder instproc endTableRow {} {
+	my addStringDecr {</TR>}
+	return
+    }
 
-## startTableCell - start a TD element
-## Optional arguments:
-##   -colspan number
-##   -rowspan number
-##   -align left|center|right|justify|char
-##   -valign top|middle|bottom|baseline
-##   -bgcolor
-##   -width
-##   Common HTML arguments
+    ## startTableCell - start a TD element
+    ## Optional arguments:
+    ##   -colspan number
+    ##   -rowspan number
+    ##   -align left|center|right|justify|char
+    ##   -valign top|middle|bottom|baseline
+    ##   -bgcolor
+    ##   -width
+    ##   Common HTML arguments
 
-HtmlBuilder instproc startTableCell {args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "COLSPAN" "ROWSPAN" "ALIGN" "VALIGN" \
-		      "BGCOLOR" "WIDTH"] [list]]
-    my addStringIncr "<TD$attributes>"
-    return
-}
+    HtmlBuilder instproc startTableCell {args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "COLSPAN" "ROWSPAN" "ALIGN" "VALIGN" \
+				 "BGCOLOR" "WIDTH"] [list]]
+	my addStringIncr "<TD$attributes>"
+	return
+    }
 
-## endTableCell - end a TD element
+    ## endTableCell - end a TD element
 
-HtmlBuilder instproc endTableCell {} {
-    my addStringDecr {</TD>}
-    return
-}
+    HtmlBuilder instproc endTableCell {} {
+	my addStringDecr {</TD>}
+	return
+    }
 
-#
-# add a simple table cell which just contains a string
-#
-HtmlBuilder instproc addTableCell {{string ""} args} {
-  eval my startTableCell $args
-  my addString $string
-  my endTableCell
-}
+    #
+    # add a simple table cell which just contains a string
+    #
+    HtmlBuilder instproc addTableCell {{string ""} args} {
+	eval my startTableCell $args
+	my addString $string
+	my endTableCell
+    }
 
-## startTableHeaderCell - start a TH element
-## Optional arguments:
-##   -colspan number
-##   -rowspan number
-##   -align left|center|right|justify|char
-##   -valign top|middle|bottom|baseline
-##   Common HTML arguments
+    ## startTableHeaderCell - start a TH element
+    ## Optional arguments:
+    ##   -colspan number
+    ##   -rowspan number
+    ##   -align left|center|right|justify|char
+    ##   -valign top|middle|bottom|baseline
+    ##   Common HTML arguments
 
-HtmlBuilder instproc startTableHeaderCell {args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "COLSPAN" "ROWSPAN" "ALIGN" "VALIGN"] [list]]
-    my addStringIncr "<TH$attributes>"
-    return
-}
+    HtmlBuilder instproc startTableHeaderCell {args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "COLSPAN" "ROWSPAN" "ALIGN" "VALIGN"] [list]]
+	my addStringIncr "<TH$attributes>"
+	return
+    }
 
-## endTableHeaderCell - end a TH element
+    ## endTableHeaderCell - end a TH element
 
-HtmlBuilder instproc endTableHeaderCell {} {
-    my addStringDecr {</TH>}
-    return
-}
+    HtmlBuilder instproc endTableHeaderCell {} {
+	my addStringDecr {</TH>}
+	return
+    }
 
-## startForm - start a FORM element
-## Required arguments:
-##   -action URI
-## Optional arguments:
-##   -method get|post
-##   Common HTML arguments
+    ## startForm - start a FORM element
+    ## Required arguments:
+    ##   -action URI
+    ## Optional arguments:
+    ##   -method get|post
+    ##   Common HTML arguments
 
-HtmlBuilder instproc startForm {args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "ACTION" "METHOD" "ENCTYPE"] [list]]
-    my addStringIncr "<FORM$attributes>"
-    return
-}
+    HtmlBuilder instproc startForm {args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "ACTION" "METHOD" "ENCTYPE"] [list]]
+	my addStringIncr "<FORM$attributes>"
+	return
+    }
 
-## endForm - end a FORM element
+    ## endForm - end a FORM element
 
-HtmlBuilder instproc endForm {} {
-    my addStringDecr {</FORM>}
-    return
-}
+    HtmlBuilder instproc endForm {} {
+	my addStringDecr {</FORM>}
+	return
+    }
 
-## addInput - add in INPUT element
-## Required arguments:
-##   -type <input type>
-##   -name <control name>
-## Optional arguments:
-##   -value <initial value>
-##   -size <width of input, in pixels of characters>
-##   -maxlength <max number of characters for text input>
-##   -checked
-##   Common HTML arguments
- 
-HtmlBuilder instproc addInput {args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "TYPE" "NAME" "VALUE" "SIZE" "MAXLENGTH"] \
-                    [list "CHECKED"]]
-    my addString "<INPUT$attributes>"
-    return
-}
+    ## addInput - add in INPUT element
+    ## Required arguments:
+    ##   -type <input type>
+    ##   -name <control name>
+    ## Optional arguments:
+    ##   -value <initial value>
+    ##   -size <width of input, in pixels of characters>
+    ##   -maxlength <max number of characters for text input>
+    ##   -checked
+    ##   Common HTML arguments
+    
+    HtmlBuilder instproc addInput {args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "TYPE" "NAME" "VALUE" "SIZE" "MAXLENGTH"] \
+			    [list "CHECKED"]]
+	my addString "<INPUT$attributes>"
+	return
+    }
 
-## addTextArea - start a TEXTAREA element
-## First parameter: value - Default value of the text area
-## Required arguments:
-##   -rows <number of rows>
-##   -cols <number of columns>
-## Optional arguments:
-##   -name <control name>
-##   Common HTML Arguments
+    ## addTextArea - start a TEXTAREA element
+    ## First parameter: value - Default value of the text area
+    ## Required arguments:
+    ##   -rows <number of rows>
+    ##   -cols <number of columns>
+    ## Optional arguments:
+    ##   -name <control name>
+    ##   Common HTML Arguments
 
-HtmlBuilder instproc addTextArea {value args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "ROWS" "COLS" "NAME"] [list]]
-    my addString "<TEXTAREA$attributes>$value</TEXTAREA>"
-    return
-}
+    HtmlBuilder instproc addTextArea {value args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "ROWS" "COLS" "NAME"] [list]]
+	my addString "<TEXTAREA$attributes>$value</TEXTAREA>"
+	return
+    }
 
-## startOptionSelector - start a SELECT element
-## Optional arguments:
-##   -name <control name>
-##   -size <number of visible items>
-##   -multiple
-##   Common HTML arguments
+    ## startOptionSelector - start a SELECT element
+    ## Optional arguments:
+    ##   -name <control name>
+    ##   -size <number of visible items>
+    ##   -multiple
+    ##   Common HTML arguments
 
-HtmlBuilder instproc startOptionSelector {args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "NAME" "SIZE"] [list "MULTIPLE"]]
-    my addStringIncr "<SELECT$attributes>"
-    return
-}    
+    HtmlBuilder instproc startOptionSelector {args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "NAME" "SIZE"] [list "MULTIPLE"]]
+	my addStringIncr "<SELECT$attributes>"
+	return
+    }    
 
-## endOptionSelector - end a SELECT element
+    ## endOptionSelector - end a SELECT element
 
-HtmlBuilder instproc endOptionSelector {} {
-    my addStringDecr "</SELECT>"
-    return
-}
+    HtmlBuilder instproc endOptionSelector {} {
+	my addStringDecr "</SELECT>"
+	return
+    }
 
-## startOption - start an OPTION element
-## Optional arguments:
-##   -value <value of option>
-##   -selected
-##   Common HTML arguments
+    ## startOption - start an OPTION element
+    ## Optional arguments:
+    ##   -value <value of option>
+    ##   -selected
+    ##   Common HTML arguments
 
-HtmlBuilder instproc startOption {args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "VALUE"] [list "SELECTED"]]
-    my addStringIncr "<OPTION$attributes>"
-    return
-}
+    HtmlBuilder instproc startOption {args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "VALUE"] [list "SELECTED"]]
+	my addStringIncr "<OPTION$attributes>"
+	return
+    }
 
-## endOption - end an OPTION element
+    ## endOption - end an OPTION element
 
-HtmlBuilder instproc endOption {} {
-    my addStringDecr "</OPTION>"
-    return
-}
+    HtmlBuilder instproc endOption {} {
+	my addStringDecr "</OPTION>"
+	return
+    }
 
-## addImage - add an IMG element
-## Required arguments:
-##   -src <url>
-##   -alt <alternate text>
-##   -align <alignment> (deprecated in HTML 4.0)
-## Optional arguments:
-##   Common HTML arguments
+    ## addImage - add an IMG element
+    ## Required arguments:
+    ##   -src <url>
+    ##   -alt <alternate text>
+    ##   -align <alignment> (deprecated in HTML 4.0)
+    ## Optional arguments:
+    ##   Common HTML arguments
 
-HtmlBuilder instproc addImage {args} {
-    set attributes [HtmlBuilder parseArguments $args \
-                    [list "SRC" "ALT" "ALIGN"] [list]]
-    my addString "<IMG$attributes>"
-    return
-}
+    HtmlBuilder instproc addImage {args} {
+	set attributes [HtmlBuilder parseArguments $args \
+			    [list "SRC" "ALT" "ALIGN"] [list]]
+	my addString "<IMG$attributes>"
+	return
+    }
 
-## startBlock - start a DIV element (a generic block-level container)
-## Optional arguments:
-##   Common HTML attributes
+    ## startBlock - start a DIV element (a generic block-level container)
+    ## Optional arguments:
+    ##   Common HTML attributes
 
-HtmlBuilder instproc startBlock {args} {
-    set attributes [HtmlBuilder parseArguments $args [list] [list]]
-    my addStringIncr "<DIV$attributes>"
-    return
-}
+    HtmlBuilder instproc startBlock {args} {
+	set attributes [HtmlBuilder parseArguments $args [list] [list]]
+	my addStringIncr "<DIV$attributes>"
+	return
+    }
 
-## endBlock - end a DIV element
+    ## endBlock - end a DIV element
 
-HtmlBuilder instproc endBlock {} {
-    my addStringDecr "</DIV>"
-    return
-}
+    HtmlBuilder instproc endBlock {} {
+	my addStringDecr "</DIV>"
+	return
+    }
 
-## addHorizontalRule - add an HR element
-## Optional arguments:
-##   Common HTML arguments
+    ## addHorizontalRule - add an HR element
+    ## Optional arguments:
+    ##   Common HTML arguments
 
-HtmlBuilder instproc addHorizontalRule {args} {
-    set attributes [HtmlBuilder parseArguments $args [list] [list]]
-    my addString "<HR$attributes>"
-    return
+    HtmlBuilder instproc addHorizontalRule {args} {
+	set attributes [HtmlBuilder parseArguments $args [list] [list]]
+	my addString "<HR$attributes>"
+	return
+    }
+
+    namespace export HtmlBuilder
 }
+
+namespace import ::xotcl::htmllib::*
Index: xotcl/library/lib/mixinStrategy.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/lib/mixinStrategy.xotcl	(.../mixinStrategy.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/lib/mixinStrategy.xotcl	(.../mixinStrategy.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,92 +1,98 @@
-#$Id: mixinStrategy.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
-package provide xotcl::mixinStrategy 0.8
+#$Id: mixinStrategy.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+package provide xotcl::mixinStrategy 0.9
 
-@ @File { description {
-  These methods provide support for managing "strategies",  i.e. 
-  mixin-classes, where only one kind of a family of conformant 
-  mixins should be registered.
-  <@p>
-  Naming convertions for strategies:
-  All strategies must follow the naming convention 'kind=implementation'. 
-  Examples are the persistency strategy 'eager' specfied as 
-  'persistent=eager' or the persistency strategy 'lazy' (specified as
-  'persistent=lazy')
-}}
+package require XOTcl
 
-@ Object instproc mixinStrategy {strategy "Strategy to be added" } {
-  description {
-    This method adds or replaces a new strategy from the mixin
-    list. Strategies are named following the converntion mentioned 
-    above.
+namespace eval ::xotcl::mixinStrategy {
+  namespace import ::xotcl::*
+
+  @ @File { description {
+    These methods provide support for managing "strategies",  i.e. 
+    mixin-classes, where only one kind of a family of conformant 
+    mixins should be registered.
+    <@p>
+    Naming convertions for strategies:
+    All strategies must follow the naming convention 'kind=implementation'. 
+    Examples are the persistency strategy 'eager' specfied as 
+    'persistent=eager' or the persistency strategy 'lazy' (specified as
+    'persistent=lazy')
+  }}
+
+  @ Object instproc mixinStrategy {strategy "Strategy to be added" } {
+    description {
+      This method adds or replaces a new strategy from the mixin
+      list. Strategies are named following the convention mentioned 
+      above.
+    }
+    return "old strategy"
   }
-  return "old strategy"
-}
 
-Object instproc mixinStrategy {strategy} {
-  ::regexp {^([^:]+)=} $strategy _ kind
-  ::set mixins ""
-  ::set oldStrategy ""
-  foreach mixin [my info mixin] {
-    if {[::string match ::$kind=* $mixin]} {
-      ::lappend mixins $strategy
-      ::set oldStrategy $mixin
-    } else {
-      ::lappend mixins $mixin
+  Object instproc mixinStrategy {strategy} {
+    regexp {:?([^:=]+)=} $strategy _ kind
+    set mixins ""
+    set oldStrategy ""
+    foreach mixin [my info mixin] {
+      if {[string match *${kind}=* $mixin]} {
+	lappend mixins $strategy
+	set oldStrategy $mixin
+      } else {
+	lappend mixins $mixin
+      }
     }
+    if {$oldStrategy == ""} {
+      lappend mixins $strategy
+    }
+    my mixin $mixins
+    return $oldStrategy
   }
-  if {$oldStrategy == ""} {
-    ::lappend mixins $strategy
+
+  @ Object instproc mixinQueryStrategy {kind "strategy kind"} {
+    description {
+      This method searches the mixin list for a mixin of this
+      kind (starting with $kind=)
+    }
+    return "returns the maching strategy"
   }
-  my mixin $mixins
-  return $oldStrategy
-}
 
-@ Object instproc mixinQueryStrategy {kind "strategy kind"} {
-  description {
-    This method searches the mixin list for a mixin of this
-    kind (starting with $kind=)
+  Object instproc mixinQueryStrategy {kind} {
+    set m [my info mixin]
+    return [::lindex $m [::lsearch -glob $m $kind=*]]
   }
-  return "returns the maching strategy"
-}
 
-Object instproc mixinQueryStrategy {kind} {
-  set m [my info mixin]
-  return [::lindex $m [::lsearch -glob $m $kind=*]]
-}
+  @ Object instproc add {construct "(inst) 'filter' or 'mixin'" args "to be added"} {
+    description "add the specified (inst) 'filters' or 'mixins'"
+    return "empty"
+  }
 
-@ Object instproc add {construct "(inst) 'filter' or 'mixin'" args "to be added"} {
-  description "add the specified (inst) 'filters' or 'mixins'"
-  return "empty"
-}
-
-Object instproc add {kind args} {
-  if {$kind != {instfilter} && $kind != {instmixin} &&
-      $kind != {filter} && $kind != {mixin}} {
-    error "Usage: <object> [self proc] <instfilter|instmixin|filter|mixin> ..."
+  Object instproc add {kind args} {
+    if {$kind != {instfilter} && $kind != {instmixin} &&
+	$kind != {filter} && $kind != {mixin}} {
+      error "Usage: <object> [self proc] <instfilter|instmixin|filter|mixin> ..."
+    }
+    ::set classes [my info $kind]
+    eval ::lappend classes $args
+    my $kind $classes
+    #puts stderr "$kind of [self] are now: �[my info $kind]�"
   }
-  ::set classes [my info $kind]
-  eval ::lappend classes $args
-  my $kind $classes
-  #puts stderr "$kind of [self] are now: �[my info $kind]�"
-}
-@ Object instproc remove {construct "(inst) 'filter' or 'mixin'" args "to be removed"} {
-  description "remove the specified (inst) 'filters' or 'mixins'"
-  return "empty"
-}
-Object instproc remove {kind args} {
-  if {$kind != {instfilter} && $kind != {instmixin} &&
-      $kind != {filter} && $kind != {mixin}} {
-    error "Usage: <object> [self proc] <instfilter|instmixin|filter|mixin> ..."
+  @ Object instproc remove {construct "(inst) 'filter' or 'mixin'" args "to be removed"} {
+    description "remove the specified (inst) 'filters' or 'mixins'"
+    return "empty"
   }
-  ::set classes [my info $kind]
-  foreach c $args {
-    ::set pos [::lsearch $classes $c]
-    if {$pos == -1} { 
-      error "$kind �$c� could not be removed" 
-    } else {
-      set $classes [::lreplace $classes $pos $pos]
+  Object instproc remove {kind args} {
+    if {$kind != {instfilter} && $kind != {instmixin} &&
+	$kind != {filter} && $kind != {mixin}} {
+      error "Usage: <object> [self proc] <instfilter|instmixin|filter|mixin> ..."
     }
-  } 
-  my $kind $classes
-  # puts stderr "$kind of [self] are now: �[my info $kind]�"
+    ::set classes [my info $kind]
+    foreach c $args {
+      ::set pos [::lsearch $classes $c]
+      if {$pos == -1} { 
+	error "$kind �$c� could not be removed" 
+      } else {
+	set $classes [::lreplace $classes $pos $pos]
+      }
+    } 
+    my $kind $classes
+    # puts stderr "$kind of [self] are now: �[my info $kind]�"
+  }
 }
Index: xotcl/library/lib/package.xotcl
===================================================================
diff -u -r489071934af0126a0f768b0ced07dea3b2328a23 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/lib/package.xotcl	(.../package.xotcl)	(revision 489071934af0126a0f768b0ced07dea3b2328a23)
+++ xotcl/library/lib/package.xotcl	(.../package.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,135 +1,156 @@
-#$Id: package.xotcl,v 1.2 2004/12/02 00:01:20 neumann Exp $
+#$Id: package.xotcl,v 1.3 2005/09/09 21:07:23 neumann Exp $
 package provide xotcl::package 0.91
 
 package require xotcl::mixinStrategy
+package require XOTcl
 
 rename package tcl_package
 
-@ @File {description {
-  Represent Tcl package loading command by an XOTcl
-  object. Enables tracking, tracing, and verbose output
-  of package loading
-  }
-}
-@ Object package {
-  description {
-    Supports all Tcl package options plus present and verbose.
-  }
-}
-@ package proc present {args "packageName or -exact packageName"} {
-  description {
-    Check whether a package is present or not. Similar to Tcl's 
-    package present, but works with Tcl < 8.3
-  }
-}
-@ package proc verbose {v  "1 or 0"} {
-  description {
-    Toggle verbose output on/off. If on, package prints the locations
-    from where packages are loaded to the screen. Default is off.
-  }
-} 
+namespace eval ::xotcl::package {
+    namespace import ::xotcl::*
 
-Object package
-package set component .
-package set verbose 0
-package proc unknown args {
-  #puts stderr "unknown: package $args"
-  eval tcl_package $args
-}
-package proc verbose value {
-  my set verbose $value
-}
-package proc present args {
-  if {$::tcl_version<8.3} {
-    my instvar loaded
-    switch -exact -- [lindex $args 0] {
-      -exact  {set pkg [lindex $args 1]}
-      default {set pkg [lindex $args 0]}
+    @ @File {description {
+	Represent Tcl package loading command by an XOTcl
+	object. Enables tracking, tracing, and verbose output
+	of package loading
     }
-    if {[info exists loaded($pkg)]} {
-      return $loaded($pkg)
-    } else {
-      error "not found"
     }
-  } else {
-    eval tcl_package present $args
-  }
-}
+    @ Object package {
+	description {
+	    Supports all Tcl package options plus present and verbose.
+	}
+    }
+    @ package proc present {args "packageName or -exact packageName"} {
+	description {
+	    Check whether a package is present or not. Similar to Tcl's 
+	    package present, but works with Tcl < 8.3
+	}
+    }
+    @ package proc verbose {v  "1 or 0"} {
+	description {
+	    Toggle verbose output on/off. If on, package prints the locations
+	    from where packages are loaded to the screen. Default is off.
+	}
+    } 
 
-package proc require args {
-  my instvar component verbose uses loaded
-  set prevComponent $component
-  if {[catch {set v [eval package present $args]} msg]} {
-    #puts stderr "we have to load $msg"
-    switch -exact -- [lindex $args 0] {
-	-exact  {set pkg [lindex $args 1]}
-	default {set pkg [lindex $args 0]}
+    Object package
+    package set component .
+    package set verbose 0
+    package proc unknown args {
+	#puts stderr "unknown: package $args"
+	eval tcl_package $args
     }
-    set component $pkg
-    lappend uses($prevComponent) $component
-    set v [eval tcl_package require $args]
-    if {$v != "" && $verbose} {
-      set path [lindex [tcl_package ifneeded $pkg $v] 1]
-      puts "... $pkg $v loaded from '$path'"
-      set loaded($pkg) $v   ;# loaded stuff needed for Tcl 8.0
+    package proc verbose value {
+	my set verbose $value
     }
-  }
-  set component $prevComponent
-  return $v
-}
+    package proc present args {
+	if {$::tcl_version<8.3} {
+	    my instvar loaded
+	    switch -exact -- [lindex $args 0] {
+		-exact  {set pkg [lindex $args 1]}
+		default {set pkg [lindex $args 0]}
+	    }
+	    if {[info exists loaded($pkg)]} {
+		return $loaded($pkg)
+	    } else {
+		error "not found"
+	    }
+	} else {
+	    eval tcl_package present $args
+	}
+    }
 
-Object package::tracker
-package::tracker set verbose 0
-package::tracker proc storeEntry {table index} {
-    my instvar verbose $table
-    set ${table}($index) "[package set component] [info script]"
-    if {$verbose} {
-	puts  "... $table $index loaded from [info script]"
+    package proc require args {
+	my instvar component verbose uses loaded
+	set prevComponent $component
+	if {[catch {set v [eval package present $args]} msg]} {
+	    #puts stderr "we have to load $msg"
+	    switch -exact -- [lindex $args 0] {
+		-exact  {set pkg [lindex $args 1]}
+		default {set pkg [lindex $args 0]}
+	    }
+	    set component $pkg
+	    lappend uses($prevComponent) $component
+	    set v [eval tcl_package require $args]
+	    if {$v != "" && $verbose} {
+		set path [lindex [tcl_package ifneeded $pkg $v] 1]
+		puts "... $pkg $v loaded from '$path'"
+		set loaded($pkg) $v   ;# loaded stuff needed for Tcl 8.0
+	    }
+	}
+	set component $prevComponent
+	return $v
     }
-}
-package::tracker proc dump {} {
-  my instvar class object instproc proc
-  if {[info exist class]}    { parray class }
-  if {[info exist object]}   { parray object }
-  if {[info exist instproc]} { parray instproc }
-  if {[info exist proc]}     { parray proc }
-}
-package::tracker proc start {} {
-    ::Class  add mixin [self]::M
-    ::Object add mixin [self]::M
-}
 
-Class package::tracker::M
-package::tracker::M instproc create {cls args} {
-    set table [string tolower [string trimleft [self] :]]
-    package::tracker storeEntry $table [lindex $args 0]
-    next
-    $cls add mixin [self class]
-}
-package::tracker::M instproc instproc args {
-    package::tracker storeEntry instproc [self]->[lindex $args 0]
-    next
-}
-package::tracker::M instproc proc args {
-    package::tracker storeEntry proc [self]->[lindex $args 0]
-    next
-}
+    Object package::tracker
+    package::tracker set verbose 0
+    package::tracker proc storeEntry {table index} {
+	my instvar verbose $table
+	set ${table}($index) "[package set component] [info script]"
+	if {$verbose} {
+	    puts  "... $table $index loaded from [info script]"
+	}
+    }
+    package::tracker proc dump {} {
+	my instvar class object instproc proc
+	if {[info exist class]}    { parray class }
+	if {[info exist object]}   { parray object }
+	if {[info exist instproc]} { parray instproc }
+	if {[info exist proc]}     { parray proc }
+    }
+    package::tracker proc start {} {
+	::Class  add mixin [self]::M
+	::Object add mixin [self]::M
+    }
 
-#package::tracker set verbose 1
-#package::tracker start
-#
-#Class A
-#A instproc p args {
-#    puts A
-#}
-#A proc pp args {
-#    a call 
-#}
-#Object o
-#o proc ppp args {
-#    another call
-#}
-#puts stderr ====================================================
-#package::tracker dump
+    Class package::tracker::M
+    package::tracker::M instproc create {cls args} {
+	set table [string tolower [string trimleft [self] :]]
+	package::tracker storeEntry $table [lindex $args 0]
+	next
+	$cls add mixin [self class]
+    }
+    package::tracker::M instproc instproc args {
+	package::tracker storeEntry instproc [self]->[lindex $args 0]
+	next
+    }
+    package::tracker::M instproc proc args {
+					    package::tracker storeEntry proc [self]->[lindex $args 0]
+					    next
+					}
 
-#puts stderr AUTO_PATH=$auto_path.
+    #package::tracker set verbose 1
+    #package::tracker start
+    #
+    #Class A
+    #A instproc p args {
+    #    puts A
+    #}
+    #A proc pp args {
+    #    a call 
+    #}
+    #Object o
+    #o proc ppp args {
+    #    another call
+    #}
+    #puts stderr ====================================================
+    #package::tracker dump
+
+    #puts stderr AUTO_PATH=$auto_path.
+
+    namespace export package
+    namespace eval package {
+	namespace export tracker
+	namespace eval tracker {
+	    namespace export M
+	}
+    }
+}
+
+namespace import ::xotcl::package::*
+namespace eval package {
+    namespace import ::xotcl::package::package::*
+    namespace eval tracker {
+	namespace import ::xotcl::package::package::tracker::*
+    }
+}
Index: xotcl/library/lib/trace.xotcl
===================================================================
diff -u -r0896d4deb00780e48b5b03269bf9c4ecca948919 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/lib/trace.xotcl	(.../trace.xotcl)	(revision 0896d4deb00780e48b5b03269bf9c4ecca948919)
+++ xotcl/library/lib/trace.xotcl	(.../trace.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,265 +1,275 @@
-# -*- Tcl -*- $Id: trace.xotcl,v 1.3 2005/01/06 03:10:05 neumann Exp $
+# -*- Tcl -*- $Id: trace.xotcl,v 1.4 2005/09/09 21:07:23 neumann Exp $
 package provide xotcl::trace 0.91
-@ @File {description {
-  Various tracing tools for the XOTcl language.
-  }
-}
-@ Object instproc traceFilter {
-  args "arbitrary args"
-} {
-    Description {
-      Filter to trace every method call on an object or class hierarchy.
-      Outputs a message befora and after each call of the traced object.
+package require XOTcl
+
+namespace eval ::xotcl::trace {
+    namespace import ::xotcl::*
+
+    @ @File {description {
+	Various tracing tools for the XOTcl language.
     }
-    return "empty string"
-}
-@ Object Trace { 
-  Description {
-    Write trace outputs and produce statistics. Variable traceStream
-    defines where to write trace output (default: stderr).
-  }
-}
-@ Trace proc puts {line "output line"} {
-  Description {
-    Define how traceFilter writes to the output stream. Default:
-    write to trace stream.
-  }
-}
-@ Trace proc openTraceFile {name "file name"} {
-  Description {
-    Redirect trace output to file.
-  }
-}
-@ Trace proc closeTraceFile {name "file name"} {
-  Description {
-    Close trace  file and redirect output to stderr.
-  }
-}
-@ Object instproc lintFilter {} {
-  Description {Experimental lint filter}
-}
-@ Object instproc statFilter {} {
-  Description {Experimental statistics filter}
-}
-@ Object instproc showVars {args "ist of variables"} {
-  Description {Show the values of the specified variables (or of all variables)
-    of an object on stderr.}
-}
-@ Object instproc showMsg {msg "optional output"} {
-  Description {Show a message msg with the form "[self] $cls->$method $msg" on stderr.}
-}
-@ Object instproc showClass {} { Description {Show classes and mixins of the object}}
-@ Object instproc showStack {maxDepth "max stack depth, default=100"} { 
-  Description {Show callstack up to the specified calldepth.}}
-@ Object instproc showCall {} { Description {Show the current call with the form "[self] $cls->$method $args" on stderr.}}
-@ Object instproc showTimeStart {"?handle?" "Handle object name, optional"} {Description {start a timer}}
-@ Object instproc showTimeEnd {"?handle?" "Handle object name, optional"} {Description {end a timer and show result}}
+    }
+    @ Object instproc traceFilter {
+	args "arbitrary args"
+    } {
+	Description {
+	    Filter to trace every method call on an object or class hierarchy.
+	    Outputs a message befora and after each call of the traced object.
+	}
+	return "empty string"
+    }
+    @ Object Trace { 
+	Description {
+	    Write trace outputs and produce statistics. Variable traceStream
+	    defines where to write trace output (default: stderr).
+	}
+    }
+    @ Trace proc puts {line "output line"} {
+	Description {
+	    Define how traceFilter writes to the output stream. Default:
+	    write to trace stream.
+	}
+    }
+    @ Trace proc openTraceFile {name "file name"} {
+	Description {
+	    Redirect trace output to file.
+	}
+    }
+    @ Trace proc closeTraceFile {name "file name"} {
+	Description {
+	    Close trace  file and redirect output to stderr.
+	}
+    }
+    @ Object instproc lintFilter {} {
+	Description {Experimental lint filter}
+    }
+    @ Object instproc statFilter {} {
+	Description {Experimental statistics filter}
+    }
+    @ Object instproc showVars {args "ist of variables"} {
+	Description {Show the values of the specified variables (or of all variables)
+	    of an object on stderr.}
+    }
+    @ Object instproc showMsg {msg "optional output"} {
+	Description {Show a message msg with the form "[self] $cls->$method $msg" on stderr.}
+    }
+    @ Object instproc showClass {} { Description {Show classes and mixins of the object}}
+    @ Object instproc showStack {maxDepth "max stack depth, default=100"} { 
+	Description {Show callstack up to the specified calldepth.}}
+    @ Object instproc showCall {} { Description {Show the current call with the form "[self] $cls->$method $args" on stderr.}}
+    @ Object instproc showTimeStart {"?handle?" "Handle object name, optional"} {Description {start a timer}}
+    @ Object instproc showTimeEnd {"?handle?" "Handle object name, optional"} {Description {end a timer and show result}}
 
-##########################################################################
+    ##########################################################################
 
-proc showCall {} { Trace deprecated-function showCall}
-proc showVars {} { Trace deprecated-function showVars}
-proc showObj {o {printObjectName 1}} { Trace deprecated-function showObj}
-proc showStack {{m 100}} { Trace deprecated-function showStack}
+    proc showCall {} { Trace deprecated-function showCall}
+    proc showVars {} { Trace deprecated-function showVars}
+    proc showObj {o {printObjectName 1}} { Trace deprecated-function showObj}
+    proc showStack {{m 100}} { Trace deprecated-function showStack}
 
 
-Object Trace
-Trace set traceStream stderr
-Trace proc openTraceFile name {
-  my set traceStream [open $name w]
-}
-Trace proc closeTraceFile {} {
-  close $Trace::traceStream
-  my set traceStream stderr
-}
-Trace proc puts line {
-  puts $Trace::traceStream $line
-}
-Trace proc add {type classname} {
-  $classname instfilter [concat [$classname info instfilter] ${type}Filter]
-}
+    Object Trace
+    Trace set traceStream stderr
+    Trace proc openTraceFile name {
+	my set traceStream [open $name w]
+    }
+    Trace proc closeTraceFile {} {
+	close $Trace::traceStream
+	my set traceStream stderr
+    }
+    Trace proc puts line {
+	puts $Trace::traceStream $line
+    }
+    Trace proc add {type classname} {
+	$classname instfilter [concat [$classname info instfilter] ${type}Filter]
+    }
 
-Trace proc statReset {} {
-  catch {my unset stat}
-}
-Trace proc statReportClass c {
-  if {[my exists stat($c)]} {
-    puts "\nClass $c: [my set stat($c)] references"
-    foreach method [$c info instprocs] {
-      set key $c->$method			       
-      if {[info exists stat($key)]} {
-	puts "\t$key: [my set stat($key)] references"
-      } else {
-	puts "\t$key: not used"
-      }
+    Trace proc statReset {} {
+	catch {my unset stat}
     }
-  } else {
-    puts "\nClass $c: not used"
-  }
-  foreach subclass [lsort [$c info subclass]] {
-    my [self proc] $subclass
-  }
-}
-Trace proc statReport {} {
-  my statReportClass Object
-}
-Trace proc statCount key {
-  if {[my exists stat($key)]} {
-    my incr stat($key)
-  } else {
-    my incr set stat($key) 1
-  }
-}
-Trace proc deprecated-function {name} {
-  puts stderr "Function <$name> is deprecated. Use method with same name instead."
-}
+    Trace proc statReportClass c {
+	if {[my exists stat($c)]} {
+	    puts "\nClass $c: [my set stat($c)] references"
+	    foreach method [$c info instprocs] {
+						set key $c->$method			       
+						if {[info exists stat($key)]} {
+						    puts "\t$key: [my set stat($key)] references"
+						} else {
+						    puts "\t$key: not used"
+						}
+					    }
+	} else {
+	    puts "\nClass $c: not used"
+	}
+	foreach subclass [lsort [$c info subclass]] {
+	    my [self proc] $subclass
+	}
+    }
+    Trace proc statReport {} {
+	my statReportClass Object
+    }
+    Trace proc statCount key {
+	if {[my exists stat($key)]} {
+	    my incr stat($key)
+	} else {
+	    my incr set stat($key) 1
+	}
+    }
+    Trace proc deprecated-function {name} {
+	puts stderr "Function <$name> is deprecated. Use method with same name instead."
+    }
 
 
 
-Object instproc traceFilter args {
-  # don't trace the Trace object
-  if {[self] == "::Trace"} {return [next]}
-  set context "[self callingclass]->[self callingproc]"
-  set method [self calledproc]
-  switch -- $method {
-    proc -
-    instproc {set dargs [list [lindex $args 0] [lindex $args 1] ...] }
-    default  {set dargs $args }
-  }
-  #my showStack
-  Trace::puts "CALL $context>  [self]->$method $dargs (next=[self next])"
-  set result [next]
-  Trace::puts "EXIT $context>  [self]->$method ($result)"
-  return $result
-}
+    Object instproc traceFilter args {
+	# don't trace the Trace object
+	if {[self] == "::Trace"} {return [next]}
+	set context "[self callingclass]->[self callingproc]"
+	set method [self calledproc]
+	switch -- $method {
+	    proc -
+	    instproc {set dargs [list [lindex $args 0] [lindex $args 1] ...] }
+	    default  {set dargs $args }
+	}
+	#my showStack
+	Trace::puts "CALL $context>  [self]->$method $dargs (next=[self next])"
+	set result [next]
+	Trace::puts "EXIT $context>  [self]->$method ($result)"
+	return $result
+    }
 
-Object instproc lintFilter args {
-  #puts stderr c=[self class],ic[my info class],p=[self calledproc]
-  #puts stderr " =====================METHOD='[self calledproc]'"
-  my instvar __reported
-  switch -exact -- [self calledproc] {
-    instvar {
-      set ccls [self callingclass]
-      set method [self callingproc]
+    Object instproc lintFilter args {
+	#puts stderr c=[self class],ic[my info class],p=[self calledproc]
+	#puts stderr " =====================METHOD='[self calledproc]'"
+	my instvar __reported
+	switch -exact -- [self calledproc] {
+	    instvar {
+		set ccls [self callingclass]
+		set method [self callingproc]
 
-      #puts stderr ccls=$ccls.
-      if {$ccls == ""} { ;## instvar in proc
-	set bod [my info body $method]
-	set context "proc [self]->$method"
-      } else { ;## instvar in instproc
-	set bod [$ccls info instbody $method]
-	set context "instproc $ccls->$method"
-      }
-      foreach v $args {
-	set vpattern "$v\[^a-zA-Z0-9\]"
-	if {[regexp "\[\$\]$vpattern" $bod]} continue
-	if {[regexp " *$vpattern" $bod]}  continue
-	#if {[regexp "info *exists *$vpattern" $bod]}  continue
-	#if {[regexp "append *$vpattern" $bod]}  continue
-	#if {[regexp "array.*$vpattern" $bod]}  continue
-	if {[info exists __reported($v,$context)]} continue
-	set __reported($v,$context) 1
-	puts stderr "'$v' of 'instvar $args' is NOT used in\n\
+		#puts stderr ccls=$ccls.
+		if {$ccls == ""} { ;## instvar in proc
+		    set bod [my info body $method]
+		    set context "proc [self]->$method"
+		} else { ;## instvar in instproc
+		    set bod [$ccls info instbody $method]
+		    set context "instproc $ccls->$method"
+		}
+		foreach v $args {
+		    set vpattern "$v\[^a-zA-Z0-9\]"
+		    if {[regexp "\[\$\]$vpattern" $bod]} continue
+		    if {[regexp " *$vpattern" $bod]}  continue
+		    #if {[regexp "info *exists *$vpattern" $bod]}  continue
+		    #if {[regexp "append *$vpattern" $bod]}  continue
+		    #if {[regexp "array.*$vpattern" $bod]}  continue
+		    if {[info exists __reported($v,$context)]} continue
+		    set __reported($v,$context) 1
+		    puts stderr "'$v' of 'instvar $args' is NOT used in\n\
 	$context ... {$bod}"
-      }
+		}
+	    }
+	}
+	next
     }
-  }
-  next
-}
-Object instproc statFilter args {
-  # don't return statistics from the Trace object
-  #puts stderr "self=[self]"
-  if {[self] == "::Trace"} {return [next]}
-  set ccls [self callingclass]
-  set cmet [self callingproc]
-  set met [self calledproc]
-  #::puts stderr "cls=$ccls->$cmet, [self]->$met"
-  Trace statCount $ccls
-  Trace statCount $ccls->$cmet
-  next
-}
+    Object instproc statFilter args {
+	# don't return statistics from the Trace object
+	#puts stderr "self=[self]"
+	if {[self] == "::Trace"} {return [next]}
+	set ccls [self callingclass]
+	set cmet [self callingproc]
+	set met [self calledproc]
+	#::puts stderr "cls=$ccls->$cmet, [self]->$met"
+	Trace statCount $ccls
+	Trace statCount $ccls->$cmet
+	next
+    }
 
 
 
-######################################################################
-# show**** methods
-#
-Object instproc showVars args {
-  set msg {}
-  if {$args == {}} {
-    foreach var [lsort [my info vars]] {
-      if {[my array exists $var]} {
-	append msg "\n\t$var: "
-	#puts stderr "ARRAY $var"
-	#puts stderr "ARRAY names <[[self]array names $var]>"
-	foreach i [lsort [my array names $var]] {
-	  append msg $i=[my set ${var}($i)] ", "
+    ######################################################################
+    # show**** methods
+    #
+    Object instproc showVars args {
+	set msg {}
+	if {$args == {}} {
+	    foreach var [lsort [my info vars]] {
+		if {[my array exists $var]} {
+		    append msg "\n\t$var: "
+		    #puts stderr "ARRAY $var"
+		    #puts stderr "ARRAY names <[[self]array names $var]>"
+		    foreach i [lsort [my array names $var]] {
+			append msg $i=[my set ${var}($i)] ", "
+		    }
+		} elseif {[my exists $var]} {
+		    append msg "\n\t$var: " [list [my set $var]]
+		} else {
+		    append msg "\n\t$var: " UNKNOWN
+		}
+	    }
+	} else {
+	    foreach var $args {
+		if {[my array exists $var]} {
+		    lappend msg $var: ARRAY
+		} elseif {[my exists $var]} {
+		    lappend msg $var: [my set $var]
+		} else {
+		    lappend msg $var: UNKNOWN
+		}
+	    }
 	}
-      } elseif {[my exists $var]} {
-	append msg "\n\t$var: " [list [my set $var]]
-      } else {
-	append msg "\n\t$var: " UNKNOWN
-      }
+	set method [self callingproc]
+	set cls [self callingclass]
+	puts stderr "[self] $cls->$method $msg"
+	#puts stderr "        MIXINS: [my info mixin]"
     }
-  } else {
-    foreach var $args {
-      if {[my array exists $var]} {
-	lappend msg $var: ARRAY
-      } elseif {[my exists $var]} {
-	lappend msg $var: [my set $var]
-      } else {
-	lappend msg $var: UNKNOWN
-      }
+    Object instproc showMsg msg {
+	set method [self callingproc]
+	set cls [self callingclass]
+	puts stderr "[self] $cls->$method $msg"
     }
-  }
-  set method [self callingproc]
-  set cls [self callingclass]
-  puts stderr "[self] $cls->$method $msg"
-  #puts stderr "        MIXINS: [my info mixin]"
-}
-Object instproc showMsg msg {
-  set method [self callingproc]
-  set cls [self callingclass]
-  puts stderr "[self] $cls->$method $msg"
-}
-Object instproc showClass {} {
-  set method [self callingproc]
-  set cls [self callingclass]
-  puts stderr "[self] $cls->$method class [my info class]\
+    Object instproc showClass {} {
+	set method [self callingproc]
+	set cls [self callingclass]
+	puts stderr "[self] $cls->$method class [my info class]\
 	mixins {[my info mixin]}"
-}
-Object instproc showStack {{m 100}} {
-  set max [info level]  
-  if {$m<$max} {set max $m}
-  puts stderr "Call Stack (level: command)"
-  for {set i 0} {$i < $max} {incr i} {
-    if {[catch {set s [uplevel $i self]} msg]} {
-      set s ""
     }
-    puts stderr "[format %5d -$i]:\t$s [info level [expr {-$i}]]"
-  }
-}
-Object instproc showCall {} {
-  set method [self callingproc]
-  set cls [self callingclass]
-  set args [lreplace [info level -1] 0 0]
-  puts stderr "[self] $cls->$method $args"
-}
-Object instproc showTimeStart {{handle __h}} {
-  upvar [self callinglevel] $handle obj
-  set obj [Object [self]::[my autoname __time]]
-  $obj set clicks [clock clicks]
-  return
-}
-Object instproc showTimeEnd {{handle __h}} {
-  upvar [self callinglevel] $handle obj
-  set method [self callingproc]
-  set cls [self callingclass]
-  set elapsed [expr {([clock clicks]-[$obj set clicks])/1000000.0}]
-  puts stderr "[self] $cls->$method: elapsed [format %.2f $elapsed]secs"
-  $obj destroy
-}
+    Object instproc showStack {{m 100}} {
+	set max [info level]  
+	if {$m<$max} {set max $m}
+	puts stderr "Call Stack (level: command)"
+	for {set i 0} {$i < $max} {incr i} {
+	    if {[catch {set s [uplevel $i self]} msg]} {
+		set s ""
+	    }
+	    puts stderr "[format %5d -$i]:\t$s [info level [expr {-$i}]]"
+	}
+    }
+    Object instproc showCall {} {
+	set method [self callingproc]
+	set cls [self callingclass]
+	set args [lreplace [info level -1] 0 0]
+	puts stderr "[self] $cls->$method $args"
+    }
+    Object instproc showTimeStart {{handle __h}} {
+	upvar [self callinglevel] $handle obj
+	set obj [Object [self]::[my autoname __time]]
+	$obj set clicks [clock clicks]
+	return
+    }
+    Object instproc showTimeEnd {{handle __h}} {
+	upvar [self callinglevel] $handle obj
+	set method [self callingproc]
+	set cls [self callingclass]
+	set elapsed [expr {([clock clicks]-[$obj set clicks])/1000000.0}]
+	puts stderr "[self] $cls->$method: elapsed [format %.2f $elapsed]secs"
+	$obj destroy
+    }
 
 
-######################################################################
+    ######################################################################
 
+
+    namespace export showCall showVars showObj showStack Trace
+}
+
+namespace import ::xotcl::trace::*
Index: xotcl/library/lib/upvarcompat.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/lib/upvarcompat.xotcl	(.../upvarcompat.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/lib/upvarcompat.xotcl	(.../upvarcompat.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,35 +1,42 @@
-#$Id: upvarcompat.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+#$Id: upvarcompat.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::upvar-compat 1.0
+package require XOTcl
 
-@ @File {description {
-  Provide a version of upvar and uplevel that provide 
-  backward compatibility such that these commands 
-  ignore inactive filter and mixin frames (upvar behaves
-  the same whether or not a filter is installed). Newer
-  scripts should use <@TT>upvar/uplevel [self callinglevel] var/command</@TT>
-  instead.
-} }
+namespace eval ::xotcl::upvar-compat {
+    namespace import ::xotcl::*
 
+    @ @File {description {
+	Provide a version of upvar and uplevel that provide 
+	backward compatibility such that these commands 
+	ignore inactive filter and mixin frames (upvar behaves
+						 the same whether or not a filter is installed). Newer
+	scripts should use <@TT>upvar/uplevel [self callinglevel] var/command</@TT>
+	instead.
+    } }
+}
+
 # Define upvar and uplevel; use the level, if given explizitely:
 # otherwise point to the callinglevel from XOTcl
-rename uplevel ::xotcl::tcl_uplevel
-proc uplevel {lvl args} {
-  # the outer uplevel is needed to leave the scope of this proc
-  if {[regexp {^\#?[0-9]+$} $lvl]} {
-    ::xotcl::tcl_uplevel 1 [list eval ::xotcl::tcl_uplevel $lvl $args]
-  } else {
-    set cl [::xotcl::tcl_uplevel 1 ::xotcl::self callinglevel]
-    ::xotcl::tcl_uplevel 1 [list eval ::xotcl::tcl_uplevel $cl [list $lvl] $args]
-  }
+rename ::uplevel ::xotcl::tcl_uplevel
+proc ::uplevel {lvl args} {
+    # the outer uplevel is needed to leave the scope of this proc
+    if {[regexp {^\#?[0-9]+$} $lvl]} {
+	::xotcl::tcl_uplevel 1 [list eval ::xotcl::tcl_uplevel $lvl $args]
+    } else {
+	set cl [::xotcl::tcl_uplevel 1 ::xotcl::self callinglevel]
+	::xotcl::tcl_uplevel 1 [list eval ::xotcl::tcl_uplevel $cl [list $lvl] $args]
+    }
 }
 
-rename upvar ::xotcl::tcl_upvar
-proc upvar {lvl args} {
-  # the outer uplevel is needed to leave the scope of this proc
-  if {[regexp {^\#?[0-9]+$} $lvl]} {
-    ::xotcl::tcl_uplevel 1 [list eval ::xotcl::tcl_upvar $lvl $args]
-  } else {
-    set cl [::xotcl::tcl_uplevel 1 ::xotcl::self callinglevel]
-    ::xotcl::tcl_uplevel 1 [list eval ::xotcl::tcl_upvar $cl [list $lvl] $args]
-  }
+rename ::upvar ::xotcl::tcl_upvar
+proc ::upvar {lvl args} {
+    # the outer uplevel is needed to leave the scope of this proc
+    if {[regexp {^\#?[0-9]+$} $lvl]} {
+	::xotcl::tcl_uplevel 1 [list eval ::xotcl::tcl_upvar $lvl $args]
+    } else {
+	set cl [::xotcl::tcl_uplevel 1 ::xotcl::self callinglevel]
+	::xotcl::tcl_uplevel 1 [list eval ::xotcl::tcl_upvar $cl [list $lvl] $args]
+    }
 }
+
Index: xotcl/library/lib/xodoc.xotcl
===================================================================
diff -u -r2c6cdd4f5d1c45c96e996a70b54ae4c5f46a40fd -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/lib/xodoc.xotcl	(.../xodoc.xotcl)	(revision 2c6cdd4f5d1c45c96e996a70b54ae4c5f46a40fd)
+++ xotcl/library/lib/xodoc.xotcl	(.../xodoc.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,402 +1,412 @@
-# $Id: xodoc.xotcl,v 1.2 2004/10/30 20:19:55 neumann Exp $
+# $Id: xodoc.xotcl,v 1.3 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::xodoc 0.84
 package require xotcl::staticMetadataAnalyzer
 package require xotcl::htmllib
 #package require xotcl::trace
+package require XOTcl
 
-@ @File {
-  description {
-    XOTcl documentation tool. Overloads the command @, which is used
-    as a documentation token. 
-  }
-}
+namespace eval ::xotcl::xodoc {
+    namespace import ::xotcl::*
 
-@ Class MetadataTokenHTML {
-  description {Instmixin to provide HTML printing. Such instmixins
-    are registered for all token types.
-  }
-}
-Class MetadataTokenHTML
-@ MetadataTokenHTML abstract instproc printHTML {} {
-  description {Print token to HTML document object}
-}
-MetadataTokenHTML abstract instproc printHTML {}
+    @ @File {
+	description {
+	    XOTcl documentation tool. Overloads the command @, which is used
+	    as a documentation token. 
+	}
+    }
 
-@ MetadataTokenHTML instproc getDocPropertiesHTML {} {
-    description {
-	Returns list of properties as HTML.
+    @ Class MetadataTokenHTML {
+	description {Instmixin to provide HTML printing. Such instmixins
+	    are registered for all token types.
+	}
     }
-}
+    Class MetadataTokenHTML
+    @ MetadataTokenHTML abstract instproc printHTML {} {
+	description {Print token to HTML document object}
+    }
+    MetadataTokenHTML abstract instproc printHTML {}
 
-MetadataTokenHTML instproc getDocPropertiesHTML {htmlDoc} {
-  foreach p [my set properties] { 
-    $htmlDoc startTableRow -valign top
-    if {[my exists $p]} {
-      $htmlDoc startTableCell -valign top
-      $htmlDoc addString "<em> [my capitalize $p]:</em>" 
-      $htmlDoc endTableCell
+    @ MetadataTokenHTML instproc getDocPropertiesHTML {} {
+	description {
+	    Returns list of properties as HTML.
+	}
+    }
 
-      $htmlDoc startTableCell -valign top
-      if {$p == "errorCodes"} {
-	# Build table cell with list of error codes.
-	foreach {code desc} [my set $p] {
-	  set code [string map [list < &lt\; > &gt\;] $code]
-	  set desc [string map [list < &lt\; > &gt\;] $desc]
-	  $htmlDoc addString "<b>$code</b>: $desc\n<p>"
+    MetadataTokenHTML instproc getDocPropertiesHTML {htmlDoc} {
+	foreach p [my set properties] { 
+	    $htmlDoc startTableRow -valign top
+	    if {[my exists $p]} {
+		$htmlDoc startTableCell -valign top
+		$htmlDoc addString "<em> [my capitalize $p]:</em>" 
+		$htmlDoc endTableCell
+
+		$htmlDoc startTableCell -valign top
+		if {$p == "errorCodes"} {
+		    # Build table cell with list of error codes.
+		    foreach {code desc} [my set $p] {
+			set code [string map [list < &lt\; > &gt\;] $code]
+			set desc [string map [list < &lt\; > &gt\;] $desc]
+			$htmlDoc addString "<b>$code</b>: $desc\n<p>"
+		    }
+		} else {
+		    $htmlDoc addString [my set $p]
+		}
+		$htmlDoc endTableCell
+	    }
+	    $htmlDoc endTableRow
 	}
-      } else {
-	$htmlDoc addString [my set $p]
-      }
-      $htmlDoc endTableCell
     }
-    $htmlDoc endTableRow
-  }
-}
 
-MetadataTokenHTML instproc reflowHTML {left paragraph} {
-  #set result ""
-  #foreach line [split $paragraph \n] {
-  #  if {![regexp {^ *$} $line]} {
-  #    append result "$left$line<br>\n"
-  #  }
-  #}
-  #return $result
-  return $paragraph
-}
+    MetadataTokenHTML instproc reflowHTML {left paragraph} {
+	#set result ""
+	#foreach line [split $paragraph \n] {
+	#  if {![regexp {^ *$} $line]} {
+	#    append result "$left$line<br>\n"
+	#  }
+	#}
+	#return $result
+	return $paragraph
+    }
 
-MetadataToken instmixin [concat [MetadataToken info instmixin] MetadataTokenHTML]
+    MetadataToken instmixin [concat [MetadataToken info instmixin] MetadataTokenHTML]
 
-@ Class FileTokenHTML -superclass MetadataTokenHTML
-Class FileTokenHTML -superclass MetadataTokenHTML
-FileTokenHTML instproc printHTML {htmlDoc} {
-  $htmlDoc addLineBreak
-  $htmlDoc addString "<b> Filename: </b>"
-  $htmlDoc addAnchor [my set name] -href [my set name]
-  $htmlDoc addLineBreak
-  $htmlDoc addLineBreak
-  $htmlDoc startTable -border 0
-  my getDocPropertiesHTML $htmlDoc
-  $htmlDoc endTable
-}
+    @ Class FileTokenHTML -superclass MetadataTokenHTML
+    Class FileTokenHTML -superclass MetadataTokenHTML
+    FileTokenHTML instproc printHTML {htmlDoc} {
+	$htmlDoc addLineBreak
+	$htmlDoc addString "<b> Filename: </b>"
+	$htmlDoc addAnchor [my set name] -href [my set name]
+	$htmlDoc addLineBreak
+	$htmlDoc addLineBreak
+	$htmlDoc startTable -border 0
+	my getDocPropertiesHTML $htmlDoc
+	$htmlDoc endTable
+    }
 
-FileToken instmixin [concat [FileToken info instmixin] FileTokenHTML]
+    FileToken instmixin [concat [FileToken info instmixin] FileTokenHTML]
 
-@ Class ConstraintTokenHTML -superclass MetadataTokenHTML
-Class ConstraintTokenHTML -superclass MetadataTokenHTML
-ConstraintTokenHTML instproc printHTML {htmlDoc} {
-  $htmlDoc addAnchor "" -name [my set name]
-  $htmlDoc addString "<h2> Constraint: <em> [my set name] </em> </h2>"
-  $htmlDoc addLineBreak
-  $htmlDoc startTable -border 0
-  my getDocPropertiesHTML $htmlDoc
-  $htmlDoc endTable
-}
+    @ Class ConstraintTokenHTML -superclass MetadataTokenHTML
+    Class ConstraintTokenHTML -superclass MetadataTokenHTML
+    ConstraintTokenHTML instproc printHTML {htmlDoc} {
+	$htmlDoc addAnchor "" -name [my set name]
+	$htmlDoc addString "<h2> Constraint: <em> [my set name] </em> </h2>"
+	$htmlDoc addLineBreak
+	$htmlDoc startTable -border 0
+	my getDocPropertiesHTML $htmlDoc
+	$htmlDoc endTable
+    }
 
-ConstraintToken instmixin [concat [ConstraintToken info instmixin] ConstraintTokenHTML]
+    ConstraintToken instmixin [concat [ConstraintToken info instmixin] ConstraintTokenHTML]
 
-@ Class ObjTokenHTML -superclass MetadataTokenHTML
-Class ObjTokenHTML -superclass MetadataTokenHTML
-ObjTokenHTML instproc getProcsHTML {htmlDoc} {
-  set c ""
-  set pl [MetadataToken sortTokenList [my procList]]
-  if {[my istype ClassToken]} {
-    set pl [concat [MetadataToken sortTokenList [my instprocList]] $pl]
-  }
-  foreach p $pl {
-    set pn [$p set name]
-    set label($pn) "<a href=\"#[my set name]-$pn\">$pn</a>"
-  }
-  foreach l [lsort [array names label]] {
-    if {$c != ""} {append c ", "}
-    append c $label($l)
-  }
-  if {$c != ""} {append c "."}
-  $htmlDoc addString "$c"
-}
-  
-ObjTokenHTML instproc printHTML {htmlDoc} {
-  $htmlDoc addAnchor "" -name [my set name]
-  if {[my istype MetaClassToken]} {
-    set start "<h2> MetaClass:"
-  } elseif {[my istype ClassToken]} {
-    set start "<h2> Class:"
-  } else {
-    set start "<h2> Object:"
-  }
-  $htmlDoc addString "$start <em> [my set name] </em> </h2>"
-  if {[my exists cl]} {
-    $htmlDoc addString "<b>Class</b>: [my set cl]"
-    $htmlDoc addLineBreak
-  }
-  if {[my exists heritage]} {
-    $htmlDoc addString "<b>Heritage</b>: [my set heritage]"
-    $htmlDoc addLineBreak
-  }
+    @ Class ObjTokenHTML -superclass MetadataTokenHTML
+    Class ObjTokenHTML -superclass MetadataTokenHTML
+    ObjTokenHTML instproc getProcsHTML {htmlDoc} {
+	set c ""
+	set pl [MetadataToken sortTokenList [my procList]]
+	if {[my istype ClassToken]} {
+	    set pl [concat [MetadataToken sortTokenList [my instprocList]] $pl]
+	}
+	foreach p $pl {
+	    set pn [$p set name]
+	    set label($pn) "<a href=\"#[my set name]-$pn\">$pn</a>"
+	}
+	foreach l [lsort [array names label]] {
+	    if {$c != ""} {append c ", "}
+	    append c $label($l)
+	}
+	if {$c != ""} {append c "."}
+	$htmlDoc addString "$c"
+    }
+    
+    ObjTokenHTML instproc printHTML {htmlDoc} {
+	$htmlDoc addAnchor "" -name [my set name]
+	if {[my istype MetaClassToken]} {
+	    set start "<h2> MetaClass:"
+	} elseif {[my istype ClassToken]} {
+	    set start "<h2> Class:"
+	} else {
+	    set start "<h2> Object:"
+	}
+	$htmlDoc addString "$start <em> [my set name] </em> </h2>"
+	if {[my exists cl]} {
+	    $htmlDoc addString "<b>Class</b>: [my set cl]"
+	    $htmlDoc addLineBreak
+	}
+	if {[my exists heritage]} {
+	    $htmlDoc addString "<b>Heritage</b>: [my set heritage]"
+	    $htmlDoc addLineBreak
+	}
 
-  set head ""
-  if {[my procList] != ""} {set head "<b> Procs </b> "}
-  if {[my istype ClassToken]} {
-    if {[my instprocList] != ""} {set head "<b> Procs/Instprocs: </b> "}
-  }
-  $htmlDoc addString $head
-  my getProcsHTML $htmlDoc
+	set head ""
+	if {[my procList] != ""} {set head "<b> Procs </b> "}
+	if {[my istype ClassToken]} {
+	    if {[my instprocList] != ""} {set head "<b> Procs/Instprocs: </b> "}
+	}
+	$htmlDoc addString $head
+	my getProcsHTML $htmlDoc
 
-  $htmlDoc startTable -border 0
-  my getDocPropertiesHTML $htmlDoc
-  $htmlDoc endTable
-}
+	$htmlDoc startTable -border 0
+	my getDocPropertiesHTML $htmlDoc
+	$htmlDoc endTable
+    }
 
-ObjToken instmixin [concat [ObjToken info instmixin] ObjTokenHTML]
+    ObjToken instmixin [concat [ObjToken info instmixin] ObjTokenHTML]
 
-@ Class MethodTokenHTML -superclass MetadataTokenHTML
-Class MethodTokenHTML -superclass MetadataTokenHTML
+    @ Class MethodTokenHTML -superclass MetadataTokenHTML
+    Class MethodTokenHTML -superclass MetadataTokenHTML
 
-# Prints out method information as HTML.
-MethodTokenHTML instproc printHTML {htmlDoc} {
-  #my showVars
-  set argText "\n"
+    # Prints out method information as HTML.
+    MethodTokenHTML instproc printHTML {htmlDoc} {
+	#my showVars
+	set argText "\n"
 
-  HtmlBuilder args
+	HtmlBuilder args
 
-  set a  "<em>Arguments:</em>"
+	set a  "<em>Arguments:</em>"
 
-  set anchor [my set obj]-[my set name]
-  $htmlDoc addAnchor "" -name $anchor
+	set anchor [my set obj]-[my set name]
+	$htmlDoc addAnchor "" -name $anchor
 
-  if {[my abstract]} {$htmlDoc addString  "<b><em>abstract</em></b>"}
-  $htmlDoc addString  "<b>[my set name] </b>"
+	if {[my abstract]} {$htmlDoc addString  "<b><em>abstract</em></b>"}
+	$htmlDoc addString  "<b>[my set name] </b>"
 
-  args set indentLevel [$htmlDoc set indentLevel]
+	args set indentLevel [$htmlDoc set indentLevel]
 
-  if {[my exists arguments]} {
-    #set argText "<table>\n"
-    foreach {arg argDescription} [my set arguments] {
-      if {[llength $arg] > 1} {
-	# A default value was given to the argument.
-	$htmlDoc addString "<em>?[lindex $arg 0]?</em>"
-	set at "<b>?[lindex $arg 0]?</b>:$argDescription Default: \"[lindex $arg 1]\"."
-      } else {
-	$htmlDoc addString "<em>$arg</em>"
-	set at "<b>$arg</b>: $argDescription"
-      }
-      args startTableRow -valign top
-      args startTableCell -valign top
-      args addString $a
-      set a ""
-      args endTableCell
-      args startTableCell -valign top
-      args addString $at
-      args endTableCell
-      args endTableRow
-    }
-  }
-  $htmlDoc startTable -border 0
-  
-  $htmlDoc addString [args toString]
-  args destroy
+	if {[my exists arguments]} {
+	    #set argText "<table>\n"
+	    foreach {arg argDescription} [my set arguments] {
+		if {[llength $arg] > 1} {
+		    # A default value was given to the argument.
+		    $htmlDoc addString "<em>?[lindex $arg 0]?</em>"
+		    set at "<b>?[lindex $arg 0]?</b>:$argDescription Default: \"[lindex $arg 1]\"."
+		} else {
+		    $htmlDoc addString "<em>$arg</em>"
+		    set at "<b>$arg</b>: $argDescription"
+		}
+		args startTableRow -valign top
+		args startTableCell -valign top
+		args addString $a
+		set a ""
+		args endTableCell
+		args startTableCell -valign top
+		args addString $at
+		args endTableCell
+		args endTableRow
+	    }
+	}
+	$htmlDoc startTable -border 0
+	
+	$htmlDoc addString [args toString]
+	args destroy
 
-  my getDocPropertiesHTML $htmlDoc
+	my getDocPropertiesHTML $htmlDoc
 
-  $htmlDoc endTable
+	$htmlDoc endTable
 
-  #$htmlDoc endListItem
-}
+	#$htmlDoc endListItem
+    }
 
-MethodToken instmixin [concat [MethodToken info instmixin] MethodTokenHTML]
+    MethodToken instmixin [concat [MethodToken info instmixin] MethodTokenHTML]
 
-@ Class XODoc { description "Handler class for building a documentation database" }
+    @ Class XODoc { description "Handler class for building a documentation database" }
 
-Class XODoc -superclass StaticMetadataAnalyzer
+    Class XODoc -superclass StaticMetadataAnalyzer
 
-@ XODoc proc documentFileAsHTML {
-    file "filename of the xotcl file to be documented"
-    docdir "directory to which the html file is written"
-} {
-    description "Uses the xoDoc package to produce an HTML documentation of
+    @ XODoc proc documentFileAsHTML {
+				     file "filename of the xotcl file to be documented"
+				     docdir "directory to which the html file is written"
+				 } {
+	description "Uses the xoDoc package to produce an HTML documentation of
                a specified file ***.xotcl. The file is written to ***.html
                in docdir"
-    return "file basename without suffix"
-}
+	return "file basename without suffix"
+    }
 
-XODoc proc documentFileAsHTML {file docdir} {
-  set docdb [XODoc [XODoc autoname docdb]]
-  ::@ set analyzerObj $docdb
-  $docdb analyzeFile $file
-  set ext [file extension $file]
-  if {$ext != ""} {set ext -[string trimleft $ext .]}
-  set docfilename [file rootname [file tail $file]]$ext
-  $docdb writeFile ${docdir}/$docfilename.html $file
-  $docdb destroy
-  return $docfilename
-}
+    XODoc proc documentFileAsHTML {file docdir} {
+	set docdb [XODoc [XODoc autoname docdb]]
+	::@ set analyzerObj $docdb
+	$docdb analyzeFile $file
+	set ext [file extension $file]
+	if {$ext != ""} {set ext -[string trimleft $ext .]}
+	set docfilename [file rootname [file tail $file]]$ext
+	$docdb writeFile ${docdir}/$docfilename.html $file
+	$docdb destroy
+	return $docfilename
+    }
 
-XODoc instproc printPackages {htmlDoc} {
-  my instvar packageList
-  $htmlDoc addString "<h2> Package/File Information </h2>"
-  if {[llength $packageList] > 0} {
-    foreach t $packageList {
-      if {[$t type] == "provide"} {
-	$htmlDoc addString "<b> Package provided: </b> [$t name] [$t version]"
-      } elseif {[$t type] == "require"} {
-	$htmlDoc addString "<b> Package required: </b> [$t name] [$t version]"
-      }
-      $htmlDoc addLineBreak
+    XODoc instproc printPackages {htmlDoc} {
+	my instvar packageList
+	$htmlDoc addString "<h2> Package/File Information </h2>"
+	if {[llength $packageList] > 0} {
+	    foreach t $packageList {
+		if {[$t type] == "provide"} {
+		    $htmlDoc addString "<b> Package provided: </b> [$t name] [$t version]"
+		} elseif {[$t type] == "require"} {
+		    $htmlDoc addString "<b> Package required: </b> [$t name] [$t version]"
+		}
+		$htmlDoc addLineBreak
+	    }
+	} else {
+	    $htmlDoc addString "<b> No package provided/required </b>"
+	    $htmlDoc addLineBreak
+	}
     }
-  } else {
-    $htmlDoc addString "<b> No package provided/required </b>"
-    $htmlDoc addLineBreak
-  }
-}
 
-XODoc instproc printExtensions {htmlDoc} {
-  my instvar extensions
-  if {[info exists extensions]} {
-    # Add list of extensions.
-    foreach extension $extensions {
-      $htmlDoc addLineBreak
-      $htmlDoc addString "<h2>Document extension: <em>[$extension name]</em>"
-      $htmlDoc addString "<em>Description:</em> [$extension description]"
-      $htmlDoc addLineBreak
+    XODoc instproc printExtensions {htmlDoc} {
+	my instvar extensions
+	if {[info exists extensions]} {
+	    # Add list of extensions.
+	    foreach extension $extensions {
+		$htmlDoc addLineBreak
+		$htmlDoc addString "<h2>Document extension: <em>[$extension name]</em>"
+		$htmlDoc addString "<em>Description:</em> [$extension description]"
+		$htmlDoc addLineBreak
+	    }
+	}
     }
-  }
-}
 
-XODoc instproc printObjList {htmlDoc} {
-  set objList [MetadataToken sortTokenList [my objList]]
+    XODoc instproc printObjList {htmlDoc} {
+	set objList [MetadataToken sortTokenList [my objList]]
 
-  if {[llength $objList]>0} {
-    $htmlDoc addLineBreak
-    $htmlDoc addString "<b>Defined Objects/Classes: </b>"
-    $htmlDoc startUnorderedList
-    foreach obj $objList {
-      set on [$obj set name]
-      $htmlDoc startListItem
-      $htmlDoc addAnchor "<em>$on</em>:" -href "#$on"
-      $obj getProcsHTML $htmlDoc
-      $htmlDoc addLineBreak
-      $htmlDoc endListItem
+	if {[llength $objList]>0} {
+	    $htmlDoc addLineBreak
+	    $htmlDoc addString "<b>Defined Objects/Classes: </b>"
+	    $htmlDoc startUnorderedList
+	    foreach obj $objList {
+		set on [$obj set name]
+		$htmlDoc startListItem
+		$htmlDoc addAnchor "<em>$on</em>:" -href "#$on"
+		$obj getProcsHTML $htmlDoc
+		$htmlDoc addLineBreak
+		$htmlDoc endListItem
+	    }
+	    $htmlDoc endUnorderedList
+	}
     }
-    $htmlDoc endUnorderedList
-  }
-}
 
-XODoc instproc printFileToken {htmlDoc} {
-  if {[my exists fileToken]} {
-    [my set fileToken] printHTML $htmlDoc
-  } else {
-    $htmlDoc addString "<b> No file information. </b>\n"
-  }
-  $htmlDoc addLineBreak
-}
+    XODoc instproc printFileToken {htmlDoc} {
+	if {[my exists fileToken]} {
+	    [my set fileToken] printHTML $htmlDoc
+	} else {
+	    $htmlDoc addString "<b> No file information. </b>\n"
+	}
+	$htmlDoc addLineBreak
+    }
 
-XODoc instproc printConstraintsList {htmlDoc} {
-  set constraintList [MetadataToken sortTokenList [my constraintList]]
+    XODoc instproc printConstraintsList {htmlDoc} {
+	set constraintList [MetadataToken sortTokenList [my constraintList]]
 
-  if {[llength $constraintList]>0} {
-    $htmlDoc addLineBreak
-    $htmlDoc addString "<b>Defined Constraints: </b>"
-    $htmlDoc startUnorderedList
-    foreach c $constraintList {
-      set cn [$c set name]
-      $htmlDoc startListItem
-      $htmlDoc addAnchor "<em>$cn</em>:" -href "#$cn"
-      $htmlDoc addLineBreak
-      $htmlDoc endListItem
+	if {[llength $constraintList]>0} {
+	    $htmlDoc addLineBreak
+	    $htmlDoc addString "<b>Defined Constraints: </b>"
+	    $htmlDoc startUnorderedList
+	    foreach c $constraintList {
+		set cn [$c set name]
+		$htmlDoc startListItem
+		$htmlDoc addAnchor "<em>$cn</em>:" -href "#$cn"
+		$htmlDoc addLineBreak
+		$htmlDoc endListItem
+	    }
+	    $htmlDoc endUnorderedList
+	}
     }
-    $htmlDoc endUnorderedList
-  }
-}
 
-XODoc instproc printConstraints {htmlDoc} {
-  foreach c [my set constraintList] {
-    $htmlDoc addHorizontalRule
-    $htmlDoc startParagraph
-    $c printHTML $htmlDoc
-    $htmlDoc endParagraph
-  }
-  $htmlDoc addLineBreak
-}
+    XODoc instproc printConstraints {htmlDoc} {
+	foreach c [my set constraintList] {
+	    $htmlDoc addHorizontalRule
+	    $htmlDoc startParagraph
+	    $c printHTML $htmlDoc
+	    $htmlDoc endParagraph
+	}
+	$htmlDoc addLineBreak
+    }
 
-XODoc instproc printProcsList {htmlDoc list string} {
-  if {[llength $list] > 0} {
-    $htmlDoc addString "<h3>$string</h3>"
-    $htmlDoc startUnorderedList
-    foreach s $list {
-      $htmlDoc startListItem
-      $s printHTML $htmlDoc
-      $htmlDoc endListItem
+    XODoc instproc printProcsList {htmlDoc list string} {
+	if {[llength $list] > 0} {
+	    $htmlDoc addString "<h3>$string</h3>"
+	    $htmlDoc startUnorderedList
+	    foreach s $list {
+		$htmlDoc startListItem
+		$s printHTML $htmlDoc
+		$htmlDoc endListItem
+	    }
+	    $htmlDoc endUnorderedList
+	}
     }
-    $htmlDoc endUnorderedList
-  }
-}
-XODoc instproc printObjs {htmlDoc} {
-  set objList [MetadataToken sortTokenList [my objList]]
+    XODoc instproc printObjs {htmlDoc} {
+	set objList [MetadataToken sortTokenList [my objList]]
 
-  foreach t $objList {
-    $htmlDoc addHorizontalRule
-    $htmlDoc startParagraph
-    $t printHTML $htmlDoc
-    if {[$t istype ClassToken]} {
-      my printProcsList $htmlDoc [$t set instprocList] Instprocs
+	foreach t $objList {
+	    $htmlDoc addHorizontalRule
+	    $htmlDoc startParagraph
+	    $t printHTML $htmlDoc
+	    if {[$t istype ClassToken]} {
+		my printProcsList $htmlDoc [$t set instprocList] Instprocs
+	    }
+	    my printProcsList $htmlDoc [$t set procList] Procs
+	    $htmlDoc endParagraph
+	}
     }
-    my printProcsList $htmlDoc [$t set procList] Procs
-    $htmlDoc endParagraph
-  }
-}
 
-XODoc instproc replaceFormatTags {fc} {
-  regsub -all <@ $fc < fc
-  regsub -all </@ $fc </ fc
-  return $fc
-}
+    XODoc instproc replaceFormatTags {fc} {
+	regsub -all <@ $fc < fc
+	regsub -all </@ $fc </ fc
+	return $fc
+    }
 
-@ XODoc instproc printHTML {
-  name "name of the html document"
-} {
-    description "Create HTML documentation object from metadata token"
-}
-XODoc instproc printHTML {name} {
-  HtmlBuilder htmlDoc
-  htmlDoc startDocument -title "XOTcl - Documentation -- $name" \
-      -bgcolor FFFFFF -stylesheet xotcl-doc.css
-  htmlDoc addStringIncr "<h1>"
-  htmlDoc addImage -src "./logo-100.jpg" -alt "$name" -align MIDDLE 
-  htmlDoc addStringDecr "$name</h1>"
-  htmlDoc addHorizontalRule
-  htmlDoc startParagraph
+    @ XODoc instproc printHTML {
+	name "name of the html document"
+    } {
+	description "Create HTML documentation object from metadata token"
+    }
+    XODoc instproc printHTML {name} {
+	HtmlBuilder htmlDoc
+	htmlDoc startDocument -title "XOTcl - Documentation -- $name" \
+	    -bgcolor FFFFFF -stylesheet xotcl-doc.css
+	htmlDoc addStringIncr "<h1>"
+	htmlDoc addImage -src "./logo-100.jpg" -alt "$name" -align MIDDLE 
+	htmlDoc addStringDecr "$name</h1>"
+	htmlDoc addHorizontalRule
+	htmlDoc startParagraph
 
-  my printPackages htmlDoc
-  my printExtensions htmlDoc
-  my printObjList htmlDoc
-  my printConstraintsList htmlDoc
-  my printFileToken htmlDoc
-  my printObjs htmlDoc
-  my printConstraints htmlDoc
-  htmlDoc endParagraph
-  htmlDoc addHorizontalRule
-  htmlDoc startParagraph
-  htmlDoc endParagraph
-  htmlDoc addAnchor "Back to index page." -href "./index.html"
-  htmlDoc addLineBreak
-  htmlDoc addHorizontalRule 
-  htmlDoc startParagraph 
-  htmlDoc endParagraph
-  htmlDoc endDocument
-  set r [my replaceFormatTags [htmlDoc toString]]
-  htmlDoc destroy
-  return $r
-}
+	my printPackages htmlDoc
+	my printExtensions htmlDoc
+	my printObjList htmlDoc
+	my printConstraintsList htmlDoc
+	my printFileToken htmlDoc
+	my printObjs htmlDoc
+	my printConstraints htmlDoc
+	htmlDoc endParagraph
+	htmlDoc addHorizontalRule
+	htmlDoc startParagraph
+	htmlDoc endParagraph
+	htmlDoc addAnchor "Back to index page." -href "./index.html"
+	htmlDoc addLineBreak
+	htmlDoc addHorizontalRule 
+	htmlDoc startParagraph 
+	htmlDoc endParagraph
+	htmlDoc endDocument
+	set r [my replaceFormatTags [htmlDoc toString]]
+	htmlDoc destroy
+	return $r
+    }
 
-@ XODoc instproc writeFile {
-  filename "file name destination" name "name of the html document"
-} {
-    description "Create HTML docuemntation from metadata token and write to file <filename>"
+    @ XODoc instproc writeFile {
+	filename "file name destination" name "name of the html document"
+    } {
+	description "Create HTML docuemntation from metadata token and write to file <filename>"
+    }
+    XODoc instproc writeFile {filename name} {
+	set content [my printHTML $name]
+	set f [open $filename w]
+	puts $f $content
+	close $f
+    }
+
+    namespace export \
+	MetadataTokenHTML FileTokenHTML ConstraintTokenHTML ObjTokenHTML \
+	MethodTokenHTML XODoc
 }
-XODoc instproc writeFile {filename name} {
-  set content [my printHTML $name]
-  set f [open $filename w]
-  puts $f $content
-  close $f
-}
 
-
+namespace import ::xotcl::xodoc::*
Index: xotcl/library/patterns/ChainOfResponsibility.xotcl
===================================================================
diff -u -r5ce5a10c82bc948f50fc4542f844dcd50de1eae3 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/patterns/ChainOfResponsibility.xotcl	(.../ChainOfResponsibility.xotcl)	(revision 5ce5a10c82bc948f50fc4542f844dcd50de1eae3)
+++ xotcl/library/patterns/ChainOfResponsibility.xotcl	(.../ChainOfResponsibility.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,43 +1,53 @@
-# $Id: ChainOfResponsibility.xotcl,v 1.2 2004/07/03 21:19:39 neumann Exp $
+# $Id: ChainOfResponsibility.xotcl,v 1.3 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::pattern::chainOfResponsibility 0.9
+package require XOTcl
 
-Class ChainOfResponsibility -superclass Class
+namespace eval ::xotcl::pattern::chainOfResponsibility {
+    namespace import ::xotcl::*
 
-ChainOfResponsibility instproc chainingFilter args {
-  set cp [self calledproc]
-  set registrationclass [lindex [self filterreg] 0]
-  $registrationclass instvar operations
-  #puts stderr "CHAIN [array names [self regclass]::chainedOperations ]---$cp"
-  if {[$registrationclass exists chainedOperations($cp)]} {
-    #
-    # a value is found on the chain, if it differs from the failure value !
-    #
-    set failureValue [$registrationclass set chainedOperations($cp)]
-    set r [my $cp $args]
-    if {$r == $failureValue} {
-      if {[my exists successor] &&
-	  [set s [my set successor]] != ""} {
-	#puts stderr "CHAIN: forwarding to $s"
-	set r [$s $cp $args]
-      }
+    Class ChainOfResponsibility -superclass Class
+
+    ChainOfResponsibility instproc chainingFilter args {
+	set cp [self calledproc]
+	set registrationclass [lindex [self filterreg] 0]
+	$registrationclass instvar operations
+	#puts stderr "CHAIN [array names [self regclass]::chainedOperations ]---$cp"
+	if {[$registrationclass exists chainedOperations($cp)]} {
+	    #
+	    # a value is found on the chain, if it differs from the failure value !
+	    #
+	    set failureValue [$registrationclass set chainedOperations($cp)]
+	    set r [my $cp $args]
+	    if {$r == $failureValue} {
+		if {[my exists successor] &&
+		    [set s [my set successor]] != ""} {
+		    #puts stderr "CHAIN: forwarding to $s"
+		    set r [$s $cp $args]
+		}
+	    }
+	    set r ;# return $r
+	} else {
+	    next ;# return [next]
+	}
     }
-    set r ;# return $r
-  } else {
-    next ;# return [next]
-  }
-}
 
-ChainOfResponsibility instproc init args {
-  my instfilter add chainingFilter
-  my parameter {successor}
-  # chained operations hold their value of failure
-  my array set chainedOperations {}
-}
+    ChainOfResponsibility instproc init args {
+	my instfilter add chainingFilter
+	my parameter {successor}
+	# chained operations hold their value of failure
+	my array set chainedOperations {}
+    }
 
-ChainOfResponsibility instproc addChainedOperation {name {failureValue ""}} {
-  my set chainedOperations($name) $failureValue
-}
+    ChainOfResponsibility instproc addChainedOperation {name {failureValue ""}} {
+	my set chainedOperations($name) $failureValue
+    }
 
-ChainOfResponsibility instproc removeChainedOperation {name} {
-  my unset chainedOperations($name)
+    ChainOfResponsibility instproc removeChainedOperation {name} {
+	my unset chainedOperations($name)
+    }
+
+    namespace export ChainOfResponsibility
 }
+
+namespace import ::xotcl::pattern::chainOfResponsibility::*
Index: xotcl/library/patterns/OnCalleeProxy.xotcl
===================================================================
diff -u -r5ce5a10c82bc948f50fc4542f844dcd50de1eae3 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/patterns/OnCalleeProxy.xotcl	(.../OnCalleeProxy.xotcl)	(revision 5ce5a10c82bc948f50fc4542f844dcd50de1eae3)
+++ xotcl/library/patterns/OnCalleeProxy.xotcl	(.../OnCalleeProxy.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,31 +1,41 @@
-# $Id: OnCalleeProxy.xotcl,v 1.2 2004/07/03 21:19:39 neumann Exp $
+# $Id: OnCalleeProxy.xotcl,v 1.3 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::pattern::onCalleeProxy 0.8
+package require XOTcl
 
-Class OnCalleeProxy -superclass Class  
+namespace eval ::xotcl::pattern::onCalleeProxy {
+    namespace import ::xotcl::*
 
-@ @File {
-  description {
-    Simple proxy pattern implementation enhanced with the ability to adapt
-    calls solely for specified calling objects
-    for each calling obj there may be a different delegator obj
-  }
-}
+    Class OnCalleeProxy -superclass Class  
 
-OnCalleeProxy instproc onCalleeProxyFilter args { 
-  set o [string trimleft [self callingobject] :]
-  my instvar callee
-  #puts stderr "[self class]: checking $o -- [self] -- [self calledproc] "
-  if {[info exists callee($o)]} {
-    return [::eval [set callee($o)] [self calledproc] $args]
-  } else {
-    next
-  }
-}
+    @ @File {
+	description {
+	    Simple proxy pattern implementation enhanced with the ability to adapt
+	    calls solely for specified calling objects
+	    for each calling obj there may be a different delegator obj
+	}
+    }
 
-OnCalleeProxy instproc init args {
-  my instfilter add onCalleeProxyFilter
-  next
-  my instproc setCallee {callingObj a} {
-    my set callee([string trimleft $callingObj :]) $a
-  }
+    OnCalleeProxy instproc onCalleeProxyFilter args { 
+	set o [string trimleft [self callingobject] :]
+	my instvar callee
+	#puts stderr "[self class]: checking $o -- [self] -- [self calledproc] "
+	if {[info exists callee($o)]} {
+	    return [::eval [set callee($o)] [self calledproc] $args]
+	} else {
+	    next
+	}
+    }
+
+    OnCalleeProxy instproc init args {
+	my instfilter add onCalleeProxyFilter
+	next
+	my instproc setCallee {callingObj a} {
+	    my set callee([string trimleft $callingObj :]) $a
+	}
+    }
+
+    namespace export OnCalleeProxy
 }
+
+namespace import ::xotcl::pattern::onCalleeProxy::*
Index: xotcl/library/patterns/Singleton.xotcl
===================================================================
diff -u -r5ce5a10c82bc948f50fc4542f844dcd50de1eae3 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/patterns/Singleton.xotcl	(.../Singleton.xotcl)	(revision 5ce5a10c82bc948f50fc4542f844dcd50de1eae3)
+++ xotcl/library/patterns/Singleton.xotcl	(.../Singleton.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,76 +1,84 @@
-# $Id: Singleton.xotcl,v 1.2 2004/07/03 21:19:39 neumann Exp $
+# $Id: Singleton.xotcl,v 1.3 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::pattern::singleton 0.8
+package require XOTcl
 
-Class SingletonBase
-SingletonBase instproc getInstance args {
-  my instvar _instance 
-  if {[info exists _instance]} {
-    return $_instance
-  }
-  return ""
-} 
+namespace eval ::xotcl::pattern::singleton {
+    namespace import ::xotcl::*
 
+    Class SingletonBase
+    SingletonBase instproc getInstance args {
+	my instvar _instance 
+	if {[info exists _instance]} {
+	    return $_instance
+	}
+	return ""
+    } 
 
-#
-# A simple pattern mixin that makes a class to a non-specializable singleton
-#
-Class NonSpecializableSingleton -superclass SingletonBase
 
-NonSpecializableSingleton instproc create args {
-  my instvar _instance
-  if {![info exists _instance]} {
-    set _instance [self]
-    next
-  }
-  return $_instance
-}
+    #
+    # A simple pattern mixin that makes a class to a non-specializable singleton
+    #
+    Class NonSpecializableSingleton -superclass SingletonBase
 
-NonSpecializableSingleton instproc getInstance {} {
-  if {[info exists _instance]} {
-    my instvar _instance
-    return $_instance
-  }
-  return ""
-}
+    NonSpecializableSingleton instproc create args {
+	my instvar _instance
+	if {![info exists _instance]} {
+	    set _instance [self]
+	    next
+	}
+	return $_instance
+    }
 
-#
-# Specializable Singleton 
-#
-Class Singleton -superclass {SingletonBase Class}
-Singleton instproc singletonFilter args {
-  switch -exact [self calledproc] {
-    init {
-      set registrationclass [lindex [self filterreg] 0]
-      $registrationclass instvar _instance
-      if {![info exists _instance]} {
-	set _instance [self]
-	next
-      } else {
-	my destroy
-      }
-      return $_instance
+    NonSpecializableSingleton instproc getInstance {} {
+	if {[info exists _instance]} {
+	    my instvar _instance
+	    return $_instance
+	}
+	return ""
     }
-    default {
-      return [next]
+
+    #
+    # Specializable Singleton 
+    #
+    Class Singleton -superclass {SingletonBase Class}
+    Singleton instproc singletonFilter args {
+	switch -exact [self calledproc] {
+	    init {
+		set registrationclass [lindex [self filterreg] 0]
+		$registrationclass instvar _instance
+		if {![info exists _instance]} {
+		    set _instance [self]
+		    next
+		} else {
+		    my destroy
+		}
+		return $_instance
+	    }
+	    default {
+		return [next]
+	    }
+	}
     }
-  }
-}
 
-Singleton instproc init args {
-  my instfilter add singletonFilter
-  #
-  # specialized singletons have to look up the singleton class
-  # first
-  Class instproc getInstance {} {
-    foreach sc [my info superclass] {
-      if {[$sc info class] == "::Singleton"} {
-	return [$sc getInstance]
-      } else {
-	return ""
-      }
+    Singleton instproc init args {
+	my instfilter add singletonFilter
+	#
+	# specialized singletons have to look up the singleton class
+	# first
+	Class instproc getInstance {} {
+	    foreach sc [my info superclass] {
+		if {[$sc info class] == "::Singleton"} {
+		    return [$sc getInstance]
+		} else {
+		    return ""
+		}
+	    }
+	}
+	next
     }
-  }
-  next
+
+    namespace export SingletonBase NonSpecializableSingleton Singleton
 }
 
-    
+namespace import ::xotcl::pattern::singleton::*
Index: xotcl/library/patterns/SortedComposite.xotcl
===================================================================
diff -u -r5ce5a10c82bc948f50fc4542f844dcd50de1eae3 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/patterns/SortedComposite.xotcl	(.../SortedComposite.xotcl)	(revision 5ce5a10c82bc948f50fc4542f844dcd50de1eae3)
+++ xotcl/library/patterns/SortedComposite.xotcl	(.../SortedComposite.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,70 +1,80 @@
-# $Id: SortedComposite.xotcl,v 1.2 2004/07/03 21:19:39 neumann Exp $
+# $Id: SortedComposite.xotcl,v 1.3 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::pattern::sortedCompositeWithAfter 0.9
+package require XOTcl
 
-Class SortedComposite -superclass Class
+namespace eval ::xotcl::pattern::sortedCompositeWithAfter {
+    namespace import ::xotcl::*
 
-@ @File {
-  description {
-    Composite pattern enhanced with sorting 
-  }
-}
+    Class SortedComposite -superclass Class
 
-SortedComposite instproc remove {array element} {
-  if {my exists ${array}($element)]} {
-    my unset ${array}($element)}
-}
+    @ @File {
+	description {
+	    Composite pattern enhanced with sorting 
+	}
+    }
 
-SortedComposite instproc addOperations args {
-  foreach pair $args {
-    foreach {proc op} $pair {my set operations($proc) $op}
-  }
-} 
+    SortedComposite instproc remove {array element} {
+	if {[my exists ${array}($element)]} {
+	    my unset ${array}($element)
+	}
+    }
 
-SortedComposite instproc removeOperations args {
-  foreach op $args {my remove operations $op}
-}
+    SortedComposite instproc addOperations args {
+	foreach pair $args {
+	    foreach {proc op} $pair {my set operations($proc) $op}
+	}
+    } 
 
-SortedComposite instproc addAfterOperations args {
-  foreach pair $args {
-    foreach {proc op} $pair {my set afterOperations($proc) $op}
-  }
-} 
-SortedComposite instproc removeAfterOperations args {
-  foreach op $args {my remove afterOperations $op}
-}
+    SortedComposite instproc removeOperations args {
+	foreach op $args {my remove operations $op}
+    }
 
-SortedComposite instproc compositeFilter args {
-  set registrationclass [lindex [self filterreg] 0]
-  set r [self calledproc]
-  set result [next]
-  if {[$registrationclass exists operations($r)] && [my exists children]} {
-    set method [$registrationclass set operations($r)]
-    foreach object [my set children] {
-      eval [self]::$object $method $args
+    SortedComposite instproc addAfterOperations args {
+	foreach pair $args {
+	    foreach {proc op} $pair {my set afterOperations($proc) $op}
+	}
+    } 
+    SortedComposite instproc removeAfterOperations args {
+	foreach op $args {my remove afterOperations $op}
     }
-  }
-  if {[$registrationclass exists afterOperations($r)]} {
-    eval my [$registrationclass set afterOperations($r)] $args
-  }
-  set result
-}
 
-SortedComposite instproc init args {
-  my array set operations {}
-  my array set afterOperations {}
+    SortedComposite instproc compositeFilter args {
+	set registrationclass [lindex [self filterreg] 0]
+	set r [self calledproc]
+	set result [next]
+	if {[$registrationclass exists operations($r)] && [my exists children]} {
+	    set method [$registrationclass set operations($r)]
+	    foreach object [my set children] {
+		eval [self]::$object $method $args
+	    }
+	}
+	if {[$registrationclass exists afterOperations($r)]} {
+	    eval my [$registrationclass set afterOperations($r)] $args
+	}
+	set result
+    }
 
-  my instproc setChildren args {
-    switch [llength $args] {
-      0 { return [my set children] }
-      1 { return [my set children [lindex $args 0]] }
-      default {error "wrong # args: [self] setChildren ?children?"}
+    SortedComposite instproc init args {
+	my array set operations {}
+	my array set afterOperations {}
+
+	my instproc setChildren args {
+	    switch [llength $args] {
+		0 { return [my set children] }
+		1 { return [my set children [lindex $args 0]] }
+		default {error "wrong # args: [self] setChildren ?children?"}
+	    }
+	}
+	my instproc appendChildren args {
+	    eval my lappend children $args
+	}
+
+	next
+	my instfilter add compositeFilter 
     }
-  }
-  my instproc appendChildren args {
-    eval my lappend children $args
-  }
 
-  next
-  my instfilter add compositeFilter 
+    namespace export SortedComposite
 }
 
+namespace import ::xotcl::pattern::sortedCompositeWithAfter::*
Index: xotcl/library/patterns/adapter.xotcl
===================================================================
diff -u -r5ce5a10c82bc948f50fc4542f844dcd50de1eae3 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/patterns/adapter.xotcl	(.../adapter.xotcl)	(revision 5ce5a10c82bc948f50fc4542f844dcd50de1eae3)
+++ xotcl/library/patterns/adapter.xotcl	(.../adapter.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,33 +1,44 @@
-# $Id: adapter.xotcl,v 1.2 2004/07/03 21:19:39 neumann Exp $
+# $Id: adapter.xotcl,v 1.3 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::pattern::adapter 0.9
 
-Class Adapter -superclass Class  
+package require XOTcl
 
-@ @File {
-  description {
-    Simple adapter pattern meta-class taken from the paper 
-    'Filters as a Language Support for Design Patterns in
-    Object-Oriented Scripting Languages'. 
-  }
-}
+namespace eval ::xotcl::pattern::adapter {
+    namespace import ::xotcl::*
 
-Adapter instproc adapterFilter args { 
-    set r [self calledproc]
-    my instvar specificRequest adaptee \
-	[list specificRequest($r) sr]
-    if {[info exists sr]} {
-	return [eval $adaptee $sr $args]
+    Class Adapter -superclass Class  
+
+    @ @File {
+	description {
+	    Simple adapter pattern meta-class taken from the paper 
+	    'Filters as a Language Support for Design Patterns in
+	    Object-Oriented Scripting Languages'. 
+	}
     }
-    next
-}
 
-Adapter instproc init args {
-    my instfilter add adapterFilter
-    next
-    my instproc setRequest {r sr} {
-	my set specificRequest($r) $sr
+    Adapter instproc adapterFilter args { 
+	set r [self calledproc]
+	my instvar specificRequest adaptee \
+	    [list specificRequest($r) sr]
+	if {[info exists sr]} {
+	    return [eval $adaptee $sr $args]
+	}
+	next
     }
-    my instproc setAdaptee {a} {
-	my set adaptee $a
+
+    Adapter instproc init args {
+	my instfilter add adapterFilter
+	next
+	my instproc setRequest {r sr} {
+	    my set specificRequest($r) $sr
+	}
+	my instproc setAdaptee {a} {
+	    my set adaptee $a
+	}
     }
+
+    namespace export Adapter
 }
+
+namespace import ::xotcl::pattern::adapter::*
Index: xotcl/library/patterns/composite.xotcl
===================================================================
diff -u -r5ce5a10c82bc948f50fc4542f844dcd50de1eae3 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/patterns/composite.xotcl	(.../composite.xotcl)	(revision 5ce5a10c82bc948f50fc4542f844dcd50de1eae3)
+++ xotcl/library/patterns/composite.xotcl	(.../composite.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,54 +1,62 @@
-# $Id: composite.xotcl,v 1.2 2004/07/03 21:19:39 neumann Exp $
+# $Id: composite.xotcl,v 1.3 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::pattern::composite  0.9
+package require XOTcl
 
-Class Composite -superclass Class
+namespace eval ::xotcl::pattern::composite {
+    namespace import ::xotcl::*
 
-@ @File {
-  description {
-    Simple composite pattern meta-class taken from the paper 
-    'Filters as a Language Support for Design Patterns in
-    Object-Oriented Scripting Languages'. 
-  }
-}
+    Class Composite -superclass Class
 
-Composite instproc addOperations args {
-    foreach op $args {
-	if {![my exists operations($op)]} {
-	    my set operations($op) $op
+    @ @File {
+	description {
+	    Simple composite pattern meta-class taken from the paper 
+	    'Filters as a Language Support for Design Patterns in
+	    Object-Oriented Scripting Languages'. 
 	}
     }
-} 
 
-Composite instproc removeOperations args {
-    foreach op $args {
-	if {![my exists operations($op)]} {
-	    my unset operations($op)
+    Composite instproc addOperations args {
+	foreach op $args {
+	    if {![my exists operations($op)]} {
+		my set operations($op) $op
+	    }
 	}
+    } 
+
+    Composite instproc removeOperations args {
+	foreach op $args {
+	    if {![my exists operations($op)]} {
+		my unset operations($op)
+	    }
+	}
     }
-}
 
-Composite instproc compositeFilter args {
-  # get the operations class variable from the object's class
-  set registrationclass [lindex [self filterreg] 0]
-  $registrationclass instvar operations
-  # get the request
-  set r [self calledproc]
+    Composite instproc compositeFilter args {
+	# get the operations class variable from the object's class
+	set registrationclass [lindex [self filterreg] 0]
+	$registrationclass instvar operations
+	# get the request
+	set r [self calledproc]
 
-  # check if the request is a registered operation 
-  if {[info exists operations($r)]} {
-    foreach object [my info children] {
-      # forward request
-      eval $object $r $args
+	# check if the request is a registered operation 
+	if {[info exists operations($r)]} {
+	    foreach object [my info children] {
+		# forward request
+		eval $object $r $args
+	    }
+	}
+	return [next]    
     }
-  }
-  return [next]    
-}
 
 
-Composite instproc init {args} {
-  my array set operations {}
-  next
-  my instfilter add compositeFilter 
+    Composite instproc init {args} {
+	my array set operations {}
+	next
+	my instfilter add compositeFilter 
+    }
+
+    namespace export Composite
 }
 
-
+namespace import ::xotcl::pattern::composite::*
Index: xotcl/library/patterns/link.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/patterns/link.xotcl	(.../link.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/patterns/link.xotcl	(.../link.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,48 +1,58 @@
-# $Id: link.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: link.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::pattern::link 0.9
-#
-# establish/introspect 'link' through link-instproc
-#
-Class Link -parameter {
-  {link ""}
-}
+package require XOTcl
 
-Link instproc adapterFilter args {
-  set l [my set link]
-  set m [self calledproc]
+namespace eval ::xotcl::pattern::link {
+    namespace import ::xotcl::*
 
-  # let link/destroy requests go through to the link
-  if {$m == "link" || $m == "destroy"} {
-    return [next]
-  }
+    #
+    # establish/introspect 'link' through link-instproc
+    #
+    Class Link -parameter {
+	{link ""}
+    }
 
-  if {[Object isobject $l]} {
-    puts stderr "adapting $m on link [self] -> $l"
-    eval $l $m $args
-  } else {
-    # if there is currently no link establish -> return
-    if {$l == ""} {return}
-    error "Link: object $l is no xotcl object"
-  }
-}
+    Link instproc adapterFilter args {
+	set l [my set link]
+	set m [self calledproc]
 
-Link instfilter adapterFilter
+	# let link/destroy requests go through to the link
+	if {$m == "link" || $m == "destroy"} {
+	    return [next]
+	}
 
-# Link L
-# Class A
+	if {[Object isobject $l]} {
+	    puts stderr "adapting $m on link [self] -> $l"
+	    eval $l $m $args
+	} else {
+	    # if there is currently no link establish -> return
+	    if {$l == ""} {return}
+	    error "Link: object $l is no xotcl object"
+	}
+    }
 
-# L link A
+    Link instfilter adapterFilter
 
-# L w
+    # Link L
+    # Class A
 
-# w set a 45
+    # L link A
 
-# puts [w set a]
+    # L w
 
-# puts [L link]
+    # w set a 45
 
-# #A destroy
-# puts ----1
-# L set r 45
-# puts ----2
+    # puts [w set a]
 
+    # puts [L link]
+
+    # #A destroy
+    # puts ----1
+    # L set r 45
+    # puts ----2
+
+    namespace export Link
+}
+
+namespace import ::xotcl::pattern::link::*
Index: xotcl/library/patterns/manager.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/patterns/manager.xotcl	(.../manager.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/patterns/manager.xotcl	(.../manager.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,31 +1,40 @@
-# $Id: manager.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: manager.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::pattern::manager 0.8
+package require XOTcl
 
-#
-# a simle manager pattern following buschmann (164) 
-# based on dynamic object aggregation and using dynamic code
-# for supplier creation (instead of loading)
-#
-# it shares the suppliers !
-#
+namespace eval ::xotcl::pattern::manager {
+    namespace import ::xotcl::*
 
-#
-# abstract supplier, init starts dynamic code creation
-#
-Class Supplier
-Supplier abstract instproc init args
-Supplier abstract instproc m args
+    #
+    # a simle manager pattern following buschmann (164) 
+    # based on dynamic object aggregation and using dynamic code
+    # for supplier creation (instead of loading)
+    #
+    # it shares the suppliers !
+    #
 
+    #
+    # abstract supplier, init starts dynamic code creation
+    #
+    Class Supplier
+    Supplier abstract instproc init args
+    Supplier abstract instproc m args
 
-Class Manager -parameter {
-  {supplierClass Supplier}
-} 
 
-Manager instproc getSupplier {name} {
-  if {[my info children [namespace tail $name]] != ""} {
-    return [self]::[namespace tail $name]
-  } else {
-    return [my [my supplierClass] [namespace tail $name]]
-  }
+    Class Manager -parameter {
+	{supplierClass Supplier}
+    } 
+
+    Manager instproc getSupplier {name} {
+	if {[my info children [namespace tail $name]] != ""} {
+	    return [self]::[namespace tail $name]
+	} else {
+	    return [my [my supplierClass] [namespace tail $name]]
+	}
+    }
+
+    namespace export Supplier Manager
 }
 
+namespace import ::xotcl::pattern::manager::*
Index: xotcl/library/patterns/observer.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/patterns/observer.xotcl	(.../observer.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/patterns/observer.xotcl	(.../observer.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,85 +1,100 @@
-# $Id: observer.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: observer.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::pattern::observer 0.8
+package require XOTcl
 
-Class Observer -superclass Class
+namespace eval ::xotcl::pattern::observer {
+    namespace import ::xotcl::*
 
-@ @File {
-  description {
-    Simple observer pattern meta-class taken from the paper 
-    'Filters as a Language Support for Design Patterns in
-    Object-Oriented Scripting Languages'. 
-  }
-}
+    Class Observer -superclass Class
 
-Class Observer::Subject -superclass Class
+    @ @File {
+	description {
+	    Simple observer pattern meta-class taken from the paper 
+	    'Filters as a Language Support for Design Patterns in
+	    Object-Oriented Scripting Languages'. 
+	}
+    }
 
-Observer::Subject instproc notificationFilter {args} {
-  set procName [self calledproc]
-  my instvar \
-      preObservers  [list preObservers($procName)  preObs] \
-      postObservers [list postObservers($procName) postObs]
+    Class Observer::Subject -superclass Class
 
-  if {[info exists preObs]} {
-    foreach obj $preObs { $obj update [self] $args }
-  }
-  set result [next]
+    Observer::Subject instproc notificationFilter {args} {
+	set procName [self calledproc]
+	my instvar \
+	    preObservers  [list preObservers($procName)  preObs] \
+	    postObservers [list postObservers($procName) postObs]
 
-  if {[info exists postObs]} {
-    foreach obj $postObs { $obj update [self] $args }
-  }
-  return $result
-}
+	if {[info exists preObs]} {
+	    foreach obj $preObs { $obj update [self] $args }
+	}
+	set result [next]
 
-Class Observer::SubjectMgt
-Observer::SubjectMgt instproc attach {hook objs} {
-  upvar [self callinglevel] $hook observers
-  foreach obj $objs {
-    if {![info exists observers] || [lsearch $observers $obj] == -1} {
-      lappend observers $obj
+	if {[info exists postObs]} {
+	    foreach obj $postObs { $obj update [self] $args }
+	}
+	return $result
     }
-  }
-}
-Observer::SubjectMgt instproc detach {hook objs} {
-  upvar [self callinglevel] $hook observers
-  if {[info exists observers]} {
-    foreach obj $objs {
-      set p [lsearch $observers $obj]
-      set observers [lreplace $observers $p $p]
+
+    Class Observer::SubjectMgt
+    Observer::SubjectMgt instproc attach {hook objs} {
+	upvar [self callinglevel] $hook observers
+	foreach obj $objs {
+	    if {![info exists observers] || [lsearch $observers $obj] == -1} {
+		lappend observers $obj
+	    }
+	}
     }
-  }
-}
+    Observer::SubjectMgt instproc detach {hook objs} {
+	upvar [self callinglevel] $hook observers
+	if {[info exists observers]} {
+	    foreach obj $objs {
+		set p [lsearch $observers $obj]
+		set observers [lreplace $observers $p $p]
+	    }
+	}
+    }
 
-Observer::SubjectMgt instproc attachPre {procName args} {
-  my instvar preObservers 
-  my attach  preObservers($procName) $args
-} 
-Observer::SubjectMgt instproc attachPost {procName args} {
-  my instvar postObservers 
-  my attach  postObservers($procName) $args
-} 
-Observer::SubjectMgt instproc detachPre {procName args} {
-  my instvar preObservers
-  my detach  preObservers($procName) $args
-}
-Observer::SubjectMgt instproc detachPost {procName args} {
-  my instvar postObservers
-  my detach  postObservers($procName) $args
-}
+    Observer::SubjectMgt instproc attachPre {procName args} {
+	my instvar preObservers 
+	my attach  preObservers($procName) $args
+    } 
+    Observer::SubjectMgt instproc attachPost {procName args} {
+	my instvar postObservers 
+	my attach  postObservers($procName) $args
+    } 
+    Observer::SubjectMgt instproc detachPre {procName args} {
+	my instvar preObservers
+	my detach  preObservers($procName) $args
+    }
+    Observer::SubjectMgt instproc detachPost {procName args} {
+	my instvar postObservers
+	my detach  postObservers($procName) $args
+    }
 
-Observer::Subject instproc init args {
-    next
-    my superclass [list Observer::SubjectMgt [my info superclass]]
-    my instfilter notificationFilter
-}
+    Observer::Subject instproc init args {
+	next
+	my superclass [list Observer::SubjectMgt [my info superclass]]
+	my instfilter notificationFilter
+    }
 
-Observer instproc timeout t {
-  my set timeout $t
-}
+    Observer instproc timeout t {
+	my set timeout $t
+    }
 
-Observer instproc update {subject args} {
-  #addTimeOut [my set timeout] "my update $subject $args"
-  #$subject getResponse
-  # do something with the response
-  puts [self]---update
+    Observer instproc update {subject args} {
+	#addTimeOut [my set timeout] "my update $subject $args"
+	#$subject getResponse
+	# do something with the response
+	puts [self]---update
+    }
+
+    namespace export Observer
+    namespace eval Observer {
+	namespace export Subject SubjectMgt
+    }
 }
 
+namespace import ::xotcl::pattern::observer::*
+namespace eval Observer {
+    namespace import ::xotcl::pattern::observer::Observer::*
+}
Index: xotcl/library/rdf/RDFCreator.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/rdf/RDFCreator.xotcl	(.../RDFCreator.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/rdf/RDFCreator.xotcl	(.../RDFCreator.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,133 +1,142 @@
-# $Id: RDFCreator.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
-package provide xotcl::rdf::tripleRecreator 0.9
+# $Id: RDFCreator.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
 
+package provide xotcl::rdf::tripleRecreator 0.9
+package require XOTcl
 package require xotcl::rdf::parser
 
-Class RDFCreator -parameter {
-  {rdfNS "http://www.w3.org/1999/02/22-rdf-syntax-ns#"}
-  {openExprs ""}
-}
+namespace eval ::xotcl::rdf::tripleRecreator {
+    namespace import ::xotcl::*
 
-Class OpenExpr -parameter {
-  {type ""}
-  {subject ""}
-  {closing ""}
-} 
+    Class RDFCreator -parameter {
+	{rdfNS "http://www.w3.org/1999/02/22-rdf-syntax-ns#"}
+	{openExprs ""}
+    }
 
-RDFCreator instproc init args {
-  next
-}
+    Class OpenExpr -parameter {
+	{type ""}
+	{subject ""}
+	{closing ""}
+    } 
 
-RDFCreator instproc free {} {
-  my instvar openExprs
-  while {$openExprs != ""} {
-    set o [lindex $openExprs 0]
-    set openExprs [lrange $openExprs 1 end]
-    $o destroy
-  }
-}
+    RDFCreator instproc init args {
+	next
+    }
 
-RDFCreator instproc sort {tl} {
-  #
-  # this assumes that the triples are created and named in node tree order, e.g. 
-  # through autonames like triple0, triple1, ... (as in rdfTripleCreator)
-  #
-  # => bag types defs are before bag's _1, _2 -- etc.
-  #
-  # otherwise overload sorting method !
-  #
-  return [lsort $tl]
-}
+    RDFCreator instproc free {} {
+	my instvar openExprs
+	while {$openExprs != ""} {
+	    set o [lindex $openExprs 0]
+	    set openExprs [lrange $openExprs 1 end]
+	    $o destroy
+	}
+    }
 
-RDFCreator instproc createFromTriples {tripleList} {
-  my instvar openExprs
-  set heading "<?xml version=\"1.0\"?>\n<RDF
+    RDFCreator instproc sort {tl} {
+	#
+	# this assumes that the triples are created and named in node tree order, e.g. 
+	# through autonames like triple0, triple1, ... (as in rdfTripleCreator)
+	#
+	# => bag types defs are before bag's _1, _2 -- etc.
+	#
+	# otherwise overload sorting method !
+	#
+	return [lsort $tl]
+    }
+
+    RDFCreator instproc createFromTriples {tripleList} {
+	my instvar openExprs
+	set heading "<?xml version=\"1.0\"?>\n<RDF
   xmlns:rdf=\"[my set rdfNS]\""
-  set body ""
-  XMLNamespace [self]::ns
-  [self]::ns add rdf [set rdfNS [my rdfNS]]
-  my free
+	set body ""
+	XMLNamespace [self]::ns
+	[self]::ns add rdf [set rdfNS [my rdfNS]]
+	my free
 
-  foreach t [my sort $tripleList] {
-    set p [$t predicate]
-    set o [$t object]
-    set s [$t subject]
+	foreach t [my sort $tripleList] {
+	    set p [$t predicate]
+	    set o [$t object]
+	    set s [$t subject]
 
-   
-    set opening ""
-    set closing ""
-    if {[regexp "(^.*://.*/(\[^/\]+)(/|\#))(\[^/\]+)\$" $p _ ns prefix __ name]} {
-   
-      if {[string match $rdfNS $ns]} {
-	if {[string match "type" $name]} {
-	  if {[regexp "${rdfNS}(RDFAlt|RDFBag|RDFSeq)" $o _ type]} {
-	    set opening "\n<rdf:$type ID=\"$s\">"
-	    set closing "\n</rdf:$type>"
-	  }
-	}
-      }
+	    
+	    set opening ""
+	    set closing ""
+	    if {[regexp "(^.*://.*/(\[^/\]+)(/|\#))(\[^/\]+)\$" $p _ ns prefix __ name]} {
+		
+		if {[string match $rdfNS $ns]} {
+		    if {[string match "type" $name]} {
+			if {[regexp "${rdfNS}(RDFAlt|RDFBag|RDFSeq)" $o _ type]} {
+			    set opening "\n<rdf:$type ID=\"$s\">"
+			    set closing "\n</rdf:$type>"
+			}
+		    }
+		}
 
-      if {[set nsPrefix [[self]::ns searchFullName $ns]] == ""} {
-	[self]::ns add [set nsPrefix [my autoname $prefix]] $ns
-	append heading "\n  xmlns:${nsPrefix}=\"$ns\""
-      }
-  	
-      set oe [lindex [my set openExprs] 0]
+		if {[set nsPrefix [[self]::ns searchFullName $ns]] == ""} {
+		    [self]::ns add [set nsPrefix [my autoname $prefix]] $ns
+		    append heading "\n  xmlns:${nsPrefix}=\"$ns\""
+		}
+		
+		set oe [lindex [my set openExprs] 0]
 
-      if {$oe == "" || [$oe subject] != $s} {
-	if {$oe != ""} {
-	  append body [$oe closing]
-	  [lindex [set openExprs] 0] destroy
-	  set openExprs [lrange $openExprs 1 end]
-	}
-	if {$opening == ""} {
-	  append body "\n<rdf:Description about=\"$s\">"
-	  set closing "\n</rdf:Description>"
-	  set type "Description"
-	} else {
-	  append body $opening
-	}
-	set noe [my OpenExpr [my autoname oe]]
-	set openExprs [concat $noe $openExprs]
-	
-	$noe subject $s
-	$noe closing $closing
-	$noe type $type
-	set oe $noe
-      }
-      set tn ${nsPrefix}:$name
+		if {$oe == "" || [$oe subject] != $s} {
+		    if {$oe != ""} {
+			append body [$oe closing]
+			[lindex [set openExprs] 0] destroy
+			set openExprs [lrange $openExprs 1 end]
+		    }
+		    if {$opening == ""} {
+			append body "\n<rdf:Description about=\"$s\">"
+			set closing "\n</rdf:Description>"
+			set type "Description"
+		    } else {
+			append body $opening
+		    }
+		    set noe [my OpenExpr [my autoname oe]]
+		    set openExprs [concat $noe $openExprs]
+		    
+		    $noe subject $s
+		    $noe closing $closing
+		    $noe type $type
+		    set oe $noe
+		}
+		set tn ${nsPrefix}:$name
 
-      switch -exact [$oe type] {
-	RDFDescription {
-	  #puts DESCRIPTION
-	  append body "\n<$tn> [$t object] </$tn>"
+		switch -exact [$oe type] {
+		    RDFDescription {
+			#puts DESCRIPTION
+			append body "\n<$tn> [$t object] </$tn>"
+		    }
+		    RDFAlt - RDFSeq {
+			#puts ALT---$tn
+			if {[regexp {rdf:_([0-9]*)} $tn _ __]} {
+			    append body "\n<rdf:li resource=\"[$t object]\"/>"
+			}
+		    } 
+		    RDFBag {
+			if {[regexp {rdf:_([0-9]*)} $tn _ __]} {
+			    append body "\n<$tn resource=\"[$t object]\"/>"
+			}
+		    }
+		}
+	    } else { 
+		puts "Predicate '$p' not matched"
+		# hier als xmlns behandeln ...
+	    } 
 	}
-	RDFAlt - RDFSeq {
-	  #puts ALT---$tn
-	  if {[regexp {rdf:_([0-9]*)} $tn _ __]} {
-	    append body "\n<rdf:li resource=\"[$t object]\"/>"
-	  }
-	} 
-	RDFBag {
-	  if {[regexp {rdf:_([0-9]*)} $tn _ __]} {
-	    append body "\n<$tn resource=\"[$t object]\"/>"
-	  }
+	append heading ">"
+	set r $heading
+	while {$openExprs != ""} {
+	    set oe [lindex $openExprs 0]
+	    set openExprs [lrange $openExprs 1 end]
+	    append body [$oe closing]
+	    $oe destroy
 	}
-      }
-    } else { 
-      puts "Predicate '$p' not matched"
-      # hier als xmlns behandeln ...
-    } 
-  }
-  append heading ">"
-  set r $heading
-  while {$openExprs != ""} {
-    set oe [lindex $openExprs 0]
-    set openExprs [lrange $openExprs 1 end]
-    append body [$oe closing]
-    $oe destroy
-  }
-  append r $body
-  append r "\n</RDF>"
-  return $r
+	append r $body
+	append r "\n</RDF>"
+	return $r
+    }
+
+    namespace export RDFCreator OpenExpr
 }
+
+namespace import ::xotcl::rdf::tripleRecreator::*
Index: xotcl/library/rdf/RDFTriple.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/rdf/RDFTriple.xotcl	(.../RDFTriple.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/rdf/RDFTriple.xotcl	(.../RDFTriple.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,535 +1,545 @@
-# $Id: RDFTriple.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
-package provide xotcl::rdf::triple 0.9
+# $Id: RDFTriple.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+package provide xotcl::rdf::triple 1.0
 
+package require XOTcl
 package require xotcl::rdf::parser
 
-Class RDFTriple -parameter {
-  predicate
-  subject
-  object
-}
+namespace eval ::xotcl::rdf::triple {
+  namespace import ::xotcl::*
 
-RDFTriple instproc dump {} {
-  #set o [my object]; if {[info command $o] != ""} { $o showVars  }
-  #return "P: [my predicate] S: [my subject] O: [my object]\n"
-  return "[my subject] -[my predicate]-> '[my object]'\n"
-}
+  Class RDFTriple -parameter {
+    predicate
+    subject
+    object
+  }
 
-Class NodeInfo -parameter {
-  lastCurrentNode
-  {aboutEach 0}
-  {aboutEachPrefix 0}
-  topID
-  {statements ""}
-}
+  RDFTriple instproc dump {} {
+    #set o [my object]; if {[info command $o] != ""} { $o showVars  }
+    #return "P: [my predicate] S: [my subject] O: [my object]\n"
+    return "[my subject] -[my predicate]-> '[my object]'\n"
+  }
 
-Class DescriptionInfo -superclass NodeInfo -parameter {
-  {bagID 0}
-}
+  Class NodeInfo -parameter {
+    lastCurrentNode
+    {aboutEach 0}
+    {aboutEachPrefix 0}
+    topID
+    {statements ""}
+  }
 
-Class PropertyInfo -superclass NodeInfo -parameter {
-  {reify 0}
-  generatedParentID
-}
+  Class DescriptionInfo -superclass NodeInfo -parameter {
+    {bagID 0}
+  }
 
-Class AboutEachMgr
+  Class PropertyInfo -superclass NodeInfo -parameter {
+    {reify 0}
+    generatedParentID
+  }
 
-AboutEachMgr instproc init args {
-  my array set entries {}
-  next
-}
+  Class AboutEachMgr
 
-AboutEachMgr instproc reset {} {
-  foreach c [my info children] {$c destroy}
-  my init
-}
+  AboutEachMgr instproc init args {
+    my array set entries {}
+    next
+  }
 
-AboutEachMgr instproc addEntry {name} {
-  my set entries($name) ""
-}
+  AboutEachMgr instproc reset {} {
+    foreach c [my info children] {$c destroy}
+    my init
+  }
 
-AboutEachMgr instproc isEntry {name} {
-  my exists entries($name)
-}
+  AboutEachMgr instproc addEntry {name} {
+    my set entries($name) ""
+  }
 
-AboutEachMgr instproc addTriple {name p s o} {
-  if {[my exists entries($name)]} {
-    set r [RDFTriple create [self]::[my autoname name%08d]]
+  AboutEachMgr instproc isEntry {name} {
+    my exists entries($name)
+  }
+
+  AboutEachMgr instproc addTriple {name p s o} {
+    if {[my exists entries($name)]} {
+      set r [RDFTriple create [self]::[my autoname name%08d]]
+      $r set predicate $p
+      $r set subject $s
+      $r set object $o
+      my lappend entries($name) $r
+      return $r
+    }
+    return ""
+  }
+
+  AboutEachMgr instproc getTriples {name} {
+    if {[my exists entries($name)]} {
+      my set entries($name)
+    } else {return ""}
+  }
+
+  Class RDFTripleDB
+  RDFTripleDB instproc add {p s o} {
+    #my showCall
+    set r [RDFTriple create [self]::[my autoname triple%08d]]
     $r set predicate $p
     $r set subject $s
     $r set object $o
-    my lappend entries($name) $r
     return $r
   }
-  return ""
-}
-
-AboutEachMgr instproc getTriples {name} {
-  if {[my exists entries($name)]} {
-    my set entries($name)
-  } else {return ""}
-}
-
-Class RDFTripleDB
-RDFTripleDB instproc add {p s o} {
-  #my showCall
-  set r [RDFTriple create [self]::[my autoname triple%08d]]
-  $r set predicate $p
-  $r set subject $s
-  $r set object $o
-  return $r
-}
-RDFTripleDB instproc dump {} {
-  #my showCall
-  set r ""
-  foreach fact [my info children] {append r [$fact dump]}
-  return $r
-}
-RDFTripleDB instproc getTriples {} {
-  # for the time being: return only children of type RDFTriple
-  set ch {}
-  foreach c [my info children] {if {[$c info class] == "::RDFTriple"} {lappend ch $c}}
-  return $ch
-  #my info children
-}
-RDFTripleDB instproc reset {} {
-  #my showCall
-  foreach c [my info children] {$c destroy}
-  my autoname -reset triple
-  #my showMsg "children after reset: <[my info children]>'"
-}
-# return all triples that match the subject
-RDFTripleDB instproc querySubject {s} {
-  #my showCall
-  set r ""
-  foreach t [my info children] {
-    if {[string match $s [$t subject]]} {
-      lappend r $t
+  RDFTripleDB instproc dump {} {
+    #my showCall
+    set r ""
+    foreach fact [my info children] {append r [$fact dump]}
+    return $r
+  }
+  RDFTripleDB instproc getTriples {} {
+    # for the time being: return only children of type RDFTriple
+    set ch {}
+    foreach c [my info children] {if {[$c istype "RDFTriple"]} {lappend ch $c}}
+    return $ch
+    #my info children
+  }
+  RDFTripleDB instproc reset {} {
+    #my showCall
+    foreach c [my info children] {$c destroy}
+    my autoname -reset triple
+    #my showMsg "children after reset: <[my info children]>'"
+  }
+  # return all triples that match the subject
+  RDFTripleDB instproc querySubject {s} {
+    #my showCall
+    set r ""
+    foreach t [my info children] {
+      if {[string match $s [$t subject]]} {
+	lappend r $t
+      }
     }
+    return $r
   }
-  return $r
-}
 
-RDFTripleDB instproc queryPredicate {p} {
-  #my showCall
-  set r ""
-  foreach t [my info children] {
-    if {[string match $p [$t predicate]]} {
-      lappend r $t
+  RDFTripleDB instproc queryPredicate {p} {
+    #my showCall
+    set r ""
+    foreach t [my info children] {
+      if {[string match $p [$t predicate]]} {
+	lappend r $t
+      }
     }
+    return $r
   }
-  return $r
-}
 
-RDFTripleDB instproc queryPredicateOnSubject {p s} {
-  #my showCall
-  foreach t [my querySubject $s] {
-    if {[string match $p [$t predicate]]} {
-      # there may be only one matching P on a S
-      # return the triple
-      return $t
+  RDFTripleDB instproc queryPredicateOnSubject {p s} {
+    #my showCall
+    foreach t [my querySubject $s] {
+      if {[string match $p [$t predicate]]} {
+	# there may be only one matching P on a S
+	# return the triple
+	return $t
+      }
     }
+    return ""
   }
-  return ""
-}
-RDFTripleDB instproc prettyTriples {} {
-  my instvar result
-  if {[my exists table]} {my unset table}
-  if {[my exists subjectPrinted]} {my unset subjectPrinted}
-  set result ""
+  RDFTripleDB instproc prettyTriples {} {
+    my instvar result
+    if {[my exists table]} {my unset table}
+    if {[my exists subjectPrinted]} {my unset subjectPrinted}
+    set result ""
 
-  foreach triple [lsort [my getTriples]] {
-    set subject [$triple set subject]
-    set predicate [$triple set predicate]
-    set object [$triple set object]
+    foreach triple [lsort [my getTriples]] {
+      set subject [$triple set subject]
+      set predicate [$triple set predicate]
+      set object [$triple set object]
 
-    regexp {^http.*w3[.]org.*(\#.*)$} $predicate _ predicate
-    regexp {^http.*w3[.]org.*(\#.*)$} $object _ object
-    my lappend table($subject) $predicate $object
-  }
-  foreach subject [lsort [my array names table]] {
-    if {![regexp {^rdfdoc\#} $subject]} { my prettyStatements "" $subject }
-  }
-  set r $result; set result ""
-  foreach subject [lsort [my array names table]] {
-    if {![my exists subjectPrinted($subject)]} { 
-      my prettyStatements "" $subject 
+      regexp {^http.*w3[.]org.*(\#.*)$} $predicate _ predicate
+      regexp {^http.*w3[.]org.*(\#.*)$} $object _ object
+      my lappend table($subject) $predicate $object
     }
+    foreach subject [lsort [my array names table]] {
+      if {![regexp {^rdfdoc\#} $subject]} { my prettyStatements "" $subject }
+    }
+    set r $result; set result ""
+    foreach subject [lsort [my array names table]] {
+      if {![my exists subjectPrinted($subject)]} { 
+	my prettyStatements "" $subject 
+      }
+    }
+    if {$result != ""} {
+      append r "\n=================== unreferenced:\n$result"
+      
+    }
+    return $r
   }
-  if {$result != ""} {
-    append r "\n=================== unreferenced:\n$result"
-    
+  RDFTripleDB instproc prettyStatement {space subject predicate object} {
+    my append result "$space   [format %-35s $subject] [format %-25s $predicate] $object\n"
   }
-  return $r
-}
-RDFTripleDB instproc prettyStatement {space subject predicate object} {
-  my append result "$space   [format %-35s $subject] [format %-25s $predicate] $object\n"
-}
-RDFTripleDB instproc prettyStatements {space subject} {
-  if {![my exists table($subject)]} {
-    my append result "$space NO VALUE FOR $subject\n"
-  } else {
-    if {![my exists subjectPrinted($subject)]} {
-      my set subjectPrinted($subject) 1
-      foreach {predicate object} [my set table($subject)] {
-	my prettyStatement $space $subject $predicate $object
-	if {[regexp {^rdfdoc\#} $object]} {
-	  my prettyStatements "$space  " $object
+  RDFTripleDB instproc prettyStatements {space subject} {
+    if {![my exists table($subject)]} {
+      my append result "$space NO VALUE FOR $subject\n"
+    } else {
+      if {![my exists subjectPrinted($subject)]} {
+	my set subjectPrinted($subject) 1
+	foreach {predicate object} [my set table($subject)] {
+	  my prettyStatement $space $subject $predicate $object
+	  if {[regexp {^rdfdoc\#} $object]} {
+	    my prettyStatements "$space  " $object
+	  }
 	}
       }
     }
   }
-}
 
 
-Class TripleVisitor -superclass NodeTreeVisitor -parameter {
-  {descriptionAsBag 0}
-  {currentNode ""}
-  parser
-  rdfNS
-}
+  Class TripleVisitor -superclass NodeTreeVisitor -parameter {
+    {descriptionAsBag 0}
+    {currentNode ""}
+    parser
+    rdfNS
+  }
 
-TripleVisitor instproc getInfo {} {
-  my set openNode([my set currentNode])
-}
+  TripleVisitor instproc getInfo {} {
+    my set openNode([my set currentNode])
+  }
 
-TripleVisitor instproc getLastInfo {info} {
-  my set openNode([$info set lastCurrentNode])
-}
+  TripleVisitor instproc getLastInfo {info} {
+    my set openNode([$info set lastCurrentNode])
+  }
 
-TripleVisitor instproc popInfo {objName} {
-  set i [my getInfo]
-  my set currentNode [$i set lastCurrentNode]
-  my unset openNode($objName)
-  return $i
-}
+  TripleVisitor instproc popInfo {objName} {
+    set i [my getInfo]
+    my set currentNode [$i set lastCurrentNode]
+    my unset openNode($objName)
+    return $i
+  }
 
-TripleVisitor instproc pushInfo {objName ei} {
-  set lce [$ei set lastCurrentNode [my set currentNode]]
-  if {$lce != ""} {
-    set lastInfo [my set openNode($lce)]
-    $ei aboutEach [$lastInfo aboutEach]
-    $ei aboutEachPrefix [$lastInfo aboutEachPrefix]
+  TripleVisitor instproc pushInfo {objName ei} {
+    set lce [$ei set lastCurrentNode [my set currentNode]]
+    if {$lce != ""} {
+      set lastInfo [my set openNode($lce)]
+      $ei aboutEach [$lastInfo aboutEach]
+      $ei aboutEachPrefix [$lastInfo aboutEachPrefix]
+    }
+    my set openNode($objName) $ei
+    my set currentNode $objName
   }
-  my set openNode($objName) $ei
-  my set currentNode $objName
-}
 
-TripleVisitor instproc qualify {obj var} {
-  [$obj resolveNS] getFullName $var
-}
+  TripleVisitor instproc qualify {obj var} {
+    [$obj resolveNS] getFullName $var
+  }
 
-TripleVisitor instproc init args {
-  my array set openNode {{} {}}
-  RDFTripleDB create [self]::db
-  AboutEachMgr create [self]::aboutEach
-  AboutEachMgr create [self]::aboutEachPrefix
-  next
-}
+  TripleVisitor instproc init args {
+    my array set openNode {{} {}}
+    RDFTripleDB create [self]::db
+    AboutEachMgr create [self]::aboutEach
+    AboutEachMgr create [self]::aboutEachPrefix
+    next
+  }
 
-TripleVisitor instproc resetWithoutDB args {
-  [self]::aboutEach reset
-  [self]::aboutEachPrefix reset
-  next
-}
+  TripleVisitor instproc resetWithoutDB args {
+    [self]::aboutEach reset
+    [self]::aboutEachPrefix reset
+    next
+  }
 
-TripleVisitor instproc reset args {
-  [self]::db reset
-  my resetWithoutDB
-  next
-}
+  TripleVisitor instproc reset args {
+    [self]::db reset
+    my resetWithoutDB
+    next
+  }
 
-TripleVisitor instproc addDB {p s o} {
-  #puts "ADDDB: P<$p> S<$s> O<$o>"
-  set info [my getInfo]
-  if {$info != ""} {
-    set topID [$info set topID]
-    if {[$info aboutEach]} {
-      return [[self]::aboutEach addTriple $topID $p $s $o]
-    } elseif {[$info aboutEachPrefix]} {
-      return [[self]::aboutEachPrefix addTriple $topID $p $s $o]
+  TripleVisitor instproc addDB {p s o} {
+    #puts "ADDDB: P<$p> S<$s> O<$o>"
+    set info [my getInfo]
+    if {$info != ""} {
+      set topID [$info set topID]
+      if {[$info aboutEach]} {
+	return [[self]::aboutEach addTriple $topID $p $s $o]
+      } elseif {[$info aboutEachPrefix]} {
+	return [[self]::aboutEachPrefix addTriple $topID $p $s $o]
+      }
     }
+    return [[self]::db add $p $s $o]
   }
-  return [[self]::db add $p $s $o]
-}
 
-TripleVisitor instproc checkReification {triple node} {
-  # for statements that nest inside a description/property, we remember
-  # the statement to be able to reify them
-  # (e.g., bag created for description)
-  if {$triple != "" && $node != ""} {
-    set info [my set openNode($node)]
-    if {[my isobject $info] && [$info istype NodeInfo]} {
-      ${info} lappend statements $triple
+  TripleVisitor instproc checkReification {triple node} {
+    # for statements that nest inside a description/property, we remember
+    # the statement to be able to reify them
+    # (e.g., bag created for description)
+    if {$triple != "" && $node != ""} {
+      set info [my set openNode($node)]
+      if {[my isobject $info] && [$info istype NodeInfo]} {
+	${info} lappend statements $triple
+      }
     }
   }
-}
 
-TripleVisitor instproc qualifyWithBaseURL v {
-  if {[string match "\#*" $v]} {
-    return [[my set parser] baseURL]$v
+  TripleVisitor instproc qualifyWithBaseURL v {
+    if {[string match "\#*" $v]} {
+      return [[my set parser] baseURL]$v
+    }
+    return $v
   }
-  return $v
-}
 
-TripleVisitor instproc RDFTag {objName} {
-  set ns [$objName resolveNS]
-  set rdfNS [$ns searchNamespaceByPrefix rdf]
-  if {$rdfNS == ""} {
-    set rdfNS [$ns searchNamespaceByPrefix xmlns]
+  TripleVisitor instproc RDFTag {objName} {
+    set ns [$objName resolveNS]
+    set rdfNS [$ns searchNamespaceByPrefix rdf]
+    if {$rdfNS == ""} {
+      set rdfNS [$ns searchNamespaceByPrefix xmlns]
+    }
+    my set rdfNS $rdfNS
   }
-  my set rdfNS $rdfNS
-}
-TripleVisitor instproc DescriptionNode objName {
-  set di [DescriptionInfo create [self]::[my autoname di]]
-  $di topID [my qualifyWithBaseURL [$objName getSubject]]
-  my pushInfo $objName $di
-  #
-  # if a description nests inside a Member, we need a triple
-  # for the member index (connected to the Description topId)
-  #
-  if {[[set member [$objName info parent]] info class] == "::RDFMember"} {
-    set bag_ID [[$member info parent] set ID]
-    my addDB [my qualify $objName [$member set memberIndex]] \
-      $bag_ID [$di set topID] 
+  TripleVisitor instproc DescriptionNode objName {
+    set di [DescriptionInfo create [self]::[my autoname di]]
+    $di topID [my qualifyWithBaseURL [$objName getSubject]]
+    my pushInfo $objName $di
+    #
+    # if a description nests inside a Member, we need a triple
+    # for the member index (connected to the Description topId)
+    #
+    if {[namespace tail [[set member [$objName info parent]] info class]] \
+	    == "RDFMember"} {
+      set bag_ID [[$member info parent] set ID]
+      my addDB [my qualify $objName [$member set memberIndex]] \
+	  $bag_ID [$di set topID] 
+    }
   }
-}
 
-TripleVisitor instproc handlePCData {objName pcdata} {
-  set info [my getInfo]
+  TripleVisitor instproc handlePCData {objName pcdata} {
+    set info [my getInfo]
 
-  if {[set lcn [$info set lastCurrentNode]] == ""} {
-    #puts stderr "cannot determine lastCurrentNode from $info"
-    #$info showVars
-    set selector ""
-  } else {
-    set selector [$lcn info class]
-  }
-  
-  switch -exact $selector {
-    ::RDFDescription {
-      set triple [my addDB \
-		    [my qualify $objName [$objName set content]] \
-		    [$info set topID] $pcdata]
-      my checkReification $triple $lcn
+    if {[set lcn [$info set lastCurrentNode]] == ""} {
+      #puts stderr "cannot determine lastCurrentNode from $info"
+      #$info showVars
+      set selector ""
+    } else {
+      set selector [namespace tail [$lcn info class]]
     }
-    ::RDFProperty {
-      if {[set rAttr [$lcn getRDFAttribute resource]] != ""} {
+    
+    switch -exact $selector {
+      RDFDescription {
 	set triple [my addDB \
-		      [my qualify $objName [$objName set content]] \
-		      [$lcn set $rAttr] $pcdata]
-	#$lcn showVars
-      } else {
-	set lastInfo [my getLastInfo $info]
-	if {[$lastInfo exists generatedParentID]} {
-	  set parentID [$lastInfo set generatedParentID]
+			[my qualify $objName [$objName set content]] \
+			[$info set topID] $pcdata]
+	my checkReification $triple $lcn
+      }
+      RDFProperty {
+	if {[set rAttr [$lcn getRDFAttribute resource]] != ""} {
+	  set triple [my addDB \
+			  [my qualify $objName [$objName set content]] \
+			  [$lcn set $rAttr] $pcdata]
+	  #$lcn showVars
 	} else {
-	  set parentID [[$objName info parent] set ID]
+	  set lastInfo [my getLastInfo $info]
+	  if {[$lastInfo exists generatedParentID]} {
+	    set parentID [$lastInfo set generatedParentID]
+	  } else {
+	    set parentID [[$objName info parent] set ID]
+	  }
+	  #set parentID [$lastInfo set generatedParentID]
+	  set triple [my addDB \
+			  [my qualify $objName [$objName set content]] \
+			  $parentID $pcdata]
 	}
-	#set parentID [$lastInfo set generatedParentID]
+      }
+      default {
+	#puts stderr "create a generatedParentID for reification"
+	$info set generatedParentID [[my set parser] makeID]
 	set triple [my addDB \
-		      [my qualify $objName [$objName set content]] \
-		      $parentID $pcdata]
+			[my qualify $objName [$objName set content]] \
+			[$info set generatedParentID] $pcdata]
+	my checkReification $triple [my set currentNode]
       }
     }
-    default {
-      #puts stderr "create a generatedParentID for reification"
-      $info set generatedParentID [[my set parser] makeID]
-      set triple [my addDB \
-		      [my qualify $objName [$objName set content]] \
-		      [$info set generatedParentID] $pcdata]
-      my checkReification $triple [my set currentNode]
-    }
+    $info set tripleWritten 1
   }
-  $info set tripleWritten 1
-}
 
-TripleVisitor instproc Property objName {
-  set info [PropertyInfo create [self]::[my autoname pi]]
-  ## if we find no subject and are in Container ->
-  ## reifiy over generatedParentID
-  set propSubject [$objName getSubject]
+  TripleVisitor instproc Property objName {
+    set info [PropertyInfo create [self]::[my autoname pi]]
+    ## if we find no subject and are in Container ->
+    ## reifiy over generatedParentID
+    set propSubject [$objName getSubject]
 
-  $info topID [my qualifyWithBaseURL $propSubject]
-  my pushInfo $objName $info
-  
-  if {[$objName exists pcdata]} {
-    my handlePCData $objName [$objName getFirstPCData]
-  } 
-}
+    $info topID [my qualifyWithBaseURL $propSubject]
+    my pushInfo $objName $info
+    
+    if {[$objName exists pcdata]} {
+      my handlePCData $objName [$objName getFirstPCData]
+    } 
+  }
 
-TripleVisitor instproc ContainerNode objName {
-  set ID [my qualifyWithBaseURL [$objName set ID]]
-  foreach t [$objName array names rdfTypes] {
-    my addDB [my qualify $objName \
-		      [$objName qualifyWithRdfNsPrefix type]] $ID $t
+  TripleVisitor instproc ContainerNode objName {
+    set ID [my qualifyWithBaseURL [$objName set ID]]
+    foreach t [$objName array names rdfTypes] {
+      my addDB [my qualify $objName \
+		    [$objName qualifyWithRdfNsPrefix type]] $ID $t
+    }
   }
-}
 
-TripleVisitor instproc Member objName {
-  set container [$objName info parent]
-  set resource [$objName qualifyWithRdfNsPrefix resource]
-  set parseType [$objName qualifyWithRdfNsPrefix parseType]
-  if {[$objName exists pcdata]} {
-    set co [$objName getFirstPCData]
-  } elseif {[$objName exists attributes(resource)]} {
-    set co [$objName set attributes(resource)]
-  } elseif {[$objName exists attributes($resource)]} {
-    set co [$objName set attributes($resource)]
+  TripleVisitor instproc Member objName {
+    set container [$objName info parent]
+    set resource [$objName qualifyWithRdfNsPrefix resource]
+    set parseType [$objName qualifyWithRdfNsPrefix parseType]
+    if {[$objName exists pcdata]} {
+      set co [$objName getFirstPCData]
+    } elseif {[$objName exists attributes(resource)]} {
+      set co [$objName set attributes(resource)]
+    } elseif {[$objName exists attributes($resource)]} {
+      set co [$objName set attributes($resource)]
+    }
+    #puts stderr "CONTAINER = [info exists co]"
+    if {[info exists co]} {
+      my addDB \
+	  [my qualify $container [$objName set memberIndex]] \
+	  [$container set ID] $co
+    } else {
+      #$objName showVars
+    }
   }
-  #puts stderr "CONTAINER = [info exists co]"
-  if {[info exists co]} {
-    my addDB \
-      [my qualify $container [$objName set memberIndex]] \
-      [$container set ID] $co
-  } else {
-    #$objName showVars
-  }
-}
 
-TripleVisitor instproc visit objName {
-  set cl [$objName info class]
-  $objName instvar attributes
-  set triple ""
+  TripleVisitor instproc visit objName {
+    set cl [namespace tail [$objName info class]]
+    $objName instvar attributes
+    set triple ""
 
-  #puts "********Visit $objName -- $cl"
+    #puts "********Visit $objName -- $cl"
 
-  switch -exact $cl {
-    {::RDFTag} {my RDFTag $objName}
-    {::RDFDescription} {my DescriptionNode $objName}
-    {::RDFProperty} {my Property $objName}
-    {::RDFBag} - {::RDFSeq} - {::RDFAlt} {my ContainerNode $objName}
-    {::RDFMember} {my Member $objName}
-  }
+    switch -exact $cl {
+      RDFTag 		{my RDFTag $objName}
+      RDFDescription 	{my DescriptionNode $objName}
+      RDFProperty 	{my Property $objName}
+      RDFBag - RDFSeq - RDFAlt {my ContainerNode $objName}
+      RDFMember 	{my Member $objName}
+    }
 
-  foreach a [array names attributes] {
-    regexp "^([$objName set rdfNSPrefix]:|)(.*)" $a _ __ an
-    switch -exact $an {
-      bagID {
-	set info [my getInfo]
-	$info set bagID 1
-      }
-      aboutEach {
-	set info [my getInfo]
-	if {[DescriptionInfo info instances $info] == ""} {
-	  error "AboutEach not in description"
+    foreach a [array names attributes] {
+      regexp "^([$objName set rdfNSPrefix]:|)(.*)" $a _ __ an
+      switch -exact $an {
+	bagID {
+	  set info [my getInfo]
+	  $info set bagID 1
 	}
-	$info aboutEach 1
-	[self]::aboutEach addEntry [my qualifyWithBaseURL [$objName getSubject]]
-      }
-      aboutEachPrefix {
-	set info [my getInfo]
-	if {[DescriptionInfo info instances $info] == ""} {
-	  error "AboutEachPrefix not in description"
+	aboutEach {
+	  set info [my getInfo]
+	  if {[DescriptionInfo info instances $info] == ""} {
+	    error "AboutEach not in description"
+	  }
+	  $info aboutEach 1
+	  [self]::aboutEach addEntry [my qualifyWithBaseURL [$objName getSubject]]
 	}
-	$info aboutEachPrefix 1
-	[self]::aboutEachPrefix addEntry [my qualifyWithBaseURL [$objName getSubject]]
-      }
-      resource {
-	if {$cl == "::RDFProperty"} {
-	  my handlePCData $objName [set attributes($a)]
+	aboutEachPrefix {
+	  set info [my getInfo]
+	  if {[DescriptionInfo info instances $info] == ""} {
+	    error "AboutEachPrefix not in description"
+	  }
+	  $info aboutEachPrefix 1
+	  [self]::aboutEachPrefix addEntry [my qualifyWithBaseURL [$objName getSubject]]
 	}
+	resource {
+	  if {$cl eq "RDFProperty"} {
+	    my handlePCData $objName [set attributes($a)]
+	  }
+	}
       }
     }
   }
-}
 
-TripleVisitor instproc reificate {objName p s o} {
-  set memberID [[my set parser] makeID]
-  my addDB [my qualify $objName \
+  TripleVisitor instproc reificate {objName p s o} {
+    set memberID [[my set parser] makeID]
+    my addDB [my qualify $objName \
 		  [$objName qualifyWithRdfNsPrefix predicate]] $memberID $p
-  my addDB [my qualify $objName \
-		[$objName qualifyWithRdfNsPrefix subject]] $memberID $s
-  my addDB [my qualify $objName \
-		[$objName qualifyWithRdfNsPrefix object]] $memberID $o
-  my addDB [my qualify $objName \
-		[$objName qualifyWithRdfNsPrefix type]] $memberID \
-    [my qualify $objName [$objName qualifyWithRdfNsPrefix Statement]]
-  return $memberID
-}
+    my addDB [my qualify $objName \
+		  [$objName qualifyWithRdfNsPrefix subject]] $memberID $s
+    my addDB [my qualify $objName \
+		  [$objName qualifyWithRdfNsPrefix object]] $memberID $o
+    my addDB [my qualify $objName \
+		  [$objName qualifyWithRdfNsPrefix type]] $memberID \
+	[my qualify $objName [$objName qualifyWithRdfNsPrefix Statement]]
+    return $memberID
+  }
 
-TripleVisitor instproc visitEnd objName {
-  switch -exact [$objName info class] {
-    {::RDFDescription} {
-      set di [my popInfo $objName]
-      if {[my descriptionAsBag] || [$di set bagID]} {
-	set bagID [$objName set bagID]
-	my addDB [my qualify $objName [$objName qualifyWithRdfNsPrefix type]] \
-	  $bagID [my qualify $objName [$objName qualifyWithRdfNsPrefix Bag]]
-	
-	set bagCount 0
-	
-	foreach s [$di set statements] {
-	  set memberID [my reificate $objName \
-			    [$s set predicate] [$s set subject] [$s set object]]
-	  my addDB [my qualify $objName \
-			    [$objName qualifyWithRdfNsPrefix _[incr bagCount]]] \
-	      $bagID $memberID
+  TripleVisitor instproc visitEnd objName {
+    switch -exact [namespace tail [$objName info class]] {
+      RDFDescription {
+	set di [my popInfo $objName]
+	if {[my descriptionAsBag] || [$di set bagID]} {
+	  set bagID [$objName set bagID]
+	  my addDB [my qualify $objName [$objName qualifyWithRdfNsPrefix type]] \
+	      $bagID [my qualify $objName [$objName qualifyWithRdfNsPrefix Bag]]
+	  
+	  set bagCount 0
+	  
+	  foreach s [$di set statements] {
+	    set memberID [my reificate $objName \
+			      [$s set predicate] [$s set subject] [$s set object]]
+	    my addDB [my qualify $objName \
+			  [$objName qualifyWithRdfNsPrefix _[incr bagCount]]] \
+		$bagID $memberID
+	  }
 	}
+	foreach t [$objName array names rdfTypes] {
+	  my addDB [my qualify $objName [$objName qualifyWithRdfNsPrefix "type"]] \
+	      [$objName getSubject] $t
+	}
+	$di destroy
       }
-      foreach t [$objName array names rdfTypes] {
-	my addDB [my qualify $objName [$objName qualifyWithRdfNsPrefix "type"]] \
-	    [$objName getSubject] $t
-      }
-      $di destroy
-    }
-    {::RDFProperty} {
-      set info [my popInfo $objName]
-      if {![$info exists tripleWritten]} {
-	set triple ""
-	foreach fc [$objName info children] {
-	  switch -exact [$fc info class] {
-	    {::RDFDescription} {
-	      set triple [my addDB \
-			    [my qualify $objName [$objName set content]] \
-			    [my qualifyWithBaseURL [$objName getSubject]] [$fc getSubject]]
-	      break
+      RDFProperty {
+	set info [my popInfo $objName]
+	if {![$info exists tripleWritten]} {
+	  set triple ""
+	  foreach fc [$objName info children] {
+	    switch -exact [namespace tail [$fc info class]] {
+	      RDFDescription {
+		set triple [my addDB \
+				[my qualify $objName [$objName set content]] \
+				[my qualifyWithBaseURL [$objName getSubject]] [$fc getSubject]]
+		break
+	      }
+	      RDFBag - RDFSeq - RDFAlt {
+		set triple [my addDB \
+				[my qualify $objName [$objName set content]] \
+				[my qualifyWithBaseURL [$objName getSubject]] [$fc set ID]]
+		break
+	      }
 	    }
-	    {::RDFBag} - {::RDFSeq} - {::RDFAlt} {
-	      set triple [my addDB \
-			    [my qualify $objName [$objName set content]] \
-			    [my qualifyWithBaseURL [$objName getSubject]] [$fc set ID]]
-	      break
-	    }
 	  }
+	  if {$triple != ""} {
+	    my checkReification $triple [my set currentNode]
+	  }
 	}
-	if {$triple != ""} {
-	  my checkReification $triple [my set currentNode]
-	}
+	$info destroy
       }
-      $info destroy
     }
   }
-}
 
-TripleVisitor instproc evaluateAboutEach {} {
-  set triplesWritten ""
-  set rdfNSFullName [[my rdfNS] searchPrefix rdf]
+  TripleVisitor instproc evaluateAboutEach {} {
+    set triplesWritten ""
+    set rdfNSFullName [[my rdfNS] searchPrefix rdf]
 
-  foreach entry [[self]::aboutEach array names entries] {
-    # matching entry triples should be bag types and their
-    # members -> duplication of aboutEach statements for the
-    # members
-    foreach entryTriple [lsort [[self]::db querySubject $entry]] {
-      if {[regexp "^${rdfNSFullName}_\[0-9\]*$" [$entryTriple predicate]]} {
-	foreach t [[self]::aboutEach getTriples $entry] {
-	  set subject [$t subject]
-	  # if this is a toplevel elt of an about each tree -> its
-	  # subject is the object of the container member
-	  if {$subject == $entry} {
-	    [self]::db add [$t predicate] [$entryTriple object] [$t object]
-	  } elseif {[lsearch $triplesWritten $t] == -1} {
-	    [self]::db add [$t predicate] $subject [$t object]
-	    lappend triplesWritten $t
+    foreach entry [[self]::aboutEach array names entries] {
+      # matching entry triples should be bag types and their
+      # members -> duplication of aboutEach statements for the
+      # members
+      foreach entryTriple [lsort [[self]::db querySubject $entry]] {
+	if {[regexp "^${rdfNSFullName}_\[0-9\]*$" [$entryTriple predicate]]} {
+	  foreach t [[self]::aboutEach getTriples $entry] {
+	    set subject [$t subject]
+	    # if this is a toplevel elt of an about each tree -> its
+	    # subject is the object of the container member
+	    if {$subject eq $entry} {
+	      [self]::db add [$t predicate] [$entryTriple object] [$t object]
+	    } elseif {[lsearch $triplesWritten $t] == -1} {
+	      [self]::db add [$t predicate] $subject [$t object]
+	      lappend triplesWritten $t
+	    }
 	  }
 	}
       }
     }
   }
-}
 
-TripleVisitor instproc interpretNodeTree {node} {
-  my set parser [$node set parser]
-  $node accept [self]
-  my evaluateAboutEach
+  TripleVisitor instproc interpretNodeTree {node} {
+    my set parser [$node set parser]
+    $node accept [self]
+    my evaluateAboutEach
+  }
+
+  namespace export RDFTriple NodeInfo DescriptionInfo PropertyInfo \
+      AboutEachMgr RDFTripleDB TripleVisitor
 }
+namespace import ::xotcl::rdf::triple::*
Index: xotcl/library/rdf/rdfRecreatorVisitor.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/rdf/rdfRecreatorVisitor.xotcl	(.../rdfRecreatorVisitor.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/rdf/rdfRecreatorVisitor.xotcl	(.../rdfRecreatorVisitor.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,35 +1,45 @@
-#$Id: rdfRecreatorVisitor.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+#$Id: rdfRecreatorVisitor.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::rdf::recreatorVisitor 0.9
 package require xotcl::rdf::parser
 package require xotcl::xml::recreatorVisitor
+package require XOTcl
 
-##############################################################################
-#
-# a visitor that recreates an RDF representation from a
-# node tree
-#
-#############################################################################
-Class RDFRecreatorVisitor -superclass XMLRecreatorVisitor
+namespace eval ::xotcl::rdf::recreatorVisitor {
+    namespace import ::xotcl::*
+
+    ##############################################################################
+    #
+    # a visitor that recreates an RDF representation from a
+    # node tree
+    #
+    #############################################################################
+    Class RDFRecreatorVisitor -superclass XMLRecreatorVisitor
     
-RDFRecreatorVisitor instproc appendLineFeed obj {
-  if {[set parseType [$obj getRDFAttribute parseType]] != ""} {
-    if {$parseType != "Resource"} {
-      # we have parseType == Literal 
-      # -> don't append "\n"
-      return ""
-    } 
-  }
-  return "\n"
-}
+    RDFRecreatorVisitor instproc appendLineFeed obj {
+	if {[set parseType [$obj getRDFAttribute parseType]] != ""} {
+	    if {$parseType != "Resource"} {
+		# we have parseType == Literal 
+		# -> don't append "\n"
+		return ""
+	    } 
+	}
+	return "\n"
+    }
 
-RDFRecreatorVisitor instproc visit objName {
-  next
-  my instvar result
-  if {[$objName istype RDFResource]} {
-    foreach t [$objName array names rdfTypes] {
-      set ts [$objName prependRDFPrefix type]
-      append result "  [my insertIndent $objName]<$ts resource=\"$t\"/>\n"
+    RDFRecreatorVisitor instproc visit objName {
+	next
+	my instvar result
+	if {[$objName istype RDFResource]} {
+	    foreach t [$objName array names rdfTypes] {
+		set ts [$objName prependRDFPrefix type]
+		append result "  [my insertIndent $objName]<$ts resource=\"$t\"/>\n"
+	    }
+	}
+	return $result
     }
-  }
-  return $result
-}
\ No newline at end of file
+
+    namespace export RDFRecreatorVisitor
+}
+
+namespace import ::xotcl::rdf::recreatorVisitor::*
Index: xotcl/library/rdf/xoRDF.xotcl
===================================================================
diff -u -r5ce5a10c82bc948f50fc4542f844dcd50de1eae3 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/rdf/xoRDF.xotcl	(.../xoRDF.xotcl)	(revision 5ce5a10c82bc948f50fc4542f844dcd50de1eae3)
+++ xotcl/library/rdf/xoRDF.xotcl	(.../xoRDF.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,769 +1,777 @@
-# $Id: xoRDF.xotcl,v 1.2 2004/07/03 21:19:39 neumann Exp $
-package provide xotcl::rdf::parser 0.9
+# $Id: xoRDF.xotcl,v 1.3 2005/09/09 21:07:23 neumann Exp $
+package provide xotcl::rdf::parser 1.0
 
+package require XOTcl
 package require xotcl::xml::parser
 #package require xotcl::pattern::link
 package require xotcl::trace
 
-##############################################################################
-#
-#  RDF Parse Type Handling for RDF Node Class and RDF Parser class
-#  to be used as mixin. Here, we have decomposed the parse type handling
-#
-##############################################################################
+namespace eval ::xotcl::rdf::parser {
+  namespace import ::xotcl::*
 
-#
-#  Nodes just call "isParseLiteral", "isParseResource", and "handleParseType"
-#  by their template methods -> mixins concretizes implementation
-#
-Class RDFNodeParseTypeHandling
+  ##############################################################################
+  #
+  #  RDF Parse Type Handling for RDF Node Class and RDF Parser class
+  #  to be used as mixin. Here, we have decomposed the parse type handling
+  #
+  ##############################################################################
 
-#
-# parseType=literal nodes are not parsed, but handled as literals
-# -> the XML parser should parse these nodes -> we have cut them off
-# if we encounter "parseType = literal" nextParsedLiterals searches the
-# parseLiterals array and returns the content
-#
-RDFNodeParseTypeHandling instproc nextParsedLiterals {} {
-  set parser [my set parser]
-  $parser set parseLiterals([$parser incr parseLiteralsCount])
-}
+  #
+  #  Nodes just call "isParseLiteral", "isParseResource", and "handleParseType"
+  #  by their template methods -> mixins concretizes implementation
+  #
+  Class RDFNodeParseTypeHandling
 
-#
-# handle attributes that determine the parse type
-#
-RDFNodeParseTypeHandling instproc handleParseType value {
-  if {$value == "Resource"} {
-    my set parseResource 1
-  } else {
-    # with RDF 1.0 all values other than Resource are treated
-    # as parseType = literal
-    my set pcdata [list "" [my nextParsedLiterals]]
-    my set parseLiteral 1
+  #
+  # parseType=literal nodes are not parsed, but handled as literals
+  # -> the XML parser should parse these nodes -> we have cut them off
+  # if we encounter "parseType = literal" nextParsedLiterals searches the
+  # parseLiterals array and returns the content
+  #
+  RDFNodeParseTypeHandling instproc nextParsedLiterals {} {
+    set parser [my set parser]
+    $parser set parseLiterals([$parser incr parseLiteralsCount])
   }
-}
 
-#
-# two convinience methods that tell us whether the parse type is literal/resource
-#
-RDFNodeParseTypeHandling instproc isParseLiteral {} {
   #
-  # if the parse literal var is set -> one child
-  # is of type ParseTypeLiteral !
+  # handle attributes that determine the parse type
   #
-  my exists parseLiteral
-}
-RDFNodeParseTypeHandling instproc isParseResource {} {
+  RDFNodeParseTypeHandling instproc handleParseType value {
+    if {$value eq "Resource"} {
+      my set parseResource 1
+    } else {
+      # with RDF 1.0 all values other than Resource are treated
+      # as parseType = literal
+      my set pcdata [list "" [my nextParsedLiterals]]
+      my set parseLiteral 1
+    }
+  }
+
   #
-  # if the parseResource var is set -> one child
-  # is of type ParseTypeResource !
+  # two convinience methods that tell us whether the parse type is literal/resource
   #
-  my exists parseResource
-}
+  RDFNodeParseTypeHandling instproc isParseLiteral {} {
+    #
+    # if the parse literal var is set -> one child
+    # is of type ParseTypeLiteral !
+    #
+    my exists parseLiteral
+  }
+  RDFNodeParseTypeHandling instproc isParseResource {} {
+    #
+    # if the parseResource var is set -> one child
+    # is of type ParseTypeResource !
+    #
+    my exists parseResource
+  }
 
-#
-# and we overload the Parser's parse method in order to cut off
-# all parseType = "Literal", because we have to hinder the XML
-# parser to parse RDF text that is marked as parseType = literal
-# we store the result in an array "parseLiterals" that is used
-# by the RDFNodeParseTypeHandling Mixin
-#
-Class RDFParserParseTypeHandling
-RDFParserParseTypeHandling instproc parse data {
-  my array set parseLiterals {}
-  my set parseLiteralsCount 0
-  set count 0
+  #
+  # and we overload the Parser's parse method in order to cut off
+  # all parseType = "Literal", because we have to hinder the XML
+  # parser to parse RDF text that is marked as parseType = literal
+  # we store the result in an array "parseLiterals" that is used
+  # by the RDFNodeParseTypeHandling Mixin
+  #
+  Class RDFParserParseTypeHandling
+  RDFParserParseTypeHandling instproc parse data {
+    my array set parseLiterals {}
+    my set parseLiteralsCount 0
+    set count 0
 
-  set dt $data
+    set dt $data
 
-  while {[set pt [string first "parseType" $dt]] != -1} {
-    # we cut the string off manually, because a regexp is slower
-    if {$::tcl_version > 8.0} {
-      set last [string first "=" $dt $pt]
-    } else {
-      set last [string first "=" [string range $dt $pt end]]
-      incr last $pt
-    }
-    set ptStart [expr {[string last "<" [string range $dt 0 $pt]] + 1}]
-    set propName [string range $dt $ptStart $pt]
-    set blank [string first " " $propName]
-    if {$blank != -1} {
-      set propName [string range $propName 0 [expr {$blank -1}]]
-    }
-    set dt [string range $dt $last end]
-    # All parse types != Resource treated as literals
-    if {![regexp {^= *[\"']Resource} $dt]} {
-      regexp -indices ">" $dt idx
-      set start [lindex $idx 1]
-      if {[regexp -indices "</$propName>" $dt idx]} {
-	set endTagLeft [lindex $idx 0]
-	set literal [string range $dt [expr {$start + 1}] [expr {$endTagLeft - 1}]]
-	set dt [string range $dt $endTagLeft end]
-	my set parseLiterals([incr count]) $literal
+    while {[set pt [string first "parseType" $dt]] != -1} {
+      # we cut the string off manually, because a regexp is slower
+      if {$::tcl_version > 8.0} {
+	set last [string first "=" $dt $pt]
       } else {
-	error "end tag for $propName missing"
+	set last [string first "=" [string range $dt $pt end]]
+	incr last $pt
       }
+      set ptStart [expr {[string last "<" [string range $dt 0 $pt]] + 1}]
+      set propName [string range $dt $ptStart $pt]
+      set blank [string first " " $propName]
+      if {$blank != -1} {
+	set propName [string range $propName 0 [expr {$blank -1}]]
+      }
+      set dt [string range $dt $last end]
+      # All parse types != Resource treated as literals
+      if {![regexp {^= *[\"']Resource} $dt]} {
+	regexp -indices ">" $dt idx
+	set start [lindex $idx 1]
+	if {[regexp -indices "</$propName>" $dt idx]} {
+	  set endTagLeft [lindex $idx 0]
+	  set literal [string range $dt [expr {$start + 1}] [expr {$endTagLeft - 1}]]
+	  set dt [string range $dt $endTagLeft end]
+	  my set parseLiterals([incr count]) $literal
+	} else {
+	  error "end tag for $propName missing"
+	}
+      }
     }
+    next $data
   }
-  next $data
-}
 
-##############################################################################
-#
-#  RDFNode Node Class
-#
-##############################################################################
+  ##############################################################################
+  #
+  #  RDFNode Node Class
+  #
+  ##############################################################################
 
-Class RDFNode -superclass XMLNode -parameter {
-  subject
-  {rdfNSPrefix ""}
-}
-@ Class RDFNode -superclass XMLNode {
-  description {
-    general superclass for RDF nodes
-    common properties
+  Class RDFNode -superclass XMLNode -parameter {
+    subject
+    {rdfNSPrefix ""}
   }
-}
+  @ Class RDFNode -superclass XMLNode {
+    description {
+      general superclass for RDF nodes
+      common properties
+    }
+  }
 
-#
-# add mixins for parse type handling
-#
-RDFNode instproc init args {
-  next
-  my mixin add RDFNodeParseTypeHandling
-  set p [my info parent]
-  if {[$p exists rdfNSPrefix]} {
-    my set rdfNSPrefix [$p set rdfNSPrefix]
-    #puts stderr "RDF Prefix defined in [self]->init to [$p set rdfNSPrefix]" 
+  #
+  # add mixins for parse type handling
+  #
+  RDFNode instproc init args {
+    next
+    my mixin add RDFNodeParseTypeHandling
+    set p [my info parent]
+    if {[$p exists rdfNSPrefix]} {
+      my set rdfNSPrefix [$p set rdfNSPrefix]
+      #puts stderr "RDF Prefix defined in [self]->init to [$p set rdfNSPrefix]" 
+    }
   }
-}
 
-RDFNode instproc parseData {text} {
-  if {[my isParseLiteral]} {return}
-  next
-}
+  RDFNode instproc parseData {text} {
+    if {[my isParseLiteral]} {return}
+    next
+  }
 
-#
-# try to find the "subject" of the RDF statement ->
-# if it not found on the actual node search the parents
-#
-# per default subject is ""; subclasses add subjects,
-# when they encounter ID, about, ... attrs
-#
-RDFNode instproc getSubject {} {
-  for {set o [self]} {![$o istype RDFTag]} {set o [$o info parent]} {
-    if {[$o exists subject]} {return [$o set subject]}
+  #
+  # try to find the "subject" of the RDF statement ->
+  # if it not found on the actual node search the parents
+  #
+  # per default subject is ""; subclasses add subjects,
+  # when they encounter ID, about, ... attrs
+  #
+  RDFNode instproc getSubject {} {
+    for {set o [self]} {![$o istype RDFTag]} {set o [$o info parent]} {
+      if {[$o exists subject]} {return [$o set subject]}
+    }
+    return ""
   }
-  return ""
-}
 
 
-#
-# lets the parser construct an unique ID in the parser
-#
-RDFNode instproc makeID {} {
-  [my set parser] makeID
-}
+  #
+  # lets the parser construct an unique ID in the parser
+  #
+  RDFNode instproc makeID {} {
+    [my set parser] makeID
+  }
 
-#
-# abstract methods that have to be concretized with parse type handling
-# by a parse type mixin (or in subclass)
-#
-RDFNode abstract instproc isParseLiteral {}
-RDFNode abstract instproc isParseResource {}
-RDFNode abstract instproc handleParseType value
+  #
+  # abstract methods that have to be concretized with parse type handling
+  # by a parse type mixin (or in subclass)
+  #
+  RDFNode abstract instproc isParseLiteral {}
+  RDFNode abstract instproc isParseResource {}
+  RDFNode abstract instproc handleParseType value
 
-RDFNode instproc appendRDFType t {
-  set t [[my resolveNS] getFullName $t]
-  my set rdfTypes($t) 1
-}
+  RDFNode instproc appendRDFType t {
+    set t [[my resolveNS] getFullName $t]
+    my set rdfTypes($t) 1
+  }
 
-#
-# get a typed node abbreviation -> convert it to
-# a description + a nested rdf:type property
-#
-RDFNode instproc getTypedNode {name attrList} {
-  set r [my getNestingNode RDFDescription \
-	   [my qualifyWithRdfNsPrefix Description] $attrList]
-  $r appendRDFType $name
-  set r
-}
+  #
+  # get a typed node abbreviation -> convert it to
+  # a description + a nested rdf:type property
+  #
+  RDFNode instproc getTypedNode {name attrList} {
+    set r [my getNestingNode RDFDescription \
+	       [my qualifyWithRdfNsPrefix Description] $attrList]
+    $r appendRDFType $name
+    set r
+  }
 
-#
-# try to parse children corresponding to parse type or if none is given
-# try to parse a child of type obj -> Description or Container
-#
-RDFNode instproc parseNestedChild {name attrList} {
-  if {[my isParseResource]} {
-    if {![my exists resourceDescription]} {
-      my set resourceDescription \
-	[my getNestingNode RDFDescription \
-	   [my qualifyWithRdfNsPrefix Description] {}]
-      # we have resolved parseType="resource" with a description
-      # -> remove parse type attribute info ... it is not correct anymore,
-      # but remember parseResource flag
-      if {[my exists attributes(parseType)]} {
-	my unset attributes(parseType)
+  #
+  # try to parse children corresponding to parse type or if none is given
+  # try to parse a child of type obj -> Description or Container
+  #
+  RDFNode instproc parseNestedChild {name attrList} {
+    if {[my isParseResource]} {
+      if {![my exists resourceDescription]} {
+	my set resourceDescription \
+	    [my getNestingNode RDFDescription \
+		 [my qualifyWithRdfNsPrefix Description] {}]
+	# we have resolved parseType="resource" with a description
+	# -> remove parse type attribute info ... it is not correct anymore,
+	# but remember parseResource flag
+	if {[my exists attributes(parseType)]} {
+	  my unset attributes(parseType)
+	}
+	if {[my exists attributes([set parseType [my qualifyWithRdfNsPrefix parseType]])]} {
+	  my unset attributes($parseType)
+	}
       }
-      if {[my exists attributes([set parseType [my qualifyWithRdfNsPrefix parseType]])]} {
-	my unset attributes($parseType)
+      
+      set r [[my set resourceDescription] getPropertyNodeChild $name $attrList]
+    } elseif {[my isParseLiteral]} {
+      set r [self]
+      # literal -> do nothing
+    } else {
+      if {[set node [my isNestingNode $name]] ne ""} {
+	set r [my getNestingNode $node $name $attrList]
+      } else {
+	set r [my getTypedNode $name $attrList]
       }
     }
-    
-    set r [[my set resourceDescription] getPropertyNodeChild $name $attrList]
-  } elseif {[my isParseLiteral]} {
-    set r [self]
-    # literal -> do nothing
-  } else {
-    if {[set node [my isNestingNode $name]] != ""} {
-      set r [my getNestingNode $node $name $attrList]
+    return $r
+  }
+
+  #
+  # step forward in the attrList
+  #
+  RDFNode instproc nextAttrNode {node attrList index} {
+    upvar [self callinglevel] $index i $attrList a
+    if {$node ne ""} {
+      set a [lreplace $a $i [expr {$i + 1}]]
     } else {
-      set r [my getTypedNode $name $attrList]
+      incr i 2
     }
   }
-  return $r
-}
 
-#
-# step forward in the attrList
-#
-RDFNode instproc nextAttrNode {node attrList index} {
-  upvar [self callinglevel] $index i $attrList a
-  if {$node != ""} {
-    set a [lreplace $a $i [expr {$i + 1}]]
-  } else {
-    incr i 2
-  }
-}
-
-#
-# create a child node of Property type and return it
-#
-# don't build a node for "type" properties, but append them to
-# the list
-#
-RDFNode instproc getPropertyNodeChild {name attrList} {
-  regexp "^[my set rdfNSPrefix]:(.*)" $name _ name
-  set parser [my set parser]
-  if {$name == "type" && [my istype RDFResource]} {
-    # seek for resource attribute and append type to list
-    set rp [my prependRDFPrefix resource]
-    set rdfns [$parser set rdfNamespace]
-    foreach {n v} $attrList {
-      if {![my istype RDFContainerNodeClass]} {
-        if {$n == $rp || $n == "resource"} {
-          foreach c {Bag Alt Seq} {
-            if {$v == "$rdfns$c"} {
-              my class ::RDF$c
-              my set memberNr 0
-              my set ID [my set bagID]
-              my unset bagID
-              my set content [my prependRDFPrefix $c]
-              # reclass existing li props to member
-              set li [my prependRDFPrefix li]
-              foreach child [lsort [my info children]] {
-                if {[$child info class] == "::RDFProperty"} {
-                  if {[$child set content] == $li || 
-		      [$child set content] == "li"} {
-                    $child class RDFMember
-                    my giveMemberNr $child
-                    $child set content $li
-                  }
-                }
-              }
-            }
-          }
-        }
+  #
+  # create a child node of Property type and return it
+  #
+  # don't build a node for "type" properties, but append them to
+  # the list
+  #
+  RDFNode instproc getPropertyNodeChild {name attrList} {
+    regexp "^[my set rdfNSPrefix]:(.*)" $name _ name
+    set parser [my set parser]
+    if {$name eq "type" && [my istype RDFResource]} {
+      # seek for resource attribute and append type to list
+      set rp [my prependRDFPrefix resource]
+      set rdfns [$parser set rdfNamespace]
+      foreach {n v} $attrList {
+	if {![my istype RDFContainerNodeClass]} {
+	  if {$n eq $rp || $n eq "resource"} {
+	    foreach c {Bag Alt Seq} {
+	      if {$v eq "$rdfns$c"} {
+		my class RDF$c
+		my set memberNr 0
+		my set ID [my set bagID]
+		my unset bagID
+		my set content [my prependRDFPrefix $c]
+		# reclass existing li props to member
+		set li [my prependRDFPrefix li]
+		foreach child [lsort [my info children]] {
+		  if {[namespace tail [$child info class]] eq "RDFProperty"} {
+		    if {[$child set content] eq $li || 
+			[$child set content] eq "li"} {
+		      $child class RDFMember
+		      my giveMemberNr $child
+		      $child set content $li
+		    }
+		  }
+		}
+	      }
+	    }
+	  }
+	}
+	my appendRDFType $v
       }
-      my appendRDFType $v
+      return [self]
+    } else {
+      set nf [$parser set nodeFactory]
+      set r [$nf getNode RDFProperty [self]::[my nextChild prop] $parser]
+      $r set content $name
+      $r parseAttributes $name $attrList
+      set r
     }
-    return [self]
-  } else {
-    set nf [$parser set nodeFactory]
-    set r [$nf getNode RDFProperty [self]::[my nextChild prop] $parser]
-    $r set content $name
-    $r parseAttributes $name $attrList
+  }
+
+  #
+  # property in abbr syntax (as attribute)
+  #
+  RDFNode instproc propertyAttribute {n v} {
+    set r [my getPropertyNodeChild $n ""]
+    $r parseData $v
     set r
   }
-}
 
-#
-# property in abbr syntax (as attribute)
-#
-RDFNode instproc propertyAttribute {n v} {
-  set r [my getPropertyNodeChild $n ""]
-  $r parseData $v
-  set r
-}
-
-#
-# check whether an attribute name matches an attributed RDFNode
-# of this class or not
-# return the corresponding node class
-#
-RDFNode instproc isAttribute {n} {
-  regexp "^[my set rdfNSPrefix]:(.*)" $n _ n
-  if {[lsearch [[my info class] set attributeList] $n] != -1} {
-    return $n
-  } elseif {$n == "xml:lang"} {
-    # we create attribute for xml_lang (for recreation purposes)
-    return $n
+  #
+  # check whether an attribute name matches an attributed RDFNode
+  # of this class or not
+  # return the corresponding node class
+  #
+  RDFNode instproc isAttribute {n} {
+    regexp "^[my set rdfNSPrefix]:(.*)" $n _ n
+    if {[lsearch [[my info class] set attributeList] $n] != -1} {
+      return $n
+    } elseif {$n eq "xml:lang"} {
+      # we create attribute for xml_lang (for recreation purposes)
+      return $n
+    }
+    return ""
   }
-  return ""
-}
 
-#
-# check if name matches an node class that may be nested in [self]
-#
-RDFNode instproc isNestingNode {n} {
-  regexp "^[my set rdfNSPrefix]:(.*)" $n _ n
-  set cl [my info class]
-  if {[$cl exists nestingList($n)]} {
-    return [$cl set nestingList($n)]
+  #
+  # check if name matches an node class that may be nested in [self]
+  #
+  RDFNode instproc isNestingNode {n} {
+    regexp "^[my set rdfNSPrefix]:(.*)" $n _ n
+    set cl [my info class]
+    if {[$cl exists nestingList($n)]} {
+      return [$cl set nestingList($n)]
+    }
+    return ""
   }
-  return ""
-}
 
-RDFNode instproc getNestingNode {node name attrList} {
-  set parser [my set parser]
-  set nf [$parser set nodeFactory]
-  switch $node {
-    "RDFMember" - "RDFProperty" {set objName prop} 
-    default {set objName res}
+  RDFNode instproc getNestingNode {node name attrList} {
+    set parser [my set parser]
+    set nf [$parser set nodeFactory]
+    switch [namespace tail $node] {
+      "RDFMember" - "RDFProperty" {set objName prop} 
+      default {set objName res}
+    }
+    set r [$nf getNode $node [self]::[my nextChild $objName] $parser]
+    $r set content $name
+    $r parseAttributes $name $attrList
+    set r
   }
-  set r [$nf getNode $node [self]::[my nextChild $objName] $parser]
-  $r set content $name
-  $r parseAttributes $name $attrList
-  set r
-}
 
-#
-# check whether the RDF namespace is redefined to another prefix
-#
-RDFNode instproc makeIndividualNSEntry {prefix entry} {
-  if {$entry == [[my set parser] rdfNamespace]} {
-    if {[my set rdfNSPrefix] == "" || $prefix != "xmlns"} {
-      my set rdfNSPrefix $prefix
+  #
+  # check whether the RDF namespace is redefined to another prefix
+  #
+  RDFNode instproc makeIndividualNSEntry {prefix entry} {
+    if {$entry eq [[my set parser] rdfNamespace]} {
+      if {[my set rdfNSPrefix] eq "" || $prefix ne "xmlns"} {
+	my set rdfNSPrefix $prefix
+      }
+      #puts stderr "RDF Prefix redefined in [self] to $prefix"
     }
-    #puts stderr "RDF Prefix redefined in [self] to $prefix"
+    next
   }
-  next
-}
 
-RDFNode instproc qualifyWithRdfNsPrefix t {
-  set ns [my set rdfNSPrefix]
-  if {$ns == "xmlns"} {return $t}
-  return $ns:$t
-}
-
-#
-# checks whether a given attribute is part of the attributes array
-# and returns the varname, otherwise ""
-#
-RDFNode instproc getAttribute {n nsFullName} {
-  set ns [my resolveNS]
-  set xmlns [$ns searchPrefix xmlns]
-  if {$xmlns == $nsFullName && [my exists attributes($n)]} {
-    return attributes($n)
+  RDFNode instproc qualifyWithRdfNsPrefix t {
+    set ns [my set rdfNSPrefix]
+    if {$ns eq "xmlns"} {return $t}
+    return $ns:$t
   }
-  set prefix [$ns searchFullName $nsFullName]
-  if {$prefix != "" &&
-      [my exists attributes($prefix:$n)]} {
-    return attributes($prefix:$n)
-  }
-  return ""
-}
 
-#
-# searches for attribute "n" with rdf namespace prefix
-#
-RDFNode instproc getRDFAttribute {n} {
-  if {[my exists attributes($n)]} {
-    return [my set attributes($n)]
+  #
+  # checks whether a given attribute is part of the attributes array
+  # and returns the varname, otherwise ""
+  #
+  RDFNode instproc getAttribute {n nsFullName} {
+    set ns [my resolveNS]
+    set xmlns [$ns searchPrefix xmlns]
+    if {$xmlns eq $nsFullName && [my exists attributes($n)]} {
+      return attributes($n)
+    }
+    set prefix [$ns searchFullName $nsFullName]
+    if {$prefix ne "" &&
+	[my exists attributes($prefix:$n)]} {
+      return attributes($prefix:$n)
+    }
+    return ""
   }
-  set rdfNSPrefix [my set rdfNSPrefix]
-  if {$rdfNSPrefix != "xmlns"} {
-    set n $rdfNSPrefix:$n
+
+  #
+  # searches for attribute "n" with rdf namespace prefix
+  #
+  RDFNode instproc getRDFAttribute {n} {
     if {[my exists attributes($n)]} {
       return [my set attributes($n)]
     }
+    set rdfNSPrefix [my set rdfNSPrefix]
+    if {$rdfNSPrefix ne "xmlns"} {
+      set n $rdfNSPrefix:$n
+      if {[my exists attributes($n)]} {
+	return [my set attributes($n)]
+      }
+    }
+    return ""
   }
-  return ""
-}
 
-RDFNode instproc prependRDFPrefix ts {
-  set rdfNSPrefix [my set rdfNSPrefix]
-  if {$rdfNSPrefix != "xmlns"} {set ts $rdfNSPrefix:$ts}
-  return $ts
-}
+  RDFNode instproc prependRDFPrefix ts {
+    set rdfNSPrefix [my set rdfNSPrefix]
+    if {$rdfNSPrefix ne "xmlns"} {set ts $rdfNSPrefix:$ts}
+    return $ts
+  }
 
-##############################################################################
-#
-# superclass for all resources (like Description, Alt, Seq, Beg)
-# used directly in the parse tree ... resource nodes are mixed in
-#
-##############################################################################
+  ##############################################################################
+  #
+  # superclass for all resources (like Description, Alt, Seq, Beg)
+  # used directly in the parse tree ... resource nodes are mixed in
+  #
+  ##############################################################################
 
-Class RDFResource -superclass RDFNode
+  Class RDFResource -superclass RDFNode
 
-RDFResource instproc print {} {
-  set t [my array names rdfTypes]
-  if {$t == ""} {return [next]} else {return "[next]\nTYPES: $t"}
-}
+  RDFResource instproc print {} {
+    set t [my array names rdfTypes]
+    if {$t eq ""} {return [next]} else {return "[next]\nTYPES: $t"}
+  }
 
 
-##############################################################################
-#
-# superclasses for container node classes (alt seq bag)
-#
-##############################################################################
-Class RDFContainerNodeClass -superclass RDFResource
+  ##############################################################################
+  #
+  # superclasses for container node classes (alt seq bag)
+  #
+  ##############################################################################
+  Class RDFContainerNodeClass -superclass RDFResource
 
-RDFContainerNodeClass instproc init args {
-  # cache the member number
-  # 0 inidicates, there is currently no member
-  next
+  RDFContainerNodeClass instproc init args {
+    # cache the member number
+    # 0 inidicates, there is currently no member
+    next
 
-  my set memberNr 0
-  my set ID [my makeID]
-  my appendRDFType [my qualifyWithRdfNsPrefix \
+    my set memberNr 0
+    my set ID [my makeID]
+    my appendRDFType [my qualifyWithRdfNsPrefix \
 			  [[my info class] set content]]
-}
+  }
 
-RDFContainerNodeClass instproc parseAttributes {name attrList} {
-  #set index 0
-  foreach {n v} $attrList {
-    if {[set an [my isAttribute $n]] != ""} {
-      my set attributes($n) $v
-      if {$an == "ID"} {	
-	my set subject $v
-	my set ID [[my set parser] set baseURL]\#$v
+  RDFContainerNodeClass instproc parseAttributes {name attrList} {
+    #set index 0
+    foreach {n v} $attrList {
+      if {[set an [my isAttribute $n]] ne ""} {
+	my set attributes($n) $v
+	if {$an eq "ID"} {	
+	  my set subject $v
+	  my set ID [[my set parser] set baseURL]\#$v
+	}
       }
+      #set attrList [my nextAttrNode $an attrList index]
     }
-    #set attrList [my nextAttrNode $an attrList index]
   }
-}
 
-RDFContainerNodeClass instproc giveMemberNr {member} {
-  set pf [my getContentPrefix]
-  if {$pf != ""} {append pf ":"}
-  $member set memberIndex "${pf}_[my incr memberNr]"
-}
+  RDFContainerNodeClass instproc giveMemberNr {member} {
+    set pf [my getContentPrefix]
+    if {$pf ne ""} {append pf ":"}
+    $member set memberIndex "${pf}_[my incr memberNr]"
+  }
 
-RDFContainerNodeClass instproc parseStart {name attrList} {
-  set r [self]
-  next
-  if {[set node [my isNestingNode $name]] != ""} {
-    set r [my getNestingNode $node $name $attrList]
-    if {[$r info class] == "::RDFMember"} {
-      my giveMemberNr $r
+  RDFContainerNodeClass instproc parseStart {name attrList} {
+    set r [self]
+    next
+    if {[set node [my isNestingNode $name]] ne ""} {
+      set r [my getNestingNode $node $name $attrList]
+      if {[namespace tail [$r info class]] eq "RDFMember"} {
+	my giveMemberNr $r
+      }
+    } else {
+      set r [my getPropertyNodeChild $name $attrList]
     }
-  } else {
-    set r [my getPropertyNodeChild $name $attrList]
+    return $r
   }
-  return $r
-}
 
-##############################################################################
-#
-# Concrete Factory for creating RDF-style nodes
-#
-##############################################################################
-Class RDFNodeClassFactory -superclass XMLNodeClassFactory
-RDFNodeClassFactory instproc content content {
-  my set content $content
-}
-RDFNodeClassFactory instproc attributeList attributeList {
-  my set attributeList $attributeList
-}
-RDFNodeClassFactory instproc nestingTo nestingTo {
-  set name [string trimleft [self] :]
-  foreach cl $nestingTo {
-    $cl set nestingList([my set content]) $name
+  ##############################################################################
+  #
+  # Concrete Factory for creating RDF-style nodes
+  #
+  ##############################################################################
+  Class RDFNodeClassFactory -superclass XMLNodeClassFactory
+  RDFNodeClassFactory instproc content content {
+    my set content $content
   }
-}
+  RDFNodeClassFactory instproc attributeList attributeList {
+    my set attributeList $attributeList
+  }
+  RDFNodeClassFactory instproc nestingTo nestingTo {
+    set name [string trimleft [self] :]
+    foreach cl $nestingTo {
+      $cl set nestingList([my set content]) $name
+    }
+  }
 
-RDFNodeClassFactory proc create args {
-  # create the class
-  set name [next]
-  switch -exact $name {
-    RDFDescription - RDFProperty - RDFMember {
-      my array set attributeList {}
+  RDFNodeClassFactory proc create args {
+    # create the class
+    set name [next]
+    switch -exact $name {
+      RDFDescription - RDFProperty - RDFMember {
+	my array set attributeList {}
+      }
+      RDFMember - RDFProperty {
+	my array set nestingList {}
+      }
     }
-    RDFMember - RDFProperty {
-      my array set nestingList {}
+  }
+  ##########################################################################
+  #
+  # now create a factory and build all the node classes
+  # needed for the RDF Parser/Interpreter
+  #
+  ##########################################################################
+  RDFNodeClassFactory proc createFactories {} {
+    foreach {name superclasses content attributeList} {
+      RDFTag 	  RDFNode		        RDF     {}
+      RDFBag 	  RDFContainerNodeClass 	Bag     {ID}
+      RDFSeq 	  RDFContainerNodeClass 	Seq     {ID}
+      RDFAlt 	  RDFContainerNodeClass 	Alt     {ID}
+      RDFProperty RDFNode	    	""      {bagID ID resource parseType}
+      RDFMember   RDFProperty           li      {resource parseType}
+      RDFDescription  RDFResource	Description {ID bagID about type aboutEach aboutEachPrefix}
+    } {
+      #puts "Create class: $name -superclass $superclasses"
+      RDFNodeClassFactory create $name -superclass $superclasses \
+	  -content $content \
+	  -attributeList $attributeList
     }
   }
-}
-##########################################################################
-#
-# now create a factory and build all the node classes
-# needed for the RDF Parser/Interpreter
-#
-##########################################################################
-RDFNodeClassFactory proc createFactories {} {
-  foreach {name superclasses content attributeList} {
-    RDFTag 	  RDFNode		        RDF     {}
-    RDFBag 	  RDFContainerNodeClass 	Bag     {ID}
-    RDFSeq 	  RDFContainerNodeClass 	Seq     {ID}
-    RDFAlt 	  RDFContainerNodeClass 	Alt     {ID}
-    RDFProperty   RDFNode	                ""      {bagID ID resource parseType}
-    RDFMember 	  RDFProperty         	        li      {resource parseType}
-    RDFDescription  RDFResource         	Description {ID bagID about type aboutEach aboutEachPrefix}
-  } {
-    #puts "Create class: $name -superclass $superclasses"
-    RDFNodeClassFactory create $name -superclass $superclasses \
-	-content $content \
-	-attributeList $attributeList
-  }
-}
-RDFNodeClassFactory createFactories
+  RDFNodeClassFactory createFactories
 
-#
-# define nesting constraints
-#
-RDFTag nestingTo {}
-RDFBag nestingTo {RDFTag RDFProperty}
-RDFSeq nestingTo {RDFTag RDFProperty}
-RDFAlt nestingTo {RDFTag RDFProperty}
-RDFMember nestingTo {RDFContainerNodeClass RDFBag RDFSeq RDFAlt}
-RDFProperty nestingTo {}
-RDFDescription nestingTo {RDFTag RDFMember RDFProperty}
+  #
+  # define nesting constraints
+  #
+  RDFTag nestingTo {}
+  RDFBag nestingTo {RDFTag RDFProperty}
+  RDFSeq nestingTo {RDFTag RDFProperty}
+  RDFAlt nestingTo {RDFTag RDFProperty}
+  RDFMember nestingTo {RDFContainerNodeClass RDFBag RDFSeq RDFAlt}
+  RDFProperty nestingTo {}
+  RDFDescription nestingTo {RDFTag RDFMember RDFProperty}
 
-##############################################################################
-#
-# add some methods to the property node class
-#
-##############################################################################
+  ##############################################################################
+  #
+  # add some methods to the property node class
+  #
+  ##############################################################################
 
-RDFProperty instproc parseAttributes {name attrList} {
-  set r [self]
-  #set index 0
-  foreach {n v} $attrList {
-    if {[my checkForXmlNS $n $v]} {continue}
-    if {[set an [my isAttribute $n]] != ""} {
-      my set attributes($n) $v
-      if {$an == "parseType"} {my handleParseType $v}
-    } else {
-      if {![info exists abbrvPropResource]} {
-	set abbrvPropResource \
-	  [my getNestingNode RDFDescription \
-	     [my qualifyWithRdfNsPrefix Description] {}]
+  RDFProperty instproc parseAttributes {name attrList} {
+    set r [self]
+    #set index 0
+    foreach {n v} $attrList {
+      if {[my checkForXmlNS $n $v]} {continue}
+      if {[set an [my isAttribute $n]] ne ""} {
+	my set attributes($n) $v
+	if {$an eq "parseType"} {my handleParseType $v}
+      } else {
+	if {![info exists abbrvPropResource]} {
+	  set abbrvPropResource \
+	      [my getNestingNode RDFDescription \
+		   [my qualifyWithRdfNsPrefix Description] {}]
+	}
+	$abbrvPropResource propertyAttribute $n $v
       }
-      $abbrvPropResource propertyAttribute $n $v
+      #set attrList [my nextAttrNode $an attrList index]
     }
-    #set attrList [my nextAttrNode $an attrList index]
-  }
 
-  if {[info exists abbrvPropResource]} {
-    # if resource attribute is given -> use it for abbr property 
-    # description as about attr  
-    if {[my exists attributes(resource)]} {
-      set about [my set attributes(resource)]
-      my unset attributes(resource)
+    if {[info exists abbrvPropResource]} {
+      # if resource attribute is given -> use it for abbr property 
+      # description as about attr  
+      if {[my exists attributes(resource)]} {
+	set about [my set attributes(resource)]
+	my unset attributes(resource)
+      }
+      if  {[my exists attributes([set resource [my qualifyWithRdfNsPrefix resource]])]} {
+	set about [my set attributes($resource)]
+	my unset attributes($resource)
+      }
+      if {[info exists about]} {
+	$abbrvPropResource set attributes(about) $about
+	$abbrvPropResource set subject $about
+      }
     }
-    if  {[my exists attributes([set resource [my qualifyWithRdfNsPrefix resource]])]} {
-      set about [my set attributes($resource)]
-      my unset attributes($resource)
-    }
-    if {[info exists about]} {
-      $abbrvPropResource set attributes(about) $about
-      $abbrvPropResource set subject $about
-    }
   }
-}
-RDFProperty instproc parseStart {name attrList} {
-  if {[my isParseLiteral]} {return [self]}
-  next
-  return [my parseNestedChild $name $attrList]
-}
+  RDFProperty instproc parseStart {name attrList} {
+    if {[my isParseLiteral]} {return [self]}
+    next
+    return [my parseNestedChild $name $attrList]
+  }
 
-##############################################################################
-#
-# add methods to the member class
-#
-##############################################################################
+  ##############################################################################
+  #
+  # add methods to the member class
+  #
+  ##############################################################################
 
-RDFMember parameter {
-  memberIndex
-}
+  RDFMember parameter {
+    memberIndex
+  }
 
-RDFMember instproc parseAttributes {name attrList} {
-  #set index 0
-  foreach {n v} $attrList {
-    if {[set an [my isAttribute $n]] != ""} {
-      my set attributes($n) $v
-      if {$an == "parseType"} {my handleParseType $v}
+  RDFMember instproc parseAttributes {name attrList} {
+    #set index 0
+    foreach {n v} $attrList {
+      if {[set an [my isAttribute $n]] ne ""} {
+	my set attributes($n) $v
+	if {$an eq "parseType"} {my handleParseType $v}
+      }
+      #set attrList [my nextAttrNode $an attrList index]
     }
-    #set attrList [my nextAttrNode $an attrList index]
   }
-}
 
-RDFMember instproc print {} {
-  return "[next]\nMEMBER-INDEX: [my set memberIndex]"
-}
+  RDFMember instproc print {} {
+    return "[next]\nMEMBER-INDEX: [my set memberIndex]"
+  }
 
-##############################################################################
-#
-# add methods to the description node class
-#
-##############################################################################
+  ##############################################################################
+  #
+  # add methods to the description node class
+  #
+  ##############################################################################
 
-RDFDescription instproc init {args} {
-  next
-  set ID [my makeID]
-  my set subject $ID
-  my set bagID $ID
-}
+  RDFDescription instproc init {args} {
+    next
+    set ID [my makeID]
+    my set subject $ID
+    my set bagID $ID
+  }
 
-RDFDescription instproc parseAttributes {name attrList} {
-  set r [self]
+  RDFDescription instproc parseAttributes {name attrList} {
+    set r [self]
 
-  # if the parent is a property with an ID -> use it
-  # as description subject
-  set ID [my qualifyWithRdfNsPrefix ID]
-  set parent [my info parent]
-  if {[$parent exists attributes(ID)]} {
-    my set subject [$parent set attributes(ID)]
-  } elseif {[$parent exists attributes($ID)]} {
-    my set subject [$parent set attributes($ID)]
-  }
+    # if the parent is a property with an ID -> use it
+    # as description subject
+    set ID [my qualifyWithRdfNsPrefix ID]
+    set parent [my info parent]
+    if {[$parent exists attributes(ID)]} {
+      my set subject [$parent set attributes(ID)]
+    } elseif {[$parent exists attributes($ID)]} {
+      my set subject [$parent set attributes($ID)]
+    }
 
-  foreach {n v} $attrList {
-    if {[my checkForXmlNS $n $v]} {continue}
-    if {[set an [my isAttribute $n]] != ""} {
-      my set attributes($n) $v
-      switch -exact $an {
-	about -
-	ID -
-	aboutEach -
-	aboutEachPrefix {
-	  my set subject $v
+    foreach {n v} $attrList {
+      if {[my checkForXmlNS $n $v]} {continue}
+      if {[set an [my isAttribute $n]] ne ""} {
+	my set attributes($n) $v
+	switch -exact $an {
+	  about -
+	  ID -
+	  aboutEach -
+	  aboutEachPrefix {
+	    my set subject $v
+	  }
+	  bagID {
+	    my set bagID [[my set parser] set baseURL]\#$v
+	  }
+	  type {
+	    my appendRDFType $v
+	  }
 	}
-	bagID {
-	  my set bagID [[my set parser] set baseURL]\#$v
-	}
-	type {
-	  my appendRDFType $v
-	}
+      } else {
+	set r [my propertyAttribute $n $v]
       }
-    } else {
-      set r [my propertyAttribute $n $v]
     }
+    return $r
   }
-  return $r
-}
 
-RDFDescription instproc parseStart {name attrList} {
-  next
-  return [my getPropertyNodeChild $name $attrList]
-}
+  RDFDescription instproc parseStart {name attrList} {
+    next
+    return [my getPropertyNodeChild $name $attrList]
+  }
 
-##############################################################################
-#
-# add some methods to the <RDF> node class
-#
-##############################################################################
+  ##############################################################################
+  #
+  # add some methods to the <RDF> node class
+  #
+  ##############################################################################
 
-RDFTag parameter {{startTagOn 0}}
+  RDFTag parameter {{startTagOn 0}}
 
-RDFTag instproc match {c} {
-  # the prefix of the topnode determines initially how the RDF 
-  # namespace is named ... since several examples don't have a 
-  # namespace definition for this ns, we set here a default, which
-  # may be overridden by ns definitions in the XML text
-  if {[regexp {^([^:]*):(.*)} $c _ pre c]} {
-    my makeIndividualNSEntry $pre [[my set parser] rdfNamespace]
-    #puts stderr "Making RDF namespace entry for <$pre>"
+  RDFTag instproc match {c} {
+    # the prefix of the topnode determines initially how the RDF 
+    # namespace is named ... since several examples don't have a 
+    # namespace definition for this ns, we set here a default, which
+    # may be overridden by ns definitions in the XML text
+    if {[regexp {^([^:]*):(.*)} $c _ pre c]} {
+      my makeIndividualNSEntry $pre [[my set parser] rdfNamespace]
+      #puts stderr "Making RDF namespace entry for <$pre>"
+    }
+    #puts "Match for $c --- Content: [[my info class] set content]"
+    expr {$c eq [[my info class] set content]}
   }
-  #puts "Match for $c --- Content: [[my info class] set content]"
-  expr {$c == [[my info class] set content]}
-}
 
-RDFTag instproc parseStart {name attrList} {
-  set parsed 0
-  if {[set node [my isNestingNode $name]] != ""} {
-    set r [my getNestingNode $node $name $attrList]
-  } else {
-    set r [my getTypedNode $name $attrList]
+  RDFTag instproc parseStart {name attrList} {
+    set parsed 0
+    if {[set node [my isNestingNode $name]] ne ""} {
+      set r [my getNestingNode $node $name $attrList]
+    } else {
+      set r [my getTypedNode $name $attrList]
+    }
+    next
+    return $r
   }
-  next
-  return $r
-}
 
-RDFTag instproc parseEnd content {
-  if {!([my startTagOn] && [my match $content])} {
-    [my errorChild $content]
+  RDFTag instproc parseEnd content {
+    if {!([my startTagOn] && [my match $content])} {
+      [my errorChild $content]
+    }
+    next
+    self ;# return [self]
   }
-  next
-  self ;# return [self]
-}
 
-##############################################################################
-#
-# RDF Factory for creating node objects
-#
-##############################################################################
-Class RDFNodeFactory -superclass XMLNodeFactory
-#RDFNodeFactory instproc getNode {key objName} {
-#  set r [next]
-#  return $r
-#}
-RDFNodeFactory rdfNodeFactory -sharedNodes {RDFDescription RDFTag}
+  ##############################################################################
+  #
+  # RDF Factory for creating node objects
+  #
+  ##############################################################################
+  Class RDFNodeFactory -superclass XMLNodeFactory
+  RDFNodeFactory create rdfNodeFactory -sharedNodes {RDFDescription RDFTag}
 
 
-##############################################################################
-#
-# RDF �arser class used to access the xml parser and produce the
-# rdf node tree
-#
-##############################################################################
-Class RDFParser -superclass XMLParser -parameter {
-  {baseURL "rdfdoc"}
-  {rdfNamespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"}
-}
+  ##############################################################################
+  #
+  # RDF parser class used to access the xml parser and produce the
+  # rdf node tree
+  #
+  ##############################################################################
+  Class RDFParser -superclass XMLParser -parameter {
+    {baseURL "rdfdoc"}
+    {rdfNamespace "http://www.w3.org/1999/02/22-rdf-syntax-ns#"}
+  }
 
-RDFParser instproc init args {
-  my mixin add RDFParserParseTypeHandling
+  RDFParser instproc init args {
+    my mixin add RDFParserParseTypeHandling
 
-  ### this special parser handles rdf:RDF tags
-  my topLevelHandlerPattern {^([^:]*):RDF|RDF} RDFTag
+    ### this special parser handles rdf:RDF tags
+    my topLevelHandlerPattern {^([^:]*):RDF|RDF} RDFTag
 
-  next
-  my set nodeFactory "rdfNodeFactory"
-}
+    next
+    my set nodeFactory "rdfNodeFactory"
+  }
 
-RDFParser instproc makeID {} {
-  my autoname [my baseURL]\#id
-}
+  RDFParser instproc makeID {} {
+    my autoname [my baseURL]\#id
+  }
 
-RDFParser instproc reset {} {
-  next
-  set id [my baseURL]\#id
-  my autoname -reset $id
-}
-
-RDFParser instproc createTopLevelNode {name attrList} {
-  set tn [next]
-  #$tn makeIndividualNSEntry xmlns [my set rdfNamespace]
-  ### toplevel node must be of type RDFTag
-  if {![$tn istype RDFTag]} {
-    error "Top level node must be of type RDFTag"
+  RDFParser instproc reset {} {
+    next
+    set id [my baseURL]\#id
+    my autoname -reset $id
   }
-  if {[$tn match $name]} {
-    $tn set content $name
-    $tn startTagOn 1
 
-    ### use default values for rdf/default (xmlns) namespace
-    #my makeIndividualNSEntry rdfs "http://www.w3.org/TR/1999/PR-rdf-schema-19990303#"
+  RDFParser instproc createTopLevelNode {name attrList} {
+    set tn [next]
+    #$tn makeIndividualNSEntry xmlns [my set rdfNamespace]
+    ### toplevel node must be of type RDFTag
+    if {![$tn istype RDFTag]} {
+      error "Top level node must be of type RDFTag"
+    }
+    if {[$tn match $name]} {
+      $tn set content $name
+      $tn startTagOn 1
 
-    foreach {n v} $attrList {
-      if {[$tn checkForXmlNS $n $v]} {continue}
+      ### use default values for rdf/default (xmlns) namespace
+      #my makeIndividualNSEntry rdfs "http://www.w3.org/TR/1999/PR-rdf-schema-19990303#"
+
+      foreach {n v} $attrList {
+	if {[$tn checkForXmlNS $n $v]} {continue}
+      }
     }
+    return $tn
   }
-  return $tn
+
+  #RDFParser instproc parse data {
+  #  next
+  #}
+
+  namespace export RDFNodeParseTypeHandling RDFParserParseTypeHandling \
+      RDFNode RDFResource RDFContainerNodeClass RDFNodeClassFactory \
+      RDFNodeFactory RDFParser rdfNodeFactory \
+      RDFTag RDFBag RDFSeq RDFAlt RDFProperty  RDFMember RDFDescription
 }
 
-#RDFParser instproc parse data {
-#  next
-#}
+namespace import ::xotcl::rdf::parser::*
Index: xotcl/library/serialize/RecoveryPoint.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/serialize/RecoveryPoint.xotcl	(.../RecoveryPoint.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/serialize/RecoveryPoint.xotcl	(.../RecoveryPoint.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,430 +1,441 @@
-# $Id: RecoveryPoint.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: RecoveryPoint.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::scriptCreation::recoveryPoint 0.8
+package require XOTcl
 
-## fehlt noch: filter, mixins, metadata, ass, assoption, etc
-## beim recover Class's,Object's proc instproc vars nicht ueberschreiben
-## filter dann anhaengen etc ...
-## der Recovery Filter darf durch Object filter "" nicht gel�scht werden
+namespace eval ::xotcl::scriptCreation::recoveryPoint {
+    namespace import ::xotcl::*
 
-#
-# filter to ensure that recovering doesn't overwrite 
-# existing objs/classes
-#
+    ## fehlt noch: filter, mixins, metadata, ass, assoption, etc
+    ## beim recover Class's,Object's proc instproc vars nicht ueberschreiben
+    ## filter dann anhaengen etc ...
+    ## der Recovery Filter darf durch Object filter "" nicht gel�scht werden
 
-Object instproc recoveryFilter args {
-    ::set method [self calledproc] 
+    #
+    # filter to ensure that recovering doesn't overwrite 
+    # existing objs/classes
+    #
 
-    switch -- $method {
-	create {
-	    # don't overwrite objects
-	    if {![::Object isobject [lindex $args 0]]} {
-		next
-	    } else {
-		# puts stderr "Recovery Filter: omitting [lindex $args 0]"
+    Object instproc recoveryFilter args {
+	::set method [self calledproc] 
+
+	switch -- $method {
+	    create {
+		# don't overwrite objects
+		if {![::Object isobject [lindex $args 0]]} {
+		    next
+		} else {
+		    # puts stderr "Recovery Filter: omitting [lindex $args 0]"
+		}
 	    }
-	}
-	proc {
-	    if {[lsearch [my info procs] [lindex $args 0]] == -1} {
-		next
-	    } else {
-		# puts stderr "Recovery Filter: omitting proc [self]::[lindex $args 0]"
-	    }	
-	}
-	instproc {
-	    if {[lsearch [my info instprocs] [lindex $args 0]] == -1} {
-		next
-	    } else {
-		# puts stderr "Recovery Filter: omitting instproc [self]::[lindex $args 0]"
+	    proc {
+		if {[lsearch [my info procs] [lindex $args 0]] == -1} {
+		    next
+		} else {
+		    # puts stderr "Recovery Filter: omitting proc [self]::[lindex $args 0]"
+		}	
 	    }
-	}
-	set {
-	    if {[lsearch [my info vars] [lindex $args 0]] == -1} {
-		next
-	    } else {
-		# puts stderr "Recovery Filter: omitting var [self]::[lindex $args 0]"
+	    instproc {
+		if {[lsearch [my info instprocs] [lindex $args 0]] == -1} {
+		    next
+		} else {
+		    # puts stderr "Recovery Filter: omitting instproc [self]::[lindex $args 0]"
+		}
 	    }
+	    set {
+		if {[lsearch [my info vars] [lindex $args 0]] == -1} {
+		    next
+		} else {
+		    # puts stderr "Recovery Filter: omitting var [self]::[lindex $args 0]"
+		}
+	    }
+	    default  {next}
 	}
-	default  {next}
     }
-}
 
-#
-# remove filter from object
-#
-Object instproc filterremove f {
-    ::set fl [my info filter]
-    puts stderr "filterremove on [self] with $f; fullName: [my filtersearch $f]" 
-    while {[::set index [lsearch $fl [my filtersearch $f]]] != -1} {
-	::set fl [lreplace $fl $index $index]
+    #
+    # remove filter from object
+    #
+    Object instproc filterremove f {
+	::set fl [my info filter]
+	puts stderr "filterremove on [self] with $f; fullName: [my filtersearch $f]" 
+	while {[::set index [lsearch $fl [my filtersearch $f]]] != -1} {
+	    ::set fl [lreplace $fl $index $index]
+	}
+	my filter $fl
     }
-    my filter $fl
-}
 
-#
-# remove mixin from object
-#
-Object instproc mixinremove m {
-    puts stderr "mixinremove on [self] with $m" 
-    ::set ml [my info mixins]
-    while {[::set index [lsearch $ml $m]] != -1} {
-	::set ml [lreplace $ml $index $index]
+    #
+    # remove mixin from object
+    #
+    Object instproc mixinremove m {
+	puts stderr "mixinremove on [self] with $m" 
+	::set ml [my info mixins]
+	while {[::set index [lsearch $ml $m]] != -1} {
+	    ::set ml [lreplace $ml $index $index]
+	}
+	my mixin $ml
     }
-    my mixin $ml
-}
 
-Class RecoveryPoint \
-    -parameter {
-	{appendedObjs ""} 
-	{appendedCls ""} 
-	{appendedNamespaces ""} 
-	{withState 0}
-	{appendToFile 0}
-	{definedObjs [list Object \
-		      Class \
-		      Class::Parameter]}
-	{excludeNames ""}
-    }
+    Class RecoveryPoint \
+	-parameter {
+	    {appendedObjs ""} 
+	    {appendedCls ""} 
+	    {appendedNamespaces ""} 
+	    {withState 0}
+	    {appendToFile 0}
+	    {definedObjs [list Object \
+			      Class \
+			      Class::Parameter]}
+	    {excludeNames ""}
+	}
 
-#
-# queries the definedObjs variable whether a given object
-# is already defined/predefined or not  
-# -> a way to exclude classes/objs from saving
-#
-RecoveryPoint instproc isDefined {n} {
-    my instvar definedObjs
-    puts stderr "Checking Defined: $n in $definedObjs"
-    if {[lsearch $definedObjs [string trimleft $n :]] == -1} {
-	return 0
-    } else {
-	return 1
-    }
-}
-
-RecoveryPoint instproc appendDefined {n} {
-    my instvar definedObjs
-    lappend definedObjs [string trimleft $n :]
-}
-
-#
-# check whether an obj/cls/namespace is appended already
-# append obj/cls/namespace 
-#
-foreach method {Obj Cl Namespace} {
-    set r {
-	my instvar {appended${method}s name}}
-    set r [subst -nocommands -nobackslash $r]
-    
-    set s $r
-    append s {
-	if {[lsearch $name [string trimleft $n :]] == -1} {
+    #
+    # queries the definedObjs variable whether a given object
+    # is already defined/predefined or not  
+    # -> a way to exclude classes/objs from saving
+    #
+    RecoveryPoint instproc isDefined {n} {
+	my instvar definedObjs
+	puts stderr "Checking Defined: $n in $definedObjs"
+	if {[lsearch $definedObjs [string trimleft $n :]] == -1} {
 	    return 0
 	} else {
 	    return 1
 	}
     }
 
-    RecoveryPoint instproc isAppended$method {n} $s
-
-    append r {
-	lappend name [string trimleft $n :]
+    RecoveryPoint instproc appendDefined {n} {
+	my instvar definedObjs
+	lappend definedObjs [string trimleft $n :]
     }
-    RecoveryPoint instproc append$method {n} $r
-}
-   
 
-#
-# compare command for lsort  
-#
-RecoveryPoint instproc namespaceDepth {a b} {
-    set aCount 0
-    set bCount 0
-    for {set i 0} {$i < [string length $a]} {incr i} {
-	if {[string index $a $i] == ":"} {
-	    incr aCount
+    #
+    # check whether an obj/cls/namespace is appended already
+    # append obj/cls/namespace 
+    #
+    foreach method {Obj Cl Namespace} {
+				       set r {
+					   my instvar {appended${method}s name}}
+				       set r [subst -nocommands -nobackslash $r]
+				       
+				       set s $r
+				       append s {
+					   if {[lsearch $name [string trimleft $n :]] == -1} {
+					       return 0
+					   } else {
+					       return 1
+					   }
+				       }
+
+				       RecoveryPoint instproc isAppended$method {n} $s
+
+				       append r {
+					   lappend name [string trimleft $n :]
+				       }
+				       RecoveryPoint instproc append$method {n} $r
+				   }
+    
+
+    #
+    # compare command for lsort  
+    #
+    RecoveryPoint instproc namespaceDepth {a b} {
+	set aCount 0
+	set bCount 0
+	for {set i 0} {$i < [string length $a]} {incr i} {
+	    if {[string index $a $i] == ":"} {
+		incr aCount
+	    }
 	}
-    }
-    for {set i 0} {$i < [string length $b]} {incr i} {
-	if {[string index $b $i] == ":"} {
-	    incr bCount
+	for {set i 0} {$i < [string length $b]} {incr i} {
+	    if {[string index $b $i] == ":"} {
+		incr bCount
+	    }
 	}
-    }
-    if {$aCount == $bCount} {
-	return 0
-    } elseif {$aCount > $bCount} {
-	return 1
-    }
-		   
-    return -1
-} 
+	if {$aCount == $bCount} {
+	    return 0
+	} elseif {$aCount > $bCount} {
+	    return 1
+	}
+	
+	return -1
+    } 
 
-#
-# produces a script containing the current state of 
-# the given obj
-#
-RecoveryPoint instproc stateScript {obj} {
-    set script ""
-    foreach v [$obj info vars] {
-	if {[lsearch [my set excludeNames] $v] == -1} {
-	  $obj instvar $v
-	  if {[array exists $v]} {
-	    foreach name [array names $v] {
-	      set arr ${v}($name)
-	      set value [$obj set $arr]
-	      append script "$obj set $arr \"$value\"\n"
+    #
+    # produces a script containing the current state of 
+    # the given obj
+    #
+    RecoveryPoint instproc stateScript {obj} {
+	set script ""
+	foreach v [$obj info vars] {
+	    if {[lsearch [my set excludeNames] $v] == -1} {
+		$obj instvar $v
+		if {[array exists $v]} {
+		    foreach name [array names $v] {
+			set arr ${v}($name)
+			set value [$obj set $arr]
+			append script "$obj set $arr \"$value\"\n"
+		    }
+		} else {
+		    set value [set $v]
+		    append script "$obj set $v \"$value\"\n"
+		}
 	    }
-	  } else {
-	    set value [set $v]
-	    append script "$obj set $v \"$value\"\n"
-	  }
 	}
+	return $script
     }
-    return $script
-}
 
-#
-# produces a script containing the procs of the given obj
-#
-RecoveryPoint instproc procScript {obj} {
-    set script ""
-    foreach p [$obj info procs] {
-	if {[lsearch [my set excludeNames] $v] == -1} {
-	    append script \
-		"$obj proc $p \{[$obj info args $p]\} \{[$obj info body $p]\}\n"
+    #
+    # produces a script containing the procs of the given obj
+    #
+    RecoveryPoint instproc procScript {obj} {
+	set script ""
+	foreach p [$obj info procs] {
+	    if {[lsearch [my set excludeNames] $v] == -1} {
+		append script \
+		    "$obj proc $p \{[$obj info args $p]\} \{[$obj info body $p]\}\n"
+	    }
 	}
+	return $script
     }
-    return $script
-}
 
-#
-# produces a script containing the instprocs of the given class
-#
-RecoveryPoint instproc instprocScript {cl} {
-    set script ""
-    foreach p [$cl info instprocs] {
-	if {[lsearch [my set excludeNames] $v] == -1} {
-	    append script \
-		"$cl instproc $p \{[$cl info instargs $p]\} \{[$cl info instbody $p]\}\n"
+    #
+    # produces a script containing the instprocs of the given class
+    #
+    RecoveryPoint instproc instprocScript {cl} {
+	set script ""
+	foreach p [$cl info instprocs] {
+	    if {[lsearch [my set excludeNames] $v] == -1} {
+		append script \
+		    "$cl instproc $p \{[$cl info instargs $p]\} \{[$cl info instbody $p]\}\n"
+	    }
 	}
+	return $script
     }
-    return $script
-}
 
-#
-# append parent obj/classes/namespaces of an object completly
-#
+    #
+    # append parent obj/classes/namespaces of an object completly
+    #
 
-RecoveryPoint instproc appendParents {name} {
-    # puts stderr "Recovery -- appendParents $name "
-    set p ""
-    set script ""
+    RecoveryPoint instproc appendParents {name} {
+	# puts stderr "Recovery -- appendParents $name "
+	set p ""
+	set script ""
 
-    set n $name
-    while {[set np [namespace parent ::$n]] != "::"} {
-	lappend p $np
-	set n $np
-    }    
-    set p [lsort -command {[self] namespaceDepth} $p]
+	set n $name
+	while {[set np [namespace parent ::$n]] != "::"} {
+	    lappend p $np
+	    set n $np
+	}    
+	set p [lsort -command {[self] namespaceDepth} $p]
 
-    foreach n $p {
-	if {[Object isobject $n]} {
-	    if {[$n isclass]} {
-		append script [my classScript $n]
+	foreach n $p {
+	    if {[Object isobject $n]} {
+		if {[$n isclass]} {
+		    append script [my classScript $n]
+		} else {
+		    append script [my objectScript $n]
+		}
 	    } else {
-		append script [my objectScript $n]
+		if {![my isAppendedNamespace $n]} {
+		    append script "namespace eval $n \{\}\n"
+		    # puts stderr "Recovery -- Appending Namespace: $n"
+		    my appendedNamespace $n
+		}        
 	    }
-	} else {
-	    if {![my isAppendedNamespace $n]} {
-		append script "namespace eval $n \{\}\n"
-		# puts stderr "Recovery -- Appending Namespace: $n"
-		my appendedNamespace $n
-	    }        
 	}
+	return $script
     }
-    return $script
-}
 
 
-#
-# produces a script recovering the given obj with all children
-# without state
-#
-RecoveryPoint instproc objectScript {obj} {
-    # puts stderr "Recovery -- Object Script $obj"
-    my instvar withState
-    set script ""
-    if {![my isDefined $obj] && 
-	![my isAppendedObj $obj]} {
-	# if the object's class is not yet appended => do it now
-	set objClass [$obj info class]
-	append script [my classScript $objClass]
+    #
+    # produces a script recovering the given obj with all children
+    # without state
+    #
+    RecoveryPoint instproc objectScript {obj} {
+	# puts stderr "Recovery -- Object Script $obj"
+	my instvar withState
+	set script ""
+	if {![my isDefined $obj] && 
+	    ![my isAppendedObj $obj]} {
+	    # if the object's class is not yet appended => do it now
+	    set objClass [$obj info class]
+	    append script [my classScript $objClass]
 
-	# append all parent namespaces
-	append script [my appendParents $obj]
+	    # append all parent namespaces
+	    append script [my appendParents $obj]
 
-	# append the obj
-	append script "$objClass $obj\n"
-	append script [my procScript $obj]
-	if {$withState == 1} {
-	    append script [my stateScript $obj]
-	}
-	# puts stderr "Recovery -- Appending Object: $obj"
-	my appendObj $obj
+	    # append the obj
+	    append script "$objClass $obj\n"
+	    append script [my procScript $obj]
+	    if {$withState == 1} {
+		append script [my stateScript $obj]
+	    }
+	    # puts stderr "Recovery -- Appending Object: $obj"
+	    my appendObj $obj
 
-	# append its children
-	foreach o [$obj info children] {
-	    append script [my objectScript $o]
+	    # append its children
+	    foreach o [$obj info children] {
+		append script [my objectScript $o]
+	    }
 	}
+	return $script
     }
-    return $script
-}
 
-#
-# produces a script recovering the given class with all children
-# without state
-#
-RecoveryPoint instproc classScript {cl} {
-    # puts stderr "Recovery -- Class Script $cl"
-    my instvar withState
-    set script ""
-    if {![my isDefined $cl] &&
-	  ![my isAppendedCl $cl]} { 
-	# if the class's meta-class is not yet appended => do it now
-	set metaClass [$cl info class]
-	append script [my classScript $metaClass]
+    #
+    # produces a script recovering the given class with all children
+    # without state
+    #
+    RecoveryPoint instproc classScript {cl} {
+	# puts stderr "Recovery -- Class Script $cl"
+	my instvar withState
+	set script ""
+	if {![my isDefined $cl] &&
+	    ![my isAppendedCl $cl]} { 
+	    # if the class's meta-class is not yet appended => do it now
+	    set metaClass [$cl info class]
+	    append script [my classScript $metaClass]
 
-	# append all parent namespaces
-	append script [my appendParents $cl]
+	    # append all parent namespaces
+	    append script [my appendParents $cl]
 
-	# append the class
-	append script "$metaClass $cl"
+	    # append the class
+	    append script "$metaClass $cl"
 
-	set sl [$cl info superclass]
-	if {$sl != ""} {
-	    append script " -superclass \{$sl\}\n"
-	} else {
-	    append script "\n"
-	}
+	    set sl [$cl info superclass]
+	    if {$sl != ""} {
+		append script " -superclass \{$sl\}\n"
+	    } else {
+		append script "\n"
+	    }
 
-	append script [my instprocScript $cl]
-	append script [my procScript $cl]
+	    append script [my instprocScript $cl]
+	    append script [my procScript $cl]
 
-	if {$withState == 1} {
-	    append script [my stateScript $cl]
-	}
+	    if {$withState == 1} {
+		append script [my stateScript $cl]
+	    }
 
-	# puts stderr "Recovery -- Appending Class: $cl \n $script"
-	my appendCl $cl
+	    # puts stderr "Recovery -- Appending Class: $cl \n $script"
+	    my appendCl $cl
 
-	# append children
-	set children [$cl info children]
-	set classChildren [$cl info classchildren]
+	    # append children
+	    set children [$cl info children]
+	    set classChildren [$cl info classchildren]
 
-	foreach c $children {
-	    if {[lsearch $classChildren $c] != -1} {
-		append script [my classScript $c]
-	    } else {
-		append script [my objectScript $c]
+	    foreach c $children {
+		if {[lsearch $classChildren $c] != -1} {
+		    append script [my classScript $c]
+		} else {
+		    append script [my objectScript $c]
+		}
 	    }
 	}
+	return $script
     }
-    return $script
-}
 
-#
-# produces a script recovering the given class and all subclasses 
-# with all their children and all instances
-#
-#
-RecoveryPoint instproc hierarchyScript {cl} {
-    set script [my classScript $cl]
-    set sortedInstances \
-	[lsort -command {[self] namespaceDepth} [$cl info instances]]
+    #
+    # produces a script recovering the given class and all subclasses 
+    # with all their children and all instances
+    #
+    #
+    RecoveryPoint instproc hierarchyScript {cl} {
+	set script [my classScript $cl]
+	set sortedInstances \
+	    [lsort -command {[self] namespaceDepth} [$cl info instances]]
 
-    foreach o $sortedInstances {
-	append script [my objectScript $o]
+	foreach o $sortedInstances {
+	    append script [my objectScript $o]
+	}
+
+	foreach c [$cl info subclass] {
+	    append script [my hierarchyScript $c]
+	}
+
+	return $script
     }
 
-    foreach c [$cl info subclass] {
-	append script [my hierarchyScript $c]
+    #
+    # saves a script to a file
+    #
+    RecoveryPoint instproc saveScript {filename script} {
+	my instvar appendToFile
+	if {$appendToFile} {
+	    set mode a
+	} else {
+	    set mode w
+	}
+	set f [open $filename $mode]
+	puts $f $script
+	close $f
     }
 
-    return $script
-}
-
-#
-# saves a script to a file
-#
-RecoveryPoint instproc saveScript {filename script} {
-    my instvar appendToFile
-    if {$appendToFile} {
-	set mode a
-    } else {
-	set mode w
+    #
+    # load a script from a file
+    #
+    RecoveryPoint instproc loadScript {filename} {
+	set f [open $filename r]
+	set r [read $f]
+	close $f
+	return $r
     }
-    set f [open $filename $mode]
-    puts $f $script
-    close $f
-}
 
-#
-# load a script from a file
-#
-RecoveryPoint instproc loadScript {filename} {
-    set f [open $filename r]
-    set r [read $f]
-    close $f
-    return $r
-}
+    #
+    # produce methods to save/recover an object script to/from a file 
+    # with/without state/only state
+    #
 
-#
-# produce methods to save/recover an object script to/from a file 
-# with/without state/only state
-#
+    foreach method {
+	Object ObjectState ObjectWithState Class ClassWithState \
+	    Hierarchy HierarchyWithState
+    } {
+       set s {
+	   my set withState
+       }
 
-foreach method {Object ObjectState ObjectWithState Class ClassWithState \
-		Hierarchy HierarchyWithState} {
-  
-  set s {
-    my set withState
-  }
+       if {[regexp {(.*)WithState} $method _ m]} {
+	   set call $m
+	   append s "1"
+       } else {
+	   set call $method
+	   append s "0"
+       }
 
-  if {[regexp {(.*)WithState} $method _ m]} {
-      set call $m
-      append s "1"
-  } else {
-      set call $method
-      append s "0"
-  }
+       scan $call %c l
+       set ::low "[format %c [expr {$l + 32}]][string range $call 1 end]"
 
-  scan $call %c l
-  set ::low "[format %c [expr {$l + 32}]][string range $call 1 end]"
-
-  append s {
-    my appendedObjs ""
-    my appendedCls ""
-    my appendedNamespaces ""
-  }
-  append s "
+       append s {
+	   my appendedObjs ""
+	   my appendedCls ""
+	   my appendedNamespaces ""
+       }
+       append s "
     foreach a \$args \{"
-  set r {      
-      set script [my ${low}Script }
-  set r [subst -nocommands -nobackslash $r]
-  append s $r
-  append s {$a] 
-      my saveScript $filename $script}
-  append s "
+       set r {      
+	   set script [my ${low}Script }
+	   set r [subst -nocommands -nobackslash $r]
+	   append s $r
+	   append s {$a] 
+	   my saveScript $filename $script}
+       append s "
     \}
   "
 
-  RecoveryPoint instproc save$method {filename args} $s
+       RecoveryPoint instproc save$method {filename args} $s
+   }
+
+    RecoveryPoint instproc recover {filename} {
+	set r [my loadScript $filename]
+	Object filterappend recoveryFilter
+	# puts stderr "RecoveryFilter appended for $filename" 
+	eval $r
+	Object filterremove recoveryFilter
+	# puts stderr "RecoveryFilter removed for $filename" 
+	return
+    }
+
+    namespace export RecoveryPoint
 }
 
-RecoveryPoint instproc recover {filename} {
-    set r [my loadScript $filename]
-    Object filterappend recoveryFilter
-    # puts stderr "RecoveryFilter appended for $filename" 
-    eval $r
-    Object filterremove recoveryFilter
-    # puts stderr "RecoveryFilter removed for $filename" 
-    return
-}
\ No newline at end of file
+namespace import ::xotcl::scriptCreation::recoveryPoint::*
Index: xotcl/library/serialize/ScriptCreator.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/serialize/ScriptCreator.xotcl	(.../ScriptCreator.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/serialize/ScriptCreator.xotcl	(.../ScriptCreator.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,218 +1,228 @@
-# $Id: ScriptCreator.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: ScriptCreator.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::scriptCreation::scriptCreator 0.8
+package require XOTcl
 
-Class ScriptCreator \
-  -parameter {
-    {excludedObjs {Object Class Class::Parameter}}
-    {excludeNames ""}
-    {dependencyChecking 1}
-  }
+namespace eval ::xotcl::scriptCreation::scriptCreator {
+    namespace import ::xotcl::*
 
+    Class ScriptCreator \
+	-parameter {
+	    {excludedObjs {Object Class Class::Parameter}}
+	    {excludeNames ""}
+	    {dependencyChecking 1}
+	}
 
-#
-# queries the excludedObjs variable whether a given object
-# is already defined/predefined or not  
-# -> a way to exclude classes/objs from saving
-#
-ScriptCreator instproc isExcluded {n} {
-    my instvar excludedObjs
-    #puts stderr "Checking Excluded: $n in $excludedObjs"
-    if {[lsearch $excludedObjs [string trimleft $n :]] == -1} {
-	return 0
-    } else {
-	return 1
+
+    #
+    # queries the excludedObjs variable whether a given object
+    # is already defined/predefined or not  
+    # -> a way to exclude classes/objs from saving
+    #
+    ScriptCreator instproc isExcluded {n} {
+	my instvar excludedObjs
+	#puts stderr "Checking Excluded: $n in $excludedObjs"
+	if {[lsearch $excludedObjs [string trimleft $n :]] == -1} {
+	    return 0
+	} else {
+	    return 1
+	}
     }
-}
 
-ScriptCreator instproc appendExcluded {n} {
-    my instvar excludedObjs
-    lappend excludedObjs [string trimleft $n :]
-}
+    ScriptCreator instproc appendExcluded {n} {
+	my instvar excludedObjs
+	lappend excludedObjs [string trimleft $n :]
+    }
 
-#
-# compare command for lsort  
-#
-ScriptCreator instproc namespaceDepth {a b} {
-    set aCount 0
-    set bCount 0
-    for {set i 0} {$i < [string length $a]} {incr i} {
-	if {[string index $a $i] == ":"} {
-	    incr aCount
+    #
+    # compare command for lsort  
+    #
+    ScriptCreator instproc namespaceDepth {a b} {
+	set aCount 0
+	set bCount 0
+	for {set i 0} {$i < [string length $a]} {incr i} {
+	    if {[string index $a $i] == ":"} {
+		incr aCount
+	    }
 	}
-    }
-    for {set i 0} {$i < [string length $b]} {incr i} {
-	if {[string index $b $i] == ":"} {
-	    incr bCount
+	for {set i 0} {$i < [string length $b]} {incr i} {
+	    if {[string index $b $i] == ":"} {
+		incr bCount
+	    }
 	}
-    }
-    if {$aCount == $bCount} {
-	return 0
-    } elseif {$aCount > $bCount} {
-	return 1
-    }
-		   
-    return -1
-} 
+	if {$aCount == $bCount} {
+	    return 0
+	} elseif {$aCount > $bCount} {
+	    return 1
+	}
+	
+	return -1
+    } 
 
-#
-# produces a script containing the current state of 
-# the given obj
-#
-ScriptCreator instproc stateScript {obj} {
-    set script ""
-    foreach v [$obj info vars] {
-	if {[lsearch [my set excludeNames] $v] == -1} {
-	    if {[$obj array exists $v]} {
-		foreach name [$obj array names $v] {
-		    set arr ${v}($name)
-		    set value [$obj set $arr]
-		    append script "$obj set $arr \"$value\"\n"
+    #
+    # produces a script containing the current state of 
+    # the given obj
+    #
+    ScriptCreator instproc stateScript {obj} {
+	set script ""
+	foreach v [$obj info vars] {
+	    if {[lsearch [my set excludeNames] $v] == -1} {
+		if {[$obj array exists $v]} {
+		    foreach name [$obj array names $v] {
+			set arr ${v}($name)
+			set value [$obj set $arr]
+			append script "$obj set $arr \"$value\"\n"
+		    }
+		} else {
+		    set value [$obj set $v]
+		    append script "$obj set $v \"$value\"\n"
 		}
-	    } else {
-		set value [$obj set $v]
-		append script "$obj set $v \"$value\"\n"
 	    }
 	}
+	return $script
     }
-    return $script
-}
 
-#
-# produces a script containing the procs of the given obj
-#
-ScriptCreator instproc procScript {obj} {
-    set script ""
-    foreach p [$obj info procs] {
-	if {[lsearch [my set excludeNames] $p] == -1} {
-	    append script \
-		"$obj proc $p \{[$obj info args $p]\} \{[$obj info body $p]\}\n"
+    #
+    # produces a script containing the procs of the given obj
+    #
+    ScriptCreator instproc procScript {obj} {
+	set script ""
+	foreach p [$obj info procs] {
+	    if {[lsearch [my set excludeNames] $p] == -1} {
+		append script \
+		    "$obj proc $p \{[$obj info args $p]\} \{[$obj info body $p]\}\n"
+	    }
 	}
+	return $script
     }
-    return $script
-}
 
-#
-# produces a script containing the instprocs of the given class
-#
-ScriptCreator instproc instprocScript {cl} {
-    set script ""
-    foreach p [$cl info instprocs] {
-	if {[lsearch [my set excludeNames] $p] == -1} {
-	    append script \
-		"$cl instproc $p \{[$cl info instargs $p]\} \{[$cl info instbody $p]\}\n"
+    #
+    # produces a script containing the instprocs of the given class
+    #
+    ScriptCreator instproc instprocScript {cl} {
+	set script ""
+	foreach p [$cl info instprocs] {
+	    if {[lsearch [my set excludeNames] $p] == -1} {
+		append script \
+		    "$cl instproc $p \{[$cl info instargs $p]\} \{[$cl info instbody $p]\}\n"
+	    }
 	}
+	return $script
     }
-    return $script
-}
 
 
 
-#
-# saves a script to a file
-#
-ScriptCreator instproc saveScript {filename script} {
-  set f [open $filename w]
-  puts $f $script
-  close $f
-}
+    #
+    # saves a script to a file
+    #
+    ScriptCreator instproc saveScript {filename script} {
+	set f [open $filename w]
+	puts $f $script
+	close $f
+    }
 
-#
-# load a script from a file
-#
-ScriptCreator instproc loadScript {filename} {
-  set f [open $filename r]
-  set r [read $f]
-  close $f
-  return $r
-}
+    #
+    # load a script from a file
+    #
+    ScriptCreator instproc loadScript {filename} {
+	set f [open $filename r]
+	set r [read $f]
+	close $f
+	return $r
+    }
 
-#
-# check parent obj/classes/namespaces of an object completly
-#
-ScriptCreator instproc checkParents {name} {
-  set p ""
+    #
+    # check parent obj/classes/namespaces of an object completly
+    #
+    ScriptCreator instproc checkParents {name} {
+	set p ""
 
-  set n $name
-  while {[set np [namespace parent ::$n]] != "::"} {
-    lappend p $np
-    set n $np
-  }    
-  set p [lsort -command {my namespaceDepth} $p]
+	set n $name
+	while {[set np [namespace parent ::$n]] != "::"} {
+	    lappend p $np
+	    set n $np
+	}    
+	set p [lsort -command {my namespaceDepth} $p]
 
-  foreach n $p {
-    if {![my isExcluded $n] &&
-	![my isAppended $n]} {
-      error "ScriptCreator: $name needs parent $n, neither appended nor excluded yet."
+	foreach n $p {
+	    if {![my isExcluded $n] &&
+		![my isAppended $n]} {
+		error "ScriptCreator: $name needs parent $n, neither appended nor excluded yet."
+	    }
+	}
     }
-  }
-}
 
-ScriptCreator instproc checkClass {obj class} {
-  if {![my isExcluded $class] &&
-      ![my isAppended $class]} {
-    error "ScriptCreator: $obj depends on $class, neither appended nor excluded yet."
-  }
-}
+    ScriptCreator instproc checkClass {obj class} {
+	if {![my isExcluded $class] &&
+	    ![my isAppended $class]} {
+	    error "ScriptCreator: $obj depends on $class, neither appended nor excluded yet."
+	}
+    }
 
-ScriptCreator instproc isAppended name {
-  set n [string trimleft $name :]
-  if {[lsearch [my set appendedNames] $n]!=-1} {
-    return 1
-  } else {
-    return 0
-  }
-}
+    ScriptCreator instproc isAppended name {
+	set n [string trimleft $name :]
+	if {[lsearch [my set appendedNames] $n]!=-1} {
+	    return 1
+	} else {
+	    return 0
+	}
+    }
 
-ScriptCreator instproc appendName name {
-  set n [string trimleft $name :]
-  my lappend appendedNames $n
-}
+    ScriptCreator instproc appendName name {
+	set n [string trimleft $name :]
+	my lappend appendedNames $n
+    }
 
-ScriptCreator instproc makeScript args {
-  my instvar dependencyChecking
-  my set appendedNames ""
-  set script ""
-  foreach name $args {
-    #puts stderr "Script Creator -- $name"
-    if {![my isExcluded $name] && 
-	![my isAppended $name]} {
-      
-      if {$dependencyChecking} {
-	my checkParents $name
-      }
-      if {[Object isobject $name]} {
-	set class [$name info class]
-	if {$dependencyChecking} {
-	  my checkClass $name $class
-	}
-	if {[Object isclass $name]} {
-	  # append the class
-	  #puts stderr "Appending Class: $name"
-	  append script "[$name info class] $name"
-	  set sl [$name info superclass]
-	  if {$dependencyChecking} {
-	    foreach c $sl {
-	      my checkClass $name $c
+    ScriptCreator instproc makeScript args {
+	my instvar dependencyChecking
+	my set appendedNames ""
+	set script ""
+	foreach name $args {
+	    #puts stderr "Script Creator -- $name"
+	    if {![my isExcluded $name] && 
+		![my isAppended $name]} {
+		
+		if {$dependencyChecking} {
+		    my checkParents $name
+		}
+		if {[Object isobject $name]} {
+		    set class [$name info class]
+		    if {$dependencyChecking} {
+			my checkClass $name $class
+		    }
+		    if {[Object isclass $name]} {
+			# append the class
+			#puts stderr "Appending Class: $name"
+			append script "[$name info class] $name"
+			set sl [$name info superclass]
+			if {$dependencyChecking} {
+			    foreach c $sl {
+				my checkClass $name $c
+			    }
+			}
+			if {$sl != ""} {
+			    append script " -superclass \{$sl\}\n"
+			} else {
+			    append script "\n"
+			}
+			append script [my instprocScript $name]
+		    } else {
+			# append the obj
+			#puts stderr "Appending Object: $name"
+			append script "[$name info class] $name\n"
+		    }
+		    append script [my procScript $name]
+		} else {
+		    append script "namespace eval $name \{\}\n"
+		    #puts stderr "Appending Namespace: $name"
+		}
+		my appendName $name
 	    }
-	  }
-	  if {$sl != ""} {
-	    append script " -superclass \{$sl\}\n"
-	  } else {
-	    append script "\n"
-	  }
-	  append script [my instprocScript $name]
-	} else {
-	  # append the obj
-	  #puts stderr "Appending Object: $name"
-	  append script "[$name info class] $name\n"
 	}
-	append script [my procScript $name]
-      } else {
-	append script "namespace eval $name \{\}\n"
-	#puts stderr "Appending Namespace: $name"
-      }
-      my appendName $name
+	return $script
     }
-  }
-  return $script
+
+    namespace export ScriptCreator
 }
+
+namespace import ::xotcl::scriptCreation::scriptCreator::*
Index: xotcl/library/store/JufGdbmStorage.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/store/JufGdbmStorage.xotcl	(.../JufGdbmStorage.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/store/JufGdbmStorage.xotcl	(.../JufGdbmStorage.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,40 +1,50 @@
-# $Id: JufGdbmStorage.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: JufGdbmStorage.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::store::jufgdbm 0.81
 
 package require xotcl::store::juf_gdbm
 package require xotcl::store
+package require XOTcl
 
-#
-# a simple GNU Gdbm DB Store Access
-#
-Class Storage=JufGdbm -superclass Storage
-Storage=JufGdbm instproc open f {
-  my set persistenceDB [juf_gdbm open $f rwc]
-}
+namespace eval ::xotcl::store::jufgdbm {
+    namespace import ::xotcl::*
 
-Storage=JufGdbm instproc store {k v} {
-  #my showCall
-  juf_gdbm store [my set persistenceDB] $k $v
-}
+    #
+    # a simple GNU Gdbm DB Store Access
+    #
+    Class Storage=JufGdbm -superclass Storage
+    Storage=JufGdbm instproc open f {
+	my set persistenceDB [juf_gdbm open $f rwc]
+    }
 
-Storage=JufGdbm instproc list {} {
-  juf_gdbm list [my set persistenceDB]
-}
+    Storage=JufGdbm instproc store {k v} {
+	#my showCall
+	juf_gdbm store [my set persistenceDB] $k $v
+    }
 
-Storage=JufGdbm instproc fetch {k var} {
-  my instvar persistenceDB
-  if {[juf_gdbm exists $persistenceDB $k]} {
-    upvar [self callinglevel] $var value
-    set value [juf_gdbm fetch $persistenceDB $k]
-    return 1
-  }
-  return 0
-}
+    Storage=JufGdbm instproc list {} {
+	juf_gdbm list [my set persistenceDB]
+    }
 
-Storage=JufGdbm instproc close args {
-  juf_gdbm close [my set persistenceDB]
-}
+    Storage=JufGdbm instproc fetch {k var} {
+	my instvar persistenceDB
+	if {[juf_gdbm exists $persistenceDB $k]} {
+	    upvar [self callinglevel] $var value
+	    set value [juf_gdbm fetch $persistenceDB $k]
+	    return 1
+	}
+	return 0
+    }
 
-Storage=JufGdbm instproc delete k {
-  juf_gdbm delete [my set persistenceDB] $k
+    Storage=JufGdbm instproc close args {
+	juf_gdbm close [my set persistenceDB]
+    }
+
+    Storage=JufGdbm instproc delete k {
+	juf_gdbm delete [my set persistenceDB] $k
+    }
+
+    namespace export Storage=JufGdbm
 }
+
+namespace import ::xotcl::store::jufgdbm::*
Index: xotcl/library/store/MemStorage.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/store/MemStorage.xotcl	(.../MemStorage.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/store/MemStorage.xotcl	(.../MemStorage.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,93 +1,102 @@
-# $Id: MemStorage.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: MemStorage.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::store::mem 0.84
 package require xotcl::store 0.84
+package require XOTcl
 
-Object xotcl::memStoragePool
-xotcl::memStoragePool proc add {filename} {
-  my set memStores($filename) [Object new -childof [self]]
-}
-xotcl::memStoragePool proc get {filename} {
-  if {[my exists memStores($filename)]} {
-    return [my set memStores($filename)]
+namespace eval ::xotcl::store::mem {
+  namespace import ::xotcl::*
+
+  Object ::xotcl::memStoragePool
+  ::xotcl::memStoragePool proc add {filename} {
+    my set memStores($filename) [Object new -childof [self]]
   }
-  return ""
-}
-xotcl::memStoragePool proc remove {filename} {
-  catch {
-    set store [my set memStores($filename)]
-    $store destroy
-    my unset memStores($filename)
+  ::xotcl::memStoragePool proc get {filename} {
+    if {[my exists memStores($filename)]} {
+      return [my set memStores($filename)]
+    }
+    return ""
   }
-}
+  ::xotcl::memStoragePool proc remove {filename} {
+    catch {
+      set store [my set memStores($filename)]
+      $store destroy
+      my unset memStores($filename)
+    }
+  }
 
-#
-# a class using an XOTcl Object for memory storage
-#the following line worked due to a bug in parameter before...
-#Class Storage=Mem -parameter {{searchID ""}}
-Class Storage=Mem -superclass Storage
-Storage=Mem instproc init args {
-  my instvar searchID
-  ::set searchID ""
-}
-Storage=Mem instproc names  {}   {
-  my instvar store
-  $store array names v
-}
-Storage=Mem instproc exists name {
-  my instvar store
-  $store exists v($name)
-}
-Storage=Mem instproc unset name  {
-  my instvar store
-  $store unset v($name)
-}
-Storage=Mem instproc set args {
-  my instvar store
-  ::set l [llength $args]
-  if {$l == 1} {
-    $store set v([lindex $args 0])
-  } elseif {$l == 2} {
-    $store set v([lindex $args 0]) [lindex $args 1]
-  } else {
-    eval $store set $args
+  #
+  # a class using an XOTcl Object for memory storage
+  Class Storage=Mem -superclass Storage
+  Storage=Mem instproc init args {
+    my instvar searchID
+    ::set searchID ""
   }
-}
-Storage=Mem instproc close {} {
-  my instvar store
-  ::unset store
-}
-Storage=Mem instproc open filename {
-  my instvar store
-  if {[::set store [xotcl::memStoragePool get $filename]] == ""} {
-    ::set store [xotcl::memStoragePool add $filename]
+  Storage=Mem instproc names  {}   {
+    my instvar store
+    $store array names v
   }
-}
-Storage=Mem instproc firstkey {} {
-  my instvar store
-  $store instvar v
-  my instvar searchID
-  if {$searchID != ""} {
-    array donesearch v $searchID
+  Storage=Mem instproc exists name {
+    my instvar store
+    $store exists v($name)
   }
-  ::set searchID [array startsearch v]
-  return [array nextelement v $searchID]
-}
-Storage=Mem instproc nextkey {} {
-  my instvar store
-  $store instvar v
-  my instvar searchID
-  if {$searchID == ""} {
-    error "[self class]: firstkey was not invoked on storage search"
+  Storage=Mem instproc unset name  {
+    my instvar store
+    $store unset v($name)
   }
-  
-  ::set elt [array nextelement v $searchID]
-  if {$elt == ""} {
-    # if array end is reach search is terminated automatically!!
-    ::set searchID ""
+  Storage=Mem instproc set args {
+    my instvar store
+    ::set l [llength $args]
+    if {$l == 1} {
+      $store set v([lindex $args 0])
+    } elseif {$l == 2} {
+      $store set v([lindex $args 0]) [lindex $args 1]
+    } else {
+      eval $store set $args
+    }
   }
-  return $elt
+  Storage=Mem instproc close {} {
+    my instvar store
+    ::unset store
+  }
+  Storage=Mem instproc open filename {
+    my instvar store
+    if {[::set store [::xotcl::memStoragePool get $filename]] == ""} {
+      ::set store [::xotcl::memStoragePool add $filename]
+    }
+  }
+  Storage=Mem instproc firstkey {} {
+    my instvar store
+    $store instvar v
+    my instvar searchID
+    if {$searchID != ""} {
+      array donesearch v $searchID
+    }
+    ::set searchID [array startsearch v]
+    return [array nextelement v $searchID]
+  }
+  Storage=Mem instproc nextkey {} {
+    my instvar store
+    $store instvar v
+    my instvar searchID
+    if {$searchID == ""} {
+      error "[self class]: firstkey was not invoked on storage search"
+    }
+    
+    ::set elt [array nextelement v $searchID]
+    if {$elt == ""} {
+      # if array end is reach search is terminated automatically!!
+      ::set searchID ""
+    }
+    return $elt
+  }
+
+  ### warum geht eigentlich folgendes nicht:
+  ##  Object o; o set a::b::c 1
+  ### dann koennte man sich das set und exists schenken...
+
+  namespace export Storage=Mem
 }
 
-### warum geht eigentlich folgendes nicht:
-##  Object o; o set a::b::c 1
-### dann koennte man sich das set und exists schenken...
+namespace import ::xotcl::store::mem::*
+#namespace eval ::xotcl {namespace import ::xotcl::store::mem::*}
Index: xotcl/library/store/Persistence.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/store/Persistence.xotcl	(.../Persistence.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/store/Persistence.xotcl	(.../Persistence.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,355 +1,365 @@
-# $Id: Persistence.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: Persistence.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::store::persistence 0.8
 
 package require xotcl::trace
 package require xotcl::package
 package require xotcl::mixinStrategy
 package require xotcl::store
+package require XOTcl
 
-@ @File {
-  description {
-    Persistent store for XOTcl objects with Eager and Lazy persistence.
-    Take a look at "persistenceExample.xotcl" for exmaple of usage.
-  }
-}
+namespace eval ::xotcl::store::persistence {
+    namespace import ::xotcl::*
 
-@ Class PersistenceMgr {
-  description {
-    A persistent store requires a persistent manager. The persistent
-    manager implements the Storage interface via storage mixin. With 
-    the parameter "dbPackage" we can specify which storage will be used.
-    The persistent manager than tries to load the package 
-    "xotcl::${dbPackage}Storage". Default is Sdbm.
+    @ @File {
+	description {
+	    Persistent store for XOTcl objects with Eager and Lazy persistence.
+	    Take a look at "persistenceExample.xotcl" for exmaple of usage.
+	}
+    }
 
-    Example:
-    <@pre>
-    PersistenceMgr pmgr -persistenceDir . -persistenceFile example-db
-    </@pre>
+    @ Class PersistenceMgr {
+	description {
+	    A persistent store requires a persistent manager. The persistent
+	    manager implements the Storage interface via storage mixin. With 
+	    the parameter "dbPackage" we can specify which storage will be used.
+	    The persistent manager than tries to load the package 
+	    "xotcl::${dbPackage}Storage". Default is Sdbm.
 
-  }
-}
+	    Example:
+	    <@pre>
+	    PersistenceMgr pmgr -persistenceDir . -persistenceFile example-db
+	    </@pre>
 
-#
-# base class for persistent managers -- just register corresponding 
-# storage mixin and open DB
-#
-Class PersistenceMgr -parameter {
-  {fileName {[string trimleft [self] :]}}
-  {dbPackage Sdbm}
-  trace
-  dirName
-}
+	}
+    }
 
-PersistenceMgr instproc init args {
-  my instvar dbPackage
-  package require xotcl::store::[string tolower $dbPackage]
+    #
+    # base class for persistent managers -- just register corresponding 
+    # storage mixin and open DB
+    #
+    Class PersistenceMgr -parameter {
+	{fileName {[string trimleft [self] :]}}
+	{dbPackage Sdbm}
+	trace
+	dirName
+    }
 
-  Storage=$dbPackage [self]::store $args
-  foreach v {dirName fileName} {
-    if {[my exists $v]} {
-      [self]::store $v [my set $v]
+    PersistenceMgr instproc init args {
+	my instvar dbPackage
+	package require xotcl::store::[string tolower $dbPackage]
+
+	Storage=$dbPackage [self]::store $args
+	foreach v {dirName fileName} {
+	    if {[my exists $v]} {
+		[self]::store $v [my set $v]
+	    }
+	}
+
+	if {[my exists trace]} {
+	    [self]::store filter traceFilter
+	}
+	my array set persistentObjs {}
+	next
     }
-  }
+    # delegate methods to the store object
+    PersistenceMgr instproc store args {
+	eval [self]::store $args
+    }
 
-  if {[my exists trace]} {
-    [self]::store filter traceFilter
-  }
-  my array set persistentObjs {}
-  next
-}
-# delegate methods to the store object
-PersistenceMgr instproc store args {
-  eval [self]::store $args
-}
 
+    PersistenceMgr instproc destroy args {
+	foreach obj [my array names persistentObjs] {
+	    $obj storeall
+	    $obj persistenceMgr ""
+	}
+	[self]::store close
+	next
+    }
+    PersistenceMgr instproc assureOpenDb {} {
+	if {![my exists dbOpen]} {
+	    [self]::store dbOpen
+	    my set dbOpen 1
+	}
+    }
+    PersistenceMgr instproc addPersistentObj {obj} {
+	my set persistentObjs($obj) ""
+    }
+    PersistenceMgr instproc removePersistentObj {obj} {
+	if {[my exists persistentObjs($obj)]} {
+	    my unset persistentObjs($obj)
+	}
+    }
 
-PersistenceMgr instproc destroy args {
-  foreach obj [my array names persistentObjs] {
-    $obj storeall
-    $obj persistenceMgr ""
-  }
-  [self]::store close
-  next
-}
-PersistenceMgr instproc assureOpenDb {} {
-  if {![my exists dbOpen]} {
-    [self]::store dbOpen
-    my set dbOpen 1
-  }
-}
-PersistenceMgr instproc addPersistentObj {obj} {
-  my set persistentObjs($obj) ""
-}
-PersistenceMgr instproc removePersistentObj {obj} {
-  if {[my exists persistentObjs($obj)]} {
-    my unset persistentObjs($obj)
-  }
-}
+    @ Class Persistent {
+	description {
+	    Superclass or mixin class for all persistent objects. Normally
+	    subclasses are used as mixins or instmixins on object, like:
+	    <@pre>
+	    o mixin Persistent=Eager
+	    p mixin Persistent=Lazy
+	    </@pre>
+	}
+    }
+    #
+    # Persistence (mixin) classes#
+    Class Persistent -parameter {
+	persistenceMgr
+    }
 
-@ Class Persistent {
-  description {
-    Superclass or mixin class for all persistent objects. Normally
-    subclasses are used as mixins or instmixins on object, like:
-    <@pre>
-      o mixin Persistent=Eager
-      p mixin Persistent=Lazy
-    </@pre>
-  }
-}
-#
-# Persistence (mixin) classes#
-Class Persistent -parameter {
-  persistenceMgr
-}
+    # can be overloaded by subclasses, that need a cleanup on 
+    # persistenceMgr->destroy (like Lazy)
+    Persistent instproc storeall {} {;}
 
-# can be overloaded by subclasses, that need a cleanup on 
-# persistenceMgr->destroy (like Lazy)
-Persistent instproc storeall {} {;}
+    @ Persistent instproc persistenceMgr {args "persistent manager name"} {
+	description {
+	    Specify which persistence manager to use for [self] object, like:
+	    <@pre>
+	    o persistenceMgr pmgr
+	    </@pre>
+	    Each persistent object must have a persistence manager specified, 
+	    before vars can be made persistent.
+	}
+    }
 
-@ Persistent instproc persistenceMgr {args "persistent manager name"} {
-  description {
-    Specify which persistence manager to use for [self] object, like:
-    <@pre>
-      o persistenceMgr pmgr
-    </@pre>
-    Each persistent object must have a persistence manager specified, 
-    before vars can be made persistent.
-  }
-}
+    #
+    # turn off persistence with ... persistenceMgr "", but 
+    # persistent vars stay persistent
+    #
+    Persistent instproc persistenceMgr args {
+	if {[llength $args] == 0} {
+	    return [my set [self proc]]
+	} elseif {[llength $args] == 1} {
+	    set pmgr [lindex $args 0]
+	    if {$pmgr == "" && [my exists persistenceMgr]} {
+		[my set persistenceMgr] removePersistentObj [self]
+		my unset persistenceMgr
+		return ""
+	    }
+	    $pmgr addPersistentObj [self]
+	    return [my set [self proc] $pmgr]
+	} else {
+	    error "wrong # args: [self] [self proc] ?value?"
+	}
+    }
 
-#
-# turn off persistence with ... persistenceMgr "", but 
-# persistent vars stay persistent
-#
-Persistent instproc persistenceMgr args {
-  if {[llength $args] == 0} {
-    return [my set [self proc]]
-  } elseif {[llength $args] == 1} {
-    set pmgr [lindex $args 0]
-    if {$pmgr == "" && [my exists persistenceMgr]} {
-      [my set persistenceMgr] removePersistentObj [self]
-      my unset persistenceMgr
-      return ""
+    @ Persistent instproc persistentVars {} {
+	description {
+	    Returns list of persistent vars.
+	}
     }
-    $pmgr addPersistentObj [self]
-    return [my set [self proc] $pmgr]
-  } else {
-    error "wrong # args: [self] [self proc] ?value?"
-  }
-}
 
-@ Persistent instproc persistentVars {} {
-  description {
-    Returns list of persistent vars.
-  }
-}
+    Persistent instproc persistentVars {} {
+	if {[my exists __persistentVars]} {
+	    return [my set __persistentVars]
+	}
+	return ""
+    }
 
-Persistent instproc persistentVars {} {
-  if {[my exists __persistentVars]} {
-    return [my set __persistentVars]
-  }
-  return ""
-}
+    @ Persistent instproc persistent {list "persistent variables" } {
+	description {
+	    Make a list of object variables persistent. If a persistent
+	    DB exists, the values are read from this DB, overwriting the current value.
+	    E.g.:
+	    <@pre>
+	    o persistent {x y}
+	    </@pre>
 
-@ Persistent instproc persistent {list "persistent variables" } {
-  description {
-    Make a list of object variables persistent. If a persistent
-    DB exists, the values are read from this DB, overwriting the current value.
-    E.g.:
-    <@pre>
-     o persistent {x y}
-    </@pre>
+	}
+    }
 
-  }
-}
+    Persistent instproc persistent {list} {
+	my instvar persistenceMgr
+	if {![info exists persistenceMgr]} {return}
+	set store ${persistenceMgr}::store
 
-Persistent instproc persistent {list} {
-  my instvar persistenceMgr
-  if {![info exists persistenceMgr]} {return}
-  set store ${persistenceMgr}::store
+	$persistenceMgr assureOpenDb
+	foreach var $list {
+	    my lappend __persistentVars $var
+	    # try to refetch vars from db
+	    if {[$store exists [self]::${var}(_____arraynames)]} {
+		#puts stderr array=[self]::${var}
+		foreach i [$store set [self]::${var}(_____arraynames)]  {
+		    my set ${var}($i) [$store set [self]::${var}($i)]
+		}
+	    } elseif {[$store exists [self]::$var]} {
+		#puts stderr "---store=$store exists [self]::$var"
+		#puts stderr "---set [self]::$var <[$store set [self]::$var]>"
+		my instvar $var
+		#set name [$store set [self]::$var]
+		#puts ***name*[set name]--$var
+		set $var [$store set [self]::$var]
+	    } elseif {[my exists $var]} {
+		#
+		# first store of the variable in persistent store
+		if {[my array exists $var]} {
+		    # this variable is an array
+		    #puts stderr array=[self]::$var
+		    set anames [my array names $var]
+		    foreach n $anames {
+			$store set [self]::${var}($n) [my set ${var}($n)]
+		    }
+		    $store set [self]::${var}(_____arraynames) $anames
+		} else {
+		    #puts stderr "+++set [self]::$var [$store set [self]::$var]"
+		    $store set [self]::$var [my set $var]
+		}
+	    } else {
+		error "persistent: $var is not a variable on [self]"
+	    }
+	}
+    }
 
-  $persistenceMgr assureOpenDb
-  foreach var $list {
-    my lappend __persistentVars $var
-    # try to refetch vars from db
-    if {[$store exists [self]::${var}(_____arraynames)]} {
-      #puts stderr array=[self]::${var}
-      foreach i [$store set [self]::${var}(_____arraynames)]  {
-	my set ${var}($i) [$store set [self]::${var}($i)]
-      }
-    } elseif {[$store exists [self]::$var]} {
-      #puts stderr "---store=$store exists [self]::$var"
-      #puts stderr "---set [self]::$var <[$store set [self]::$var]>"
-      my instvar $var
-      #set name [$store set [self]::$var]
-      #puts ***name*[set name]--$var
-      set $var [$store set [self]::$var]
-    } elseif {[my exists $var]} {
-      #
-      # first store of the variable in persistent store
-      if {[my array exists $var]} {
-	# this variable is an array
-	#puts stderr array=[self]::$var
-	set anames [my array names $var]
-	foreach n $anames {
-	  $store set [self]::${var}($n) [my set ${var}($n)]
+    @ Persistent instproc persistent+init {list "persistent variables" } {
+	description {
+	    Initialize all data in the list as empty strings, 
+	    if they do not exist yet, and then make them persistent
+	    using the 'persistent' method
 	}
-	$store set [self]::${var}(_____arraynames) $anames
-      } else {
-	#puts stderr "+++set [self]::$var [$store set [self]::$var]"
-	$store set [self]::$var [my set $var]
-      }
-    } else {
-      error "persistent: $var is not a variable on [self]"
     }
-  }
-}
 
-@ Persistent instproc persistent+init {list "persistent variables" } {
-  description {
-    Initialize all data in the list as empty strings, 
-    if they do not exist yet, and then make them persistent
-    using the 'persistent' method
-  }
-}
-
-Persistent instproc persistent+init {list} {  
-  foreach pd $list {
-    if {![my exists $pd]} {
-      my set $pd ""
+    Persistent instproc persistent+init {list} {  
+	foreach pd $list {
+	    if {![my exists $pd]} {
+		my set $pd ""
+	    }
+	}
+	my persistent $list
     }
-  }
-  my persistent $list
-}
 
 
-@ Persistent instproc unPersistent {list "persistent variables" } {
-  description {
-    Make a list of object variables not persistent. 
-  }
-}
+    @ Persistent instproc unPersistent {list "persistent variables" } {
+	description {
+	    Make a list of object variables not persistent. 
+	}
+    }
 
-Persistent instproc unPersistent {list} {
-  my instvar __persistentVars
-  set pMgr [my set persistenceMgr]
-  foreach v $list {
-    set i [lsearch -exact $__persistentVars $v]
-    catch {
-      set __persistentVars [lreplace $__persistentVars $i $i]
-      ${pMgr}::store unset [self]::$v
+    Persistent instproc unPersistent {list} {
+	my instvar __persistentVars
+	set pMgr [my set persistenceMgr]
+	foreach v $list {
+	    set i [lsearch -exact $__persistentVars $v]
+	    catch {
+		set __persistentVars [lreplace $__persistentVars $i $i]
+		${pMgr}::store unset [self]::$v
+	    }
+	}
     }
-  }
-}
 
-@ Persistent instproc makeVarScript {} {
-  description {
-    Build a Tcl script of "set ..." statements reflecting the current situation in the database.
-  }
-}
-Persistent instproc makeVarScript {} {
-  set script ""
-  foreach v [my persistentVars] {
-    set vt [namespace tail $v]
-    append script [list my set $vt [my set $vt]]\n
-  }
-  #set script [concat [next] $script]
-  return $script
-}
+    @ Persistent instproc makeVarScript {} {
+	description {
+	    Build a Tcl script of "set ..." statements reflecting the current situation in the database.
+	}
+    }
+    Persistent instproc makeVarScript {} {
+	set script ""
+	foreach v [my persistentVars] {
+	    set vt [namespace tail $v]
+	    append script [list my set $vt [my set $vt]]\n
+	}
+	#set script [concat [next] $script]
+	return $script
+    }
 
-Persistent instproc destroy args {
-  if {[my exists persistenceMgr]} {
-    [my set persistenceMgr] removePersistentObj [self]
-    my unset persistenceMgr
-  }
-  next
-  #my showMsg "Persistent object [self] destroyed."
-}
+    Persistent instproc destroy args {
+	if {[my exists persistenceMgr]} {
+	    [my set persistenceMgr] removePersistentObj [self]
+	    my unset persistenceMgr
+	}
+	next
+	#my showMsg "Persistent object [self] destroyed."
+    }
 
-@ Class Persistent=Eager {
-  description {
-    Eager persistence strategy. Store everything at the same moment to the database
-  }
-}
-Class Persistent=Eager -superclass Persistent
+    @ Class Persistent=Eager {
+	description {
+	    Eager persistence strategy. Store everything at the same moment to the database
+	}
+    }
+    Class Persistent=Eager -superclass Persistent
 
-#
-# we use 'strange' argument names to avoid name clashes with given 
-# variable names, when we have to instvar "[self] instvar $nametail"
-#
-Persistent=Eager instproc vartrace {__name_vartrace __sub_vartrace __op_vartrace} {
-  #my showCall
-  if {$__op_vartrace == "w"} {
-    my instvar persistenceMgr
-    if {![info exists persistenceMgr]} {return}
-    set store ${persistenceMgr}::store
+    #
+    # we use 'strange' argument names to avoid name clashes with given 
+    # variable names, when we have to instvar "[self] instvar $nametail"
+    #
+    Persistent=Eager instproc vartrace {__name_vartrace __sub_vartrace __op_vartrace} {
+	#my showCall
+	if {$__op_vartrace == "w"} {
+	    my instvar persistenceMgr
+	    if {![info exists persistenceMgr]} {return}
+	    set store ${persistenceMgr}::store
 
-    set nametail [namespace tail $__name_vartrace]
-    set key [self]::$nametail
-    if {$__sub_vartrace == ""} {
-      my instvar $nametail
-      #puts stderr "+++VT: $store set $key [set $nametail]"
-      $store set $key [set $nametail]
-    } else {
-      if {$__sub_vartrace != "_____arraynames"} {
-	my instvar "${nametail}($__sub_vartrace) subname"
-	$store set ${key}($__sub_vartrace) $subname
-	$store set ${key}(_____arraynames) [my array names $nametail]
-      } else {
-	error "With persistent arrays you may not use '_____arraynames' as index"
-      }
+	    set nametail [namespace tail $__name_vartrace]
+	    set key [self]::$nametail
+	    if {$__sub_vartrace == ""} {
+		my instvar $nametail
+		#puts stderr "+++VT: $store set $key [set $nametail]"
+		$store set $key [set $nametail]
+	    } else {
+		if {$__sub_vartrace != "_____arraynames"} {
+		    my instvar "${nametail}($__sub_vartrace) subname"
+		    $store set ${key}($__sub_vartrace) $subname
+		    $store set ${key}(_____arraynames) [my array names $nametail]
+		} else {
+		    error "With persistent arrays you may not use '_____arraynames' as index"
+		}
+	    }
+	}
     }
-  }
-}
 
-Persistent=Eager instproc persistent {list} {
-  #my showCall
-  next
-  foreach v $list {
-    #puts stderr "***trace variable [self]::$v w [list my vartrace]"
-    my trace variable $v w [list [self] vartrace]
-  }
-}
+    Persistent=Eager instproc persistent {list} {
+	#my showCall
+	next
+	foreach v $list {
+	    #puts stderr "***trace variable [self]::$v w [list my vartrace]"
+	    my trace variable $v w [list [self] vartrace]
+	}
+    }
 
-Persistent=Eager instproc unPersistent {list} {
-  foreach v $list {
-    my trace vdelete $v w [list [self] vartrace]
-  }
-  next
-}
+    Persistent=Eager instproc unPersistent {list} {
+	foreach v $list {
+	    my trace vdelete $v w [list [self] vartrace]
+	}
+	next
+    }
 
-@ Class Persistent=Lazy {
-  description {
-    Lazy persistence strategy. Store everything on object destroy (or program termination.
-  }
-}
+    @ Class Persistent=Lazy {
+	description {
+	    Lazy persistence strategy. Store everything on object destroy (or program termination).
+	}
+    }
 
-Class Persistent=Lazy -superclass Persistent
-Persistent=Lazy instproc storeall {} {
-  my instvar persistenceMgr
-  if {![info exists persistenceMgr]} {return}
-  set store ${persistenceMgr}::store
+    Class Persistent=Lazy -superclass Persistent
+    Persistent=Lazy instproc storeall {} {
+	my instvar persistenceMgr
+	if {![info exists persistenceMgr]} {return}
+	set store ${persistenceMgr}::store
 
-  foreach v [my persistentVars] {
-    if {[my array exists $v]} {
-      set anames ""
-      foreach sub [my array names $v] {
-        if {[my exists ${v}($sub)]} {
-          set key [self]::${v}($sub)
-          $store set $key [my set ${v}($sub)]
-	  lappend anames $sub
-        }
-      }
-      $store set [self]::${v}(_____arraynames) $anames
-    } else {
-      if {[my exists $v]} {
-        set key [self]::$v
-        $store set $key [my set $v]
-      }
+	foreach v [my persistentVars] {
+	    if {[my array exists $v]} {
+		set anames ""
+		foreach sub [my array names $v] {
+		    if {[my exists ${v}($sub)]} {
+			set key [self]::${v}($sub)
+			$store set $key [my set ${v}($sub)]
+			lappend anames $sub
+		    }
+		}
+		$store set [self]::${v}(_____arraynames) $anames
+	    } else {
+		if {[my exists $v]} {
+		    set key [self]::$v
+		    $store set $key [my set $v]
+		}
+	    }
+	}
     }
-  }
-}
 
-Persistent=Lazy instproc destroy args {
-  my storeall
-  next
+    Persistent=Lazy instproc destroy args {
+	my storeall
+	next
+    }
+
+    namespace export PersistenceMgr Persistent Persistent=Eager Persistent=Lazy
 }
+
+namespace import ::xotcl::store::persistence::*
Index: xotcl/library/store/Storage.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/store/Storage.xotcl	(.../Storage.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/store/Storage.xotcl	(.../Storage.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,165 +1,175 @@
-# $Id: Storage.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: Storage.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::store 0.84
+package require XOTcl
 
-@ @File {
-  description {
-    Simple generic storage interface for hashtable-like (persistent)
-    storages. There are several different existing stores, including
-    a memory storage, a GDBM storage, a SDBM storage, and a 
-    TextFile storage.  
-  }
-  date { $Date: 2004/05/23 22:50:39 $ }
-}
+namespace eval ::xotcl::store {
+    namespace import ::xotcl::*
 
-#
-# abstract interface for storage access
-#
-@ Class Storage {
-  description {
-    Abstract storage interface class (superclass of all storages).
-  }
-}
-Class Storage -parameter {{dirName .} fileName}
+    @ @File {
+	description {
+	    Simple generic storage interface for hashtable-like (persistent)
+	    storages. There are several different existing stores, including
+	    a memory storage, a GDBM storage, a SDBM storage, and a 
+	    TextFile storage.  
+	}
+	date { $Date: 2005/09/09 21:07:23 $ }
+    }
 
-###
-@ Storage instproc open {
-  filename "database filename (or filename base, if more 
+    #
+    # abstract interface for storage access
+    #
+    @ Class Storage {
+	description {
+	    Abstract storage interface class (superclass of all storages).
+	}
+    }
+    Class Storage -parameter {{dirName .} fileName}
+
+    ###
+    @ Storage instproc open {
+	filename "database filename (or filename base, if more 
             than one file has to be created)"
-} {
-  Description {
-    Each storage object represents exactly one database table. The db
-    has to be opened, before it can it used. If it is not opened all
-    other methods return errors.
-  }
-  return "empty string"
-}
-Storage abstract instproc open filename
+    } {
+	Description {
+	    Each storage object represents exactly one database table. The db
+	    has to be opened, before it can it used. If it is not opened all
+	    other methods return errors.
+	}
+	return "empty string"
+    }
+    Storage abstract instproc open filename
 
-###
-@ Storage instproc close {} {
-  Description {
-    Close associated database.
-  }
-  return "empty string"
-}
-Storage abstract instproc close {}
+    ###
+    @ Storage instproc close {} {
+	Description {
+	    Close associated database.
+	}
+	return "empty string"
+    }
+    Storage abstract instproc close {}
 
-###
-@ Storage instproc exists {
-  key {Key to be searched for.}
-} {
-  Description {
-    Search for a key whether it exists or not.
-  }
-  return {1, if key exists in the database, otherwise 0}
-}
-Storage abstract instproc exists key
+    ###
+    @ Storage instproc exists {
+	key {Key to be searched for.}
+    } {
+	Description {
+	    Search for a key whether it exists or not.
+	}
+	return {1, if key exists in the database, otherwise 0}
+    }
+    Storage abstract instproc exists key
 
-###
-@ Storage instproc set {
-  key {Key to be set.}
-  ?value? {Optional value that might be set}
-} {
-  Description {
-    Set or query a database key in the same way as Tcl's set functions.
-  }
-  return {Key value.}
-}
-Storage abstract instproc set {key ?value?}
+    ###
+    @ Storage instproc set {
+	key {Key to be set.}
+	?value? {Optional value that might be set}
+    } {
+	Description {
+	    Set or query a database key in the same way as Tcl's set functions.
+	}
+	return {Key value.}
+    }
+    Storage abstract instproc set {key ?value?}
 
-###
-@ Storage instproc unset {
-  key {Key to be unset.}
-} {
-  Description {
-    Unset a database key in the same way as Tcl's unset functions.
-  }
-  return {empty string}
-}
-Storage abstract instproc unset key
+    ###
+    @ Storage instproc unset {
+	key {Key to be unset.}
+    } {
+	Description {
+	    Unset a database key in the same way as Tcl's unset functions.
+	}
+	return {empty string}
+    }
+    Storage abstract instproc unset key
 
-###
-@ Storage instproc names {} {
-  Description {
-    Return a list of keys in the database (functions in the same 
-    way as Tcl's array names)
-  }
-  return {List of keys in the db.}
-}
-Storage abstract instproc names {}
+    ###
+    @ Storage instproc names {} {
+	Description {
+	    Return a list of keys in the database (functions in the same 
+						   way as Tcl's array names)
+	}
+	return {List of keys in the db.}
+    }
+    Storage abstract instproc names {}
 
-###
-@ Storage instproc firstkey {} {
-  Description {
-    Start a traversal of the database, starting with any key.
-  }
-  return {Name of first key.}
-}
-Storage abstract instproc firstkey {}
+    ###
+    @ Storage instproc firstkey {} {
+	Description {
+	    Start a traversal of the database, starting with any key.
+	}
+	return {Name of first key.}
+    }
+    Storage abstract instproc firstkey {}
 
-###
-@ Storage instproc nextkey {} {
-  Description {
-    Proceed with the db traversal. Requires a firstkey before
-    first usage, otherwise it returns an error.
-  }
-  return {Name of next key, if one exists. Otherwise an empty string is returned.}
-}
-Storage abstract instproc nextkey {}
+    ###
+    @ Storage instproc nextkey {} {
+	Description {
+	    Proceed with the db traversal. Requires a firstkey before
+	    first usage, otherwise it returns an error.
+	}
+	return {Name of next key, if one exists. Otherwise an empty string is returned.}
+    }
+    Storage abstract instproc nextkey {}
 
-Storage instproc traceFilter args {
-  set context "[self callingclass]->[self callingproc]"
-  set method [self calledproc]
-  set dargs $args 
-  puts "CALL $context>  [self]->$method $dargs"
-  set result [next]
-  puts "EXIT $context>  [self]->$method ($result)"
-  return $result
-}
+    Storage instproc traceFilter args {
+	set context "[self callingclass]->[self callingproc]"
+	set method [self calledproc]
+	set dargs $args 
+	puts "CALL $context>  [self]->$method $dargs"
+	set result [next]
+	puts "EXIT $context>  [self]->$method ($result)"
+	return $result
+    }
 
-###
-@ Storage proc someNewChildStore {} {
-  Description {
-    Create a childStore according to a preference list depending on
-    which storages are available. Currently the preference list has
-    the following order: Gdbm, Sdbm and TextFile.
-  }
-  return {name of the created storage object.}
-}
-Storage proc someNewChildStore {} {
-  foreach store {Gdbm Sdbm TextFile} {
-    if {![catch {package require xotcl::store::[string tolower $store]}]} {
-      set s [Storage=$store new -childof [self]]
-      break
+    ###
+    @ Storage proc someNewChildStore {} {
+	Description {
+	    Create a childStore according to a preference list depending on
+	    which storages are available. Currently the preference list has
+	    the following order: Gdbm, Sdbm and TextFile.
+	}
+	return {name of the created storage object.}
     }
-  }
-  return $s
-}
+    Storage proc someNewChildStore {} {
+	foreach store {Gdbm Sdbm TextFile} {
+	    if {![catch {package require xotcl::store::[string tolower $store]}]} {
+		set s [Storage=$store new -childof [self]]
+		break
+	    }
+	}
+	return $s
+    }
 
-Storage instproc checkDir {} {
-  my instvar dirName
-  if {[info exists dirName]} {
-    if {![file exists $dirName]} {
-      file mkdir $dirName
-    } elseif {![file isdirectory $dirName]} {
-      error "specified directory $dirName is no directory!"
+    Storage instproc checkDir {} {
+	my instvar dirName
+	if {[info exists dirName]} {
+	    if {![file exists $dirName]} {
+		file mkdir $dirName
+	    } elseif {![file isdirectory $dirName]} {
+		error "specified directory $dirName is no directory!"
+	    }
+	}
     }
-  }
-}
-Storage instproc mkFileName {} {
-  my instvar dirName fileName
-  if {[info exists dirName]} {
-    return [file join $dirName $fileName]
-  } else {
-    return $fileName
-  }
-}
-Storage instproc dbOpen {} {
-  my checkDir
-  my open [my mkFileName]
-}
+    Storage instproc mkFileName {} {
+	my instvar dirName fileName
+	if {[info exists dirName]} {
+	    return [file join $dirName $fileName]
+	} else {
+	    return $fileName
+	}
+    }
+    Storage instproc dbOpen {} {
+	my checkDir
+	my open [my mkFileName]
+    }
 
 
-Storage proc defaultPackage {} {
-  return Sdbm
+    Storage proc defaultPackage {} {
+	return Sdbm
+    }
+
+    namespace export Storage
 }
+
+namespace import ::xotcl::store::*
Index: xotcl/library/store/TclGdbmStorage.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/store/TclGdbmStorage.xotcl	(.../TclGdbmStorage.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/store/TclGdbmStorage.xotcl	(.../TclGdbmStorage.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,51 +1,61 @@
-# $Id: TclGdbmStorage.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: TclGdbmStorage.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::store::tclgdbm 0.84
 
 package require xotcl::store::gdbm
 package require xotcl::store
+package require XOTcl
 
-#
-# a simple GNU Gdbm DB Store Access based on TclGdbm
-#
-Class Storage=TclGdbm -superclass Storage
-Storage=TclGdbm instproc open f {
-  my instvar persistenceDB
-  ::set persistenceDB [gdbm_open -wrcreat $f]
-}
+namespace eval ::xotcl::store::tclgdbm {
+    namespace import ::xotcl::*
 
-Storage=TclGdbm instproc set args {
-  my instvar persistenceDB
-  ::set l [llength $args]
-  if {$l == 1} {[::set persistenceDB] fetch [lindex $args 0]
-  } elseif {$l == 2} {[::set persistenceDB] -replace store \
-	   [lindex $args 0] [lindex $args 1]
-  } else { next }
-}
+    #
+    # a simple GNU Gdbm DB Store Access based on TclGdbm
+    #
+    Class Storage=TclGdbm -superclass Storage
+    Storage=TclGdbm instproc open f {
+	my instvar persistenceDB
+	::set persistenceDB [gdbm_open -wrcreat $f]
+    }
 
-Storage=TclGdbm instproc exists k {
-  my instvar persistenceDB
-  $persistenceDB exists $k
-}
+    Storage=TclGdbm instproc set args {
+	my instvar persistenceDB
+	::set l [llength $args]
+	if {$l == 1} {[::set persistenceDB] fetch [lindex $args 0]
+	} elseif {$l == 2} {[::set persistenceDB] -replace store \
+				[lindex $args 0] [lindex $args 1]
+	} else { next }
+    }
 
-Storage=TclGdbm instproc names {} {
-  my instvar persistenceDB
-  ::set list ""
-  if {[::set key [$persistenceDB firstkey]] != ""} {
-    lappend list $key
-    while {[::set key [$persistenceDB nextkey $key]] != ""} {
-      lappend list $key
+    Storage=TclGdbm instproc exists k {
+	my instvar persistenceDB
+	$persistenceDB exists $k
     }
-  }
-  return $list
-}
 
+    Storage=TclGdbm instproc names {} {
+	my instvar persistenceDB
+	::set list ""
+	if {[::set key [$persistenceDB firstkey]] != ""} {
+	    lappend list $key
+	    while {[::set key [$persistenceDB nextkey $key]] != ""} {
+		lappend list $key
+	    }
+	}
+	return $list
+    }
 
-Storage=TclGdbm instproc close args {
-  my instvar persistenceDB
-  $persistenceDB close
-}
 
-Storage=TclGdbm instproc unset k {
-  my instvar persistenceDB
-  $persistenceDB delete $k
+    Storage=TclGdbm instproc close args {
+	my instvar persistenceDB
+	$persistenceDB close
+    }
+
+    Storage=TclGdbm instproc unset k {
+	my instvar persistenceDB
+	$persistenceDB delete $k
+    }
+
+    namespace export Storage=TclGdbm
 }
+
+namespace import ::xotcl::store::tclgdbm::*
Index: xotcl/library/store/XOTclGdbm/Makefile
===================================================================
diff -u -rf733c5df1b1a91a473d0e361ff206deaa4ecfa0a -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/store/XOTclGdbm/Makefile	(.../Makefile)	(revision f733c5df1b1a91a473d0e361ff206deaa4ecfa0a)
+++ xotcl/library/store/XOTclGdbm/Makefile	(.../Makefile)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -12,7 +12,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: Makefile,v 1.21 2004/11/27 21:10:33 neumann Exp $
+# RCS: @(#) $Id: Makefile,v 1.22 2005/09/09 21:07:23 neumann Exp $
 
 #========================================================================
 # Add additional lines to handle any additional AC_SUBST cases that
@@ -59,7 +59,7 @@
 # configuration options) composed of the named objects.
 #========================================================================
 
-PKG_LIB_FILE	= libxotclgdbm1.2.so
+PKG_LIB_FILE	= libxotclgdbm1.2.dylib
 PKG_STUB_LIB_FILE = libxotclgdbmstub1.2.a
 
 lib_BINARIES	= $(PKG_LIB_FILE)
@@ -68,8 +68,8 @@
 SHELL		= /bin/sh
 
 srcdir		= .
-prefix		= /usr
-exec_prefix	= /usr
+prefix		= /usr/local
+exec_prefix	= /usr/local
 
 bindir		= ${exec_prefix}/bin
 libdir		= ${exec_prefix}/lib
@@ -94,26 +94,26 @@
 PACKAGE_NAME	= xotclgdbm
 PACKAGE_VERSION	= 1.2
 CC		= gcc -pipe
-CFLAGS_DEFAULT	= -O
+CFLAGS_DEFAULT	= -O3
 CFLAGS_WARNING	= -Wall -Wconversion -Wno-implicit-int
 CLEANFILES	= pkgIndex.tcl
 EXEEXT		= 
-LDFLAGS_DEFAULT	= -rdynamic
+LDFLAGS_DEFAULT	= -prebind
 MAKE_LIB	= ${SHLIB_LD} -o $@ $(PKG_OBJECTS) ${SHLIB_LD_FLAGS} ${SHLIB_LD_LIBS} 
 MAKE_SHARED_LIB	= ${SHLIB_LD} -o $@ $(PKG_OBJECTS) ${SHLIB_LD_FLAGS} ${SHLIB_LD_LIBS}
 MAKE_STATIC_LIB	= ${STLIB_LD} $@ $(PKG_OBJECTS)
 MAKE_STUB_LIB	= ${STLIB_LD} $@ $(PKG_STUB_OBJECTS)
 OBJEXT		= o
 RANLIB		= :
 RANLIB_STUB	= ranlib
-SHLIB_CFLAGS	= -fPIC
-SHLIB_LD	= gcc -pipe -shared
+SHLIB_CFLAGS	= -fno-common
+SHLIB_LD	= cc -dynamiclib ${LDFLAGS}
 SHLIB_LD_FLAGS	= 
-SHLIB_LD_LIBS	= ${LIBS} -L/usr/lib -ltclstub8.4
+SHLIB_LD_LIBS	= ${LIBS} -L/usr/local/lib -ltclstub8.4
 STLIB_LD	= ${AR} cr
-TCL_DEFS	=  -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_ATFORK=1 -DHAVE_READDIR_R=1 -DPEEK_XCLOSEIM=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_SYS_IOCTL_H=1 
-TCL_BIN_DIR	= /usr/lib
-TCL_SRC_DIR	= /home/neumann/import/tcl8.4.7
+TCL_DEFS	=  -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DTCL_WIDE_INT_TYPE=long\ long -DWORDS_BIGENDIAN=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DNO_VALUES_H=1 -DNO_DLFCN_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -Dsocklen_t=unsigned -DHAVE_SIGNED_CHAR=1 -DHAVE_PUTENV_THAT_COPIES=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1 
+TCL_BIN_DIR	= /usr/local/lib
+TCL_SRC_DIR	= /Volumes/MacOS/Users/jago/tcl8.4.4
 # This is necessary for packages that use private Tcl headers
 #TCL_TOP_DIR_NATIVE	= @TCL_TOP_DIR_NATIVE@
 # Not used, but retained for reference of what libs Tcl required
@@ -128,29 +128,29 @@
 
 EXTRA_PATH	= $(top_builddir):$(TCL_BIN_DIR)
 TCLSH_ENV	= TCL_LIBRARY=`echo $(TCL_SRC_DIR)/library` \
-		  LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \
+		  DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \
 		  PATH="$(EXTRA_PATH):$(PATH)" \
 		  TCLLIBPATH="$(top_builddir)"
-TCLSH_PROG	= /usr/lib/../bin/tclsh8.4
+TCLSH_PROG	= /usr/bin/tclsh8.4.4
 TCLSH		= $(TCLSH_ENV) $(TCLSH_PROG)
 SHARED_BUILD	= 1
 
-INCLUDES	=  -I./generic -I"/usr/include"
+INCLUDES	=  -I/Users/neumann/src/xotcl-1.3.7/generic -I./generic -I/sw/include/ -I"/usr/include"
 
-EXTRA_CFLAGS	=   
+EXTRA_CFLAGS	= -arch ppc -pipe  
 
 # TCL_DEFS is not strictly need here, but if you remove it, then you
 # must make sure that configure.in checks for the necessary components
 # that your library may use.  TCL_DEFS can actually be a problem if
 # you do not compile with a similar machine setup as the Tcl core was
 # compiled with.
-#DEFS		= $(TCL_DEFS) -DPACKAGE_NAME=\"xotclgdbm\" -DPACKAGE_TARNAME=\"xotclgdbm\" -DPACKAGE_VERSION=\"1.2\" -DPACKAGE_STRING=\"xotclgdbm\ 1.2\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1  $(EXTRA_CFLAGS)
-DEFS		= -DPACKAGE_NAME=\"xotclgdbm\" -DPACKAGE_TARNAME=\"xotclgdbm\" -DPACKAGE_VERSION=\"1.2\" -DPACKAGE_STRING=\"xotclgdbm\ 1.2\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1  $(EXTRA_CFLAGS)
+#DEFS		= $(TCL_DEFS) -DPACKAGE_NAME=\"xotclgdbm\" -DPACKAGE_TARNAME=\"xotclgdbm\" -DPACKAGE_VERSION=\"1.2\" -DPACKAGE_STRING=\"xotclgdbm\ 1.2\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DTCL_WIDE_INT_TYPE=long\ long -DWORDS_BIGENDIAN=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1  $(EXTRA_CFLAGS)
+DEFS		= -DPACKAGE_NAME=\"xotclgdbm\" -DPACKAGE_TARNAME=\"xotclgdbm\" -DPACKAGE_VERSION=\"1.2\" -DPACKAGE_STRING=\"xotclgdbm\ 1.2\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DTCL_WIDE_INT_TYPE=long\ long -DWORDS_BIGENDIAN=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1  $(EXTRA_CFLAGS)
 
 CONFIG_CLEAN_FILES = Makefile
 
 CPPFLAGS	= 
-LIBS		=  -L/home/neumann/xotcl-1.3.3 -lxotclstub1.3.3 -lgdbm 
+LIBS		=  -L/Users/neumann/src/xotcl-1.3.7 -lxotclstub1.3.7 -L/Users/neumann/src/xotcl-1.3.7 -lxotcl1.3.7 -L/sw/lib/ -lgdbm 
 AR		= ar
 CFLAGS		=  ${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS}
 COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
Index: xotcl/library/store/XOTclGdbm/configure.in
===================================================================
diff -u -r0896d4deb00780e48b5b03269bf9c4ecca948919 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/store/XOTclGdbm/configure.in	(.../configure.in)	(revision 0896d4deb00780e48b5b03269bf9c4ecca948919)
+++ xotcl/library/store/XOTclGdbm/configure.in	(.../configure.in)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -3,7 +3,7 @@
 dnl	generate the file "configure", which is run during Tcl installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.7 2005/01/06 03:10:05 neumann Exp $
+# RCS: @(#) $Id: configure.in,v 1.8 2005/09/09 21:07:23 neumann Exp $
 
 #-----------------------------------------------------------------------
 # Sample configure.in for Tcl Extensions.  The only places you should
@@ -127,8 +127,8 @@
 
 TEA_ADD_SOURCES([xotclgdbm.c])
 TEA_ADD_HEADERS([])
-TEA_ADD_INCLUDES([${XOTCL_BUILD_INCLUDE_SPEC} $GDBM_INC_SPEC])
-TEA_ADD_LIBS([$XOTCL_BUILD_STUB_LIB_SPEC $GDBM_LIB_SPEC -lgdbm])
+TEA_ADD_INCLUDES([-I${with_xotcl}/generic ${XOTCL_BUILD_INCLUDE_SPEC} ${GDBM_INC_SPEC}])
+TEA_ADD_LIBS([$XOTCL_BUILD_STUB_LIB_SPEC $XOTCL_BUILD_LIB_SPEC $GDBM_LIB_SPEC -lgdbm])
 TEA_ADD_CFLAGS([])
 TEA_ADD_STUB_SOURCES([])
 TEA_ADD_TCL_SOURCES([])
@@ -255,3 +255,5 @@
 
 
 
+
+
Index: xotcl/library/store/XOTclSdbm/Makefile
===================================================================
diff -u -rf733c5df1b1a91a473d0e361ff206deaa4ecfa0a -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/store/XOTclSdbm/Makefile	(.../Makefile)	(revision f733c5df1b1a91a473d0e361ff206deaa4ecfa0a)
+++ xotcl/library/store/XOTclSdbm/Makefile	(.../Makefile)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -12,7 +12,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: Makefile,v 1.21 2004/11/27 21:10:33 neumann Exp $
+# RCS: @(#) $Id: Makefile,v 1.22 2005/09/09 21:07:23 neumann Exp $
 
 #========================================================================
 # Add additional lines to handle any additional AC_SUBST cases that
@@ -59,7 +59,7 @@
 # configuration options) composed of the named objects.
 #========================================================================
 
-PKG_LIB_FILE	= libxotclsdbm1.2.so
+PKG_LIB_FILE	= libxotclsdbm1.2.dylib
 PKG_STUB_LIB_FILE = libxotclsdbmstub1.2.a
 
 lib_BINARIES	= $(PKG_LIB_FILE)
@@ -68,8 +68,8 @@
 SHELL		= /bin/sh
 
 srcdir		= .
-prefix		= /usr
-exec_prefix	= /usr
+prefix		= /usr/local
+exec_prefix	= /usr/local
 
 bindir		= ${exec_prefix}/bin
 libdir		= ${exec_prefix}/lib
@@ -94,26 +94,26 @@
 PACKAGE_NAME	= xotclsdbm
 PACKAGE_VERSION	= 1.2
 CC		= gcc -pipe
-CFLAGS_DEFAULT	= -O
+CFLAGS_DEFAULT	= -O3
 CFLAGS_WARNING	= -Wall -Wconversion -Wno-implicit-int
 CLEANFILES	= pkgIndex.tcl
 EXEEXT		= 
-LDFLAGS_DEFAULT	= -rdynamic
+LDFLAGS_DEFAULT	= -prebind
 MAKE_LIB	= ${SHLIB_LD} -o $@ $(PKG_OBJECTS) ${SHLIB_LD_FLAGS} ${SHLIB_LD_LIBS} 
 MAKE_SHARED_LIB	= ${SHLIB_LD} -o $@ $(PKG_OBJECTS) ${SHLIB_LD_FLAGS} ${SHLIB_LD_LIBS}
 MAKE_STATIC_LIB	= ${STLIB_LD} $@ $(PKG_OBJECTS)
 MAKE_STUB_LIB	= ${STLIB_LD} $@ $(PKG_STUB_OBJECTS)
 OBJEXT		= o
 RANLIB		= :
 RANLIB_STUB	= ranlib
-SHLIB_CFLAGS	= -fPIC
-SHLIB_LD	= gcc -pipe -shared
+SHLIB_CFLAGS	= -fno-common
+SHLIB_LD	= cc -dynamiclib ${LDFLAGS}
 SHLIB_LD_FLAGS	= 
-SHLIB_LD_LIBS	= ${LIBS} -L/usr/lib -ltclstub8.4
+SHLIB_LD_LIBS	= ${LIBS} -L/usr/local/lib -ltclstub8.4
 STLIB_LD	= ${AR} cr
-TCL_DEFS	=  -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_ATFORK=1 -DHAVE_READDIR_R=1 -DPEEK_XCLOSEIM=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_SYS_IOCTL_H=1 
-TCL_BIN_DIR	= /usr/lib
-TCL_SRC_DIR	= /home/neumann/import/tcl8.4.7
+TCL_DEFS	=  -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DTCL_WIDE_INT_TYPE=long\ long -DWORDS_BIGENDIAN=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DNO_VALUES_H=1 -DNO_DLFCN_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -Dsocklen_t=unsigned -DHAVE_SIGNED_CHAR=1 -DHAVE_PUTENV_THAT_COPIES=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1 
+TCL_BIN_DIR	= /usr/local/lib
+TCL_SRC_DIR	= /Volumes/MacOS/Users/jago/tcl8.4.4
 # This is necessary for packages that use private Tcl headers
 #TCL_TOP_DIR_NATIVE	= @TCL_TOP_DIR_NATIVE@
 # Not used, but retained for reference of what libs Tcl required
@@ -128,29 +128,29 @@
 
 EXTRA_PATH	= $(top_builddir):$(TCL_BIN_DIR)
 TCLSH_ENV	= TCL_LIBRARY=`echo $(TCL_SRC_DIR)/library` \
-		  LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \
+		  DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \
 		  PATH="$(EXTRA_PATH):$(PATH)" \
 		  TCLLIBPATH="$(top_builddir)"
-TCLSH_PROG	= /usr/lib/../bin/tclsh8.4
+TCLSH_PROG	= /usr/bin/tclsh8.4.4
 TCLSH		= $(TCLSH_ENV) $(TCLSH_PROG)
 SHARED_BUILD	= 1
 
-INCLUDES	=  -I./generic -I"/usr/include"
+INCLUDES	=  -I/Users/neumann/src/xotcl-1.3.7/generic -I./generic -I"/usr/include"
 
-EXTRA_CFLAGS	=   
+EXTRA_CFLAGS	= -arch ppc -pipe  
 
 # TCL_DEFS is not strictly need here, but if you remove it, then you
 # must make sure that configure.in checks for the necessary components
 # that your library may use.  TCL_DEFS can actually be a problem if
 # you do not compile with a similar machine setup as the Tcl core was
 # compiled with.
-#DEFS		= $(TCL_DEFS) -DPACKAGE_NAME=\"xotclsdbm\" -DPACKAGE_TARNAME=\"xotclsdbm\" -DPACKAGE_VERSION=\"1.2\" -DPACKAGE_STRING=\"xotclsdbm\ 1.2\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1  $(EXTRA_CFLAGS)
-DEFS		= -DPACKAGE_NAME=\"xotclsdbm\" -DPACKAGE_TARNAME=\"xotclsdbm\" -DPACKAGE_VERSION=\"1.2\" -DPACKAGE_STRING=\"xotclsdbm\ 1.2\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1  $(EXTRA_CFLAGS)
+#DEFS		= $(TCL_DEFS) -DPACKAGE_NAME=\"xotclsdbm\" -DPACKAGE_TARNAME=\"xotclsdbm\" -DPACKAGE_VERSION=\"1.2\" -DPACKAGE_STRING=\"xotclsdbm\ 1.2\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DTCL_WIDE_INT_TYPE=long\ long -DWORDS_BIGENDIAN=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1  $(EXTRA_CFLAGS)
+DEFS		= -DPACKAGE_NAME=\"xotclsdbm\" -DPACKAGE_TARNAME=\"xotclsdbm\" -DPACKAGE_VERSION=\"1.2\" -DPACKAGE_STRING=\"xotclsdbm\ 1.2\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DTCL_WIDE_INT_TYPE=long\ long -DWORDS_BIGENDIAN=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1  $(EXTRA_CFLAGS)
 
 CONFIG_CLEAN_FILES = Makefile
 
 CPPFLAGS	= 
-LIBS		=  -L/home/neumann/xotcl-1.3.3 -lxotclstub1.3.3 
+LIBS		=  -L/Users/neumann/src/xotcl-1.3.7 -lxotclstub1.3.7 -L/Users/neumann/src/xotcl-1.3.7 -lxotcl1.3.7 
 AR		= ar
 CFLAGS		=  ${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS}
 COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
Index: xotcl/library/store/XOTclSdbm/configure.in
===================================================================
diff -u -r0896d4deb00780e48b5b03269bf9c4ecca948919 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/store/XOTclSdbm/configure.in	(.../configure.in)	(revision 0896d4deb00780e48b5b03269bf9c4ecca948919)
+++ xotcl/library/store/XOTclSdbm/configure.in	(.../configure.in)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -3,7 +3,7 @@
 dnl	generate the file "configure", which is run during Tcl installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.7 2005/01/06 03:10:05 neumann Exp $
+# RCS: @(#) $Id: configure.in,v 1.8 2005/09/09 21:07:23 neumann Exp $
 
 #-----------------------------------------------------------------------
 # Sample configure.in for Tcl Extensions.  The only places you should
@@ -92,8 +92,8 @@
 
 TEA_ADD_SOURCES([hash.c pair.c sdbm.c xotclsdbm.c])
 TEA_ADD_HEADERS([])
-TEA_ADD_INCLUDES([${XOTCL_BUILD_INCLUDE_SPEC}])
-TEA_ADD_LIBS([$XOTCL_BUILD_STUB_LIB_SPEC])
+TEA_ADD_INCLUDES([-I${with_xotcl}/generic ${XOTCL_BUILD_INCLUDE_SPEC}])
+TEA_ADD_LIBS([$XOTCL_BUILD_STUB_LIB_SPEC $XOTCL_BUILD_LIB_SPEC])
 TEA_ADD_CFLAGS([])
 TEA_ADD_STUB_SOURCES([])
 TEA_ADD_TCL_SOURCES([])
@@ -218,3 +218,5 @@
 
 
 
+
+
Index: xotcl/library/xml/TclExpat-1.1/Makefile
===================================================================
diff -u -rf733c5df1b1a91a473d0e361ff206deaa4ecfa0a -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/xml/TclExpat-1.1/Makefile	(.../Makefile)	(revision f733c5df1b1a91a473d0e361ff206deaa4ecfa0a)
+++ xotcl/library/xml/TclExpat-1.1/Makefile	(.../Makefile)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -12,7 +12,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: Makefile,v 1.21 2004/11/27 21:10:33 neumann Exp $
+# RCS: @(#) $Id: Makefile,v 1.22 2005/09/09 21:07:23 neumann Exp $
 
 #========================================================================
 # Add additional lines to handle any additional AC_SUBST cases that
@@ -59,7 +59,7 @@
 # configuration options) composed of the named objects.
 #========================================================================
 
-PKG_LIB_FILE	= libxotclexpat0.9.so
+PKG_LIB_FILE	= libxotclexpat0.9.dylib
 PKG_STUB_LIB_FILE = libxotclexpatstub0.9.a
 
 lib_BINARIES	= $(PKG_LIB_FILE)
@@ -68,8 +68,8 @@
 SHELL		= /bin/sh
 
 srcdir		= .
-prefix		= /usr
-exec_prefix	= /usr
+prefix		= /usr/local
+exec_prefix	= /usr/local
 
 bindir		= ${exec_prefix}/bin
 libdir		= ${exec_prefix}/lib
@@ -94,26 +94,26 @@
 PACKAGE_NAME	= xotclexpat
 PACKAGE_VERSION	= 0.9
 CC		= gcc -pipe
-CFLAGS_DEFAULT	= -O
+CFLAGS_DEFAULT	= -O3
 CFLAGS_WARNING	= -Wall -Wconversion -Wno-implicit-int
 CLEANFILES	= pkgIndex.tcl
 EXEEXT		= 
-LDFLAGS_DEFAULT	= -rdynamic
+LDFLAGS_DEFAULT	= -prebind
 MAKE_LIB	= ${SHLIB_LD} -o $@ $(PKG_OBJECTS) ${SHLIB_LD_FLAGS} ${SHLIB_LD_LIBS} 
 MAKE_SHARED_LIB	= ${SHLIB_LD} -o $@ $(PKG_OBJECTS) ${SHLIB_LD_FLAGS} ${SHLIB_LD_LIBS}
 MAKE_STATIC_LIB	= ${STLIB_LD} $@ $(PKG_OBJECTS)
 MAKE_STUB_LIB	= ${STLIB_LD} $@ $(PKG_STUB_OBJECTS)
 OBJEXT		= o
 RANLIB		= :
 RANLIB_STUB	= ranlib
-SHLIB_CFLAGS	= -fPIC
-SHLIB_LD	= gcc -pipe -shared
+SHLIB_CFLAGS	= -fno-common
+SHLIB_LD	= cc -dynamiclib ${LDFLAGS}
 SHLIB_LD_FLAGS	= 
-SHLIB_LD_LIBS	= ${LIBS} -L/usr/lib -ltclstub8.4
+SHLIB_LD_LIBS	= ${LIBS} -L/usr/local/lib -ltclstub8.4
 STLIB_LD	= ${AR} cr
-TCL_DEFS	=  -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_ATFORK=1 -DHAVE_READDIR_R=1 -DPEEK_XCLOSEIM=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_SYS_IOCTL_H=1 
-TCL_BIN_DIR	= /usr/lib
-TCL_SRC_DIR	= /home/neumann/import/tcl8.4.7
+TCL_DEFS	=  -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DTCL_WIDE_INT_TYPE=long\ long -DWORDS_BIGENDIAN=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DNO_VALUES_H=1 -DNO_DLFCN_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -Dsocklen_t=unsigned -DHAVE_SIGNED_CHAR=1 -DHAVE_PUTENV_THAT_COPIES=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1 
+TCL_BIN_DIR	= /usr/local/lib
+TCL_SRC_DIR	= /Volumes/MacOS/Users/jago/tcl8.4.4
 # This is necessary for packages that use private Tcl headers
 #TCL_TOP_DIR_NATIVE	= @TCL_TOP_DIR_NATIVE@
 # Not used, but retained for reference of what libs Tcl required
@@ -128,29 +128,29 @@
 
 EXTRA_PATH	= $(top_builddir):$(TCL_BIN_DIR)
 TCLSH_ENV	= TCL_LIBRARY=`echo $(TCL_SRC_DIR)/library` \
-		  LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \
+		  DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \
 		  PATH="$(EXTRA_PATH):$(PATH)" \
 		  TCLLIBPATH="$(top_builddir)"
-TCLSH_PROG	= /usr/lib/../bin/tclsh8.4
+TCLSH_PROG	= /usr/bin/tclsh8.4.4
 TCLSH		= $(TCLSH_ENV) $(TCLSH_PROG)
 SHARED_BUILD	= 1
 
-INCLUDES	=  -I./generic -I"/usr/include"
+INCLUDES	=  -I/Users/neumann/src/xotcl-1.3.7/generic -I./generic -I"/usr/include"
 
-EXTRA_CFLAGS	=   
+EXTRA_CFLAGS	= -arch ppc -pipe  
 
 # TCL_DEFS is not strictly need here, but if you remove it, then you
 # must make sure that configure.in checks for the necessary components
 # that your library may use.  TCL_DEFS can actually be a problem if
 # you do not compile with a similar machine setup as the Tcl core was
 # compiled with.
-#DEFS		= $(TCL_DEFS) -DPACKAGE_NAME=\"xotclexpat\" -DPACKAGE_TARNAME=\"xotclexpat\" -DPACKAGE_VERSION=\"0.9\" -DPACKAGE_STRING=\"xotclexpat\ 0.9\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1  $(EXTRA_CFLAGS)
-DEFS		= -DPACKAGE_NAME=\"xotclexpat\" -DPACKAGE_TARNAME=\"xotclexpat\" -DPACKAGE_VERSION=\"0.9\" -DPACKAGE_STRING=\"xotclexpat\ 0.9\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1  $(EXTRA_CFLAGS)
+#DEFS		= $(TCL_DEFS) -DPACKAGE_NAME=\"xotclexpat\" -DPACKAGE_TARNAME=\"xotclexpat\" -DPACKAGE_VERSION=\"0.9\" -DPACKAGE_STRING=\"xotclexpat\ 0.9\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DTCL_WIDE_INT_TYPE=long\ long -DWORDS_BIGENDIAN=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1  $(EXTRA_CFLAGS)
+DEFS		= -DPACKAGE_NAME=\"xotclexpat\" -DPACKAGE_TARNAME=\"xotclexpat\" -DPACKAGE_VERSION=\"0.9\" -DPACKAGE_STRING=\"xotclexpat\ 0.9\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DTCL_WIDE_INT_TYPE=long\ long -DWORDS_BIGENDIAN=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1  $(EXTRA_CFLAGS)
 
 CONFIG_CLEAN_FILES = Makefile
 
 CPPFLAGS	= 
-LIBS		=  -L/home/neumann/xotcl-1.3.3 -lxotclstub1.3.3 
+LIBS		=  -L/Users/neumann/src/xotcl-1.3.7 -lxotclstub1.3.7 
 AR		= ar
 CFLAGS		=  ${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS}
 COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
Index: xotcl/library/xml/TclExpat-1.1/configure.in
===================================================================
diff -u -r0896d4deb00780e48b5b03269bf9c4ecca948919 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/xml/TclExpat-1.1/configure.in	(.../configure.in)	(revision 0896d4deb00780e48b5b03269bf9c4ecca948919)
+++ xotcl/library/xml/TclExpat-1.1/configure.in	(.../configure.in)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -3,7 +3,7 @@
 dnl	generate the file "configure", which is run during Tcl installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.7 2005/01/06 03:10:05 neumann Exp $
+# RCS: @(#) $Id: configure.in,v 1.8 2005/09/09 21:07:23 neumann Exp $
 
 #-----------------------------------------------------------------------
 # Sample configure.in for Tcl Extensions.  The only places you should
@@ -92,7 +92,7 @@
 
 TEA_ADD_SOURCES([xmltok.c unixfilemap.c xmlrole.c xmlwf.c codepage.c xmlparse.c hashtable.c tclexpat.c])
 TEA_ADD_HEADERS([])
-TEA_ADD_INCLUDES([-I$XOTCL_SRC_DIR/generic])
+TEA_ADD_INCLUDES([-I${with_xotcl}/generic ${XOTCL_BUILD_INCLUDE_SPEC}])
 TEA_ADD_LIBS([$XOTCL_BUILD_STUB_LIB_SPEC])
 TEA_ADD_CFLAGS([])
 TEA_ADD_STUB_SOURCES([])
@@ -218,3 +218,5 @@
 
 
 
+
+
Index: xotcl/library/xml/printVisitor.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/xml/printVisitor.xotcl	(.../printVisitor.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/xml/printVisitor.xotcl	(.../printVisitor.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,18 +1,28 @@
-# $Id: printVisitor.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: printVisitor.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::xml::printVisitor 0.9
 package require xotcl::xml::parser
+package require XOTcl
 
-##############################################################################
-#
-# Small debugging visitor that just uses node's print method to print the 
-# node tree
-#
-##############################################################################
+namespace eval ::xotcl::xml::printVisitor {
+    namespace import ::xotcl::*
 
-Class PrintVisitor -superclass NodeTreeVisitor -parameter parser
-PrintVisitor instproc visit objName {
-  puts [$objName print]
+    ##############################################################################
+    #
+    # Small debugging visitor that just uses node's print method to print the 
+    # node tree
+    #
+    ##############################################################################
+
+    Class PrintVisitor -superclass NodeTreeVisitor -parameter parser
+    PrintVisitor instproc visit objName {
+	puts [$objName print]
+    }
+    PrintVisitor instproc interpretNodeTree node {
+	$node accept [self]
+    }
+
+    namespace export PrintVisitor
 }
-PrintVisitor instproc interpretNodeTree node {
-  $node accept [self]
-}
+
+namespace import ::xotcl::xml::printVisitor::*
Index: xotcl/library/xml/xmlRecreatorVisitor.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/xml/xmlRecreatorVisitor.xotcl	(.../xmlRecreatorVisitor.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/xml/xmlRecreatorVisitor.xotcl	(.../xmlRecreatorVisitor.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,150 +1,160 @@
-# $Id: xmlRecreatorVisitor.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: xmlRecreatorVisitor.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
+
 package provide xotcl::xml::recreatorVisitor 0.9
 package require xotcl::xml::parser
+package require XOTcl
 
-##############################################################################
-#
-# a visitor that recreates an XML representation from a
-# node tree
-#
-#############################################################################
-Class XMLRecreatorVisitor -superclass NodeTreeVisitor -parameter useCDATA
+namespace eval ::xotcl::xml::recreatorVisitor {
+    namespace import ::xotcl::*
 
-#
-# determine nesting depth of an object if the aggregation tree
-#
-XMLRecreatorVisitor instproc nestingDepth {obj} {
-  for {set d 0;set s [$obj info parent]} {$s != "::"} {set s [$s info parent]} {
-    incr d
-  }
-  return $d
-}
+    ##############################################################################
+    #
+    # a visitor that recreates an XML representation from a
+    # node tree
+    #
+    #############################################################################
+    Class XMLRecreatorVisitor -superclass NodeTreeVisitor -parameter useCDATA
 
-#
-# insert appropriate number of spaces for indentation -> return space string
-#
-XMLRecreatorVisitor instproc indent chars {
-  set spaces "          "
-  for {set l 9} {$l<$chars} {incr l $l} {append spaces $spaces}
-  return [string range $spaces 1 $chars]
-}
-XMLRecreatorVisitor instproc insertIndent {obj} {
-  my instvar nestingStart
-  return [my indent [expr {([my nestingDepth $obj] - $nestingStart)*2} - 2]]
-}
+    #
+    # determine nesting depth of an object if the aggregation tree
+    #
+    XMLRecreatorVisitor instproc nestingDepth {obj} {
+	for {set d 0;set s [$obj info parent]} {$s != "::"} {set s [$s info parent]} {
+	    incr d
+	}
+	return $d
+    }
 
-XMLRecreatorVisitor instproc attrIndent {objName fa} {
-  upvar [self callinglevel] $fa firstAttr
-  if {$firstAttr} {
-    set firstAttr 0
-    return  " "
-  } else {
-    return "\n[my insertIndent $objName]    "
-  }  
-}
+    #
+    # insert appropriate number of spaces for indentation -> return space string
+    #
+    XMLRecreatorVisitor instproc indent chars {
+	set spaces "          "
+	for {set l 9} {$l<$chars} {incr l $l} {append spaces $spaces}
+	return [string range $spaces 1 $chars]
+    }
+    XMLRecreatorVisitor instproc insertIndent {obj} {
+	my instvar nestingStart
+	return [my indent [expr {([my nestingDepth $obj] - $nestingStart)*2} - 2]]
+    }
 
-XMLRecreatorVisitor instproc getContent objName {
-  return [$objName content]
-}
-XMLRecreatorVisitor instproc hasOnlyAttrs {obj} {
-  if {[$obj exists pcdata]} {return 0}
-  foreach c [$obj info children] {
-    if {[$c istype XMLNode]} {return 0}
-  }
-  return 1
-}
+    XMLRecreatorVisitor instproc attrIndent {objName fa} {
+	upvar [self callinglevel] $fa firstAttr
+	if {$firstAttr} {
+	    set firstAttr 0
+	    return  " "
+	} else {
+	    return "\n[my insertIndent $objName]    "
+	}  
+    }
 
-#
-# hook to append line feed dependent on the object
-# default is to append one \n
-#
-XMLRecreatorVisitor instproc appendLineFeed obj {
-  return "\n"
-}
-
-#
-# evaluate node objName
-#
-XMLRecreatorVisitor instproc visit objName {
-  my instvar result
-  set c [my getContent $objName]
-  if {$c != ""} {
-    $objName instvar attributes pcdata 
-    set ns [$objName resolveNS]
-    set firstAttr 1
-    set attrStr ""
-    if {[string first $objName $ns] != -1} {
-      # append xmlns attributes, xmlns=... first
-      if {[$ns exists nsArray(xmlns)]} {
-	append attrStr [my attrIndent $objName firstAttr]
-	append attrStr "xmlns = \"[$ns set nsArray(xmlns)]\""
-      }
-      foreach a [$ns array names nsArray] {
-	if {$a != "xmlns"} {
-	  append attrStr [my attrIndent $objName firstAttr]
-	  append attrStr "xmlns:${a} = \"[$ns set nsArray($a)]\""
+    XMLRecreatorVisitor instproc getContent objName {
+	return [$objName content]
+    }
+    XMLRecreatorVisitor instproc hasOnlyAttrs {obj} {
+	if {[$obj exists pcdata]} {return 0}
+	foreach c [$obj info children] {
+	    if {[$c istype XMLNode]} {return 0}
 	}
-      }
+	return 1
     }
-    foreach a [array names attributes] {
-      append attrStr [my attrIndent $objName firstAttr]
-      append attrStr "$a = \"$attributes($a)\""
+
+    #
+    # hook to append line feed dependent on the object
+    # default is to append one \n
+    #
+    XMLRecreatorVisitor instproc appendLineFeed obj {
+	return "\n"
     }
-    append result "[my insertIndent $objName]<${c}$attrStr"
 
-    if {[my hasOnlyAttrs $objName]} { 
-      append result "/>"
-    } else {
-      append result ">"
+    #
+    # evaluate node objName
+    #
+    XMLRecreatorVisitor instproc visit objName {
+	my instvar result
+	set c [my getContent $objName]
+	if {$c != ""} {
+	    $objName instvar attributes pcdata 
+	    set ns [$objName resolveNS]
+	    set firstAttr 1
+	    set attrStr ""
+	    if {[string first $objName $ns] != -1} {
+		# append xmlns attributes, xmlns=... first
+		if {[$ns exists nsArray(xmlns)]} {
+		    append attrStr [my attrIndent $objName firstAttr]
+		    append attrStr "xmlns = \"[$ns set nsArray(xmlns)]\""
+		}
+		foreach a [$ns array names nsArray] {
+		    if {$a != "xmlns"} {
+			append attrStr [my attrIndent $objName firstAttr]
+			append attrStr "xmlns:${a} = \"[$ns set nsArray($a)]\""
+		    }
+		}
+	    }
+	    foreach a [array names attributes] {
+		append attrStr [my attrIndent $objName firstAttr]
+		append attrStr "$a = \"$attributes($a)\""
+	    }
+	    append result "[my insertIndent $objName]<${c}$attrStr"
+
+	    if {[my hasOnlyAttrs $objName]} { 
+		append result "/>"
+	    } else {
+		append result ">"
+	    }
+
+	    if {[info exists pcdata] && [llength $pcdata]>1 && 
+		[lindex $pcdata 0] == ""} {
+		append result " " [my pcdataString [lindex $pcdata 1]]
+	    }
+	    append result [my appendLineFeed $objName]
+	}
+	return $result
     }
-    
-    if {[info exists pcdata] && [llength $pcdata]>1 && 
-	[lindex $pcdata 0] == ""} {
-      append result " " [my pcdataString [lindex $pcdata 1]]
+    XMLRecreatorVisitor instproc pcdataString text {
+	if {[my exists useCDATA] && [regexp < $text]} {
+	    return "<!\[CDATA\[$text]]>"
+	}
+	return $text
     }
-    append result [my appendLineFeed $objName]
-  }
-  return $result
-}
-XMLRecreatorVisitor instproc pcdataString text {
-  if {[my exists useCDATA] && [regexp < $text]} {
-    return "<!\[CDATA\[$text]]>"
-  }
-  return $text
-}
 
-#
-# evaluate end of a node
-# 
-XMLRecreatorVisitor instproc visitEnd objName {
-  my instvar result
-  set c [$objName content]
-  if {$c != ""} {
-    if {![my hasOnlyAttrs $objName]} {
-      append result [my insertIndent $objName] </$c>\n
+    #
+    # evaluate end of a node
+    # 
+    XMLRecreatorVisitor instproc visitEnd objName {
+	my instvar result
+	set c [$objName content]
+	if {$c != ""} {
+	    if {![my hasOnlyAttrs $objName]} {
+		append result [my insertIndent $objName] </$c>\n
+	    }
+	}
+	# a child is responsible for the "mixed content" data elements
+	# that have a location after the child
+	set p [$objName info parent]
+	if {[$p istype XMLElement] && [$p mixedContent]} {
+	    foreach {location data} [$p set pcdata] {
+		if {$location == $objName} {
+		    append result [my insertIndent $objName] \
+			[my pcdataString $data] \n
+		}
+	    }
+	}
     }
-  }
-  # a child is responsible for the "mixed content" data elements
-  # that have a location after the child
-  set p [$objName info parent]
-  if {[$p istype XMLElement] && [$p mixedContent]} {
-    foreach {location data} [$p set pcdata] {
-      if {$location == $objName} {
-	append result [my insertIndent $objName] \
-	    [my pcdataString $data] \n
-      }
-    }
-  }
-}
 
 
-#
-# public method to be called on top node -> returns XML text as result
-#
-XMLRecreatorVisitor instproc interpretNodeTree node {
-  my instvar result
-  set result ""
-  my set nestingStart [my nestingDepth $node]
-  $node accept [self]
-  return $result
+    #
+    # public method to be called on top node -> returns XML text as result
+    #
+    XMLRecreatorVisitor instproc interpretNodeTree node {
+	my instvar result
+	set result ""
+	my set nestingStart [my nestingDepth $node]
+	$node accept [self]
+	return $result
+    }
+
+    namespace export XMLRecreatorVisitor
 }
+
+namespace import ::xotcl::xml::recreatorVisitor::*
Index: xotcl/library/xml/xoXML.xotcl
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/library/xml/xoXML.xotcl	(.../xoXML.xotcl)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/library/xml/xoXML.xotcl	(.../xoXML.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,631 +1,641 @@
-# $Id: xoXML.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: xoXML.xotcl,v 1.2 2005/09/09 21:07:23 neumann Exp $
 package provide xotcl::xml::parser 0.94
 
+package require XOTcl
 package require xotcl::pattern::chainOfResponsibility
 package require xotcl::pattern::sortedCompositeWithAfter
 #package require xotcl::pattern::link
 package require xotcl::trace
 #package require xml
 #package require expat
 
-##############################################################################
-#
-#  XML Namespace Handling
-#
-##############################################################################
-@ ChainOfResponsibility XMLNamespace {
-  description {
-  A Chain of Responsiblity Class that handles the XML
-  XMLNamespace facility for an object tree
+namespace eval ::xotcl::xml::parser {
+  namespace import ::xotcl::*
 
-  especially for internal usage of the xoXML component
-}
-}
-ChainOfResponsibility XMLNamespace
+  ##############################################################################
+  #
+  #  XML Namespace Handling
+  #
+  ##############################################################################
+  @ ChainOfResponsibility XMLNamespace {
+    description {
+      A Chain of Responsiblity Class that handles the XML
+      XMLNamespace facility for an object tree
 
+      especially for internal usage of the xoXML component
+    }
+  }
+  ChainOfResponsibility XMLNamespace
 
-XMLNamespace instproc init args {
-  # Per default: New NS is end of a namespace chain
-  # indicated by ""
-  my successor ""
-  my array set nsArray {}
-  next
-}
 
-#
-# add two operations searchPrefix and searchFullName as chained -> calls are
-# automatically forwarded in the chain, if the failure value (here: "")
-# is returned by the chained object
-#
-XMLNamespace addChainedOperation searchPrefix ""
-XMLNamespace addChainedOperation searchFullName ""
-XMLNamespace addChainedOperation searchNamespaceByPrefix ""
-#
-# namespaces are added by value pairs of prefix and full namespace
-# name (ns)
-#
-XMLNamespace instproc add {prefix ns} {
-  #puts stderr "adding ns: $prefix $ns"
-  my set nsArray($prefix) $ns
-}
+  XMLNamespace instproc init args {
+    # Per default: New NS is end of a namespace chain
+    # indicated by ""
+    my successor ""
+    my array set nsArray {}
+    next
+  }
 
-#
-# search the chain for a prefix -> return full name, if found
-#
-XMLNamespace instproc searchPrefix {prefix} {
-  #puts stderr "[self proc]: Searching for $prefix in [self]"
-  #puts stderr "[self proc]: There are: [my array names nsArray]"
-  if {[my exists nsArray($prefix)]} {
-    return [my set nsArray($prefix)]
-  } else {
-    return ""
+  #
+  # add two operations searchPrefix and searchFullName as chained -> calls are
+  # automatically forwarded in the chain, if the failure value (here: "")
+  # is returned by the chained object
+  #
+  XMLNamespace addChainedOperation searchPrefix ""
+  XMLNamespace addChainedOperation searchFullName ""
+  XMLNamespace addChainedOperation searchNamespaceByPrefix ""
+  #
+  # namespaces are added by value pairs of prefix and full namespace
+  # name (ns)
+  #
+  XMLNamespace instproc add {prefix ns} {
+    #puts stderr "adding ns: $prefix $ns"
+    my set nsArray($prefix) $ns
   }
-}
 
-#
-# search the chain for a prefix -> return the responisble namespace name
-#
-XMLNamespace instproc searchNamespaceByPrefix {prefix} {
-  if {[my exists nsArray($prefix)]} {
-    return [self]
-  } else {
-    return ""
+  #
+  # search the chain for a prefix -> return full name, if found
+  #
+  XMLNamespace instproc searchPrefix {prefix} {
+    #puts stderr "[self proc]: Searching for $prefix in [self]"
+    #puts stderr "[self proc]: There are: [my array names nsArray]"
+    if {[my exists nsArray($prefix)]} {
+      return [my set nsArray($prefix)]
+    } else {
+      return ""
+    }
   }
-}
 
-#
-# search the chain for the full name -> return prefix, if found
-#
-XMLNamespace instproc searchFullName {fname} {
-  foreach n [my array names nsArray] {
-    if {[string match [my set nsArray($n)] $fname]} {
-      return $n
+  #
+  # search the chain for a prefix -> return the responisble namespace name
+  #
+  XMLNamespace instproc searchNamespaceByPrefix {prefix} {
+    if {[my exists nsArray($prefix)]} {
+      return [self]
+    } else {
+      return ""
     }
   }
-  return ""
-}
 
-#
-# construct the full name from either a expression "prefix:name"
-# or just "name" (then construct with "xmlns" as default namespace prefix)
-#
-XMLNamespace instproc getFullName {fname} {
-  #puts stderr "Getting FullName for $fname in [self]"
-  if {[regexp "^(.*):(.*)$" $fname _ prefix name]} {
-    if {[set pre [my searchPrefix $prefix]] != ""} {
-      return [set pre]$name
+  #
+  # search the chain for the full name -> return prefix, if found
+  #
+  XMLNamespace instproc searchFullName {fname} {
+    foreach n [my array names nsArray] {
+      if {[string match [my set nsArray($n)] $fname]} {
+	return $n
+      }
     }
-  } else {
-    # no colon -> use xmlns
-    return [my searchPrefix "xmlns"]$fname
+    return ""
   }
-  return $fname
-}
 
-##############################################################################
-#
-#  Abstract Node Class
-#
-##############################################################################
+  #
+  # construct the full name from either a expression "prefix:name"
+  # or just "name" (then construct with "xmlns" as default namespace prefix)
+  #
+  XMLNamespace instproc getFullName {fname} {
+    #puts stderr "Getting FullName for $fname in [self]"
+    if {[regexp "^(.*):(.*)$" $fname _ prefix name]} {
+      if {[set pre [my searchPrefix $prefix]] != ""} {
+	return [set pre]$name
+      }
+    } else {
+      # no colon -> use xmlns
+      return [my searchPrefix "xmlns"]$fname
+    }
+    return $fname
+  }
 
-SortedComposite AbstractXMLNode 
+  ##############################################################################
+  #
+  #  Abstract Node Class
+  #
+  ##############################################################################
 
-@ SortedComposite AbstractXMLNode { description {
-  Abstract interface for all node classes. Nodes have an event based
-  parsing interface to build up a node tree, from an event based parsing
-  stream
-}
-}
+  SortedComposite AbstractXMLNode 
 
-#
-# called if node start event occurs ->
-# start parsing node "name" and intpretation hook for the attribute list
-#
-AbstractXMLNode abstract instproc parseStart {name attrList}
+  @ SortedComposite AbstractXMLNode { description {
+    Abstract interface for all node classes. Nodes have an event based
+    parsing interface to build up a node tree, from an event based parsing
+    stream
+  }
+  }
 
-#
-# called if "character data" is reached
-#
-AbstractXMLNode abstract instproc parseData {text}
+  #
+  # called if node start event occurs ->
+  # start parsing node "name" and intpretation hook for the attribute list
+  #
+  AbstractXMLNode abstract instproc parseStart {name attrList}
 
-#
-# called if node end is reached
-#
-AbstractXMLNode abstract instproc parseEnd {name}
+  #
+  # called if "character data" is reached
+  #
+  AbstractXMLNode abstract instproc parseData {text}
 
-#
-# convinience method for printing nodes to output stream (e.g. for debugging)
-#
-AbstractXMLNode abstract instproc print {}
+  #
+  # called if node end is reached
+  #
+  AbstractXMLNode abstract instproc parseEnd {name}
 
-#
-# Visitor acceptance methods -> call visit and visitEnd of the given
-# "visitor" with my as argument
-#
-AbstractXMLNode abstract instproc accept {visitor}
-AbstractXMLNode abstract instproc acceptEnd {visitor}
+  #
+  # convinience method for printing nodes to output stream (e.g. for debugging)
+  #
+  AbstractXMLNode abstract instproc print {}
 
-# make 'accept' and 'acceptEnd' composite operations
-AbstractXMLNode addOperations {accept accept}
-AbstractXMLNode addAfterOperations {accept acceptEnd}
+  #
+  # Visitor acceptance methods -> call visit and visitEnd of the given
+  # "visitor" with my as argument
+  #
+  AbstractXMLNode abstract instproc accept {visitor}
+  AbstractXMLNode abstract instproc acceptEnd {visitor}
 
-##############################################################################
-#
-#  XMLNode Node Class
-#
-##############################################################################
+  # make 'accept' and 'acceptEnd' composite operations
+  AbstractXMLNode addOperations {accept accept}
+  AbstractXMLNode addAfterOperations {accept acceptEnd}
 
-#
-# the pcdata variable stores the data elements in form of a tuple list 
-# <location dataElt>. 
-#
-Class XMLNode -superclass AbstractXMLNode -parameter {
-  {content ""}
-  {namespace}
-  {parser ""}
-  pcdata
-} 
-@ Class XMLNode {
-  description {
-    general superclass for XML nodes
+  ##############################################################################
+  #
+  #  XMLNode Node Class
+  #
+  ##############################################################################
+
+  #
+  # the pcdata variable stores the data elements in form of a tuple list 
+  # <location dataElt>. 
+  #
+  Class XMLNode -superclass AbstractXMLNode -parameter {
+    {content ""}
+    {namespace}
+    {parser ""}
+    pcdata
+  } 
+  @ Class XMLNode {
+    description {
+      general superclass for XML nodes
+    }
   }
-}
 
-XMLNode instproc init args {
-  my array set attributes {}
-  next
-}
+  XMLNode instproc init args {
+    my array set attributes {}
+    next
+  }
 
-XMLNode instproc nextChild {name} {
-  set child [my autoname $name]
-  my set lastChild $child
-  my appendChildren $child
-  return $child
-}
+  XMLNode instproc nextChild {name} {
+    set child [my autoname $name]
+    my set lastChild $child
+    my appendChildren $child
+    return $child
+  }
 
-#
-# placeholder methods for the event interface
-#
-XMLNode instproc parseStart {name attrList} {
-  #puts "parsed start: [my info class]: $name $attrList"
-}
+  #
+  # placeholder methods for the event interface
+  #
+  XMLNode instproc parseStart {name attrList} {
+    #puts "parsed start: [my info class]: $name $attrList"
+  }
 
-#
-# chracter data is stored in a pcdata variable.
-#
-XMLNode instproc mixedContent {} {
-  expr {[my exists children] && [my exists pcdata]}
-}
-XMLNode instproc parseData {text} {
-  #my showCall
-  my instvar pcdata
-
-  set childBeforePCData ""
-  # if pcdata exists seek the last XMLElement child
-  #if {[my exists children]} {
-  #  foreach c [my set children] {
-  #    if {[[self]::$c istype XMLElement]} {
-  #	set childBeforePCData [self]::$c
-  #      }
-  #    }
-  #  }
-  if {[my exists lastChild]} {
-    set  childBeforePCData [self]::[my set lastChild]
+  #
+  # chracter data is stored in a pcdata variable.
+  #
+  XMLNode instproc mixedContent {} {
+    expr {[my exists children] && [my exists pcdata]}
   }
-  #my showMsg childBeforePCData=$childBeforePCData
-  #my showMsg old-pcdata=$pcdata
-  if {[my exists pcdata]} {
-    foreach {e d} $pcdata { }
-    #puts stderr "//$e//$d// [expr {$e == $childBeforePCData}]"
-    if {$e == $childBeforePCData} {
-      set pcdata [lreplace $pcdata [expr {[llength $pcdata]-2}] end]
-      set text $d$text
+  XMLNode instproc parseData {text} {
+    #my showCall
+    my instvar pcdata
+
+    set childBeforePCData ""
+    # if pcdata exists seek the last XMLElement child
+    #if {[my exists children]} {
+    #  foreach c [my set children] {
+    #    if {[[self]::$c istype XMLElement]} {
+    #	set childBeforePCData [self]::$c
+    #      }
+    #    }
+    #  }
+    if {[my exists lastChild]} {
+      set  childBeforePCData [self]::[my set lastChild]
     }
-    lappend pcdata $childBeforePCData $text
-    #puts stderr *append****new-pcdata=$pcdata
-  } else {
-    set pcdata [list $childBeforePCData $text]
-    #puts stderr *set*******new-pcdata=$pcdata
+    #my showMsg childBeforePCData=$childBeforePCData
+    #my showMsg old-pcdata=$pcdata
+    if {[my exists pcdata]} {
+      foreach {e d} $pcdata { }
+      #puts stderr "//$e//$d// [expr {$e == $childBeforePCData}]"
+      if {$e == $childBeforePCData} {
+	set pcdata [lreplace $pcdata [expr {[llength $pcdata]-2}] end]
+	set text $d$text
+      }
+      lappend pcdata $childBeforePCData $text
+      #puts stderr *append****new-pcdata=$pcdata
+    } else {
+      set pcdata [list $childBeforePCData $text]
+      #puts stderr *set*******new-pcdata=$pcdata
+    }
   }
-}
 
-#
-# this method just returns the data elt in the first pcdata
-#
-XMLNode instproc getFirstPCData {} {
-  if {[my exists pcdata]} {
-    return [lindex [my set pcdata] 1]
+  #
+  # this method just returns the data elt in the first pcdata
+  #
+  XMLNode instproc getFirstPCData {} {
+    if {[my exists pcdata]} {
+      return [lindex [my set pcdata] 1]
+    }
+    return ""
   }
-  return ""
-}
 
-#
-# returns a list of all pcdata elememts, without location information
-# stored in the pcdata instance variable
-#
-XMLNode instproc getPCdataList {} {
-  set result ""
-  foreach {l data} [my set pcdata] {
-    lappend result $data
+  #
+  # returns a list of all pcdata elememts, without location information
+  # stored in the pcdata instance variable
+  #
+  XMLNode instproc getPCdataList {} {
+    set result ""
+    foreach {l data} [my set pcdata] {
+      lappend result $data
+    }
+    return $result
   }
-  return $result
-}
 
-#
-#my set pcdata $text
-#}
+  #
+  #my set pcdata $text
 
-XMLNode instproc parseEnd {name} {
-  #puts "parsed end: [my info class]: $name"
-}
-
-XMLNode instproc print {} {
-  set c "[my info class]-[self] --- [my content]"
-  foreach a [my array names attributes] {
-    append c "\nATTR: $a = [my set attributes($a)]"
+  XMLNode instproc parseEnd {name} {
+    #puts "parsed end: [my info class]: $name"
   }
-  if {[my exists pcdata]} {
-    foreach d [my getPCdataList] {
-      append c "\nPCDATA:\n$d"
+
+  XMLNode instproc print {} {
+    set c "[my info class]-[self] --- [my content]"
+    foreach a [my array names attributes] {
+      append c "\nATTR: $a = [my set attributes($a)]"
     }
+    if {[my exists pcdata]} {
+      foreach d [my getPCdataList] {
+	append c "\nPCDATA:\n$d"
+      }
+    }
+    return $c
   }
-  return $c
-}
 
-#
-# composite accept operation for visiting the node tree
-# through visitors
-#
-# -> interpretation of the interpreter pattern
-#
-XMLNode instproc accept {visitor} {
-  $visitor visit [self]
-}
+  #
+  # composite accept operation for visiting the node tree
+  # through visitors
+  #
+  # -> interpretation of the interpreter pattern
+  #
+  XMLNode instproc accept {visitor} {
+    $visitor visit [self]
+  }
 
-#
-# composite operation called at termination of computation of
-# a level == end node
-#
-XMLNode instproc acceptEnd {visitor} {
-  $visitor visitEnd [self]
-}
+  #
+  # composite operation called at termination of computation of
+  # a level == end node
+  #
+  XMLNode instproc acceptEnd {visitor} {
+    $visitor visitEnd [self]
+  }
 
-#
-# error message, if child can't be parsed
-#
-XMLNode instproc errorChild {c} {
-  error "[self] unexpected content $c"
-}
+  #
+  # error message, if child can't be parsed
+  #
+  XMLNode instproc errorChild {c} {
+    error "[self] unexpected content $c"
+  }
 
-#
-# find the namespace object that is currently responsible
-# for the [self] node
-#
-XMLNode instproc resolveNS {} {
-  set parser [my set parser]
-  if {[my exists namespace]} {
-    return [my set namespace]
-  } else {
-    set p [my info parent]
-    if {$p != "" && $p != $parser} {
-      return [$p resolveNS]
+  #
+  # find the namespace object that is currently responsible
+  # for the [self] node
+  #
+  XMLNode instproc resolveNS {} {
+    set parser [my set parser]
+    if {[my exists namespace]} {
+      return [my set namespace]
     } else {
-      #puts stderr "No parent namespace !! Using Parser's topNs ..."
-      return ""
+      set p [my info parent]
+      if {$p != "" && $p != $parser} {
+	return [$p resolveNS]
+      } else {
+	#puts stderr "No parent namespace !! Using Parser's topNs ..."
+	return ""
+      }
     }
   }
-}
 
-#
-# add a new namespace entry to the object's NS entry, if it exists
-# otherwise: act as a factory method for NS objects and create an
-# NS object for the [self] node
-#
-XMLNode instproc makeIndividualNSEntry {prefix entry} {
-  set ns [my resolveNS]
-  if {[string first [self] $ns] == -1} {
-    #puts stderr "new namespace for [self]"
-    set newNS [XMLNamespace create [self]::[my autoname ns]]
-    $newNS set successor $ns
-    my namespace $newNS
-    set ns $newNS
+  #
+  # add a new namespace entry to the object's NS entry, if it exists
+  # otherwise: act as a factory method for NS objects and create an
+  # NS object for the [self] node
+  #
+  XMLNode instproc makeIndividualNSEntry {prefix entry} {
+    set ns [my resolveNS]
+    if {[string first [self] $ns] == -1} {
+      #puts stderr "new namespace for [self]"
+      set newNS [XMLNamespace create [self]::[my autoname ns]]
+      $newNS set successor $ns
+      my namespace $newNS
+      set ns $newNS
+    }
+    $ns add $prefix $entry
   }
-  $ns add $prefix $entry
-}
 
-#
-# check for xmlns attribute in the name/value pair "n v"
-# return 1 on success, otherwise 0
-#
-XMLNode instproc checkForXmlNS {n v} {
-  #puts "checking to build NS in [self] with $n == $v"
-  if {[regexp {^xmlns:?(.*)$} $n _ prefix]} {
-    if {$prefix == ""} {
-      set prefix "xmlns"
+  #
+  # check for xmlns attribute in the name/value pair "n v"
+  # return 1 on success, otherwise 0
+  #
+  XMLNode instproc checkForXmlNS {n v} {
+    #puts "checking to build NS in [self] with $n == $v"
+    if {[regexp {^xmlns:?(.*)$} $n _ prefix]} {
+      if {$prefix == ""} {
+	set prefix "xmlns"
+      }
+      my makeIndividualNSEntry $prefix $v
+      return 1
     }
-    my makeIndividualNSEntry $prefix $v
-    return 1
+    return 0
   }
-  return 0
-}
 
-# small helper proc to extract the namespace prefix from content
-XMLNode instproc getContentPrefix {} {
-  if {[regexp {^([^:]*):} [my set content] _ prefix]} {
-    return $prefix
+  # small helper proc to extract the namespace prefix from content
+  XMLNode instproc getContentPrefix {} {
+    if {[regexp {^([^:]*):} [my set content] _ prefix]} {
+      return $prefix
+    }
+    return ""
   }
-  return ""
-}
 
-##############################################################################
-#
-# XMLNode _Class_ Factory for creating XML style node
-# node classes
-#
-##############################################################################
+  ##############################################################################
+  #
+  # XMLNode _Class_ Factory for creating XML style node
+  # node classes
+  #
+  ##############################################################################
 
-Class XMLNodeClassFactory -superclass Class
+  Class XMLNodeClassFactory -superclass Class
 
-XMLNodeClassFactory create XMLElement -superclass XMLNode
+  XMLNodeClassFactory create XMLElement -superclass XMLNode
 
-##############################################################################
-#
-#  Add some methods to the created XMLElement class
-#
-##############################################################################
+  ##############################################################################
+  #
+  #  Add some methods to the created XMLElement class
+  #
+  ##############################################################################
 
-XMLElement instproc parseAttributes {name attrList} {
-  my set content $name
-  foreach {n v} $attrList {
-    if {[my checkForXmlNS $n $v]} {continue}
-    my set attributes($n) $v
+  XMLElement instproc parseAttributes {name attrList} {
+    my set content $name
+    foreach {n v} $attrList {
+      if {[my checkForXmlNS $n $v]} {continue}
+      my set attributes($n) $v
+    }
   }
-}
 
-#
-# build a child corresponding to the node start event and
-# check attribute list -> set content (attr name) and value (attr value)
-# on created attr children objects of the XMLElement child
-# return the new XMLElement child
-#
-XMLElement instproc parseStart {name attrList} {
-  set parser [my set parser]
-  set nf [$parser set nodeFactory]
-  set r [$nf getNode XMLElement [self]::[my nextChild elt] $parser]
-  $r parseAttributes $name $attrList
-  return $r
-}
+  #
+  # build a child corresponding to the node start event and
+  # check attribute list -> set content (attr name) and value (attr value)
+  # on created attr children objects of the XMLElement child
+  # return the new XMLElement child
+  #
+  XMLElement instproc parseStart {name attrList} {
+    set parser [my set parser]
+    set nf [$parser set nodeFactory]
+    set r [$nf getNode XMLElement [self]::[my nextChild elt] $parser]
+    $r parseAttributes $name $attrList
+    return $r
+  }
 
-# no action of parse end -> just return [self] for convinience
-XMLElement instproc parseEnd content {
-  self
-}
+  # no action of parse end -> just return [self] for convinience
+  XMLElement instproc parseEnd content {
+    self
+  }
 
-##############################################################################
-#
-# Abstract interface for factories that create node objects;
-#
-##############################################################################
-Class AbstractXMLNodeFactory
+  ##############################################################################
+  #
+  # Abstract interface for factories that create node objects;
+  #
+  ##############################################################################
+  Class AbstractXMLNodeFactory
 
-#
-# get a node with the specifies key (normally the classname) and name
-# the node "objName" -> without flyweights an object "objName" or type "key"
-# is created
-#
-AbstractXMLNodeFactory abstract instproc getNode {key objName parser}
+  #
+  # get a node with the specifies key (normally the classname) and name
+  # the node "objName" -> without flyweights an object "objName" or type "key"
+  # is created
+  #
+  AbstractXMLNodeFactory abstract instproc getNode {key objName parser}
 
-#
-# clean up the node factory
-#
-AbstractXMLNodeFactory abstract instproc reset {}
+  #
+  # clean up the node factory
+  #
+  AbstractXMLNodeFactory abstract instproc reset {}
 
-##############################################################################
-#
-# Special Node Factory as used in xoXML and xoRDF
-# for shared classes the factory acts as a flyweight factory
-#
-##############################################################################
-Class XMLNodeFactory -superclass AbstractXMLNodeFactory -parameter {
-  {sharedNodes ""}
-}
+  ##############################################################################
+  #
+  # Special Node Factory as used in xoXML and xoRDF
+  # for shared classes the factory acts as a flyweight factory
+  #
+  ##############################################################################
+  Class XMLNodeFactory -superclass AbstractXMLNodeFactory -parameter {
+    {sharedNodes ""}
+  }
 
-XMLNodeFactory instproc getNode {class objName parser} {
-  $class create $objName -parser $parser ;# returns object ID
-}
+  XMLNodeFactory instproc getNode {class objName parser} {
+    $class create $objName -parser $parser ;# returns object ID
+  }
 
-XMLNodeFactory instproc reset {} {
-  #my array set flyweights {}
-}
+  XMLNodeFactory instproc reset {} {
+    #my array set flyweights {}
+  }
 
-##############################################################################
-#
-# XML Factory for creating node objects
-#
-##############################################################################
-XMLNodeFactory xmlNodeFactory
+  ##############################################################################
+  #
+  # XML Factory for creating node objects
+  #
+  ##############################################################################
+  XMLNodeFactory xmlNodeFactory
 
-##############################################################################
-#
-# Xml Parser Connection Class (wrapper facade to TclXML, expat
-# interface like parsers)
-#
-##############################################################################
-Class XMLParser -parameter {
-  {topLevelNodeHandler ""}
-  {nodeFactory "xmlNodeFactory"}
-  {xmlTextParser expat_fallback_tclxml}
-}
+  ##############################################################################
+  #
+  # Xml Parser Connection Class (wrapper facade to TclXML, expat
+  # interface like parsers)
+  #
+  ##############################################################################
+  Class XMLParser -parameter {
+    {topLevelNodeHandler ""}
+    {nodeFactory "xmlNodeFactory"}
+    {xmlTextParser expat_fallback_tclxml}
+  }
 
-#
-# normally all toplevel start events are handled with XML-Elements
-# here we can define regexp patterns for other toplevel handlers
-#
-XMLParser instproc topLevelHandlerPattern {regexp handlerClass} {
-  my lappend topLevelNodeHandler $regexp $handlerClass
-}
-#
-# if regexp matches -> handler class is used (see start instproc)
-# if none matches -> use XMLElement; "name" is name given by the
-# start method
-#
-XMLParser instproc createTopLevelNode {name attrList} {
-  set nf [my set nodeFactory]
-  set tnName [my autoname topNode]
-  foreach {regexpPattern class} [my set topLevelNodeHandler] {
-    if {[regexp $regexpPattern $name]} {
-      set tn [$nf getNode $class [self]::$tnName [self]]
-      my set currentTopNode $tn
-      return $tn
+  #
+  # normally all toplevel start events are handled with XML-Elements
+  # here we can define regexp patterns for other toplevel handlers
+  #
+  XMLParser instproc topLevelHandlerPattern {regexp handlerClass} {
+    my lappend topLevelNodeHandler $regexp $handlerClass
+  }
+  #
+  # if regexp matches -> handler class is used (see start instproc)
+  # if none matches -> use XMLElement; "name" is name given by the
+  # start method
+  #
+  XMLParser instproc createTopLevelNode {name attrList} {
+    set nf [my set nodeFactory]
+    set tnName [my autoname topNode]
+    foreach {regexpPattern class} [my set topLevelNodeHandler] {
+      if {[regexp $regexpPattern $name]} {
+	set tn [$nf getNode $class [self]::$tnName [self]]
+	my set currentTopNode $tn
+	return $tn
+      }
     }
+    set tn [$nf getNode XMLElement [self]::$tnName [self]]
+    my set currentTopNode $tn
+    $tn parseAttributes $name $attrList
+    return $tn
   }
-  set tn [$nf getNode XMLElement [self]::$tnName [self]]
-  my set currentTopNode $tn
-  $tn parseAttributes $name $attrList
-  return $tn
-}
 
-#
-# determine the current node -> either the end of node list or topNode
-#
-XMLParser instproc currentNode {} {
-  set nodeList [my set nodeList]
-  if {$nodeList == ""} {
-    if {[my exists currentTopNode]} {
-      return [my set currentTopNode]
+  #
+  # determine the current node -> either the end of node list or topNode
+  #
+  XMLParser instproc currentNode {} {
+    set nodeList [my set nodeList]
+    if {$nodeList == ""} {
+      if {[my exists currentTopNode]} {
+	return [my set currentTopNode]
+      }
+      error "No current top node"
+    } else {
+      return [lindex $nodeList end]
     }
-    error "No current top node"
-  } else {
-    return [lindex $nodeList end]
   }
-}
-#
-# instatiate parser and register event callback methods with parser
-#
-XMLParser instproc init args {
-  #my set xmlTextParser expat
-  switch -- [my set xmlTextParser] {
-    tclxml {
-      package require xml
-      my set PC \
-	  [xml::parser [[self class] autoname [namespace tail [self]]]]
-    }
-    expat {
-      package require xotcl::xml::expat
-      my set PC \
-	  [expat [[self class] autoname [namespace tail [self]]]]
-    }
-    expat_fallback_tclxml {
+  #
+  # instatiate parser and register event callback methods with parser
+  #
+  XMLParser instproc init args {
+    #my set xmlTextParser expat
+    switch -- [my set xmlTextParser] {
+      tclxml {
+	package require xml
+	my set PC \
+	    [xml::parser [[self class] autoname [namespace tail [self]]]]
+      }
+      expat {
+	package require xotcl::xml::expat
+	my set PC \
+	    [expat [[self class] autoname [namespace tail [self]]]]
+      }
+      expat_fallback_tclxml {
 	if {[catch {package require xotcl::xml::expat}]} {
-	    package require xml
-	    my set PC \
-		[xml::parser [[self class] autoname [namespace tail [self]]]]
-	    #puts "using tclxml"
+	  package require xml
+	  my set PC \
+	      [xml::parser [[self class] autoname [namespace tail [self]]]]
+	  #puts "using tclxml"
 	} else {
-	    my set PC \
-		[expat [[self class] autoname [namespace tail [self]]]]
-	    #puts "using expat"
+	  my set PC \
+	      [expat [[self class] autoname [namespace tail [self]]]]
+	  #puts "using expat"
 	}
+      }
     }
+    my configure \
+	-characterdatacommand [list [self] pcdata] \
+	-elementstartcommand [list [self] start] \
+	-elementendcommand [list [self] end]
+    my set nodeList ""
+    next
   }
-  my configure \
-      -characterdatacommand [list [self] pcdata] \
-      -elementstartcommand [list [self] start] \
-      -elementendcommand [list [self] end]
-  my set nodeList ""
-  next
-}
-XMLParser instproc characterdatacommand cmd {
-  [my set PC] configure -[self proc] $cmd
-}
-XMLParser instproc elementstartcommand cmd {
-  [my set PC] configure -[self proc] $cmd
-}
-XMLParser instproc elementendcommand cmd {
-  [my set PC] configure -[self proc] $cmd
-}
+  XMLParser instproc characterdatacommand cmd {
+    [my set PC] configure -[self proc] $cmd
+  }
+  XMLParser instproc elementstartcommand cmd {
+    [my set PC] configure -[self proc] $cmd
+  }
+  XMLParser instproc elementendcommand cmd {
+    [my set PC] configure -[self proc] $cmd
+  }
 
-#
-# Create Forwarding methods to the parser ==
-# abstact interface for xml parser acces
-#
-XMLParser instproc cget option {[my set PC] cget $option}
-XMLParser instproc parse data {[my set PC] parse $data}
-XMLParser instproc parseFile filename {
-  set F [open $filename r]; set c [read $F]; close $F
-  return [my parse $c]
-}
-XMLParser instproc reset {} {
-  [my set PC] reset
-  foreach c [my info children] {
-    $c destroy
+  #
+  # Create Forwarding methods to the parser ==
+  # abstact interface for xml parser acces
+  #
+  XMLParser instproc cget option {[my set PC] cget $option}
+  XMLParser instproc parse data {[my set PC] parse $data}
+  XMLParser instproc parseFile filename {
+    set F [open $filename r]; set c [read $F]; close $F
+    return [my parse $c]
   }
-  my autoname -reset topNode
-  my set nodeList ""
-  [my set nodeFactory] reset
-}
-XMLParser instproc pcdata text {
-  #my showCall
-  set t [string trim $text]
-  if {$t != ""} {
-    #puts stderr "[self]->[self proc] '$text'"
-    [my currentNode] parseData $t
+  XMLParser instproc reset {} {
+    [my set PC] reset
+    foreach c [my info children] {
+      $c destroy
+    }
+    my autoname -reset topNode
+    my set nodeList ""
+    [my set nodeFactory] reset
   }
-}
-XMLParser instproc start {name {attrList ""}} {
-  #puts "[self]->[self proc] $name $attrList"
-  my instvar nodeList
-  if {$nodeList == ""} {
-    # no currentNode -> we have to create one
-    set newStartNode [my createTopLevelNode $name $attrList]
-  } else {
-    set newStartNode [[my currentNode] parseStart $name $attrList]
+  XMLParser instproc pcdata text {
+    #my showCall
+    set t [string trim $text]
+    if {$t != ""} {
+      #puts stderr "[self]->[self proc] '$text'"
+      [my currentNode] parseData $t
+    }
   }
-  lappend nodeList $newStartNode
-}
-XMLParser instproc end {name} {
-  #puts "[self]->[self proc] $name"
-  my instvar nodeList
-  set currentNode [my currentNode]
-  $currentNode parseEnd $name
-  set nodeList [lreplace $nodeList end end]
-}
-XMLParser instproc destroy args {
-  if {[my exists PC]} {
-    rename [my set PC] ""
+  XMLParser instproc start {name {attrList ""}} {
+    #puts "[self]->[self proc] $name $attrList"
+    my instvar nodeList
+    if {$nodeList == ""} {
+      # no currentNode -> we have to create one
+      set newStartNode [my createTopLevelNode $name $attrList]
+    } else {
+      set newStartNode [[my currentNode] parseStart $name $attrList]
+    }
+    lappend nodeList $newStartNode
   }
-  next
-}
-##############################################################################
-#
-# Abstract class for visiting Parser Node Trees
-#
-##############################################################################
-Class NodeTreeVisitor
+  XMLParser instproc end {name} {
+    #puts "[self]->[self proc] $name"
+    my instvar nodeList
+    set currentNode [my currentNode]
+    $currentNode parseEnd $name
+    set nodeList [lreplace $nodeList end end]
+  }
+  XMLParser instproc destroy args {
+    if {[my exists PC]} {
+      rename [my set PC] ""
+    }
+    next
+  }
+  ##############################################################################
+  #
+  # Abstract class for visiting Parser Node Trees
+  #
+  ##############################################################################
+  Class NodeTreeVisitor
 
-#
-# visit a given node "objName" -> called by accept method of objName
-# visit encapsulates the interpretation algorithm for a node
-#
-NodeTreeVisitor abstract instproc visit objName
+  #
+  # visit a given node "objName" -> called by accept method of objName
+  # visit encapsulates the interpretation algorithm for a node
+  #
+  NodeTreeVisitor abstract instproc visit objName
 
-#
-# interpret the whole node tree strating with top node "node"
-#
-NodeTreeVisitor abstract instproc interpretNodeTree node
+  #
+  # interpret the whole node tree strating with top node "node"
+  #
+  NodeTreeVisitor abstract instproc interpretNodeTree node
 
-#
-# visit end may stay unspecified in concrete visitors
-#
-NodeTreeVisitor instproc visitEnd objName {;}
-#
-# template method that interprets all topnodes of a parser 
-# in original order
-#
-NodeTreeVisitor instproc interpretAll {parser} {
-  set result ""
-  foreach tn [lsort [$parser info children topNode*]] {
-    append result [my interpretNodeTree $tn]
+  #
+  # visit end may stay unspecified in concrete visitors
+  #
+  NodeTreeVisitor instproc visitEnd objName {;}
+  #
+  # template method that interprets all topnodes of a parser 
+  # in original order
+  #
+  NodeTreeVisitor instproc interpretAll {parser} {
+    set result ""
+    foreach tn [lsort [$parser info children topNode*]] {
+      append result [my interpretNodeTree $tn]
+    }
+    return $result
   }
-  return $result
+
+  namespace export XMLNamespace AbstractXMLNode XMLNode \
+      XMLNodeClassFactory XMLElement AbstractXMLNodeFactory \
+      XMLNodeFactory XMLParser NodeTreeVisitor
 }
+
+namespace import ::xotcl::xml::parser::*
Index: xotcl/tcl.m4
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/tcl.m4	(.../tcl.m4)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/tcl.m4	(.../tcl.m4)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -4,12 +4,12 @@
 #	a Tcl extension.
 #
 # Copyright (c) 1999-2000 Ajuba Solutions.
-# Copyright (c) 2002-2003 ActiveState Corporation.
+# Copyright (c) 2002-2005 ActiveState Corporation.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: tcl.m4,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# RCS: @(#) $Id: tcl.m4,v 1.2 2005/09/09 21:07:23 neumann Exp $
 
 AC_PREREQ(2.50)
 
@@ -50,6 +50,13 @@
 
 	    # First check to see if --with-tcl was specified.
 	    if test x"${with_tclconfig}" != x ; then
+		case ${with_tclconfig} in
+		    */tclConfig.sh )
+			if test -f ${with_tclconfig}; then
+			    AC_MSG_WARN([--with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself])
+			    with_tclconfig=`echo ${with_tclconfig} | sed 's!/tclConfig\.sh$!!'`
+			fi ;;
+		esac
 		if test -f "${with_tclconfig}/tclConfig.sh" ; then
 		    ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)`
 		else
@@ -61,10 +68,16 @@
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
 		for i in \
 			../tcl \
+			`ls -dr ../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ../tcl[[8-9]].[[0-9]] 2>/dev/null` \
 			`ls -dr ../tcl[[8-9]].[[0-9]]* 2>/dev/null` \
 			../../tcl \
+                        `ls -dr ../../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+                        `ls -dr ../../tcl[[8-9]].[[0-9]] 2>/dev/null` \
 			`ls -dr ../../tcl[[8-9]].[[0-9]]* 2>/dev/null` \
 			../../../tcl \
+                        `ls -dr ../../../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+                        `ls -dr ../../../tcl[[8-9]].[[0-9]] 2>/dev/null` \
 			`ls -dr ../../../tcl[[8-9]].[[0-9]]* 2>/dev/null` ; do
 		    if test -f "$i/unix/tclConfig.sh" ; then
 			ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
@@ -92,6 +105,8 @@
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
 		for i in \
 			${srcdir}/../tcl \
+			`ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]] 2>/dev/null` \
 			`ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]]* 2>/dev/null` ; do
 		    if test -f "$i/unix/tclConfig.sh" ; then
 		    ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
@@ -147,6 +162,13 @@
 
 	    # First check to see if --with-tkconfig was specified.
 	    if test x"${with_tkconfig}" != x ; then
+		case ${with_tkconfig} in
+		    */tkConfig.sh )
+			if test -f ${with_tkconfig}; then
+			    AC_MSG_WARN([--with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself])
+			    with_tkconfig=`echo ${with_tkconfig} | sed 's!/tkConfig\.sh$!!'`
+			fi ;;
+		esac
 		if test -f "${with_tkconfig}/tkConfig.sh" ; then
 		    ac_cv_c_tkconfig=`(cd ${with_tkconfig}; pwd)`
 		else
@@ -158,10 +180,16 @@
 	    if test x"${ac_cv_c_tkconfig}" = x ; then
 		for i in \
 			../tk \
+			`ls -dr ../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ../tk[[8-9]].[[0-9]] 2>/dev/null` \
 			`ls -dr ../tk[[8-9]].[[0-9]]* 2>/dev/null` \
 			../../tk \
+			`ls -dr ../../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ../../tk[[8-9]].[[0-9]] 2>/dev/null` \
 			`ls -dr ../../tk[[8-9]].[[0-9]]* 2>/dev/null` \
 			../../../tk \
+			`ls -dr ../../../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ../../../tk[[8-9]].[[0-9]] 2>/dev/null` \
 			`ls -dr ../../../tk[[8-9]].[[0-9]]* 2>/dev/null` ; do
 		    if test -f "$i/unix/tkConfig.sh" ; then
 			ac_cv_c_tkconfig=`(cd $i/unix; pwd)`
@@ -187,6 +215,8 @@
 	    if test x"${ac_cv_c_tkconfig}" = x ; then
 		for i in \
 			${srcdir}/../tk \
+			`ls -dr ${srcdir}/../tk[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ${srcdir}/../tk[[8-9]].[[0-9]] 2>/dev/null` \
 			`ls -dr ${srcdir}/../tk[[8-9]].[[0-9]]* 2>/dev/null` ; do
 		    if test -f "$i/unix/tkConfig.sh" ; then
 			ac_cv_c_tkconfig=`(cd $i/unix; pwd)`
@@ -276,7 +306,6 @@
     AC_SUBST(TCL_STUB_LIB_FLAG)
     AC_SUBST(TCL_STUB_LIB_SPEC)
 
-    #AC_SUBST(TCL_DBGX)
     AC_SUBST(TCL_LIBS)
     AC_SUBST(TCL_DEFS)
     AC_SUBST(TCL_EXTRA_CFLAGS)
@@ -405,6 +434,9 @@
 #
 #	Specify if thread support should be enabled.  If "yes" is
 #	specified as an arg (optional), threads are enabled by default.
+#	TCL_THREADS is checked so that if you are compiling an extension
+#	against a threaded core, your extension must be compiled threaded
+#	as well.
 #
 # Arguments:
 #	none
@@ -427,7 +459,7 @@
     AC_ARG_ENABLE(threads, [  --enable-threads        build with threads],
 	[tcl_ok=$enableval], [tcl_ok=$1])
 
-    if test "$tcl_ok" = "yes"; then
+    if test "$tcl_ok" = "yes" -o "${TCL_THREADS}" = 1; then
 	TCL_THREADS=1
 
 	if test "${TEA_PLATFORM}" != "windows" ; then
@@ -489,6 +521,7 @@
     AC_MSG_CHECKING([for building with threads])
     if test "${TCL_THREADS}" = "1"; then
 	AC_DEFINE(TCL_THREADS)
+	#LIBS="$LIBS $THREADS_LIBS"
 	AC_MSG_RESULT([yes])
     else
 	AC_MSG_RESULT([no (default)])
@@ -539,33 +572,26 @@
 #				Sets to CFLAGS_OPTIMIZE if false
 #		LDFLAGS_DEFAULT	Sets to LDFLAGS_DEBUG if true
 #				Sets to LDFLAGS_OPTIMIZE if false
-#		DBGX		Debug library extension
+#		DBGX		Formerly used as debug library extension;
+#				always blank now.
 #
 #------------------------------------------------------------------------
 
 AC_DEFUN(TEA_ENABLE_SYMBOLS, [
     dnl Make sure we are initialized
     AC_REQUIRE([TEA_CONFIG_CFLAGS])
 
-    if test "${TEA_PLATFORM}" = "windows" ; then
-	tcl_dbgx=d
-    else
-	tcl_dbgx=g
-    fi
+    DBGX=""
 
     AC_MSG_CHECKING([for build with symbols])
     AC_ARG_ENABLE(symbols, [  --enable-symbols        build with debugging symbols [--disable-symbols]],    [tcl_ok=$enableval], [tcl_ok=no])
     if test "$tcl_ok" = "no"; then
 	CFLAGS_DEFAULT="${CFLAGS_OPTIMIZE}"
 	LDFLAGS_DEFAULT="${LDFLAGS_OPTIMIZE}"
-	DBGX=""
-	TCL_DBGX=""
 	AC_MSG_RESULT([no])
     else
 	CFLAGS_DEFAULT="${CFLAGS_DEBUG}"
 	LDFLAGS_DEFAULT="${LDFLAGS_DEBUG}"
-	DBGX=${tcl_dbgx}
-	TCL_DBGX=${tcl_dbgx}
 	if test "$tcl_ok" = "yes"; then
 	    AC_MSG_RESULT([yes (standard debugging)])
 	fi
@@ -707,8 +733,7 @@
 #			Flags used when running the compiler in debug mode
 #	CFLAGS_OPTIMIZE -
 #			Flags used when running the compiler in optimize mode
-#	EXTRA_CFLAGS -
-#			Extra CFLAGS to pass to the compiler
+#	CFLAGS -	We add CFLAGS to pass to the compiler
 #
 #	Subst's the following vars:
 #		DL_LIBS
@@ -719,7 +744,6 @@
 #		STLIB_LD
 #		SHLIB_LD
 #		SHLIB_CFLAGS
-#		SHLIB_LD_FLAGS
 #		LDFLAGS_DEBUG
 #		LDFLAGS_OPTIMIZE
 #--------------------------------------------------------------------
@@ -788,19 +812,23 @@
     AC_CHECK_LIB(dl, dlopen, have_dl=yes, have_dl=no)
 
     # Step 3: set configuration options based on system name and version.
+    # This is similar to Tcl's unix/tcl.m4 except that we've added a
+    # "windows" case and CC_SEARCH_FLAGS becomes LD_SEARCH_FLAGS for us
+    # (and we have no CC_SEARCH_FLAGS).
 
     do64bit_ok=no
-    EXTRA_CFLAGS=""
+    LDFLAGS_ORIG="$LDFLAGS"
     TCL_EXPORT_FILE_SUFFIX=""
     UNSHARED_LIB_SUFFIX=""
     TCL_TRIM_DOTS='`echo ${PACKAGE_VERSION} | tr -d .`'
     ECHO_VERSION='`echo ${PACKAGE_VERSION}`'
     TCL_LIB_VERSIONS_OK=ok
     CFLAGS_DEBUG=-g
-    CFLAGS_OPTIMIZE=-O
     if test "$GCC" = "yes" ; then
-	CFLAGS_WARNING="-Wall -Wconversion -Wno-implicit-int"
+	CFLAGS_OPTIMIZE=-O2
+	CFLAGS_WARNING="-Wall -Wno-implicit-int"
     else
+	CFLAGS_OPTIMIZE=-O
 	CFLAGS_WARNING=""
     fi
     TCL_NEEDS_EXP_FILE=0
@@ -819,11 +847,10 @@
 		if test "x${MSSDK}x" = "xx" ; then
 		    MSSDK="C:/Progra~1/Microsoft SDK"
 		fi
-		# In order to work in the tortured autoconf environment,
-		# we need to ensure that this path has no spaces
-		MSSDK=`cygpath -w -s "$MSSDK" | sed -e 's!\\\!/!g'`
+		# Ensure that this path has no spaces to work in autoconf
+		TEA_PATH_NOSPACE(MSSDK, ${MSSDK})
 		if test ! -d "${MSSDK}/bin/win64" ; then
-		    AC_MSG_WARN("could not find 64-bit SDK to enable 64bit mode")
+		    AC_MSG_WARN([could not find 64-bit SDK to enable 64bit mode])
 		    do64bit="no"
 		else
 		    do64bit_ok="yes"
@@ -838,42 +865,55 @@
 		    AC_MSG_ERROR([Windows/CE and GCC builds incompatible])
 		fi
 		TEA_PATH_CELIB
-		# set defaults
-		# Currently Tcl requires 300+
-		CEVERSION=300;	  # could be 211 300 301 ...
-		TARGETCPU=ARM;	  # could be ARM MIPS SH3 X86 ...
-		PLATFORM="Pocket PC 2002"
-		if test "$doWince" = "yes"; then
-		    doWince="300,ARM,ARM,Pocket PC 2002"
-		fi
-		eval `echo $doWince | awk -F "," '{ \
-		    if (length([$]1)) { printf "CEVERSION=%s\n", [$]1 }; \
-		    if (length([$]2)) { printf "TARGETCPU=%s\n", toupper([$]2) }; \
-		    if (length([$]3)) { printf "ARCH=%s\n", toupper([$]3) }; \
-		    if (length([$]4)) { printf "PLATFORM=%s\n", [$]4 }; \
+		# Set defaults for common evc4/PPC2003 setup
+		# Currently Tcl requires 300+, possibly 420+ for sockets
+		CEVERSION=420; 		# could be 211 300 301 400 420 ...
+		TARGETCPU=ARMV4;	# could be ARMV4 ARM MIPS SH3 X86 ...
+		ARCH=ARM;		# could be ARM MIPS X86EM ...
+		PLATFORM="Pocket PC 2003"; # or "Pocket PC 2002"
+		if test "$doWince" != "yes"; then
+		    # If !yes then the user specified something
+		    # Reset ARCH to allow user to skip specifying it
+		    ARCH=
+		    eval `echo $doWince | awk -F, '{ \
+	    if (length([$]1)) { printf "CEVERSION=\"%s\"\n", [$]1; \
+	    if ([$]1 < 400)   { printf "PLATFORM=\"Pocket PC 2002\"\n" } }; \
+	    if (length([$]2)) { printf "TARGETCPU=\"%s\"\n", toupper([$]2) }; \
+	    if (length([$]3)) { printf "ARCH=\"%s\"\n", toupper([$]3) }; \
+	    if (length([$]4)) { printf "PLATFORM=\"%s\"\n", [$]4 }; \
 		    }'`
+		    if test "x${ARCH}" = "x" ; then
+			ARCH=$TARGETCPU;
+		    fi
+		fi
 		OSVERSION=WCE$CEVERSION;
-		if test "x${ARCH}" = "x" ; then
-	            ARCH=$TARGETCPU;  # could be ARM MIPS SH3 X86 X86EM ...
+	    	if test "x${WCEROOT}" = "x" ; then
+			WCEROOT="C:/Program Files/Microsoft eMbedded C++ 4.0"
+		    if test ! -d "${WCEROOT}" ; then
+			WCEROOT="C:/Program Files/Microsoft eMbedded Tools"
+		    fi
 		fi
-		if test "x${WCEROOT}" = "x" ; then
-		    WCEROOT="C:/Program Files/Microsoft eMbedded Tools"
-		fi
 		if test "x${SDKROOT}" = "x" ; then
-		    SDKROOT="C:/Windows CE Tools"
+		    SDKROOT="C:/Program Files/Windows CE Tools"
+		    if test ! -d "${SDKROOT}" ; then
+			SDKROOT="C:/Windows CE Tools"
+		    fi
 		fi
-		# In order to work in the tortured autoconf environment,
-		# we need to ensure that this path has no spaces
-		WCEROOT=`cygpath -w -s "$WCEROOT" | sed -e 's!\\\!/!g'`
-		SDKROOT=`cygpath -w -s "$SDKROOT" | sed -e 's!\\\!/!g'`
-		CELIB_DIR=`cygpath -w -s "$CELIB_DIR" | sed -e 's!\\\!/!g'`
+		# Ensure that this path has no spaces to work in autoconf
+		TEA_PATH_NOSPACE(WCEROOT, ${WCEROOT})
+		TEA_PATH_NOSPACE(SDKROOT, ${SDKROOT})
 		if test ! -d "${SDKROOT}/${OSVERSION}/${PLATFORM}/Lib/${TARGETCPU}" \
 		    -o ! -d "${WCEROOT}/EVC/${OSVERSION}/bin"; then
 		    AC_MSG_ERROR([could not find PocketPC SDK or target compiler to enable WinCE mode [$CEVERSION,$TARGETCPU,$ARCH,$PLATFORM]])
 		    doWince="no"
 		else
-		    CEINCLUDE=`cygpath -w -s "${SDKROOT}/${OSVERSION}/${PLATFORM}/include" | sed -e 's!\\\!/!g'`
-		    CELIBPATH=`cygpath -w -s "${SDKROOT}/${OSVERSION}/${PLATFORM}/Lib/${TARGETCPU}" | sed -e 's!\\\!/!g'`
+		    # We could PATH_NOSPACE these, but that's not important,
+		    # as long as we quote them when used.
+		    CEINCLUDE="${SDKROOT}/${OSVERSION}/${PLATFORM}/include"
+		    if test -d "${CEINCLUDE}/${TARGETCPU}" ; then
+			CEINCLUDE="${CEINCLUDE}/${TARGETCPU}"
+		    fi
+		    CELIBPATH="${SDKROOT}/${OSVERSION}/${PLATFORM}/Lib/${TARGETCPU}"
     		fi
 	    fi
 
@@ -886,58 +926,65 @@
 
                 if test "$do64bit" = "yes" ; then
 		    # All this magic is necessary for the Win64 SDK RC1 - hobbs
-		    export CC="${MSSDK}/Bin/Win64/cl.exe \
-	                -I${MSSDK}/Include/prerelease \
-                        -I${MSSDK}/Include/Win64/crt \
-	                -I${MSSDK}/Include"
-		    export RC="${MSSDK}/bin/rc.exe"
-		    export lflags="-MACHINE:IA64 -LIBPATH:${MSSDK}/Lib/IA64 \
-	                -LIBPATH:${MSSDK}/Lib/Prerelease/IA64"
-		    export STLIB_LD="${MSSDK}/bin/win64/lib.exe -nologo ${lflags}"
-		    export LINKBIN="${MSSDK}/bin/win64/link.exe ${lflags}"
+		    CC="${MSSDK}/Bin/Win64/cl.exe"
+		    CFLAGS="${CFLAGS} -I${MSSDK}/Include/prerelease \
+			-I${MSSDK}/Include/Win64/crt \
+			-I${MSSDK}/Include"
+		    RC="${MSSDK}/bin/rc.exe"
+		    lflags="-MACHINE:IA64 -LIBPATH:${MSSDK}/Lib/IA64 \
+			-LIBPATH:${MSSDK}/Lib/Prerelease/IA64 -nologo"
+		    LINKBIN="${MSSDK}/bin/win64/link.exe"
 		    CFLAGS_DEBUG="-nologo -Zi -Od -W3 ${runtime}d"
-		    CFLAGS_OPTIMIZE="-nologo -O2 -Gs -W2 ${runtime}"
+		    CFLAGS_OPTIMIZE="-nologo -O2 -W2 ${runtime}"
 		elif test "$doWince" != "no" ; then
+		    CEBINROOT="${WCEROOT}/EVC/${OSVERSION}/bin"
 		    if test "${TARGETCPU}" = "X86"; then
-			CC="${WCEROOT}/EVC/${OSVERSION}/bin/cl.exe -I\"${CELIB_DIR}/inc\" -I\"${CEINCLUDE}\""
+			CC="${CEBINROOT}/cl.exe"
 		    else
-			CC="${WCEROOT}/EVC/${OSVERSION}/bin/cl${TARGETCPU}.exe -I\"${CELIB_DIR}/inc\" -I\"${CEINCLUDE}\""
+			CC="${CEBINROOT}/cl${ARCH}.exe"
 		    fi
+		    CFLAGS="$CFLAGS -I\"${CELIB_DIR}/inc\" -I\"${CEINCLUDE}\""
 		    RC="${WCEROOT}/Common/EVC/bin/rc.exe"
-		    cpulower=`echo ${TARGETCPU} | awk '{print tolower([$]0)}'`
-		    defs="${TARGETCPU} _${TARGETCPU}_ ${cpulower} _${cpulower}_ POCKET_SIZE PALM_SIZE _MT _DLL _WINDOWS"
+		    arch=`echo ${ARCH} | awk '{print tolower([$]0)}'`
+		    defs="${ARCH} _${ARCH}_ ${arch} PALM_SIZE _MT _WINDOWS"
+		    if test "${SHARED_BUILD}" = "1" ; then
+			# Static CE builds require static celib as well
+		    	defs="${defs} _DLL"
+		    fi
 		    for i in $defs ; do
 			AC_DEFINE_UNQUOTED($i)
 		    done
 		    AC_DEFINE_UNQUOTED(_WIN32_WCE, $CEVERSION)
 		    AC_DEFINE_UNQUOTED(UNDER_CE, $CEVERSION)
 		    CFLAGS_DEBUG="-nologo -Zi -Od"
 		    CFLAGS_OPTIMIZE="-nologo -Ox"
-		    lflags="-MACHINE:${TARGETCPU} -LIBPATH:\"${CELIBPATH}\" -subsystem:windowsce,3.00"
-		    STLIB_LD="${WCEROOT}/EVC/${OSVERSION}/bin/lib.exe -nologo ${lflags}"
-		    LINKBIN="${WCEROOT}/EVC/${OSVERSION}/bin/link.exe ${lflags}"
+		    lversion=`echo ${CEVERSION} | sed -e 's/\(.\)\(..\)/\1\.\2/'`
+		    lflags="-MACHINE:${ARCH} -LIBPATH:\"${CELIBPATH}\" -subsystem:windowsce,${lversion} -nologo"
+		    LINKBIN="${CEBINROOT}/link.exe"
+		    AC_SUBST(CELIB_DIR)
 		else
 		    RC="rc"
-		    STLIB_LD="lib -nologo"
-    		    LINKBIN="link -link50compat"
+		    lflags="-nologo"
+    		    LINKBIN="link"
 		    CFLAGS_DEBUG="-nologo -Z7 -Od -W3 -WX ${runtime}d"
-		    CFLAGS_OPTIMIZE="-nologo -O2 -Gs -GD -W2 ${runtime}"
+		    CFLAGS_OPTIMIZE="-nologo -O2 -W2 ${runtime}"
 		fi
 	    fi
 
 	    if test "$GCC" = "yes"; then
 		# mingw gcc mode
 		RC="windres"
 		CFLAGS_DEBUG="-g"
-		CFLAGS_OPTIMIZE="-O2"
+		CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
 		SHLIB_LD="$CC -shared"
-		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 		LDFLAGS_CONSOLE="-wl,--subsystem,console ${lflags}"
 		LDFLAGS_WINDOW="-wl,--subsystem,windows ${lflags}"
 	    else
-		SHLIB_LD="${LINKBIN} -dll -nologo"
-		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.lib'
-		EXTRA_CFLAGS="-YX"
+		SHLIB_LD="${LINKBIN} -dll ${lflags}"
+		# link -lib only works when -lib is the first arg
+		STLIB_LD="${LINKBIN} -lib ${lflags}"
+		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.lib'
 		PATHTYPE=-w
 		# For information on what debugtype is most useful, see:
 		# http://msdn.microsoft.com/library/en-us/dnvc60/html/gendepdebug.asp
@@ -955,7 +1002,7 @@
 
 	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".dll"
-	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.dll'
+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.dll'
 
 	    TCL_LIB_VERSIONS_OK=nodots
 	    # Bogus to avoid getting this turned off
@@ -975,7 +1022,6 @@
 	    SHLIB_LD_LIBS='${LIBS}'
 
 	    DL_OBJS="tclLoadDl.o"
-	    LDFLAGS=""
 	    LD_LIBRARY_PATH_VAR="LIBPATH"
 
 	    # AIX v<=4.1 has some different flags than 4.2+
@@ -991,8 +1037,8 @@
 		    AC_MSG_WARN("64bit mode not supported with GCC on $system")
 		else 
 		    do64bit_ok=yes
-		    EXTRA_CFLAGS="-q64"
-		    LDFLAGS="-q64"
+		    CFLAGS="$CFLAGS -q64"
+		    LDFLAGS="$LDFLAGS -q64"
 		    RANLIB="${RANLIB} -X64"
 		    AR="${AR} -X64"
 		    SHLIB_LD_FLAGS="-b64"
@@ -1010,11 +1056,16 @@
 		    LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'
 		fi
 	    else
-		SHLIB_LD="${TCL_SRC_DIR}/unix/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry ${SHLIB_LD_FLAGS}"
+		if test "$GCC" = "yes" ; then
+		    SHLIB_LD="gcc -shared"
+		else
+		    SHLIB_LD="/bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"
+		fi
+		SHLIB_LD="${TCL_SRC_DIR}/unix/ldAix ${SHLIB_LD} ${SHLIB_LD_FLAGS}"
 		DL_LIBS="-ldl"
 		LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
 		TCL_NEEDS_EXP_FILE=1
-		TCL_EXPORT_FILE_SUFFIX='${PACKAGE_VERSION}\$\{DBGX\}.exp'
+		TCL_EXPORT_FILE_SUFFIX='${PACKAGE_VERSION}.exp'
 	    fi
 
 	    # On AIX <=v4 systems, libbsd.a has to be linked in to support
@@ -1035,14 +1086,21 @@
 	    	AC_DEFINE(USE_DELTA_FOR_TZ)
 	    fi
 	    ;;
+	BeOS*)
+	    SHLIB_CFLAGS="-fPIC"
+	    SHLIB_LD="${CC} -nostart"
+	    SHLIB_LD_LIBS='${LIBS}'
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS="-ldl"
+	    ;;
 	BSD/OS-2.1*|BSD/OS-3*)
 	    SHLIB_CFLAGS=""
 	    SHLIB_LD="shlicc -r"
 	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
-	    LDFLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
 	BSD/OS-4.*)
@@ -1052,7 +1110,7 @@
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
-	    LDFLAGS="-export-dynamic"
+	    LDFLAGS="$LDFLAGS -export-dynamic"
 	    LD_SEARCH_FLAGS=""
 	    ;;
 	dgux*)
@@ -1062,7 +1120,6 @@
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
-	    LDFLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
 	HP-UX-*.11.*)
@@ -1077,13 +1134,18 @@
 		SHLIB_LD_LIBS='${LIBS}'
 		DL_OBJS="tclLoadShl.o"
 		DL_LIBS="-ldld"
-		LDFLAGS="-Wl,-E"
+		LDFLAGS="$LDFLAGS -Wl,-E"
+		LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
+		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
+	    fi
+	    if test "$GCC" = "yes" ; then
+		SHLIB_LD="gcc -shared"
+		SHLIB_LD_LIBS='${LIBS}'
 		LD_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
 	    fi
-	    LD_LIBRARY_PATH_VAR="SHLIB_PATH"
 
 	    # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc
-	    #EXTRA_CFLAGS="+DAportable"
+	    #CFLAGS="$CFLAGS +DAportable"
 
 	    # Check to enable 64-bit flags for compiler/linker
 	    if test "$do64bit" = "yes" ; then
@@ -1094,22 +1156,16 @@
 			    # 64-bit gcc in use.  Fix flags for GNU ld.
 			    do64bit_ok=yes
 			    SHLIB_LD="${CC} -shared"
-			    SHLIB_LD_LIBS=""
-			    LD_SEARCH_FLAGS=''
+			    SHLIB_LD_LIBS='${LIBS}'
 			    ;;
 			*)
 			    AC_MSG_WARN("64bit mode not supported with GCC on $system")
 			    ;;
 		    esac
 		else
 		    do64bit_ok=yes
-		    if test "`uname -m`" = "ia64" ; then
-			EXTRA_CFLAGS="+DD64"
-			LDFLAGS="+DD64 $LDFLAGS"
-		    else
-			EXTRA_CFLAGS="+DA2.0W"
-			LDFLAGS="+DA2.0W $LDFLAGS"
-		    fi
+		    CFLAGS="$CFLAGS +DD64"
+		    LDFLAGS="$LDFLAGS +DD64"
 		fi
 	    fi
 	    ;;
@@ -1122,7 +1178,7 @@
 		SHLIB_LD_LIBS=""
 		DL_OBJS="tclLoadShl.o"
 		DL_LIBS="-ldld"
-		LDFLAGS="-Wl,-E"
+		LDFLAGS="$LDFLAGS -Wl,-E"
 		LD_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
 	    fi
 	    LD_LIBRARY_PATH_VAR="SHLIB_PATH"
@@ -1134,9 +1190,9 @@
 	    SHLIB_LD_LIBS='${LIBS}'
 	    DL_OBJS="tclLoadAout.o"
 	    DL_LIBS=""
-	    LDFLAGS="-Wl,-D,08000000"
+	    LDFLAGS="$LDFLAGS -Wl,-D,08000000"
 	    LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
-	    SHARED_LIB_SUFFIX='${PACKAGE_VERSION}\$\{DBGX\}.a'
+	    SHARED_LIB_SUFFIX='${PACKAGE_VERSION}.a'
 	    ;;
 	IRIX-5.*)
 	    SHLIB_CFLAGS=""
@@ -1146,8 +1202,6 @@
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-	    EXTRA_CFLAGS=""
-	    LDFLAGS=""
 	    ;;
 	IRIX-6.*|IRIX64-6.5*)
 	    SHLIB_CFLAGS=""
@@ -1158,19 +1212,19 @@
 	    DL_LIBS=""
 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 	    if test "$GCC" = "yes" ; then
-		EXTRA_CFLAGS="-mabi=n32"
-		LDFLAGS="-mabi=n32"
+		CFLAGS="$CFLAGS -mabi=n32"
+		LDFLAGS="$LDFLAGS -mabi=n32"
 	    else
 		case $system in
 		    IRIX-6.3)
 			# Use to build 6.2 compatible binaries on 6.3.
-			EXTRA_CFLAGS="-n32 -D_OLD_TERMIOS"
+			CFLAGS="$CFLAGS -n32 -D_OLD_TERMIOS"
 			;;
 		    *)
-			EXTRA_CFLAGS="-n32"
+			CFLAGS="$CFLAGS -n32"
 			;;
 		esac
-		LDFLAGS="-n32"
+		LDFLAGS="$LDFLAGS -n32"
 	    fi
 	    ;;
 	IRIX64-6.*)
@@ -1180,7 +1234,6 @@
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    LDFLAGS=""
 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 
 	    # Check to enable 64-bit flags for compiler/linker
@@ -1191,8 +1244,8 @@
 	        else
 	            do64bit_ok=yes
 	            SHLIB_LD="ld -64 -shared -rdata_shared"
-	            EXTRA_CFLAGS="-64"
-	            LDFLAGS="-64"
+	            CFLAGS="$CFLAGS -64"
+	            LDFLAGS="$LDFLAGS -64"
 	        fi
 	    fi
 	    ;;
@@ -1201,6 +1254,7 @@
 	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
 
+	    CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
 	    # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings 
 	    # when you inline the string and math operations.  Turn this off to
 	    # get rid of the warnings.
@@ -1211,18 +1265,17 @@
 		SHLIB_LD="${CC} -shared"
 		DL_OBJS="tclLoadDl.o"
 		DL_LIBS="-ldl"
-		LDFLAGS="-rdynamic"
+		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
 		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 	    else
 		AC_CHECK_HEADER(dld.h, [
 		    SHLIB_LD="ld -shared"
 		    DL_OBJS="tclLoadDld.o"
 		    DL_LIBS="-ldld"
-		    LDFLAGS=""
 		    LD_SEARCH_FLAGS=""])
 	    fi
 	    if test "`uname -m`" = "alpha" ; then
-		EXTRA_CFLAGS="-mieee"
+		CFLAGS="$CFLAGS -mieee"
 	    fi
 
 	    # The combo of gcc + glibc has a bug related
@@ -1233,7 +1286,7 @@
 	    # Disable inlining only when one of the
 	    # files in compat/*.c is being linked in.
 	    if test x"${USE_COMPAT}" != x ; then
-	        EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline"
+	        CFLAGS="$CFLAGS -fno-inline"
 	    fi
 
 	    ;;
@@ -1246,18 +1299,17 @@
 		SHLIB_LD="${CC} -shared"
 		DL_OBJS=""
 		DL_LIBS="-ldl"
-		LDFLAGS="-rdynamic"
+		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
 		LD_SEARCH_FLAGS=""
 	    else
 		AC_CHECK_HEADER(dld.h, [
 		    SHLIB_LD="ld -shared"
 		    DL_OBJS=""
 		    DL_LIBS="-ldld"
-		    LDFLAGS=""
 		    LD_SEARCH_FLAGS=""])
 	    fi
 	    if test "`uname -m`" = "alpha" ; then
-		EXTRA_CFLAGS="-mieee"
+		CFLAGS="$CFLAGS -mieee"
 	    fi
 	    ;;
 	MP-RAS-02*)
@@ -1267,7 +1319,6 @@
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
-	    LDFLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
 	MP-RAS-*)
@@ -1277,7 +1328,7 @@
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
-	    LDFLAGS="-Wl,-Bexport"
+	    LDFLAGS="$LDFLAGS -Wl,-Bexport"
 	    LD_SEARCH_FLAGS=""
 	    ;;
 	NetBSD-*|FreeBSD-[[1-2]].*)
@@ -1290,7 +1341,6 @@
 		SHLIB_SUFFIX=".so"
 		DL_OBJS="tclLoadDl.o"
 		DL_LIBS=""
-		LDFLAGS=""
 		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 		AC_MSG_CHECKING([for ELF])
 		AC_EGREP_CPP(yes, [
@@ -1299,9 +1349,9 @@
 #endif
 		],
 		    AC_MSG_RESULT([yes])
-		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so',
+		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so',
 		    AC_MSG_RESULT([no])
-		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
 		)
 	    ], [
 		SHLIB_CFLAGS=""
@@ -1310,14 +1360,13 @@
 		SHLIB_SUFFIX=".a"
 		DL_OBJS="tclLoadAout.o"
 		DL_LIBS=""
-		LDFLAGS=""
 		LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 	    ])
 
 	    # FreeBSD doesn't handle version numbers with dots.
 
-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 	    TCL_LIB_VERSIONS_OK=nodots
 	    ;;
 	OpenBSD-*)
@@ -1326,7 +1375,6 @@
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    LDFLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    AC_MSG_CHECKING(for ELF)
 	    AC_EGREP_CPP(yes, [
@@ -1335,13 +1383,13 @@
 #endif
 	    ],
 		[AC_MSG_RESULT(yes)
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'],
+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'],
 		[AC_MSG_RESULT(no)
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0']
+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0']
 	    )
 
 	    # OpenBSD doesn't do version numbers with dots.
-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 	    TCL_LIB_VERSIONS_OK=nodots
 	    ;;
 	FreeBSD-*)
@@ -1352,36 +1400,34 @@
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    LDFLAGS="-export-dynamic"
+	    LDFLAGS="$LDFLAGS -export-dynamic"
 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 	    if test "${TCL_THREADS}" = "1" ; then
 		# The -pthread needs to go in the CFLAGS, not LIBS
 		LIBS=`echo $LIBS | sed s/-pthread//`
-		EXTRA_CFLAGS="-pthread"
+		CFLAGS="$CFLAGS -pthread"
 	    	LDFLAGS="$LDFLAGS -pthread"
 	    fi
 	    case $system in
 	    FreeBSD-3.*)
 	    	# FreeBSD-3 doesn't handle version numbers with dots.
-	    	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-	    	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+	    	UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+	    	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
 	    	TCL_LIB_VERSIONS_OK=nodots
 		;;
 	    esac
 	    ;;
-	Rhapsody-*|Darwin-*)
+	Darwin-*)
 	    SHLIB_CFLAGS="-fno-common"
 	    SHLIB_LD="cc -dynamiclib \${LDFLAGS}"
-	    TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_MAJOR_VERSION} -current_version \${PACKAGE_VERSION} -install_name \${LIB_RUNTIME_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr 0xa000000"
 	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".dylib"
 	    DL_OBJS="tclLoadDyld.o"
 	    DL_LIBS=""
-	    LDFLAGS="-prebind"
+	    LDFLAGS="$LDFLAGS -prebind -Wl,-search_paths_first"
 	    LD_SEARCH_FLAGS=""
 	    LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
-	    CFLAGS_OPTIMIZE="-O3"
-	    EXTRA_CFLAGS="-arch ppc -pipe"
+	    CFLAGS_OPTIMIZE="-Os"
 	    ;;
 	NEXTSTEP-*)
 	    SHLIB_CFLAGS=""
@@ -1390,7 +1436,6 @@
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadNext.o"
 	    DL_LIBS=""
-	    LDFLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
 	OS/390-*)
@@ -1406,7 +1451,6 @@
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadOSF.o"
 	    DL_LIBS=""
-	    LDFLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
 	OSF1-1.*)
@@ -1421,7 +1465,6 @@
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    LDFLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
 	OSF1-V*)
@@ -1436,21 +1479,22 @@
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    LDFLAGS=""
 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
-	    if test "$GCC" != "yes" ; then
-		EXTRA_CFLAGS="-DHAVE_TZSET -std1"
+	    if test "$GCC" = "yes" ; then
+		CFLAGS="$CFLAGS -mieee"
+            else
+		CFLAGS="$CFLAGS -DHAVE_TZSET -std1 -ieee"
 	    fi
 	    # see pthread_intro(3) for pthread support on osf1, k.furukawa
 	    if test "${TCL_THREADS}" = "1" ; then
-		EXTRA_CFLAGS="${EXTRA_CFLAGS} -DHAVE_PTHREAD_ATTR_SETSTACKSIZE"
-		EXTRA_CFLAGS="${EXTRA_CFLAGS} -DTCL_THREAD_STACK_MIN=PTHREAD_STACK_MIN*64"
+		CFLAGS="$CFLAGS -DHAVE_PTHREAD_ATTR_SETSTACKSIZE"
+		CFLAGS="$CFLAGS -DTCL_THREAD_STACK_MIN=PTHREAD_STACK_MIN*64"
 		LIBS=`echo $LIBS | sed s/-lpthreads//`
 		if test "$GCC" = "yes" ; then
 		    LIBS="$LIBS -lpthread -lmach -lexc"
 		else
-		    EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread"
-		    LDFLAGS="-pthread"
+		    CFLAGS="$CFLAGS -pthread"
+		    LDFLAGS="$LDFLAGS -pthread"
 		fi
 	    fi
 
@@ -1465,7 +1509,6 @@
 	    DL_OBJS="tclLoadDl.o"
 	    # dlopen is in -lc on QNX
 	    DL_LIBS=""
-	    LDFLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
 	RISCos-*)
@@ -1475,7 +1518,7 @@
 	    SHLIB_SUFFIX=".a"
 	    DL_OBJS="tclLoadAout.o"
 	    DL_LIBS=""
-	    LDFLAGS="-Wl,-D,08000000"
+	    LDFLAGS="$LDFLAGS -Wl,-D,08000000"
 	    LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
 	    ;;
 	SCO_SV-3.2*)
@@ -1484,10 +1527,10 @@
 	    # below.
 	    if test "$GCC" = "yes" ; then
 	    	SHLIB_CFLAGS="-fPIC -melf"
-	    	LDFLAGS="-melf -Wl,-Bexport"
+	    	LDFLAGS="$LDFLAGS -melf -Wl,-Bexport"
 	    else
 	    	SHLIB_CFLAGS="-Kpic -belf"
-	    	LDFLAGS="-belf -Wl,-Bexport"
+	    	LDFLAGS="$LDFLAGS -belf -Wl,-Bexport"
 	    fi
 	    SHLIB_LD="ld -G"
 	    SHLIB_LD_LIBS=""
@@ -1503,7 +1546,6 @@
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
-	    LDFLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
 	SunOS-4*)
@@ -1513,16 +1555,15 @@
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
-	    LDFLAGS=""
 	    LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
 
 	    # SunOS can't handle version numbers with dots in them in library
 	    # specs, like -ltcl7.5, so use -ltcl75 instead.  Also, it
 	    # requires an extra version number at the end of .so file names.
 	    # So, the library has to have a name like libtcl75.so.1.0
 
-	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 	    TCL_LIB_VERSIONS_OK=nodots
 	    ;;
 	SunOS-5.[[0-6]]*)
@@ -1542,7 +1583,6 @@
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
-	    LDFLAGS=""
 	    if test "$GCC" = "yes" ; then
 		SHLIB_LD="$CC -shared"
 		LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
@@ -1560,22 +1600,28 @@
 	    AC_DEFINE(_POSIX_PTHREAD_SEMANTICS)
 
 	    SHLIB_CFLAGS="-KPIC"
-	    LDFLAGS=""
     
 	    # Check to enable 64-bit flags for compiler/linker
 	    if test "$do64bit" = "yes" ; then
 		arch=`isainfo`
 		if test "$arch" = "sparcv9 sparc" ; then
 			if test "$GCC" = "yes" ; then
-			    AC_MSG_WARN("64bit mode not supported with GCC on $system")
+			    if test "`gcc -dumpversion` | awk -F. '{print $1}'" -lt "3" ; then
+				AC_MSG_WARN([64bit mode not supported with GCC < 3.2 on $system])
+			    else
+				do64bit_ok=yes
+				CFLAGS="$CFLAGS -m64 -mcpu=v9"
+				LDFLAGS="$LDFLAGS -m64 -mcpu=v9"
+				SHLIB_CFLAGS="-fPIC"
+			    fi
 			else
 			    do64bit_ok=yes
 			    if test "$do64bitVIS" = "yes" ; then
-				EXTRA_CFLAGS="-xarch=v9a"
-			    	LDFLAGS="-xarch=v9a"
+				CFLAGS="$CFLAGS -xarch=v9a"
+			    	LDFLAGS="$LDFLAGS -xarch=v9a"
 			    else
-				EXTRA_CFLAGS="-xarch=v9"
-			    	LDFLAGS="-xarch=v9"
+				CFLAGS="$CFLAGS -xarch=v9"
+			    	LDFLAGS="$LDFLAGS -xarch=v9"
 			    fi
 			fi
 		else
@@ -1593,6 +1639,17 @@
 	    if test "$GCC" = "yes" ; then
 		SHLIB_LD="$CC -shared"
 		LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
+		if test "$do64bit" = "yes" ; then
+		    # We need to specify -static-libgcc or we need to
+		    # add the path to the sparv9 libgcc.
+		    # JH: static-libgcc is necessary for core Tcl, but may
+		    # not be necessary for extensions.
+		    SHLIB_LD="$SHLIB_LD -m64 -mcpu=v9 -static-libgcc"
+		    # for finding sparcv9 libgcc, get the regular libgcc
+		    # path, remove so name and append 'sparcv9'
+		    #v9gcclibdir="`gcc -print-file-name=libgcc_s.so` | ..."
+		    #LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS},-R,$v9gcclibdir"
+		fi
 	    else
 		SHLIB_LD="/usr/ccs/bin/ld -G -z text"
 		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
@@ -1605,10 +1662,10 @@
 	    SHLIB_LD_LIBS='${LIBS}'
 	    DL_OBJS="tclLoadAout.o"
 	    DL_LIBS=""
-	    LDFLAGS="-Wl,-D,08000000"
+	    LDFLAGS="$LDFLAGS -Wl,-D,08000000"
 	    LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
 	    if test "$GCC" != "yes" ; then
-		EXTRA_CFLAGS="-DHAVE_TZSET -std1"
+		CFLAGS="$CFLAGS -DHAVE_TZSET -std1"
 	    fi
 	    ;;
 	UNIX_SV* | UnixWare-5*)
@@ -1621,16 +1678,11 @@
 	    # Some UNIX_SV* systems (unixware 1.1.2 for example) have linkers
 	    # that don't grok the -Bexport option.  Test that it does.
 	    hold_ldflags=$LDFLAGS
-	    AC_MSG_CHECKING([for ld accepts -Bexport flag])
-	    LDFLAGS="${LDFLAGS} -Wl,-Bexport"
-	    AC_TRY_LINK(, [int i;], found=yes, found=no)
-	    LDFLAGS=$hold_ldflags
+	    AC_MSG_CHECKING(for ld accepts -Bexport flag)
+	    LDFLAGS="$LDFLAGS -Wl,-Bexport"
+	    AC_TRY_LINK(, [int i;], [found=yes],
+			[LDFLAGS=$hold_ldflags found=no])
 	    AC_MSG_RESULT([$found])
-	    if test $found = yes; then
-	    LDFLAGS="-Wl,-Bexport"
-	    else
-	    LDFLAGS=""
-	    fi
 	    LD_SEARCH_FLAGS=""
 	    ;;
     esac
@@ -1734,7 +1786,7 @@
 	SHLIB_SUFFIX=""
 	DL_OBJS="tclLoadNone.o"
 	DL_LIBS=""
-	LDFLAGS=""
+	LDFLAGS="$LDFLAGS_ORIG"
 	LD_SEARCH_FLAGS=""
 	BUILD_DLTEST=""
     fi
@@ -1754,7 +1806,7 @@
 		    ;;
 		NetBSD-*|FreeBSD-*)
 		    ;;
-		Rhapsody-*|Darwin-*)
+		Darwin-*)
 		    ;;
 		RISCos-*)
 		    ;;
@@ -1772,26 +1824,29 @@
     fi
 
     if test "$SHARED_LIB_SUFFIX" = "" ; then
-	SHARED_LIB_SUFFIX='${PACKAGE_VERSION}\$\{DBGX\}${SHLIB_SUFFIX}'
+	SHARED_LIB_SUFFIX='${PACKAGE_VERSION}${SHLIB_SUFFIX}'
     fi
     if test "$UNSHARED_LIB_SUFFIX" = "" ; then
-	UNSHARED_LIB_SUFFIX='${PACKAGE_VERSION}\$\{DBGX\}.a'
+	UNSHARED_LIB_SUFFIX='${PACKAGE_VERSION}.a'
     fi
 
     AC_SUBST(DL_LIBS)
     AC_SUBST(CFLAGS_DEBUG)
     AC_SUBST(CFLAGS_OPTIMIZE)
     AC_SUBST(CFLAGS_WARNING)
-    AC_SUBST(EXTRA_CFLAGS)
 
     AC_SUBST(STLIB_LD)
     AC_SUBST(SHLIB_LD)
     AC_SUBST(SHLIB_CFLAGS)
-    AC_SUBST(SHLIB_LD_FLAGS)
     AC_SUBST(SHLIB_LD_LIBS)
     AC_SUBST(LDFLAGS_DEBUG)
     AC_SUBST(LDFLAGS_OPTIMIZE)
     AC_SUBST(LD_LIBRARY_PATH_VAR)
+
+    # These must be called after we do the basic CFLAGS checks and
+    # verify any possible 64-bit or similar switches are necessary
+    TEA_TCL_EARLY_FLAGS
+    TEA_TCL_64BIT_FLAGS
 ])
 
 #--------------------------------------------------------------------
@@ -1933,16 +1988,17 @@
 #		NO_DIRENT_H
 #		NO_ERRNO_H
 #		NO_VALUES_H
-#		NO_LIMITS_H
+#		HAVE_LIMITS_H or NO_LIMITS_H
 #		NO_STDLIB_H
 #		NO_STRING_H
 #		NO_SYS_WAIT_H
 #		NO_DLFCN_H
-#		HAVE_UNISTD_H
 #		HAVE_SYS_PARAM_H
 #
 #		HAVE_STRING_H ?
 #
+# tkUnixPort.h checks for HAVE_LIMITS_H, so do both HAVE and
+# CHECK on limits.h
 #--------------------------------------------------------------------
 
 AC_DEFUN(TEA_MISSING_POSIX_HEADERS, [
@@ -1976,7 +2032,8 @@
     AC_CHECK_HEADER(errno.h, , [AC_DEFINE(NO_ERRNO_H)])
     AC_CHECK_HEADER(float.h, , [AC_DEFINE(NO_FLOAT_H)])
     AC_CHECK_HEADER(values.h, , [AC_DEFINE(NO_VALUES_H)])
-    AC_CHECK_HEADER(limits.h, , [AC_DEFINE(NO_LIMITS_H)])
+    AC_CHECK_HEADER(limits.h,
+	[AC_DEFINE(HAVE_LIMITS_H)], [AC_DEFINE(NO_LIMITS_H)])
     AC_CHECK_HEADER(stdlib.h, tcl_ok=1, tcl_ok=0)
     AC_EGREP_HEADER(strtol, stdlib.h, , tcl_ok=0)
     AC_EGREP_HEADER(strtoul, stdlib.h, , tcl_ok=0)
@@ -1999,11 +2056,8 @@
     AC_CHECK_HEADER(dlfcn.h, , [AC_DEFINE(NO_DLFCN_H)])
 
     # OS/390 lacks sys/param.h (and doesn't need it, by chance).
-    # tkUnixPort.h checks for HAVE_LIMITS_H, so do both HAVE and
-    # CHECK on limits.h
+    AC_HAVE_HEADERS(sys/param.h)
 
-    AC_HAVE_HEADERS(limits.h unistd.h sys/param.h)
-
 ])
 
 #--------------------------------------------------------------------
@@ -2028,12 +2082,24 @@
 #		XINCLUDES
 #		XLIBSW
 #		LIBS (appends to)
+#		TEA_WINDOWINGSYSTEM
 #
 #--------------------------------------------------------------------
 
 AC_DEFUN(TEA_PATH_X, [
     if test "${TEA_PLATFORM}" = "unix" ; then
-	TEA_PATH_UNIX_X
+	case ${TK_DEFS} in
+	    *MAC_OSX_TK*)
+		AC_DEFINE(MAC_OSX_TK)
+		TEA_WINDOWINGSYSTEM="aqua"
+		;;
+	    *)
+		TEA_PATH_UNIX_X
+		TEA_WINDOWINGSYSTEM="x11"
+		;;
+	esac
+    elif test "${TEA_PLATFORM}" = "windows" ; then
+	TEA_WINDOWINGSYSTEM="windows"
     fi
 ])
 
@@ -2454,14 +2520,21 @@
 AC_DEFUN(TEA_TCL_64BIT_FLAGS, [
     AC_MSG_CHECKING([for 64-bit integer type])
     AC_CACHE_VAL(tcl_cv_type_64bit,[
+	tcl_cv_type_64bit=none
+	# See if the compiler knows natively about __int64
 	AC_TRY_COMPILE(,[__int64 value = (__int64) 0;],
-           tcl_cv_type_64bit=__int64,tcl_cv_type_64bit=none
-           AC_TRY_RUN([#include <unistd.h>
-		int main() {exit(!(sizeof(long long) > sizeof(long)));}
-		], tcl_cv_type_64bit="long long"))])
+	    tcl_type_64bit=__int64, tcl_type_64bit="long long")
+	# See if we should use long anyway  Note that we substitute in the
+	# type that is our current guess for a 64-bit type inside this check
+	# program, so it should be modified only carefully...
+        AC_TRY_COMPILE(,[switch (0) { 
+            case 1: case (sizeof(]${tcl_type_64bit}[)==sizeof(long)): ; 
+        }],tcl_cv_type_64bit=${tcl_type_64bit})])
     if test "${tcl_cv_type_64bit}" = none ; then
+	AC_DEFINE(TCL_WIDE_INT_IS_LONG)
 	AC_MSG_RESULT([using long])
-    elif test "${tcl_cv_type_64bit}" = "__int64" ; then
+    elif test "${tcl_cv_type_64bit}" = "__int64" \
+		-a "${TEA_PLATFORM}" = "windows" ; then
 	# We actually want to use the default tcl.h checks in this
 	# case to handle both TCL_WIDE_INT_TYPE and TCL_LL_MODIFIER*
 	AC_MSG_RESULT([using Tcl header defaults])
@@ -2536,7 +2609,9 @@
 #------------------------------------------------------------------------
 
 AC_DEFUN(TEA_INIT, [
-    TEA_VERSION="3.0"
+    # TEA extensions pass this us the version of TEA they think they
+    # are compatible with.
+    TEA_VERSION="3.2"
 
     AC_MSG_CHECKING([for correct TEA configuration])
     if test x"${PACKAGE_NAME}" = x ; then
@@ -2547,9 +2622,9 @@
 	AC_MSG_ERROR([
 TEA version not specified.])
     elif test "$1" != "${TEA_VERSION}" ; then
-	AC_MSG_RESULT([warning: TEA version "$1" != ${TEA_VERSION}])
+	AC_MSG_RESULT([warning: requested TEA version "$1", have "${TEA_VERSION}"])
     else
-	AC_MSG_RESULT([ok])
+	AC_MSG_RESULT([ok (TEA ${TEA_VERSION})])
     fi
     case "`uname -s`" in
 	*win32*|*WIN32*|*CYGWIN_NT*|*CYGWIN_9*|*CYGWIN_ME*|*MINGW32_*)
@@ -2564,8 +2639,14 @@
 	    ;;
     esac
 
-    # Check if exec_prefix is set. If not use fall back to prefix
-    if test x$exec_prefix = xNONE ; then exec_prefix=$prefix ; fi
+    # Check if exec_prefix is set. If not use fall back to prefix.
+    # Note when adjusted, so that TEA_PREFIX can correct for this.
+    # This is needed for recursive configures, since autoconf propagates
+    # $prefix, but not $exec_prefix (doh!).
+    if test x$exec_prefix = xNONE ; then
+	exec_prefix_default=yes
+	exec_prefix=$prefix
+    fi
 
     AC_SUBST(EXEEXT)
     AC_SUBST(CYGPATH)
@@ -2755,7 +2836,9 @@
 # TEA_ADD_LIBS --
 #
 #	Specify one or more libraries.  Users should check for
-#	the right platform before adding to their list.
+#	the right platform before adding to their list.  For Windows,
+#	libraries provided in "foo.lib" format will be converted to
+#	"-lfoo" when using GCC (mingw).
 #
 # Arguments:
 #	one or more file names
@@ -2768,6 +2851,10 @@
 AC_DEFUN(TEA_ADD_LIBS, [
     vars="$@"
     for i in $vars; do
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
+	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
+	    i=`echo "$i" | sed -e 's/^\([[^-]].*\)\.lib[$]/-l\1/i'`
+	fi
 	PKG_LIBS="$PKG_LIBS $i"
     done
     AC_SUBST(PKG_LIBS)
@@ -2807,21 +2894,23 @@
 #	configured.
 #------------------------------------------------------------------------
 AC_DEFUN(TEA_PREFIX, [
-    # Should be AC_MSG_NOTICE, but that requires autoconf 2.50
     if test "${prefix}" = "NONE"; then
 	prefix_default=yes
 	if test x"${TCL_PREFIX}" != x; then
-	    AC_MSG_WARN([--prefix defaulting to TCL_PREFIX ${TCL_PREFIX}])
+	    AC_MSG_NOTICE([--prefix defaulting to TCL_PREFIX ${TCL_PREFIX}])
 	    prefix=${TCL_PREFIX}
 	else
+	    AC_MSG_NOTICE([--prefix defaulting to /usr/local])
 	    prefix=/usr/local
 	fi
     fi
-    if test "${exec_prefix}" = "NONE" -a x"${prefix_default}" = x"yes" ; then
+    if test "${exec_prefix}" = "NONE" -a x"${prefix_default}" = x"yes" \
+	-o x"${exec_prefix_default}" = x"yes" ; then
 	if test x"${TCL_EXEC_PREFIX}" != x; then
-	    AC_MSG_WARN([--exec-prefix defaulting to TCL_EXEC_PREFIX ${TCL_EXEC_PREFIX}])
+	    AC_MSG_NOTICE([--exec-prefix defaulting to TCL_EXEC_PREFIX ${TCL_EXEC_PREFIX}])
 	    exec_prefix=${TCL_EXEC_PREFIX}
 	else
+	    AC_MSG_NOTICE([--exec-prefix defaulting to ${prefix}])
 	    exec_prefix=$prefix
 	fi
     fi
@@ -2909,8 +2998,6 @@
     # Common compiler flag setup
     #--------------------------------------------------------------------
 
-    TEA_TCL_EARLY_FLAGS
-    TEA_TCL_64BIT_FLAGS
     AC_C_BIGENDIAN
     if test "${TEA_PLATFORM}" = "unix" ; then
 	TEA_TCL_LINK_LIBS
@@ -2948,11 +3035,11 @@
 AC_DEFUN(TEA_MAKE_LIB, [
     if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes"; then
 	MAKE_STATIC_LIB="\${STLIB_LD} -out:\[$]@ \$(PKG_OBJECTS)"
-	MAKE_SHARED_LIB="\${SHLIB_LD} \${SHLIB_LD_FLAGS} \${SHLIB_LD_LIBS} \${LDFLAGS_DEFAULT} -out:\[$]@ \$(PKG_OBJECTS)"
+	MAKE_SHARED_LIB="\${SHLIB_LD} \${SHLIB_LD_LIBS} \${LDFLAGS_DEFAULT} -out:\[$]@ \$(PKG_OBJECTS)"
 	MAKE_STUB_LIB="\${STLIB_LD} -out:\[$]@ \$(PKG_STUB_OBJECTS)"
     else
 	MAKE_STATIC_LIB="\${STLIB_LD} \[$]@ \$(PKG_OBJECTS)"
-	MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(PKG_OBJECTS) \${SHLIB_LD_FLAGS} \${SHLIB_LD_LIBS}"
+	MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(PKG_OBJECTS) \${SHLIB_LD_LIBS}"
 	MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \$(PKG_STUB_OBJECTS)"
     fi
 
@@ -2964,11 +3051,10 @@
 
     #--------------------------------------------------------------------
     # Shared libraries and static libraries have different names.
-    # Use the double eval to make sure the ${DBGX} in the suffix is
-    # substituted.
+    # Use the double eval to make sure any variables in the suffix is
+    # substituted. (@@@ Might not be necessary anymore)
     #--------------------------------------------------------------------
 
-    RANLIB_STUB="${RANLIB}"
     if test "${TEA_PLATFORM}" = "windows" ; then
 	if test "${SHARED_BUILD}" = "1" ; then
 	    # We force the unresolved linking of symbols that are really in
@@ -2978,13 +3064,16 @@
 		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
 	    fi
 	    eval eval "PKG_LIB_FILE=${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
-	    RANLIB=:
 	else
 	    eval eval "PKG_LIB_FILE=${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
 	fi
 	# Some packages build there own stubs libraries
 	eval eval "PKG_STUB_LIB_FILE=${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
+	# These aren't needed on Windows (either MSVC or gcc)
+	RANLIB=:
+	RANLIB_STUB=:
     else
+	RANLIB_STUB="${RANLIB}"
 	if test "${SHARED_BUILD}" = "1" ; then
 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TCL_STUB_LIB_SPEC}"
 	    if test x"${TK_BIN_DIR}" != x ; then
@@ -3376,15 +3465,17 @@
 #------------------------------------------------------------------------
 
 AC_DEFUN(TEA_PROG_TCLSH, [
-    AC_MSG_CHECKING([for tclsh])
+    # Allow the user to provide this setting in the env
+    if test "x${TCLSH_PROG}" = "x" ; then
+	AC_MSG_CHECKING([for tclsh])
 
-    AC_CACHE_VAL(ac_cv_path_tclsh, [
-	if test "x${CELIB_DIR}" != "x" ; then
-	    # If CELIB_DIR is defined, assume Windows/CE target is requested
-	    # which means target tclsh cannot be run (cross-compile)
-	    search_path=`echo ${PATH} | sed -e 's/:/ /g'`
-	else
-	    search_path=`echo ${TCL_BIN_DIR}:${TCL_BIN_DIR}/../bin:${exec_prefix}/bin:${prefix}/bin:${PATH} | sed -e 's/:/ /g'`
+	AC_CACHE_VAL(ac_cv_path_tclsh, [
+	search_path=`echo ${PATH} | sed -e 's/:/ /g'`
+	if test "${TEA_PLATFORM}" != "windows" -o \
+		\( "$do64bit_ok" = "no" -a "$doWince" = "no" \) ; then
+	    # Do not allow target tclsh in known cross-compile builds,
+	    # as we need one we can run on this system
+	    search_path="${TCL_BIN_DIR} ${TCL_BIN_DIR}/../bin ${exec_prefix}/bin ${prefix}/bin ${search_path}"
 	fi
 	for dir in $search_path ; do
 	    for j in `ls -r $dir/tclsh[[8-9]]*${EXEEXT} 2> /dev/null` \
@@ -3397,13 +3488,14 @@
 		fi
 	    done
 	done
-    ])
+	])
 
-    if test -f "$ac_cv_path_tclsh" ; then
-	TCLSH_PROG=$ac_cv_path_tclsh
-	AC_MSG_RESULT([$TCLSH_PROG])
-    else
-	AC_MSG_ERROR([No tclsh found in PATH:  $search_path])
+	if test -f "$ac_cv_path_tclsh" ; then
+	    TCLSH_PROG=$ac_cv_path_tclsh
+	    AC_MSG_RESULT([$TCLSH_PROG])
+	else
+	    AC_MSG_ERROR([No tclsh found in PATH: $search_path])
+	fi
     fi
     AC_SUBST(TCLSH_PROG)
 ])
@@ -3425,15 +3517,17 @@
 #------------------------------------------------------------------------
 
 AC_DEFUN(TEA_PROG_WISH, [
-    AC_MSG_CHECKING([for wish])
+    # Allow the user to provide this setting in the env
+    if test "x${WISH_PROG}" = "x" ; then
+	AC_MSG_CHECKING([for wish])
 
-    AC_CACHE_VAL(ac_cv_path_wish, [
-	if test "x${CELIB_DIR}" != "x" ; then
-	    # If CELIB_DIR is defined, assume Windows/CE target is requested
-	    # which means target wish cannot be run (cross-compile)
-	    search_path=`echo ${PATH} | sed -e 's/:/ /g'`
-	else
-	    search_path=`echo ${TK_BIN_DIR}:${TK_BIN_DIR}/../bin:${TCL_BIN_DIR}:${TCL_BIN_DIR}/../bin:${exec_prefix}/bin:${prefix}/bin:${PATH} | sed -e 's/:/ /g'`
+	AC_CACHE_VAL(ac_cv_path_wish, [
+	search_path=`echo ${PATH} | sed -e 's/:/ /g'`
+	if test "${TEA_PLATFORM}" != "windows" -o \
+		\( "$do64bit_ok" = "no" -a "$doWince" = "no" \) ; then
+	    # Do not allow target wish in known cross-compile builds,
+	    # as we need one we can run on this system
+	    search_path="${TK_BIN_DIR} ${TK_BIN_DIR}/../bin ${TCL_BIN_DIR} ${TCL_BIN_DIR}/../bin ${exec_prefix}/bin ${prefix}/bin ${search_path}"
 	fi
 	for dir in $search_path ; do
 	    for j in `ls -r $dir/wish[[8-9]]*${EXEEXT} 2> /dev/null` \
@@ -3446,13 +3540,14 @@
 		fi
 	    done
 	done
-    ])
+	])
 
-    if test -f "$ac_cv_path_wish" ; then
+	if test -f "$ac_cv_path_wish" ; then
 	WISH_PROG=$ac_cv_path_wish
-	AC_MSG_RESULT([$WISH_PROG])
-    else
-	AC_MSG_ERROR([No wish found in PATH:  $search_path])
+	    AC_MSG_RESULT([$WISH_PROG])
+	else
+	    AC_MSG_ERROR([No wish found in PATH: $search_path])
+	fi
     fi
     AC_SUBST(WISH_PROG)
 ])
@@ -3493,6 +3588,13 @@
 
 	    # First check to see if --with-$1 was specified.
 	    if test x"${with_$1config}" != x ; then
+		case ${with_$1config} in
+		    */$1Config.sh )
+			if test -f ${with_$1config}; then
+			    AC_MSG_WARN([--with-$1 argument should refer to directory containing $1Config.sh, not to $1Config.sh itself])
+			    with_$1config=`echo ${with_$1config} | sed 's!/$1Config\.sh$!!'`
+			fi;;
+		esac
 		if test -f "${with_$1config}/$1Config.sh" ; then
 		    ac_cv_c_$1config=`(cd ${with_$1config}; pwd)`
 		else
@@ -3504,13 +3606,25 @@
 	    if test x"${ac_cv_c_$1config}" = x ; then
 		for i in \
 			../$1 \
-			`ls -dr ../$1[[8-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ../$1*[[0-9]].[[0-9]]*.[[0-9]]* 2>/dev/null` \
+			`ls -dr ../$1*[[0-9]].[[0-9]][[0-9]] 2>/dev/null` \
+			`ls -dr ../$1*[[0-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ../$1*[[0-9]].[[0-9]]* 2>/dev/null` \
 			../../$1 \
-			`ls -dr ../../$1[[8-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ../../$1*[[0-9]].[[0-9]]*.[[0-9]]* 2>/dev/null` \
+			`ls -dr ../../$1*[[0-9]].[[0-9]][[0-9]] 2>/dev/null` \
+			`ls -dr ../../$1*[[0-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ../../$1*[[0-9]].[[0-9]]* 2>/dev/null` \
 			../../../$1 \
-			`ls -dr ../../../$1[[8-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ../../../$1*[[0-9]].[[0-9]]*.[[0-9]]* 2>/dev/null` \
+			`ls -dr ../../../$1*[[0-9]].[[0-9]][[0-9]] 2>/dev/null` \
+			`ls -dr ../../../$1*[[0-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ../../../$1*[[0-9]].[[0-9]]* 2>/dev/null` \
 			${srcdir}/../$1 \
-			`ls -dr ${srcdir}/../$1[[8-9]].[[0-9]]* 2>/dev/null` \
+			`ls -dr ${srcdir}/../$1*[[0-9]].[[0-9]]*.[[0-9]]* 2>/dev/null` \
+			`ls -dr ${srcdir}/../$1*[[0-9]].[[0-9]][[0-9]] 2>/dev/null` \
+			`ls -dr ${srcdir}/../$1*[[0-9]].[[0-9]] 2>/dev/null` \
+			`ls -dr ${srcdir}/../$1*[[0-9]].[[0-9]]* 2>/dev/null` \
 			; do
 		    if test -f "$i/$1Config.sh" ; then
 			ac_cv_c_$1config=`(cd $i; pwd)`
@@ -3597,6 +3711,7 @@
     fi
 
     AC_SUBST($1_VERSION)
+    AC_SUBST($1_BIN_DIR)
     AC_SUBST($1_SRC_DIR)
 
     AC_SUBST($1_LIB_FILE)
@@ -3664,12 +3779,49 @@
 	    fi
 	])
 	if test x"${ac_cv_c_celibconfig}" = x ; then
-	    CELIB_DIR="# no Celib configs found"
 	    AC_MSG_ERROR([Cannot find celib support library directory])
 	else
 	    no_celib=
 	    CELIB_DIR=${ac_cv_c_celibconfig}
 	    AC_MSG_RESULT([found $CELIB_DIR])
+	    TEA_PATH_NOSPACE(CELIB_DIR, ${ac_cv_c_celibconfig})
 	fi
     fi
 ])
+
+#------------------------------------------------------------------------
+# TEA_PATH_NOSPACE
+#	Ensure that the given path has no spaces.  This is necessary for
+#	CC (and consitutuent vars that build it up) to work in the
+#	tortured autoconf environment.  Currently only for Windows use.
+#
+# Arguments
+#	VAR  - name of the variable to set
+#	PATH - path to ensure no spaces in
+#
+# Results
+#	Sets $VAR to short path of $PATH if it can be found.
+#------------------------------------------------------------------------
+
+AC_DEFUN([TEA_PATH_NOSPACE], [
+    if test "${TEA_PLATFORM}" = "windows" ; then
+	# we need TCLSH_PROG defined to get Windows short pathnames
+	AC_REQUIRE([TEA_PROG_TCLSH])
+
+	AC_MSG_CHECKING([short pathname for $1 ($2)])
+
+	shortpath=
+	case "$2" in
+	    *\ *)
+		# Only do this if we need to.
+		shortpath=`echo "puts [[file attributes {$2} -shortname]] ; exit" | ${TCLSH_PROG} 2>/dev/null`
+		;;
+	esac
+	if test "x${shortpath}" = "x" ; then
+	    AC_MSG_RESULT([not changed])
+	else
+	    $1=$shortpath
+	    AC_MSG_RESULT([${$1}])
+	fi
+    fi
+])
Index: xotcl/tests/actiweb.test
===================================================================
diff -u -rab63a4908f87f226de9730e0afa820388c93acc4 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/tests/actiweb.test	(.../actiweb.test)	(revision ab63a4908f87f226de9730e0afa820388c93acc4)
+++ xotcl/tests/actiweb.test	(.../actiweb.test)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,5 +1,5 @@
 # -*- Mode: tcl -*-
-# $Id: actiweb.test,v 1.4 2004/10/13 10:35:43 neumann Exp $
+# $Id: actiweb.test,v 1.5 2005/09/09 21:07:23 neumann Exp $
 # regression test for actiweb examples
 #if {[set ::tcl_platform(platform)] == "windows"} {
 #  lappend auto_path .
@@ -49,7 +49,7 @@
 
 T new -msg "Trying Counter2.xotcl ... " \
     -setResult {r0 getContentLength} \
-    -expected 294 \
+    -expected 238 \
     -cmd [list SimpleRequest r0 -url http://localhost:8091/web-c1]
 T new -msg "terminate Counter1" -setResult {set x 1}  \
     -cmd [list SimpleRequest r0 -url http://localhost:8091/receiver::exit] \
@@ -73,7 +73,7 @@
 
 T new -msg "Trying MC.xotcl ... " \
     -setResult {r0 getContentLength} \
-    -expected 1823 \
+    -expected 1767 \
     -cmd [list SimpleRequest r0 -url http://localhost:8092/Gustaf.html ]
 T new -msg "terminate MC" -setResult {set x 1} \
     -cmd [list SimpleRequest r0 -url http://localhost:8092/receiver::exit] \
Index: xotcl/tests/forwardtest.xotcl
===================================================================
diff -u -rf733c5df1b1a91a473d0e361ff206deaa4ecfa0a -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/tests/forwardtest.xotcl	(.../forwardtest.xotcl)	(revision f733c5df1b1a91a473d0e361ff206deaa4ecfa0a)
+++ xotcl/tests/forwardtest.xotcl	(.../forwardtest.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,4 +1,4 @@
-# $Id: forwardtest.xotcl,v 1.3 2004/11/27 21:10:33 neumann Exp $
+# $Id: forwardtest.xotcl,v 1.4 2005/09/09 21:07:23 neumann Exp $
 package require XOTcl
 namespace import -force xotcl::*
 package require xotcl::test
@@ -274,3 +274,31 @@
   ? [list set _ [NS create n4]] ::test::n4
   NS filter ""
 }
+
+###########################################
+# forward to expr + callstack
+###########################################
+
+Object instforward expr -objscope
+
+Class C
+C instproc xx {} {self}
+C proc t {o expr} {
+  return [$o expr $expr]
+}
+C create c1
+
+puts ====
+? {c1 expr {[self]}} 		::c1
+? {c1 expr {[self] == "::c1"}} 	1
+? {c1 expr {[my xx]}} 		::c1
+? {c1 expr {[my info class]}} 	::C
+? {c1 expr {[my istype C]}} 	1
+? {c1 expr {[my istype ::C]}} 	1
+
+? {C t ::c1 {[self]}} 		::c1
+? {C t ::c1 {[self] == "::c1"}} 1
+? {C t ::c1 {[my xx]}} 		::c1
+? {C t ::c1 {[my info class]}} ::C
+? {C t ::c1 {[my istype C]}} 	1
+? {C t ::c1 {[my istype ::C]}} 	1
\ No newline at end of file
Index: xotcl/tests/speedtest.xotcl
===================================================================
diff -u -r9722a51911e1502444c173306c8c88f7f3888989 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/tests/speedtest.xotcl	(.../speedtest.xotcl)	(revision 9722a51911e1502444c173306c8c88f7f3888989)
+++ xotcl/tests/speedtest.xotcl	(.../speedtest.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,5 +1,5 @@
 #memory trace on
-# $Id: speedtest.xotcl,v 1.2 2004/07/02 11:22:31 neumann Exp $
+# $Id: speedtest.xotcl,v 1.3 2005/09/09 21:07:23 neumann Exp $
 package require XOTcl
 namespace import -force xotcl::*
 lappend auto_path [file dirname [info script]]/..
@@ -173,7 +173,6 @@
 
 
 
-
 Test new -cmd {d istype D} -expected 1
 
 Test new -cmd {c setViaInstvar 100} -expected 100
Index: xotcl/tests/testx.xotcl
===================================================================
diff -u -r55764ef8921abb0e4f506e0ae6b0caf3f842276d -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/tests/testx.xotcl	(.../testx.xotcl)	(revision 55764ef8921abb0e4f506e0ae6b0caf3f842276d)
+++ xotcl/tests/testx.xotcl	(.../testx.xotcl)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,4 +1,4 @@
-#$Id: testx.xotcl,v 1.24 2005/01/10 11:57:35 neumann Exp $
+#$Id: testx.xotcl,v 1.25 2005/09/09 21:07:23 neumann Exp $
 package require XOTcl
 namespace import -force xotcl::*
 
@@ -23,19 +23,21 @@
   return $result
 }
 
-Class TestX
+
+Class TestX \
+    -instmixin [Class TestXM -instproc run args {next; puts "[self] PASSED"}]
+
 @ @File {description {
   This is a file which provides a regression test
   for the features of the XOTcl - Language. 
   }
 }
 @ Class TestX
 
-TestX nestingClasses
 @ TestX nestingClasses {
     description {Regression test object testing the class nesting feature.}
 }
-nestingClasses proc run {{n 20}} {
+TestX nestingClasses -proc run {{n 20}} {
   for {set i 0} {$i < $n} {incr i} {
     Class x($i)
 
@@ -82,15 +84,12 @@
       "[self] -- renaming root "
     rx destroy
   }
-  return "PASSED [self]" 
 }
 
-TestX nestingObjects
 @ TestX nestingObjects {
-    description {Regression test object testing the object nesting feature.}
+  description {Regression test object testing the object nesting feature.}
 }
-
-nestingObjects proc run {{n 20}} {
+TestX nestingObjects -proc run {{n 20}} {
   for {set i 0} {$i < $n} {incr i} {
     Class C($i)
     
@@ -141,15 +140,12 @@
     ::errorCheck [::a::n set var] "1 2 3" \
       "[self] -- arg passing - init dash"  
   }
-  return "PASSED [self]"
 }
 
-TestX assertions
 @ TestX assertions {
   description {Regression test object testing the assertions.}
   }
-
-assertions proc run {{n 20}} {
+TestX assertions -proc run {{n 20}} {
   for {set i 0} {$i < $n} {incr i} {
     Class C($i)
     C($i) invar {
@@ -286,15 +282,12 @@
   }
   ::errorCheck $err {Assertion failed check: {$y == 1} in proc 'yTo2'} \
     "[self] inheritance b yTo2"
-
-  return "PASSED [self]"
 }
 
-TestX filterAddRemove
 @ TestX filterAddRemove {
   description {Regression test object testing adding/removing of filters.}
 }
-filterAddRemove proc run {{n 20}} {
+TestX filterAddRemove -proc run {{n 20}} {
   set ::filterCount 0
   for {set i 0} {$i < $n} {incr i} {
     Class SA($i)
@@ -465,16 +458,12 @@
 
     ::errorCheck $::r "::C-f2 ::A-f2" \
       "filter method addition" 
-
-  return "PASSED [self]"	
 }
 
-TestX filterClassChange 
 @ TestX filterClassChange {
     description {Regression test object testing class changes of filters.}
 }
-
-filterClassChange proc run {{n 20}} {
+TestX filterClassChange -proc run {{n 20}} {
     for {set i 0} {$i < $n} {incr i} {
 	Class A($i)
 	Class B
@@ -531,15 +520,12 @@
     }
     B destroy
     for {set i 0} {$i < $n} {incr i} {A($i) destroy}
-    return "PASSED [self]"
 }
 
-TestX filterGuards 
 @ TestX filterGuards {
     description {Regression test object testing filter guards.}
 }
-
-filterGuards proc run {{n 20}} {
+TestX filterGuards -proc run {{n 20}} {
     global filterResult
 
     for {set i 0} {$i < $n} {incr i} {
@@ -742,15 +728,13 @@
 	::errorCheck $::r "loggingFilter-open open x" \
 	  {[self] -- info guarded scope}
     }
-    return "PASSED [self]"
 }
 
-TestX mixinGuards
+
 @ TestX mixinGuards {
     description {Regression test object testing mixin guards.}
 }
-
-mixinGuards proc run {{n 20}} {
+TestX mixinGuards -proc run {{n 20}} {
     set ::r ""
     Class Fly
     Fly instproc fly {} {lappend ::r  "[my signature]: yippee, fly like an eagle!"}
@@ -907,15 +891,13 @@
     ::errorCheck [set info] [list {[my age] > 4} {} {[my age] > 3}  \
 				 {[my age] > 4} {} ] {info (inst)mixinguard}
 
-    return "PASSED [self]"
 }
 
-TestX filterSimpleObserver
 @ TestX filterSimpleObserver {
-    description {Regression test object testing a simple observer using filters.}
+  description {Regression test object testing a simple observer using filters.
+  }
 }
-
-filterSimpleObserver proc run {{n 20}} {
+TestX filterSimpleObserver -proc run {{n 20}} {
     set ::filterCount 0
     for {set i 0} {$i < $n} {incr i} {
 	Class NetAccess$i
@@ -1015,21 +997,17 @@
 
     ::errorCheck  $::filterCount 220 \
 	"[self] -- Simple Observer - Filter Count" 
-    
-    return "PASSED [self]"   
 }
 
 
 
-TestX stdargs
 @ TestX stdargs {
-    description {
-	Regression test object testing the ability of the next primitive to pass
-	arguments without naming them.
-    }
+  description {
+    Regression test object testing the ability of the next primitive to pass
+    arguments without naming them.
+  }
 }
-
-stdargs proc run {{n 20}} {
+TestX stdargs -proc run {{n 20}} {
   for {set i 0} {$i < $n} {incr i} {
     Class C
     Class D
@@ -1067,19 +1045,18 @@
     x t 1 2 3 4 5 6 7 8 9
   }
   foreach o {x A B C D} {$o destroy}
-  return "PASSED [self]"
+
 }
 
 
-
-TestX filterInfo
 @ TestX filterInfo {
-    description{
-	Regression test object testing introspection of filters.
-    }
+  description{
+    Regression test object testing introspection of filters.
+  }
 }
-# Helper Procs
 
+TestX filterInfo
+# Helper Procs
 proc ::showStack {{m 100}} {
   set r ""
   set max [info level]  
@@ -1215,7 +1192,9 @@
     for {set i 0} {$i < $n} {incr i} {
       global InfoTraceResult
 
+      Object instfilter ""
       Object InfoTrace
+
       InfoTrace proc createInfoTrace cl {
 	$cl instproc infoTraceFilter args {
 	  global InfoTraceResult
@@ -1245,9 +1224,9 @@
 	    "{::anotherObject-::aClass-infoTraceFilter-::xotcl::Object ::xotcl::Class-alloc aProc-::anObject {::ObjectsClass-::xotcl::Object instfilter infoTraceFilter}} {-::xotcl::Class::Parameter-infoTraceFilter-::xotcl::Object ::xotcl::Class-searchDefaults aProc-::anObject {::ObjectsClass-::xotcl::Object instfilter infoTraceFilter}} {0-::anotherObject-infoTraceFilter-::xotcl::Object ::aClass-configure aProc-::anObject {::ObjectsClass-::xotcl::Object instfilter infoTraceFilter}} {-::anotherObject-infoTraceFilter-::xotcl::Object ::aClass-init aProc-::anObject {::ObjectsClass-::xotcl::Object instfilter infoTraceFilter}} {::anotherObject-::aClass-infoTraceFilter-::xotcl::Object ::xotcl::Class-create aProc-::anObject {::ObjectsClass-::xotcl::Object instfilter infoTraceFilter}} {::anotherObject-::anObject-infoTraceFilter-::xotcl::Object ::ObjectsClass-aProc run-::filterInfo {-::xotcl::Object instfilter infoTraceFilter}}" \
 	  "FilterInfo InfoTrace: Filter information wrong"
       }
-      Object instfilter {}
     }
-
+  
+  Object instfilter {}
   global fUplevelResult
   set fUplevelResult ""
 
@@ -1273,17 +1252,14 @@
   fcl fclproc
 
 #  ::errorCheck $fUplevelResult "-::FilterCL-filterA-configure-::xotcl::Object-::FilterMix-calls-configure-::xotcl::Object-::FilterCL-filterA-init-::xotcl::Object-::FilterMix-calls-init-::xotcl::Object-::FilterCL-filterA-fclproc-::FilterCL-::FilterMix-calls-fclproc-::FilterCL" "Filter/Mixin Info Uplevel Test"
-
-    return "PASSED [self]"
 }
 
-TestX nextTest
+
+
 @ TestX nextTest {
-    description {
-	Regression test object testing the next primitive.
-    }
+  description {Regression test object testing the next primitive.}
 }
-nextTest proc run {{n 20}} {
+TestX nextTest -proc run {{n 20}} {
     for {set i 0} {$i < $n} {incr i} {
 	
 	global result infoNext
@@ -1380,18 +1356,16 @@
 
 	o destroy; MIX destroy
     }
-    return "PASSED [self]"
-}
+  }
 
-TestX init_params
 @ TestX init_params {
-    description {
-	Regression test object testing the parameter instance method, 
-	the init dash '-' and constructor calling.
-    }
+  description {
+    Regression test object testing the parameter instance method, 
+    the init dash '-' and constructor calling.
+  }
 }
 
-init_params proc run {{n 20}} {
+TestX init_params -proc run {{n 20}} {
     for {set i 0} {$i < $n} {incr i} {
 	global dashResult
 	set dashResult ""
@@ -1519,19 +1493,16 @@
 	::errorCheck $r  "Meta-create-::d1" \
 	    "User defined object creation failed"
     }
-    return "PASSED [self]"
 }
 
-TestX mixinTest
 @ TestX mixinTest {
-    description {
-	Regression test object testing per-object mixins.
-    }
+  description {
+    Regression test object testing per-object mixins.
+  }
 }
 
+TestX mixinTest -proc run {{n 10}} {
 
-mixinTest proc run {{n 10}} {
-
     global mixinResult
     set mixinResult "" 
     Class Agent
@@ -1992,18 +1963,16 @@
     Object o -mixin {A B C}
     o proc x {} {return x}
     ::errorCheck [o x] {x} {mixin destroy on stack}
-    
-    return "PASSED [self]"
-  }
+}
 
-TestX mixinInheritanceTest
+
 @ TestX mixinInheritanceTest {
-    description {
-	Regression test object testing per-object mixin inheritance.
-    }
+  description {
+    Regression test object testing per-object mixin inheritance.
+  }
 }
 
-mixinInheritanceTest proc run {{n 10}} {
+TestX mixinInheritanceTest -proc run {{n 10}} {
     for {set i 0} {$i < $n} {incr i} {
 	global mixinResult
 	set mixinResult ""
@@ -2352,16 +2321,14 @@
       " ::a: ::A->init ::b: ::B->init ::b: ::A->init ::a2: ::Y->init ::a2: ::X->init ::a2: ::A->init ::b2: ::X->init ::b2: ::B->init ::b2: ::A->init ::a3: ::U->init ::a3: ::X->init ::a3: ::V->init ::a3: ::A->init ::b3: ::B->init ::b3: ::A->init ::a3: ::A->init ::b3: ::Y->init ::b3: ::X->init ::b3: ::B->init ::b3: ::A->init" \
       "Mixin init 9 failed"
 
-  return "PASSED [self]"
 }
 
-TestX copymove
+
 @ TestX copymove { 
-    description {
-	Regression test for copy/move methods
-    }
+  description {Regression test for copy/move methods}
 }
-copymove proc run {{n 10}} {
+
+TestX copymove -proc run {{n 10}} {
   # Composite
   Class Composite -superclass Class
   Composite instproc addop {op} {
@@ -2576,16 +2543,14 @@
 	"::X-::V ::X ::Z-::B ::B1" \
 	"Move of subclass relationship"
   }
-  return "PASSED [self]"
 }
 
-TestX recreation
+
 @ TestX recreation  {
-    description {
-	Regression test for object recreation/cleanup.
-    }
+  description { Regression test for object recreation/cleanup.  }
 }
-recreation proc run {{n 10}} {
+
+TestX recreation -proc run {{n 10}} {
  for {set i 0} {$i < $n} {incr i} {
   set ::recreateResult ""
   Class R
@@ -2758,16 +2723,16 @@
   META destroy
   unset ::cleanupResult
 
-  return "PASSED [self]"
+  Object instmixin ""
 }
 
 
-TestX smallScripts
 @ TestX smallScripts  {
-    description {
-	Regression test object testing arbitrary features.
-    }
+  description {
+    Regression test object testing arbitrary features.
+  }
 }
+TestX smallScripts
 proc ::up1 {} {
   return [uplevel 1 self]
 }	
@@ -2856,16 +2821,16 @@
     ::errorCheck [b info procs] "objproc" "[self]: info procs"
     ::errorCheck [B info instprocs] "myProc2" "[self]: info instprocs"
 
-    ::errorCheck [lsort [b info methods]] "__next abstract append array autoname check class cleanup configure copy defaultmethod destroy eval exists extractConfigureArg f filter filterappend filterguard filtersearch forward hasclass incr info infoTraceFilter init instvar invar isclass ismetaclass ismixin isobject istype lappend mixin mixinappend mixinguard move myProc myProc2 myProcMix1 myProcMix2 next noinit objproc parametercmd proc procsearch recreate requireNamespace self set setFilter tclcmd trace unset uplevel upvar volatile vwait"  "[self]: b info methods"
+    ::errorCheck [lsort [b info methods]] "__next abstract append array autoname check class cleanup configure copy defaultmethod destroy eval exists extractConfigureArg f filter filterappend filterguard filtersearch forward hasclass incr info infoTraceFilter init instvar invar isclass ismetaclass ismixin isobject istype lappend mixin mixinappend mixinguard move myProc myProc2 myProcMix1 myProcMix2 next noinit objproc parametercmd proc procsearch requireNamespace self set setFilter signature tclcmd trace unset uplevel upvar volatile vwait"  "[self]: b info methods"
 
-    ::errorCheck [lsort [b info methods -nocmds]] "abstract copy defaultmethod extractConfigureArg f filterappend hasclass infoTraceFilter init mixinappend move myProc myProc2 myProcMix1 myProcMix2 objproc recreate self setFilter tclcmd" "[self]: b info methods -nocmds"
+    ::errorCheck [lsort [b info methods -nocmds]] "abstract copy defaultmethod extractConfigureArg f filterappend hasclass infoTraceFilter init mixinappend move myProc myProc2 myProcMix1 myProcMix2 objproc self setFilter signature tclcmd" "[self]: b info methods -nocmds"
 
     ::errorCheck [lsort [b info methods -noprocs]] "__next append array autoname check class cleanup configure destroy eval exists filter filterguard filtersearch forward incr info instvar invar isclass ismetaclass ismixin isobject istype lappend mixin mixinguard next noinit parametercmd proc procsearch requireNamespace set trace unset uplevel upvar volatile vwait" "[self]: b info methods -noprocs"
-    ::errorCheck [lsort [b info methods -nocmds -nomixins]] "abstract copy defaultmethod extractConfigureArg f filterappend hasclass infoTraceFilter init mixinappend move myProc myProc2 objproc self setFilter tclcmd" "[self]: b info methods -nocmds -nomixins"
+    ::errorCheck [lsort [b info methods -nocmds -nomixins]] "abstract copy defaultmethod extractConfigureArg f filterappend hasclass infoTraceFilter init mixinappend move myProc myProc2 objproc self setFilter signature tclcmd" "[self]: b info methods -nocmds -nomixins"
 
     ::errorCheck [b info methods -nocmds -noprocs] "" "[self]: b info methods -nocmds -noprocs"
 
-    ::errorCheck [lsort [B info methods -nocmds]] "abstract allinstances copy defaultmethod extractConfigureArg f filterappend hasclass infoTraceFilter init instfilterappend instmixinappend insttclcmd mixinappend move recreate self setFilter tclcmd" "[self]: B info methods -nocmds"
+    ::errorCheck [lsort [B info methods -nocmds]] "abstract allinstances copy defaultmethod extractConfigureArg f filterappend hasclass infoTraceFilter init instfilterappend instmixinappend insttclcmd mixinappend move self setFilter signature tclcmd uses" "[self]: B info methods -nocmds"
 
     namespace eval a {
 	proc o args {return o}
@@ -2922,16 +2887,16 @@
     namespace delete foo 
     ::errorCheck [Object isobject ::foo::Foo] "0" "Namespace delete under object"
 
-    return "PASSED [self]"
 }
 
-TestX objectReferences
+
 @ TestX objectReferences {
     description {
 	Regression test for object and class references in tcl_objs
     }
 }
-objectReferences proc run {{n 20}} {
+
+TestX objectReferences -proc run {{n 20}} {
   my proc ok01 {} {
     Class AAA
     AAA destroy
@@ -3035,7 +3000,7 @@
   Class O -superclass UnknownClass
   ::errorCheck $::utest ::UnknownClass "[self]: __unknown"
   
-  ::errorCheck [lsort [UnknownClass info info]] {args body children class classchildren classparent commands default filter filterguard forward heritage info instances instbody instcommands instdefault instfilter instfilterguard instforward instinvar instmixin instpost instpre instprocs invar methods mixin parameter parent post pre procs subclass superclass vars} "[self]: info info"
+  ::errorCheck [lsort [UnknownClass info info]] {args body children class classchildren classparent commands default filter filterguard forward heritage info instances instbody instcommands instdefault instfilter instfilterguard instforward instinvar instmixin instpost instpre instprocs invar methods mixin parameter parent post pre precedence procs subclass superclass vars} "[self]: info info"
 
   ::errorCheck [Class info instances *Unk*] ::UnknownClass "match in info instances"
   ::errorCheck [Class info instances Unk*] "" "no match in info instances"
@@ -3091,17 +3056,16 @@
   ::errorCheck [Object ismetaclass M] 1 "is metaclass 1"
   ::errorCheck [Object ismetaclass C] 0 "is metaclass 0"
 
-
-  return "PASSED [self]"
 }
 
-TestX create condMixins
+
 @ TestX condMixins {
   description {
     Regression test for conditional mixins
   }
 }
-condMixins proc show {c obj} {
+
+TestX create condMixins -proc show {c obj} {
   set ::context $c
   set r [list]
   foreach x [list \
@@ -3128,25 +3092,23 @@
 
   set ::context payrollApp
 
-  ::errorCheck [lsort [jim info methods]] "__next abstract age append array autoname check class cleanup configure copy defaultmethod destroy driving-license eval exists extractConfigureArg f filter filterappend filterguard filtersearch forward hasclass id incr info infoTraceFilter init instvar invar isclass ismetaclass ismixin isobject istype lappend mixin mixinappend mixinguard move name next noinit parametercmd print proc procsearch recreate requireNamespace salary self set setFilter signature tclcmd trace unset uplevel upvar volatile vwait" "condmixin all methods"
+  ::errorCheck [lsort [jim info methods]] "__next abstract age append array autoname check class cleanup configure copy defaultmethod destroy driving-license eval exists extractConfigureArg filter filterappend filterguard filtersearch forward hasclass id incr info init instvar invar isclass ismetaclass ismixin isobject istype lappend mixin mixinappend mixinguard move name next noinit parametercmd print proc procsearch requireNamespace salary self set signature tclcmd trace unset uplevel upvar volatile vwait" "condmixin all methods"
 
-  ::errorCheck "[lsort [jim info methods -incontext]]" "__next abstract age append array autoname check class cleanup configure copy defaultmethod destroy eval exists extractConfigureArg f filter filterappend filterguard filtersearch forward hasclass id incr info infoTraceFilter init instvar invar isclass ismetaclass ismixin isobject istype lappend mixin mixinappend mixinguard move name next noinit parametercmd print proc procsearch recreate requireNamespace salary self set setFilter signature tclcmd trace unset uplevel upvar volatile vwait" "all methods in context"
+  ::errorCheck "[lsort [jim info methods -incontext]]" "__next abstract age append array autoname check class cleanup configure copy defaultmethod destroy eval exists extractConfigureArg filter filterappend filterguard filtersearch forward hasclass id incr info init instvar invar isclass ismetaclass ismixin isobject istype lappend mixin mixinappend mixinguard move name next noinit parametercmd print proc procsearch requireNamespace salary self set signature tclcmd trace unset uplevel upvar volatile vwait" "all methods in context"
 
   ::errorCheck [my show payrollApp jim] "{payrollApp:  jim info methods salary => salary} {payrollApp:  jim info methods -incontext salary => salary} {payrollApp:  jim info methods driv* => driving-license} {payrollApp:  jim info methods -incontext driv* => }" "payrollApp jim"
   ::errorCheck [my show shipmentApp jim] "{shipmentApp:  jim info methods salary => salary} {shipmentApp:  jim info methods -incontext salary => } {shipmentApp:  jim info methods driv* => driving-license} {shipmentApp:  jim info methods -incontext driv* => driving-license}" "shipmentApp jim"
 
-  return "PASSED [self]"
 }
 
 
-
-TestX create volatileObjects
 @ TestX volatileObjects {
-    description {
-	Regression test for volatile objects
-    }
+  description {
+    Regression test for volatile objects
+  }
 }
 
+TestX create volatileObjects
 volatileObjects proc inscope {} {
   set r 0
   set y 0
@@ -3224,9 +3186,10 @@
 
   C instfilter {}
   Class instproc f {} {}
-  return "PASSED [self]"
 }
 
+
+
 TestX create uplevelCmds
 uplevelCmds proc upproc {} {
   lappend ::result [list \
@@ -3390,7 +3353,15 @@
   Object instfilter ""
   D instmixin {}
 
-
+  C instproc selftest args {
+    return [self class]/[self isnextcall]-[next]
+  }
+  D instproc selftest args {
+    return [self class]/[self isnextcall]-[next]
+  }
+  errorCheck [d1 selftest] "::D/0-::C/1-" \
+      "self isnextcall"
+  
   Object instproc each {objName body} {
     #puts " *** level = [info level] self callinglevel = [self callinglevel]"
     uplevel [self callinglevel] [list foreach $objName [lsort [[self] info children]] $body]
@@ -3445,11 +3416,51 @@
   errorCheck [t loop2] 12 "nested uplevel eval loop"
   t destroy
 
-  return "PASSED [self]"
 }
 
-TestX create nonposargs
-nonposargs proc run {{n 20}} {
+
+TestX create namespaceCommands -proc run {{n 20}} {
+  errorCheck [catch {
+    namespace eval foo {
+      Class m
+      Object o -mixin m
+    }
+  }] 0 "mixin resolved from namespace"
+
+  Class create ::xotcl::_creator -instproc create {args} {
+    set result [next]
+    return $result
+  }
+
+  errorCheck [catch {
+    namespace eval bar {
+      Class A
+      namespace export A
+    }
+
+    namespace eval foo {
+      Class M -superclass Class
+
+      namespace import ::bar::*
+      Class B -superclass A -instmixin M
+      
+      Class instmixin ::xotcl::_creator
+      Class C -superclass A -instmixin B
+      Class instmixin ""
+    }
+  } error] 0 "mixin and Class resolve and import into namespace\n$error"
+  
+}
+
+TestX create metaClassAsMixin -proc run {{n 20}} {
+  Class create A -instmixin Class
+  Class create B -superclass A
+  B create b1
+  errorCheck [A ismetaclass]-[B ismetaclass]-[b1 ismetaclass]-[b1 isclass] \
+      "1-1-0-1" "metaclass through mixin"
+}
+
+TestX create nonposargs -proc run {{n 20}} {
     Object o	
     o proc x {a b} {
 	return "$a $b"
@@ -3628,13 +3639,10 @@
   }
 
   errorCheck [c1 m3 1 2 3] "hu3" "Defaults instproc no flag"
-  
-  return "PASSED [self]"
 }
 
 
-TestX copymove2
-copymove2 proc run {{n 10}} {
+TestX copymove2 -proc run {{n 10}} {
   # Composite
   Class Composite -superclass Class
   Composite instproc addop {op} {
@@ -3689,33 +3697,12 @@
       commands::cellcmd copy toto
     }
   }
-  return "PASSED [self]"
 }
 
 TestX proc run {} {
-  puts [nestingClasses run]
-  puts [nestingObjects run]
-#  puts [assertions run]
-  puts [copymove2 run]
-  puts [stdargs run]
-  puts [filterAddRemove run]
-  puts [filterClassChange run]
-  puts [filterSimpleObserver run]
-  puts [filterInfo run]
-  puts [filterGuards run]
-  puts [nextTest run]
-  puts [init_params run]
-  puts [mixinTest run]
-  puts [mixinInheritanceTest run]
-  puts [mixinGuards run]
-  puts [copymove run]
-  puts [recreation run]
-  puts [smallScripts run]
-  puts [objectReferences run]
-  puts [condMixins run]
-  puts [volatileObjects run]
-  puts [uplevelCmds run]
-  puts [nonposargs run]
+  foreach test [lsort [TestX info instances]] {
+    $test run
+  }
 }
 
 puts "XOTcl - Test"
Index: xotcl/tests/xoRDF.test
===================================================================
diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/tests/xoRDF.test	(.../xoRDF.test)	(revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8)
+++ xotcl/tests/xoRDF.test	(.../xoRDF.test)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,6 +1,6 @@
 #!../../src/xotclsh
 #!/usr/local/bin/xotclsh
-# $Id: xoRDF.test,v 1.1 2004/05/23 22:50:39 neumann Exp $
+# $Id: xoRDF.test,v 1.2 2005/09/09 21:07:23 neumann Exp $
 #
 package require XOTcl; namespace import -force xotcl::*
 
@@ -118,16 +118,16 @@
     </Description>
   </RDF>
 } {
-::RDFTag- --- RDF
-::RDFDescription-::res0 --- Description
+::xotcl::rdf::parser::RDFTag- --- RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- Description
 ATTR: about = http://www.w3.org/Home/Lassila
-::RDFProperty-::res0::prop0 --- s:Creator
-::RDFDescription-::res0::prop0::res0 --- Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:Creator
+::xotcl::rdf::parser::RDFDescription-::res0::prop0::res0 --- Description
 ATTR: ID = nsd
-::RDFProperty-::res0::prop0::res0::prop0 --- s:ABC
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop0 --- s:ABC
 PCDATA:
 xyz
-::RDFProperty-::res0::prop0::res0::prop1 --- fromXYZ
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop1 --- fromXYZ
 PCDATA:
 dfg
 }  {
@@ -145,10 +145,10 @@
     </rdf:Description>
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://www.w3.org/Home/Lassila
-::RDFProperty-::res0::prop0 --- s:Creator
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:Creator
 PCDATA:
 Ora Lassila
 } {
@@ -175,10 +175,10 @@
     </rdf:Description>
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://www.w3.org/Home/Lassila
-::RDFProperty-::res0::prop0 --- s:Creator
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:Creator
 PCDATA:
 Ora Lassila
 } {
@@ -192,10 +192,10 @@
                      s:Creator="Ora Lassila" />
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://www.w3.org/Home/Lassila
-::RDFProperty-::res0::prop0 --- s:Creator
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:Creator
 PCDATA:
 Ora Lassila
 } {
@@ -212,16 +212,16 @@
     </rdf:Description>
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://www.w3.org
-::RDFProperty-::res0::prop0 --- s:Publisher
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:Publisher
 PCDATA:
 World Wide Web Consortium
-::RDFProperty-::res0::prop1 --- s:Title
+::xotcl::rdf::parser::RDFProperty-::res0::prop1 --- s:Title
 PCDATA:
 W3C Home Page
-::RDFProperty-::res0::prop2 --- s:Date
+::xotcl::rdf::parser::RDFProperty-::res0::prop2 --- s:Date
 PCDATA:
 1998-10-03T02:27
 } {
@@ -239,16 +239,16 @@
          s:Date="1998-10-03T02:27"/>
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://www.w3.org
-::RDFProperty-::res0::prop0 --- s:Publisher
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:Publisher
 PCDATA:
 World Wide Web Consortium
-::RDFProperty-::res0::prop1 --- s:Title
+::xotcl::rdf::parser::RDFProperty-::res0::prop1 --- s:Title
 PCDATA:
 W3C Home Page
-::RDFProperty-::res0::prop2 --- s:Date
+::xotcl::rdf::parser::RDFProperty-::res0::prop2 --- s:Date
 PCDATA:
 1998-10-03T02:27
 } {
@@ -273,25 +273,25 @@
    </rdf:Description>
 </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://mycollege.edu/courses/6.001
-::RDFProperty-::res0::prop0 --- s:students
-::RDFBag-::res0::prop0::res0 --- rdf:Bag
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:students
+::xotcl::rdf::parser::RDFBag-::res0::prop0::res0 --- rdf:Bag
 TYPES: http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag
-::RDFMember-::res0::prop0::res0::prop0 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop0 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/Amy
 MEMBER-INDEX: rdf:_1
-::RDFMember-::res0::prop0::res0::prop1 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop1 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/Tim
 MEMBER-INDEX: rdf:_2
-::RDFMember-::res0::prop0::res0::prop2 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop2 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/John
 MEMBER-INDEX: rdf:_3
-::RDFMember-::res0::prop0::res0::prop3 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop3 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/Mary
 MEMBER-INDEX: rdf:_4
-::RDFMember-::res0::prop0::res0::prop4 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop4 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/Sue
 MEMBER-INDEX: rdf:_5                             
 } {
@@ -322,25 +322,25 @@
    </rdf:Description>
 </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://mycollege.edu/courses/6.001
-::RDFProperty-::res0::prop0 --- s:students
-::RDFBag-::res0::prop0::res0 --- rdf:Bag
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:students
+::xotcl::rdf::parser::RDFBag-::res0::prop0::res0 --- rdf:Bag
 TYPES: http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag
-::RDFMember-::res0::prop0::res0::prop0 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop0 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/Amy
 MEMBER-INDEX: rdf:_1
-::RDFMember-::res0::prop0::res0::prop1 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop1 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/Tim
 MEMBER-INDEX: rdf:_2
-::RDFMember-::res0::prop0::res0::prop2 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop2 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/John
 MEMBER-INDEX: rdf:_3
-::RDFMember-::res0::prop0::res0::prop3 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop3 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/Mary
 MEMBER-INDEX: rdf:_4
-::RDFMember-::res0::prop0::res0::prop4 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop4 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/Sue
 MEMBER-INDEX: rdf:_5
 } {
@@ -370,25 +370,25 @@
    </rdf:Description>
 </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://mycollege.edu/courses/6.001
-::RDFProperty-::res0::prop0 --- s:students
-::RDFBag-::res0::prop0::res0 --- rdf:Bag
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:students
+::xotcl::rdf::parser::RDFBag-::res0::prop0::res0 --- rdf:Bag
 TYPES: http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag
-::RDFMember-::res0::prop0::res0::prop0 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop0 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/Amy
 MEMBER-INDEX: rdf:_1
-::RDFMember-::res0::prop0::res0::prop1 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop1 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/Tim
 MEMBER-INDEX: rdf:_2
-::RDFMember-::res0::prop0::res0::prop2 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop2 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/John
 MEMBER-INDEX: rdf:_3
-::RDFMember-::res0::prop0::res0::prop3 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop3 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/Mary
 MEMBER-INDEX: rdf:_4
-::RDFMember-::res0::prop0::res0::prop4 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop4 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/Sue
 MEMBER-INDEX: rdf:_5
 } {
@@ -420,25 +420,25 @@
    </rdf:Description>
 </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://mycollege.edu/courses/6.001
-::RDFProperty-::res0::prop0 --- s:students
-::RDFAlt-::res0::prop0::res0 --- rdf:Alt
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:students
+::xotcl::rdf::parser::RDFAlt-::res0::prop0::res0 --- rdf:Alt
 TYPES: http://www.w3.org/1999/02/22-rdf-syntax-ns#Alt http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag
-::RDFMember-::res0::prop0::res0::prop0 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop0 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/Amy
 MEMBER-INDEX: rdf:_1
-::RDFMember-::res0::prop0::res0::prop1 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop1 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/Tim
 MEMBER-INDEX: rdf:_2
-::RDFMember-::res0::prop0::res0::prop2 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop2 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/John
 MEMBER-INDEX: rdf:_3
-::RDFMember-::res0::prop0::res0::prop3 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop3 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/Mary
 MEMBER-INDEX: rdf:_4
-::RDFMember-::res0::prop0::res0::prop4 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop4 --- rdf:li
 ATTR: resource = http://mycollege.edu/students/Sue
 MEMBER-INDEX: rdf:_5
 } {
@@ -466,19 +466,19 @@
     </rdf:Description>
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://x.org/packages/X11
-::RDFProperty-::res0::prop0 --- s:DistributionSite
-::RDFAlt-::res0::prop0::res0 --- rdf:Alt
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:DistributionSite
+::xotcl::rdf::parser::RDFAlt-::res0::prop0::res0 --- rdf:Alt
 TYPES: http://www.w3.org/1999/02/22-rdf-syntax-ns#Alt
-::RDFMember-::res0::prop0::res0::prop0 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop0 --- rdf:li
 ATTR: resource = ftp://ftp.x.org
 MEMBER-INDEX: rdf:_1
-::RDFMember-::res0::prop0::res0::prop1 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop1 --- rdf:li
 ATTR: resource = ftp://ftp.cs.purdue.edu
 MEMBER-INDEX: rdf:_2
-::RDFMember-::res0::prop0::res0::prop2 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop2 --- rdf:li
 ATTR: resource = ftp://ftp.eu.net
 MEMBER-INDEX: rdf:_3
 } {
@@ -502,19 +502,19 @@
     </rdf:Description>
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFBag-::res0 --- rdf:Bag
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFBag-::res0 --- rdf:Bag
 ATTR: ID = pages
 TYPES: http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag
-::RDFMember-::res0::prop0 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0 --- rdf:li
 ATTR: resource = http://foo.org/foo.html
 MEMBER-INDEX: rdf:_1
-::RDFMember-::res0::prop1 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop1 --- rdf:li
 ATTR: resource = http://bar.org/bar.html
 MEMBER-INDEX: rdf:_2
-::RDFDescription-::res1 --- rdf:Description
+::xotcl::rdf::parser::RDFDescription-::res1 --- rdf:Description
 ATTR: about = #pages
-::RDFProperty-::res1::prop0 --- s:Creator
+::xotcl::rdf::parser::RDFProperty-::res1::prop0 --- s:Creator
 PCDATA:
 Ora Lassila
 } {
@@ -542,24 +542,24 @@
   </rdf:Bag>
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: aboutEachPrefix = http://foo.org/doc
-::RDFProperty-::res0::prop0 --- s:Copyright
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:Copyright
 PCDATA:
 (c) 1998, The Foo Organization
-::RDFDescription-::res1 --- rdf:Description
+::xotcl::rdf::parser::RDFDescription-::res1 --- rdf:Description
 ATTR: aboutEach = #docpages
-::RDFProperty-::res1::prop0 --- s:Copyright
+::xotcl::rdf::parser::RDFProperty-::res1::prop0 --- s:Copyright
 PCDATA:
 (c) 1998, The Foo Organization
-::RDFBag-::res2 --- rdf:Bag
+::xotcl::rdf::parser::RDFBag-::res2 --- rdf:Bag
 ATTR: ID = docpages
 TYPES: http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag
-::RDFMember-::res2::prop0 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res2::prop0 --- rdf:li
 ATTR: resource = http://foo.org/doc/page1
 MEMBER-INDEX: rdf:_1
-::RDFMember-::res2::prop1 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res2::prop1 --- rdf:li
 ATTR: resource = http://foo.org/doc/page2
 MEMBER-INDEX: rdf:_2 
 } {
@@ -592,28 +592,28 @@
   </rdf:Bag>
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: aboutEach = #docpages
-::RDFProperty-::res0::prop0 --- s:somebag
-::RDFBag-::res0::prop0::res0 --- rdf:Bag
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:somebag
+::xotcl::rdf::parser::RDFBag-::res0::prop0::res0 --- rdf:Bag
 TYPES: http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag
-::RDFMember-::res0::prop0::res0::prop0 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop0 --- rdf:li
 ATTR: resource = http://foo.org/foo.html
 MEMBER-INDEX: rdf:_1
-::RDFMember-::res0::prop0::res0::prop1 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop1 --- rdf:li
 ATTR: resource = http://bar.org/bar.html
 MEMBER-INDEX: rdf:_2
-::RDFProperty-::res0::prop1 --- s:Creator
+::xotcl::rdf::parser::RDFProperty-::res0::prop1 --- s:Creator
 PCDATA:
 Me
-::RDFBag-::res1 --- rdf:Bag
+::xotcl::rdf::parser::RDFBag-::res1 --- rdf:Bag
 ATTR: ID = docpages
 TYPES: http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag
-::RDFMember-::res1::prop0 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res1::prop0 --- rdf:li
 ATTR: resource = http://foo.org/doc/page1
 MEMBER-INDEX: rdf:_1
-::RDFMember-::res1::prop1 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res1::prop1 --- rdf:li
 ATTR: resource = http://foo.org/doc/page2
 MEMBER-INDEX: rdf:_2
 } {
@@ -646,29 +646,29 @@
     </rdf:Seq>
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFSeq-::res0 --- rdf:Seq
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFSeq-::res0 --- rdf:Seq
 ATTR: ID = JSPapersByDate
 TYPES: http://www.w3.org/1999/02/22-rdf-syntax-ns#Seq
-::RDFMember-::res0::prop0 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0 --- rdf:li
 ATTR: resource = http://www.dogworld.com/Aug96.doc
 MEMBER-INDEX: rdf:_1
-::RDFMember-::res0::prop1 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop1 --- rdf:li
 ATTR: resource = http://www.webnuts.net/Jan97.html
 MEMBER-INDEX: rdf:_2
-::RDFMember-::res0::prop2 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop2 --- rdf:li
 ATTR: resource = http://www.carchat.com/Sept97.html
 MEMBER-INDEX: rdf:_3
-::RDFSeq-::res1 --- rdf:Seq
+::xotcl::rdf::parser::RDFSeq-::res1 --- rdf:Seq
 ATTR: ID = JSPapersBySubj
 TYPES: http://www.w3.org/1999/02/22-rdf-syntax-ns#Seq
-::RDFMember-::res1::prop0 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res1::prop0 --- rdf:li
 ATTR: resource = http://www.carchat.com/Sept97.html
 MEMBER-INDEX: rdf:_1
-::RDFMember-::res1::prop1 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res1::prop1 --- rdf:li
 ATTR: resource = http://www.dogworld.com/Aug96.doc
 MEMBER-INDEX: rdf:_2
-::RDFMember-::res1::prop2 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res1::prop2 --- rdf:li
 ATTR: resource = http://www.webnuts.net/Jan97.html
 MEMBER-INDEX: rdf:_3
 } {
@@ -713,40 +713,40 @@
     </rdf:Description>
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://www.foo.com/cool.html
-::RDFProperty-::res0::prop0 --- dc:Creator
-::RDFSeq-::res0::prop0::res0 --- rdf:Seq
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- dc:Creator
+::xotcl::rdf::parser::RDFSeq-::res0::prop0::res0 --- rdf:Seq
 ATTR: ID = CreatorsAlphabeticalBySurname
 TYPES: http://www.w3.org/1999/02/22-rdf-syntax-ns#Seq
-::RDFMember-::res0::prop0::res0::prop0 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop0 --- rdf:li
 PCDATA:
 Mary Andrew
 MEMBER-INDEX: rdf:_1
-::RDFMember-::res0::prop0::res0::prop1 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0::res0::prop1 --- rdf:li
 PCDATA:
 Jacky Crystal
 MEMBER-INDEX: rdf:_2
-::RDFProperty-::res0::prop1 --- dc:Identifier
-::RDFBag-::res0::prop1::res0 --- rdf:Bag
+::xotcl::rdf::parser::RDFProperty-::res0::prop1 --- dc:Identifier
+::xotcl::rdf::parser::RDFBag-::res0::prop1::res0 --- rdf:Bag
 ATTR: ID = MirroredSites
 TYPES: http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag
-::RDFMember-::res0::prop1::res0::prop0 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop1::res0::prop0 --- rdf:li
 ATTR: rdf:resource = http://www.foo.com.au/cool.html
 MEMBER-INDEX: rdf:_1
-::RDFMember-::res0::prop1::res0::prop1 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop1::res0::prop1 --- rdf:li
 ATTR: rdf:resource = http://www.foo.com.it/cool.html
 MEMBER-INDEX: rdf:_2
-::RDFProperty-::res0::prop2 --- dc:Title
-::RDFAlt-::res0::prop2::res0 --- rdf:Alt
+::xotcl::rdf::parser::RDFProperty-::res0::prop2 --- dc:Title
+::xotcl::rdf::parser::RDFAlt-::res0::prop2::res0 --- rdf:Alt
 TYPES: http://www.w3.org/1999/02/22-rdf-syntax-ns#Alt
-::RDFMember-::res0::prop2::res0::prop0 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop2::res0::prop0 --- rdf:li
 ATTR: xml:lang = en
 PCDATA:
 The Coolest Web Page
 MEMBER-INDEX: rdf:_1
-::RDFMember-::res0::prop2::res0::prop1 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop2::res0::prop1 --- rdf:li
 ATTR: xml:lang = it
 PCDATA:
 Il Pagio di Web Fuba
@@ -780,20 +780,20 @@
    </rdf:Bag>
 </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFBag-::res0 --- rdf:Bag
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFBag-::res0 --- rdf:Bag
 TYPES: http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag
-::RDFMember-::res0::prop0 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop0 --- rdf:li
 ATTR: parseType = Literal
 PCDATA:
  
        <rdf:Description> literal, well-formed tag </rdf:Description>
  
 MEMBER-INDEX: rdf:_1
-::RDFMember-::res0::prop1 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop1 --- rdf:li
 MEMBER-INDEX: rdf:_2
-::RDFDescription-::res0::prop1::res0 --- rdf:Description
-::RDFProperty-::res0::prop1::res0::prop0 --- s:x
+::xotcl::rdf::parser::RDFDescription-::res0::prop1::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop1::res0::prop0 --- s:x
 PCDATA:
 xyz 
 } {
@@ -859,17 +859,17 @@
    </rdf:Bag>
 </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://mycollege.edu/
-::RDFProperty-::res0::prop0 --- s:students
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:students
 ATTR: parseType = Literal
 PCDATA:
  
        <rdf:Description>xyz</rdf:Description>
-::RDFDescription-::res1 --- rdf:Description
+::xotcl::rdf::parser::RDFDescription-::res1 --- rdf:Description
 ATTR: about = http://mycollege.edu/
-::RDFProperty-::res1::prop0 --- s:students
+::xotcl::rdf::parser::RDFProperty-::res1::prop0 --- s:students
 ATTR: parseType = Literal
 PCDATA:
  
@@ -883,26 +883,26 @@
         <rdf:li resource="http://mycollege.edu/students/Mary"/>
         <rdf:li resource="http://mycollege.edu/students/Sue"/>
        </rdf:Bag>
-::RDFBag-::res2 --- rdf:Bag
+::xotcl::rdf::parser::RDFBag-::res2 --- rdf:Bag
 TYPES: http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag
-::RDFMember-::res2::prop0 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res2::prop0 --- rdf:li
 ATTR: parseType = Literal
 PCDATA:
  
        <rdf:Description> literal, well-formed tag </rdf:Description>
  
 MEMBER-INDEX: rdf:_1
-::RDFMember-::res2::prop1 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res2::prop1 --- rdf:li
 ATTR: parseType = AllOtherMustbeLiteral
 PCDATA:
  
         <rdf:Description> literal, well-formed tag </rdf:Description>
  
 MEMBER-INDEX: rdf:_2
-::RDFMember-::res2::prop2 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res2::prop2 --- rdf:li
 MEMBER-INDEX: rdf:_3
-::RDFDescription-::res2::prop2::res0 --- rdf:Description
-::RDFProperty-::res2::prop2::res0::prop0 --- s:x
+::xotcl::rdf::parser::RDFDescription-::res2::prop2::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res2::prop2::res0::prop0 --- s:x
 PCDATA:
 xyz
 } {
@@ -943,11 +943,11 @@
   </DC:typed>
 </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://www.xyz.com
 TYPES: http://purl.org/dc/elements/1.0/typed
-::RDFProperty-::res0::prop0 --- DC:Creator
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- DC:Creator
 ATTR: rdf:resource = http://www.xyz.com/homepage/
 } {
    http://www.xyz.com                  http://purl.org/dc/elements/1.0/Creator http://www.xyz.com/homepage/
@@ -970,15 +970,15 @@
     </Description>
 </RDF>
 } {
-::RDFTag- --- RDF
-::RDFDescription-::res0 --- Description
+::xotcl::rdf::parser::RDFTag- --- RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- Description
 ATTR: about = http://www.webnuts.net/Jan97.html
-::RDFProperty-::res0::prop0 --- dc:Subject
-::RDFDescription-::res0::prop0::res0 --- rdf:Description
-::RDFProperty-::res0::prop0::res0::prop0 --- value
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- dc:Subject
+::xotcl::rdf::parser::RDFDescription-::res0::prop0::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop0 --- value
 PCDATA:
 020 - Library Science
-::RDFProperty-::res0::prop0::res0::prop1 --- l:Classification
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop1 --- l:Classification
 PCDATA:
 Dewey Decimal Code 
 } {
@@ -1002,15 +1002,15 @@
     </Description>
 </RDF>
 } {
-::RDFTag- --- RDF
-::RDFDescription-::res0 --- Description
+::xotcl::rdf::parser::RDFTag- --- RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- Description
 ATTR: about = http://www.webnuts.net/Jan97.html
-::RDFProperty-::res0::prop0 --- dc:Subject
-::RDFDescription-::res0::prop0::res0 --- rdf:Description
-::RDFProperty-::res0::prop0::res0::prop0 --- value
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- dc:Subject
+::xotcl::rdf::parser::RDFDescription-::res0::prop0::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop0 --- value
 PCDATA:
 020 - Library Science
-::RDFProperty-::res0::prop0::res0::prop1 --- l:Classification
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop1 --- l:Classification
 PCDATA:
 Dewey Decimal Code
 } {
@@ -1036,15 +1036,15 @@
     </Description>
 </RDF>
 } {
-::RDFTag- --- RDF
-::RDFDescription-::res0 --- Description
+::xotcl::rdf::parser::RDFTag- --- RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- Description
 ATTR: about = http://www.webnuts.net/Jan97.html
-::RDFProperty-::res0::prop0 --- dc:Subject
-::RDFDescription-::res0::prop0::res0 --- Description
-::RDFProperty-::res0::prop0::res0::prop0 --- value
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- dc:Subject
+::xotcl::rdf::parser::RDFDescription-::res0::prop0::res0 --- Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop0 --- value
 PCDATA:
 020 - Library Science
-::RDFProperty-::res0::prop0::res0::prop1 --- l:Classification
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop1 --- l:Classification
 PCDATA:
 Dewey Decimal Code
 } {
@@ -1071,20 +1071,20 @@
     </Description>
 </RDF>
 } {
-::RDFTag- --- RDF
-::RDFDescription-::res0 --- Description
+::xotcl::rdf::parser::RDFTag- --- RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- Description
 ATTR: about = http://www.webnuts.net/Jan97.html
-::RDFProperty-::res0::prop0 --- dc:Subject
-::RDFDescription-::res0::prop0::res0 --- rdf:Description
-::RDFProperty-::res0::prop0::res0::prop0 --- value
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- dc:Subject
+::xotcl::rdf::parser::RDFDescription-::res0::prop0::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop0 --- value
 PCDATA:
 020 - Library Science
-::RDFProperty-::res0::prop0::res0::prop1 --- l:Classification
-::RDFDescription-::res0::prop0::res0::prop1::res0 --- rdf:Description
-::RDFProperty-::res0::prop0::res0::prop1::res0::prop0 --- l:lang
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop1 --- l:Classification
+::xotcl::rdf::parser::RDFDescription-::res0::prop0::res0::prop1::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop1::res0::prop0 --- l:lang
 PCDATA:
 en
-::RDFProperty-::res0::prop0::res0::prop1::res0::prop1 --- l:string
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop1::res0::prop1 --- l:string
 PCDATA:
 Dewey Decimal Code 
 } {
@@ -1110,17 +1110,17 @@
     </rdf:Description>
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://www.w3.org/Home/Lassila
-::RDFProperty-::res0::prop0 --- s:Creator
-::RDFDescription-::res0::prop0::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:Creator
+::xotcl::rdf::parser::RDFDescription-::res0::prop0::res0 --- rdf:Description
 ATTR: about = http://www.w3.org/staffId/85740
 TYPES: http://description.org/schema/Person
-::RDFProperty-::res0::prop0::res0::prop0 --- s:Name
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop0 --- s:Name
 PCDATA:
 Ora Lassila
-::RDFProperty-::res0::prop0::res0::prop1 --- s:Email
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop1 --- s:Email
 PCDATA:
 lassila@w3.org
 } {
@@ -1145,16 +1145,16 @@
     </rdf:Description>
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://www.w3.org/Home/Lassila
-::RDFProperty-::res0::prop0 --- s:Creator
-::RDFDescription-::res0::prop0::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:Creator
+::xotcl::rdf::parser::RDFDescription-::res0::prop0::res0 --- rdf:Description
 TYPES: http://description.org/schema/Person
-::RDFProperty-::res0::prop0::res0::prop0 --- s:Name
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop0 --- s:Name
 PCDATA:
 Ora Lassila
-::RDFProperty-::res0::prop0::res0::prop1 --- s:Email
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop1 --- s:Email
 PCDATA:
 lassila@w3.org
 }  {
@@ -1178,17 +1178,17 @@
     </rdf:Description>
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://www.w3.org/Home/Lassila
-::RDFProperty-::res0::prop0 --- s:Creator
-::RDFDescription-::res0::prop0::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:Creator
+::xotcl::rdf::parser::RDFDescription-::res0::prop0::res0 --- rdf:Description
 ATTR: about = http://www.w3.org/staffId/85740
 TYPES: http://description.org/schema/Person
-::RDFProperty-::res0::prop0::res0::prop0 --- s:Name
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop0 --- s:Name
 PCDATA:
 Ora Lassila
-::RDFProperty-::res0::prop0::res0::prop1 --- s:Email
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop1 --- s:Email
 PCDATA:
 lassila@w3.org
 } {
@@ -1212,16 +1212,16 @@
     </rdf:Description>
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://www.w3.org/Home/Lassila
-::RDFProperty-::res0::prop0 --- s:Creator
-::RDFDescription-::res0::prop0::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:Creator
+::xotcl::rdf::parser::RDFDescription-::res0::prop0::res0 --- rdf:Description
 TYPES: http://description.org/schema/Person
-::RDFProperty-::res0::prop0::res0::prop0 --- s:Name
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop0 --- s:Name
 PCDATA:
 Ora Lassila
-::RDFProperty-::res0::prop0::res0::prop1 --- s:Email
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop1 --- s:Email
 PCDATA:
 lassila@w3.org 
 } {
@@ -1247,16 +1247,16 @@
     </rdf:Description>
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://www.w3.org/Home/Lassila
-::RDFProperty-::res0::prop0 --- s:Creator
-::RDFDescription-::res0::prop0::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:Creator
+::xotcl::rdf::parser::RDFDescription-::res0::prop0::res0 --- rdf:Description
 ATTR: about = http://www.w3.org/staffId/85740
-::RDFProperty-::res0::prop0::res0::prop0 --- s:Name
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop0 --- s:Name
 PCDATA:
 Ora Lassila
-::RDFProperty-::res0::prop0::res0::prop1 --- s:Email
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop1 --- s:Email
 PCDATA:
 lassila@w3.org
 } {
@@ -1276,16 +1276,16 @@
     </rdf:Description>
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://www.w3.org/Home/Lassila
-::RDFProperty-::res0::prop0 --- s:Creator
-::RDFDescription-::res0::prop0::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:Creator
+::xotcl::rdf::parser::RDFDescription-::res0::prop0::res0 --- rdf:Description
 ATTR: about = http://www.w3.org/staffId/85740
-::RDFProperty-::res0::prop0::res0::prop0 --- s:Name
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop0 --- s:Name
 PCDATA:
 Ora Lassila
-::RDFProperty-::res0::prop0::res0::prop1 --- s:Email
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop1 --- s:Email
 PCDATA:
 lassila@w3.org
 } {
@@ -1305,15 +1305,15 @@
     </rdf:Description>
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://www.w3.org/Home/Lassila
-::RDFProperty-::res0::prop0 --- s:Creator
-::RDFDescription-::res0::prop0::res0 --- rdf:Description
-::RDFProperty-::res0::prop0::res0::prop0 --- s:Name
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:Creator
+::xotcl::rdf::parser::RDFDescription-::res0::prop0::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop0 --- s:Name
 PCDATA:
 Ora Lassila
-::RDFProperty-::res0::prop0::res0::prop1 --- s:Email
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop1 --- s:Email
 PCDATA:
 lassila@w3.org
 } {
@@ -1338,17 +1338,17 @@
     </rdf:Description>
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://www.w3.org/Home/Lassila
-::RDFProperty-::res0::prop0 --- s:Creator
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:Creator
 ATTR: rdf:resource = http://www.w3.org/staffId/85740
-::RDFDescription-::res1 --- rdf:Description
+::xotcl::rdf::parser::RDFDescription-::res1 --- rdf:Description
 ATTR: about = http://www.w3.org/staffId/85740
-::RDFProperty-::res1::prop0 --- v:Name
+::xotcl::rdf::parser::RDFProperty-::res1::prop0 --- v:Name
 PCDATA:
 Ora Lassila
-::RDFProperty-::res1::prop1 --- v:Email
+::xotcl::rdf::parser::RDFProperty-::res1::prop1 --- v:Email
 PCDATA:
 lassila@w3.org
 } {
@@ -1372,16 +1372,16 @@
     </rdf:Description>
   </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://www.w3.org/Home/Lassila
-::RDFProperty-::res0::prop0 --- s:Creator
-::RDFDescription-::res0::prop0::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:Creator
+::xotcl::rdf::parser::RDFDescription-::res0::prop0::res0 --- rdf:Description
 ATTR: about = http://www.w3.org/staffId/85740
-::RDFProperty-::res0::prop0::res0::prop0 --- v:Name
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop0 --- v:Name
 PCDATA:
 Ora Lassila
-::RDFProperty-::res0::prop0::res0::prop1 --- v:Email
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop1 --- v:Email
 PCDATA:
 lassila@w3.org   
 } {
@@ -1403,14 +1403,14 @@
   </s:Person>
 </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://www.xotcl.org/uwe
 TYPES: http://description.org/schema/Person
-::RDFProperty-::res0::prop0 --- s:Name
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- s:Name
 PCDATA:
 Uwe Zdun
-::RDFProperty-::res0::prop1 --- s:Email
+::xotcl::rdf::parser::RDFProperty-::res0::prop1 --- s:Email
 PCDATA:
 uwe@xotcl.org
 } {
@@ -1425,14 +1425,14 @@
   <Person rdf:about="http://www.xotcl.org/uwe" Name="Uwe Zdun" Email="uwe@xotcl.org" />
 </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: rdf:about = http://www.xotcl.org/uwe
 TYPES: http://description.org/schema/Person
-::RDFProperty-::res0::prop0 --- Name
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- Name
 PCDATA:
 Uwe Zdun
-::RDFProperty-::res0::prop1 --- Email
+::xotcl::rdf::parser::RDFProperty-::res0::prop1 --- Email
 PCDATA:
 uwe@xotcl.org
 } {
@@ -1468,36 +1468,36 @@
   </rdf:Description>
 </RDF>
 } {
-::RDFTag- --- RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://nm.wu-wien.ac.at/Lehre/oo1/
-::RDFProperty-::res0::prop0 --- gen:Title
-::RDFDescription-::res0::prop0::res0 --- rdf:Description
-::RDFProperty-::res0::prop0::res0::prop0 --- xml:lang
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- gen:Title
+::xotcl::rdf::parser::RDFDescription-::res0::prop0::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop0 --- xml:lang
 PCDATA:
 en
-::RDFProperty-::res0::prop0::res0::prop1 --- gen:String
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop1 --- gen:String
 PCDATA:
 Object Oriented Design and System Development
-::RDFProperty-::res0::prop1 --- gen:Description
-::RDFBag-::res0::prop1::res0 --- rdf:Bag
+::xotcl::rdf::parser::RDFProperty-::res0::prop1 --- gen:Description
+::xotcl::rdf::parser::RDFBag-::res0::prop1::res0 --- rdf:Bag
 TYPES: http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag
-::RDFMember-::res0::prop1::res0::prop0 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop1::res0::prop0 --- rdf:li
 MEMBER-INDEX: rdf:_1
-::RDFDescription-::res0::prop1::res0::prop0::res0 --- rdf:Description
-::RDFProperty-::res0::prop1::res0::prop0::res0::prop0 --- xml:lang
+::xotcl::rdf::parser::RDFDescription-::res0::prop1::res0::prop0::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop1::res0::prop0::res0::prop0 --- xml:lang
 PCDATA:
 en
-::RDFProperty-::res0::prop1::res0::prop0::res0::prop1 --- gen:String
+::xotcl::rdf::parser::RDFProperty-::res0::prop1::res0::prop0::res0::prop1 --- gen:String
 PCDATA:
 Introduction to the concepts of object-oriented programing
-::RDFMember-::res0::prop1::res0::prop1 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop1::res0::prop1 --- rdf:li
 MEMBER-INDEX: rdf:_2
-::RDFDescription-::res0::prop1::res0::prop1::res0 --- rdf:Description
-::RDFProperty-::res0::prop1::res0::prop1::res0::prop0 --- xml:lang
+::xotcl::rdf::parser::RDFDescription-::res0::prop1::res0::prop1::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop1::res0::prop1::res0::prop0 --- xml:lang
 PCDATA:
 de
-::RDFProperty-::res0::prop1::res0::prop1::res0::prop1 --- gen:String
+::xotcl::rdf::parser::RDFProperty-::res0::prop1::res0::prop1::res0::prop1 --- gen:String
 PCDATA:
 Einf�hrung in die Konzepte objekt-orientierter Programmierung
 } {
@@ -1543,38 +1543,38 @@
   </rdf:Description>
 </RDF>
 } {
-::RDFTag- --- RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = http://nm.wu-wien.ac.at/Lehre/oo1/
-::RDFProperty-::res0::prop0 --- gen:Title
-::RDFDescription-::res0::prop0::res0 --- rdf:Description
-::RDFProperty-::res0::prop0::res0::prop0 --- xml:lang
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- gen:Title
+::xotcl::rdf::parser::RDFDescription-::res0::prop0::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop0 --- xml:lang
 PCDATA:
 en
-::RDFProperty-::res0::prop0::res0::prop1 --- gen:String
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop1 --- gen:String
 PCDATA:
 Object Oriented Design and System Development
-::RDFProperty-::res0::prop1 --- gen:Description
-::RDFSeq-::res0::prop1::res0 --- rdf:Seq
+::xotcl::rdf::parser::RDFProperty-::res0::prop1 --- gen:Description
+::xotcl::rdf::parser::RDFSeq-::res0::prop1::res0 --- rdf:Seq
 TYPES: http://www.w3.org/1999/02/22-rdf-syntax-ns#Seq
-::RDFMember-::res0::prop1::res0::prop0 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop1::res0::prop0 --- rdf:li
 MEMBER-INDEX: rdf:_1
-::RDFDescription-::res0::prop1::res0::prop0::res0 --- rdf:Description
-::RDFProperty-::res0::prop1::res0::prop0::res0::prop0 --- cls:entry
-::RDFDescription-::res0::prop1::res0::prop0::res0::prop0::res0 --- rdf:Description
-::RDFProperty-::res0::prop1::res0::prop0::res0::prop0::res0::prop0 --- gen:language
+::xotcl::rdf::parser::RDFDescription-::res0::prop1::res0::prop0::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop1::res0::prop0::res0::prop0 --- cls:entry
+::xotcl::rdf::parser::RDFDescription-::res0::prop1::res0::prop0::res0::prop0::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop1::res0::prop0::res0::prop0::res0::prop0 --- gen:language
 PCDATA:
 en
-::RDFProperty-::res0::prop1::res0::prop0::res0::prop0::res0::prop1 --- gen:String
+::xotcl::rdf::parser::RDFProperty-::res0::prop1::res0::prop0::res0::prop0::res0::prop1 --- gen:String
 PCDATA:
 Introduction to the concepts of object-oriented programing
-::RDFMember-::res0::prop1::res0::prop1 --- rdf:li
+::xotcl::rdf::parser::RDFMember-::res0::prop1::res0::prop1 --- rdf:li
 MEMBER-INDEX: rdf:_2
-::RDFDescription-::res0::prop1::res0::prop1::res0 --- rdf:Description
-::RDFProperty-::res0::prop1::res0::prop1::res0::prop0 --- xml:lang
+::xotcl::rdf::parser::RDFDescription-::res0::prop1::res0::prop1::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop1::res0::prop1::res0::prop0 --- xml:lang
 PCDATA:
 de
-::RDFProperty-::res0::prop1::res0::prop1::res0::prop1 --- gen:String
+::xotcl::rdf::parser::RDFProperty-::res0::prop1::res0::prop1::res0::prop1 --- gen:String
 PCDATA:
 Einf�hrung in die Konzepte objekt-orientierter Programmierung
 } {
@@ -1605,21 +1605,21 @@
 </Topic>
 </r:RDF>
 } {
-::RDFTag- --- r:RDF
-::RDFDescription-::res0 --- r:Description
+::xotcl::rdf::parser::RDFTag- --- r:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- r:Description
 ATTR: r:ID = Top/Computers
 TYPES: http://dmoz.org/rdf/Topic
-::RDFProperty-::res0::prop0 --- tag
-::RDFDescription-::res0::prop0::res0 --- r:Description
-::RDFProperty-::res0::prop0::res0::prop0 --- catid
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- tag
+::xotcl::rdf::parser::RDFDescription-::res0::prop0::res0 --- r:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop0 --- catid
 PCDATA:
 4
-::RDFProperty-::res0::prop1 --- d:Title
+::xotcl::rdf::parser::RDFProperty-::res0::prop1 --- d:Title
 PCDATA:
 Computers
-::RDFProperty-::res0::prop2 --- link
+::xotcl::rdf::parser::RDFProperty-::res0::prop2 --- link
 ATTR: r:resource = http://www.cs.tcd.ie/FME/
-::RDFProperty-::res0::prop3 --- link
+::xotcl::rdf::parser::RDFProperty-::res0::prop3 --- link
 ATTR: r:resource = http://pages.whowhere.com/computers/pnyhlen/Timeline.html
 } {
    Top/Computers                       http://dmoz.org/rdf/tag   rdfdoc#id1
@@ -1642,16 +1642,16 @@
 </rdf:Description>
 </rdf:RDF>
 } {
-::RDFTag- --- rdf:RDF
-::RDFDescription-::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFTag- --- rdf:RDF
+::xotcl::rdf::parser::RDFDescription-::res0 --- rdf:Description
 ATTR: about = page
-::RDFProperty-::res0::prop0 --- g2k:area
+::xotcl::rdf::parser::RDFProperty-::res0::prop0 --- g2k:area
 ATTR: rdf:ID = b14711
-::RDFDescription-::res0::prop0::res0 --- rdf:Description
-::RDFProperty-::res0::prop0::res0::prop0 --- g2k:term
+::xotcl::rdf::parser::RDFDescription-::res0::prop0::res0 --- rdf:Description
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop0 --- g2k:term
 PCDATA:
 Hessen
-::RDFProperty-::res0::prop0::res0::prop1 --- g2k:type
+::xotcl::rdf::parser::RDFProperty-::res0::prop0::res0::prop1 --- g2k:type
 PCDATA:
 Land
 }  {
Index: xotcl/tests/xocomm.test
===================================================================
diff -u -r0896d4deb00780e48b5b03269bf9c4ecca948919 -r435b41481fb51bf000ebe736d8574fefbeec1710
--- xotcl/tests/xocomm.test	(.../xocomm.test)	(revision 0896d4deb00780e48b5b03269bf9c4ecca948919)
+++ xotcl/tests/xocomm.test	(.../xocomm.test)	(revision 435b41481fb51bf000ebe736d8574fefbeec1710)
@@ -1,5 +1,5 @@
 #!../../xotcl-0.9.4/xotclsh
-# $Id: xocomm.test,v 1.2 2005/01/06 03:10:05 neumann Exp $
+# $Id: xocomm.test,v 1.3 2005/09/09 21:07:23 neumann Exp $
 package require XOTcl; namespace import -force xotcl::*
 lappend auto_path [file dirname [info script]]/..
 package require xotcl::test
@@ -22,18 +22,22 @@
 set dir [file dir [info script]]
 set serverScript $dir/../apps/comm/webserver.xotcl
 set startCmd "$xotclsh $serverScript -root $dir/../doc -pkgdir $dir/.."
-
+puts $startCmd
 if {$opt(-startServer)} {
   set PIPE [open "| $startCmd"]
 } else {
   puts $startCmd
 }
 
-package require xotcl::package; package verbose 1
 package require xotcl::comm::httpAccess
 package require xotcl::comm::ftp
 package require xotcl::trace
 
+#::xotcl::package verbose 1
+#::xotcl::package require xotcl::comm::httpAccess
+#::xotcl::package require xotcl::comm::ftp
+#::xotcl::package require xotcl::trace
+
 set hostport localhost:8086
 set protectedhostport localhost:9096
 
@@ -63,6 +67,8 @@
 }}}
 
 Test new -msg "Trying to load image logo-100.jpg ... " -count 1 \
+     -verbose 1 \
+     -pre "puts starting..." \
     -setResult {expr {[r0::sink set contentLength] == 1706}} \
     -cmd [list SimpleRequest r0 -url http://$hostport/logo-100.jpg] \