Index: generic/aol-xotcl.tcl =================================================================== diff -u -r4bdbfae812798619b8162f7af6b45b46b03c730e -r66664a5b5d932a15c77698ed102e0d3aa1d9e62b --- generic/aol-xotcl.tcl (.../aol-xotcl.tcl) (revision 4bdbfae812798619b8162f7af6b45b46b03c730e) +++ generic/aol-xotcl.tcl (.../aol-xotcl.tcl) (revision 66664a5b5d932a15c77698ed102e0d3aa1d9e62b) @@ -1,9 +1,8 @@ # -# Load XOTcl library and some related packages. -# We expect to find them somewhere in standard -# Tcl package search path (the auto_path var) -# The simplest location is to put them under -# the "lib" directory within the AOLserver tree. +# Load Next Scripting Framework, XOTcl and some related packages. We +# expect to find them somewhere in standard Tcl package search path +# (the auto_path var) The simplest location is to put them under the +# "lib" directory within the AOLserver tree. # package require XOTcl; namespace import -force ::xotcl::* @@ -22,12 +21,11 @@ set nslist "" _ns_getnamespaces namespaces foreach n $namespaces { - if {[string match "::nsf*" $n] == 0 - && ([catch {::nsf::isobject $n} ret] || $ret == 0)} { - lappend nslist $n - } + if {$n ne "::nsf" && ![string match "::nsf::*" $n] + && ![::nsf::isobject $n]} { + } } - ns_log notice "XOTcl _ns_savenamespaces $nslist" + foreach n $nslist { foreach {ns_script ns_import} [_ns_getscript $n] { append script [list namespace eval $n $ns_script] \n @@ -41,7 +39,6 @@ (error: $objects; $::errorInfo)." set objects "" } - ns_log notice "XOTcl save blueprint [string length $objects]" ns_ictl save [append script \n \ "namespace import -force ::xotcl::*" \n \