Index: Makefile.in
===================================================================
diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -re8715774bf274fbeadabf08a5a0777a968f71148
--- Makefile.in	(.../Makefile.in)	(revision c72f9f638677608fab1502cd696c8f2d6b2952f9)
+++ Makefile.in	(.../Makefile.in)	(revision e8715774bf274fbeadabf08a5a0777a968f71148)
@@ -8,55 +8,58 @@
 #
 # Copyright (c) 1999 Scriptics Corporation.
 # Copyright (c) 2002-2003 ActiveState Corporation.
+# Copyright (c) 2001-2010 Gustaf Neumann, Uwe Zdun
 #
-# See the file "license.terms" for information on usage and redistribution
+# See the file "tcl-license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.25 2007/09/18 19:27:32 neumann Exp $
 
 #========================================================================
 # Add additional lines to handle any additional AC_SUBST cases that
 # have been added in a customized configure script.
 #========================================================================
 
-#XOTCL_VERSION 	= @PACKAGE_VERSION@
-XOTCL_VERSION 	= @XOTCL_VERSION@
+#NX_VERSION 	= @PACKAGE_VERSION@
+NX_VERSION 	= @NX_VERSION@
 
-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    = @TCL_LIB_SPEC@
-TK_LIB_SPEC	= @TK_LIB_SPEC@
-subdirs		= @subdirs@
-aol_prefix	= @aol_prefix@
+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
+src_man_dir		= ${srcdir}/man
+TCL_LIB_SPEC		= @TCL_LIB_SPEC@
+TK_LIB_SPEC		= @TK_LIB_SPEC@
+subdirs			= @subdirs@
+aol_prefix		= @aol_prefix@
 
 # Requires native paths
-PLATFORM_DIR    = `@CYGPATH@ $(srcdir)/@TEA_PLATFORM@`
-target_doc_dir 	= ./doc
+PLATFORM_DIR	= `@CYGPATH@ $(srcdir)/@TEA_PLATFORM@`
+target_doc_dir		= ./doc
+xotcl_target_doc_dir	= ./library/xotcl/doc
 
 src_lib_dir_native	= `@CYGPATH@ ${src_lib_dir}`
 src_doc_dir_native	= `@CYGPATH@ ${src_doc_dir}`
 src_test_dir_native 	= `@CYGPATH@ ${src_test_dir}`
 src_app_dir_native	= `@CYGPATH@ ${src_app_dir}`
 src_generic_dir_native	= `@CYGPATH@ ${src_generic_dir}`
 
-libdirs = comm lib serialize @libdirs_actiweb@
-libsrc 	= COPYRIGHT pkgIndex.tcl 
-appdirs = comm scripts utils @apps_actiweb@
-appsrc 	= COPYRIGHT 
+libdirs		= comm lib serialize @libdirs_actiweb@
+libsrc		= COPYRIGHT pkgIndex.tcl 
+appdirs		= comm scripts utils @apps_actiweb@
+appsrc		= COPYRIGHT 
 
-DOC_SOURCE = \
-	$(src_doc_dir)/langRef.xotcl \
-	$(src_lib_dir)/lib/*.xotcl \
-	$(src_lib_dir)/store/*.xotcl \
-	$(src_lib_dir)/serialize/Serializer.xotcl \
-	$(src_test_dir)/*.xotcl \
-	$(src_app_dir)/scripts/*.xotcl \
-	$(src_app_dir)/comm/[flsw]*.xotcl \
-	$(src_app_dir)/actiweb/univ/UNIVERSAL.xotcl \
-	$(src_app_dir)/utils/xo-*[a-z0-9] 
+# XOTcl documentation
+XOTCL_DOC_SOURCE = \
+	$(src_lib_dir)/xotcl/doc/langRef.xotcl \
+	$(src_lib_dir)/xotcl/library/lib/*.xotcl \
+	$(src_lib_dir)/xotcl/library/store/*.xotcl \
+	$(src_lib_dir)/serialize/serializer.tcl \
+	$(src_lib_dir)/xotcl/tests/*.xotcl \
+	$(src_lib_dir)/xotcl/apps/scripts/*.xotcl \
+	$(src_lib_dir)/xotcl/apps/comm/[flsw]*.xotcl \
+	$(src_lib_dir)/xotcl/apps/actiweb/univ/UNIVERSAL.xotcl \
+	$(src_lib_dir)/xotcl/apps/utils/xo-*[a-z0-9] 
 
 #export TCLLIBPATH=. ${srcdir}
 mkinstalldirs= mkdir -p
@@ -129,6 +132,7 @@
 PACKAGE_VERSION	= @PACKAGE_VERSION@
 CC		= @CC@
 CFLAGS_DEFAULT	= @CFLAGS_DEFAULT@
+# useful for debugging:  --param=ssp-buffer-size=4 -fstack-protector-all 
 CFLAGS_WARNING	= @CFLAGS_WARNING@
 CLEANFILES	= @CLEANFILES@
 EXEEXT		= @EXEEXT@
@@ -144,6 +148,8 @@
 SHLIB_LD	= @SHLIB_LD@
 SHLIB_LD_FLAGS	= @SHLIB_LD_FLAGS@
 SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
+#CC_SEARCH_FLAGS = @CC_SEARCH_FLAGS@
+#LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@
 STLIB_LD	= @STLIB_LD@
 TCL_DEFS	= @TCL_DEFS@
 TCL_BIN_DIR	= @TCL_BIN_DIR@
@@ -157,7 +163,7 @@
 pkglibdir	= @pkglibdir@
 pkgincludedir	= @pkgincludedir@
 
-# XOTCLSH = @XOTCLSH@
+# NXSH = @NXSH@
 
 #========================================================================
 # TCLLIBPATH seeds the auto_path in Tcl's init.tcl so we can test our
@@ -175,7 +181,7 @@
 TCLSH		= $(TCLSH_ENV) $(TCLSH_PROG)
 SHARED_BUILD	= @SHARED_BUILD@
 
-INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@ @XOTCL_BUILD_INCLUDE_SPEC@
+INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@ @NX_BUILD_INCLUDE_SPEC@
 EXTRA_CFLAGS	= @PKG_CFLAGS@
 
 # TCL_DEFS is not strictly need here, but if you remove it, then you
@@ -215,7 +221,7 @@
 # of the Makefile, in the "BINARIES" variable.
 #========================================================================
 
-binaries: $(BINARIES) @XOTCLSH@ @XOWISH@ pkgIndex.tcl
+binaries: $(BINARIES) @NXSH@ @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 ; \
@@ -228,17 +234,17 @@
 	done; fi;
 
 libraries-pkgindex:
-	@$(TCLSH) $(src_lib_dir_native)/lib/make.xotcl -dir $(src_lib_dir_native) -all
+	@$(TCLSH) $(src_lib_dir_native)/lib/make.tcl -dir $(src_lib_dir_native) -all
 
 fulldoc: doc pdf
 # use language reference as sample file to trigger generation of documentation files
-doc: $(target_doc_dir)/langRef-xotcl.html
+doc: $(xotcl_target_doc_dir)/langRef-xotcl.html
 
-$(target_doc_dir)/langRef-xotcl.html: $(src_doc_dir)/langRef.xotcl $(DOC_SOURCE)
+$(xotcl_target_doc_dir)/langRef-xotcl.html: $(src_lib_dir)/xotcl/doc/langRef.xotcl $(XOTCL_DOC_SOURCE)
 	@docs=""; \
-	for i in $(DOC_SOURCE); do docs="$$docs `@CYGPATH@ $$i`"; done; \
-	$(TCLSH) $(src_lib_dir_native)/lib/makeDoc.xotcl \
-		$(target_doc_dir) $$docs
+	for i in $(XOTCL_DOC_SOURCE); do docs="$$docs `@CYGPATH@ $$i`"; done; \
+	$(TCLSH) $(src_lib_dir)/xotcl/library/lib/makeDoc.xotcl \
+		$(xotcl_target_doc_dir) $$docs
 
 pdf:
 	-(cd $(src_doc_dir); htmldoc --webpage --format pdf14 --title \
@@ -256,7 +262,7 @@
 
 install-aol: install-binaries install-libraries
 	$(INSTALL) $(src_generic_dir)/aol-xotcl.tcl \
-		$(DESTDIR)/$(aol_prefix)/modules/tcl/xotcl.tcl
+		$(DESTDIR)/$(aol_prefix)/tcl/xotcl.tcl
 
 
 #========================================================================
@@ -318,7 +324,7 @@
 #========================================================================
 
 install-doc: doc $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man3 $(DESTDIR)$(mandir)/mann
-	@if test ! "x$(XOTCLSH)" = "x" ; then \
+	@if test ! "x$(NXSH)" = "x" ; then \
 	(cd $(src_man_dir)/ ; \
 	 for i in *.1; do \
 	    echo "Installing $$i"; \
@@ -335,35 +341,38 @@
 gdb:
 	$(TCLSH_ENV) gdb $(TCLSH_PROG) $(SCRIPT)
 
-test: binaries libraries test-core test-http @test_actiweb@
-test-nohttp: binaries libraries test-core
+test: binaries libraries test-core test-xotcl test-http @test_actiweb@
+test-nohttp: binaries libraries test-core test-xotcl
 
 #TESTFLAGS = -srcdir $(srcdir)
 test-core: $(TCLSH_PROG)
-	$(TCLSH) $(src_test_dir_native)/testx.xotcl \
-		-libdir $(PLATFORM_DIR) $(TESTFLAGS)
-	$(TCLSH) $(src_test_dir_native)/testo.xotcl \
-		-libdir $(PLATFORM_DIR) $(TESTFLAGS)
-	$(TCLSH) $(src_test_dir_native)/speedtest.xotcl \
-		-libdir $(PLATFORM_DIR) $(TESTFLAGS)
-	$(TCLSH) $(src_test_dir_native)/forwardtest.xotcl \
-		-libdir $(PLATFORM_DIR) $(TESTFLAGS)
-	$(TCLSH) $(src_test_dir_native)/slottest.xotcl \
-		-libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_test_dir_native)/object-system.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_test_dir_native)/destroytest.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_test_dir_native)/method-modifiers.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_test_dir_native)/var-access.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_test_dir_native)/varresolutiontest.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_test_dir_native)/info-method.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_test_dir_native)/parameters.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_test_dir_native)/interceptor-slot.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_test_dir_native)/aliastest.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_test_dir_native)/protected.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_test_dir_native)/forwardtest.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_test_dir_native)/mixinoftest.tcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
 
+test-xotcl: $(TCLSH_PROG)
+	$(TCLSH) $(src_lib_dir)/xotcl/tests/testo.xotcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_lib_dir)/xotcl/tests/speedtest.xotcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_lib_dir)/xotcl/tests/testx.xotcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_lib_dir)/xotcl/tests/slottest.xotcl -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+
 test-http: $(TCLSH_PROG)
-	$(TCLSH) $(src_test_dir_native)/xocomm.test \
-		-libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_lib_dir)/xotcl/tests/xocomm.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
 
 test-actiweb: $(TCLSH_PROG)
-	$(TCLSH) $(src_test_dir_native)/actiweb.test \
-		-libdir $(PLATFORM_DIR) $(TESTFLAGS)
-	$(TCLSH) $(src_test_dir_native)/persistence.test \
-		-libdir $(PLATFORM_DIR) $(TESTFLAGS)
-	$(TCLSH) $(src_test_dir_native)/UNIVERSAL.test \
-		-libdir $(PLATFORM_DIR) $(TESTFLAGS)
-	$(TCLSH) $(src_test_dir_native)/xoRDF.test \
-		-libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_lib_dir)/xotcl/tests/actiweb.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_lib_dir)/xotcl/tests/persistence.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_lib_dir)/xotcl/tests/UNIVERSAL.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
+	$(TCLSH) $(src_lib_dir)/xotcl/tests/xoRDF.test -libdir $(PLATFORM_DIR) $(TESTFLAGS)
 	@rm -rf receiver
 
 depend:
@@ -410,18 +419,17 @@
 	$(COMPILE) -c `@CYGPATH@ $<` -o $@
 
 #========================================================================
-# xotcl shells
+# next shells
 #========================================================================
 
 pkgIndex.tcl: $(PKG_LIB_FILE)
-	@echo package ifneeded XOTcl $(PACKAGE_VERSION) [list load [file join \$$dir . $(PKG_LIB_FILE)] XOTcl] > pkgIndex.tcl
+	@echo package ifneeded nx $(PACKAGE_VERSION) [list load [file join \$$dir . $(PKG_LIB_FILE)] nx] > pkgIndex.tcl
 
 install-pkgIndex:
-#	@echo package ifneeded XOTcl $(PACKAGE_VERSION) [list load [file join \$$dir .. "$(PKG_LIB_FILE)"] XOTcl] > "$(pkglibdir)/pkgIndex.tcl"
+#	@echo package ifneeded nx $(PACKAGE_VERSION) [list load [file join \$$dir .. "$(PKG_LIB_FILE)"] nx] > "$(pkglibdir)/pkgIndex.tcl"
 
-xotclsh: tclAppInit.o $(PKG_OBJECTS) $(CONDITIONAL_STUB_OBJECTS)
+nxsh: tclAppInit.o $(PKG_OBJECTS) $(CONDITIONAL_STUB_OBJECTS)
 	$(CC) -rdynamic -o $@ tclAppInit.o \
-		$(PKG_OBJECTS) \
 		$(CFLAGS)  $(TCL_LIB_SPEC) \
 		$(DMALLOC_LIB) $(CONDITIONAL_STUB_OBJECTS)
 
@@ -432,8 +440,8 @@
 		$(DMALLOC_LIB) $(CONDITIONAL_STUB_OBJECTS)
 
 install-shells:
-	@if test -f xotclsh; then \
-		$(INSTALL_PROGRAM) xotclsh $(DESTDIR)$(bindir); \
+	@if test -f nxsh; then \
+		$(INSTALL_PROGRAM) nxsh $(DESTDIR)$(bindir); \
 	fi
 	@if test -f xowish; then \
 		$(INSTALL_PROGRAM) xowish $(DESTDIR)$(bindir); \
@@ -453,12 +461,15 @@
 # 	$(COMPILE) -c `@CYGPATH@ $(srcdir)/src/win/exampleA.c` -o $@
 #========================================================================
 
-$(src_generic_dir)/predefined.h: $(src_generic_dir)/mk_predefined.xotcl $(src_generic_dir)/predefined.xotcl
-	(cd $(src_generic_dir); $(TCLSH) mk_predefined.xotcl > predefined.h)
+$(src_generic_dir)/predefined.h: $(src_generic_dir)/mk_predefined.tcl $(src_generic_dir)/predefined.tcl
+	(cd $(src_generic_dir); $(TCLSH) mk_predefined.tcl > predefined.h)
 
+$(src_generic_dir)/tclAPI.h: $(src_generic_dir)/gentclAPI.tcl $(src_generic_dir)/gentclAPI.decls
+	$(TCLSH) $(src_generic_dir)/gentclAPI.tcl > $(src_generic_dir)/tclAPI.h
+
 xotclStubInit.$(OBJEXT): $(PKG_HEADERS)
 xotclStubLib.$(OBJEXT): $(src_generic_dir)/xotclStubLib.c $(PKG_HEADERS)
-xotcl.$(OBJEXT): $(src_generic_dir)/xotcl.c $(src_generic_dir)/predefined.h $(PKG_HEADERS)
+xotcl.$(OBJEXT): $(src_generic_dir)/xotcl.c $(src_generic_dir)/predefined.h $(src_generic_dir)/xotclAccessInt.h $(src_generic_dir)/tclAPI.h $(PKG_HEADERS) $(src_generic_dir)/xotclStack85.c
 xotclError.$(OBJEXT): $(src_generic_dir)/xotclError.c $(PKG_HEADERS)
 xotclMetaData.$(OBJEXT): $(src_generic_dir)/xotclMetaData.c $(PKG_HEADERS)
 xotclObjectData.$(OBJEXT): $(src_generic_dir)/xotclObjectData.c $(PKG_HEADERS)
@@ -474,7 +485,7 @@
 
 genstubs:
 	$(TCLSH) $(TCL_SRC_DIR)/tools/genStubs.tcl $(src_generic_dir) \
-		$(src_generic_dir)/xotcl.decls $(src_generic_dir)/xotclInt.decls
+		$(src_generic_dir)/nx.decls $(src_generic_dir)/nxInt.decls
 
 #
 # Target to check that all exported functions have an entry in the stubs
@@ -503,8 +514,8 @@
 #========================================================================
 
 clean:  
-	-rm -rf $(BINARIES) $(CLEANFILES) @XOTCLSH@ @XOWISH@ pkgIndex.tcl ./receiver \
-		$(target_doc_dir)/*-xotcl.html
+	-rm -rf $(BINARIES) $(CLEANFILES) @NXSH@ @XOWISH@ pkgIndex.tcl ./receiver \
+		$(xotcl_target_doc_dir)/*-xotcl.html
 	find ${srcdir} -type f -name \*~ -exec rm \{} \;
 	@if test ! "x$(subdirs)" = "x" ; then dirs="$(subdirs)" ; \
 	for dir in $$dirs ; do \
@@ -524,6 +535,10 @@
 # .lib files.  Because the .lib files are not explicitly listed anywhere,
 # we need to deduce their existence from the .dll file of the same name.
 # Library files go into the lib directory.
+#
+# A manual generation of the pkgIndex files via tclsh should look like
+#     pkg_mkIndex -direct -verbose library/lib *tcl
+#
 # In addition, this will generate the pkgIndex.tcl
 # file in the install location (assuming it can find a usable tclsh shell)
 #
@@ -620,26 +635,26 @@
 end:
 	@echo "" 
 	@echo "************************************************************"
-	@echo " Make completed. In order to test XOTcl, invoke:"
+	@echo " Make completed. In order to test next-scripting, invoke:"
 	@echo "   make test"
 	@echo ""
-	@echo " In order install XOTcl, invoke:"
+	@echo " In order install next-scripting, invoke:"
 	@echo "   make install"
 	@echo ""
-	@echo " In order to install XOTcl for AOLserver 4.x, invoke:"
+	@echo " In order to install next-scripting for AOLserver 4.x, invoke:"
 	@echo "   make install-aol"
 	@echo "" 
-	@echo " In order to invoke XOTcl interactively (before install), use:" 
+	@echo " In order to invoke next-scripting interactively (before install), use:" 
 	@echo "   export TCLLIBPATH=\"$(TCLLIBPATH)\"   or    " 
 	@echo "   setenv TCLLIBPATH \"$(TCLLIBPATH)\""
 	@echo " and"
-	@if test "x$(XOTCLSH)" = "x" ; then \
+	@if test "x$(NXSH)" = "x" ; then \
 	  echo "   @TCLSH_PROG@" ; \
-	  echo "   package require XOTcl; namespace import -force xotcl::*" ; \
+	  echo "   package require nx; namespace import -force nx::*" ; \
 	  echo " or" ; \
 	  echo "   put the 'package require' line into your ~/.tclshrc" ; \
 	else \
-	  echo "   ./xotclsh" ; \
+	  echo "   ./nxsh" ; \
 	fi
 	@echo "************************************************************"
 
@@ -656,9 +671,9 @@
 
 bin-tar: 
 	(cd ..; tar zcvf xotcl-$(PACKAGE_VERSION)-bin-linux-i686-glibc.tar.gz \
-                `find $(exec_prefix)/bin/xotclsh $(exec_prefix)/bin/xowish \
-                  $(prefix)/lib/xotcl$(PACKAGE_VERSION)* \
-                  $(prefix)/lib/libxotcl$(PACKAGE_VERSION)* \
+                `find $(exec_prefix)/bin/$(NXSH) $(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/` \