Index: library/xotcl/library/comm/Access.xotcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r55d0e812c6b2d7895720b83d20addf87d0945c18 --- library/xotcl/library/comm/Access.xotcl (.../Access.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/comm/Access.xotcl (.../Access.xotcl) (revision 55d0e812c6b2d7895720b83d20addf87d0945c18) @@ -1,11 +1,11 @@ # -*- tcl -*- $ -set httpAccessVersion 0.92 +set httpAccessVersion 1.2 package provide xotcl::comm::httpAccess $httpAccessVersion package require xotcl::comm::pcache package require xotcl::comm::mime -package require xotcl::comm::connection +package require xotcl::comm::connection 1.2 package require xotcl::trace package require XOTcl 2.0 Index: library/xotcl/library/comm/Connection.xotcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r55d0e812c6b2d7895720b83d20addf87d0945c18 --- library/xotcl/library/comm/Connection.xotcl (.../Connection.xotcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/comm/Connection.xotcl (.../Connection.xotcl) (revision 55d0e812c6b2d7895720b83d20addf87d0945c18) @@ -1,6 +1,6 @@ # -*- tcl -*- $ -package provide xotcl::comm::connection 1.1 +package provide xotcl::comm::connection 1.2 package require XOTcl 2.0 @@ -72,14 +72,14 @@ 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]" + [self class] removeHandle [my set handle] + #::puts stderr "my CONNECTION close and destroy [my set 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] + close [my set socket] } next } @@ -225,7 +225,7 @@ close $socket unset socket if {[my exists handle]} { - [self class] removeHandle [my handle] + [self class] removeHandle [my set handle] } if {[my exists error]} { #my showMsg "UNSETTING ERROR -----------" Index: library/xotcl/library/comm/Httpd.xotcl =================================================================== diff -u -N -rcfd89a8d725a1fb0134ec912dc24d807512243f3 -r55d0e812c6b2d7895720b83d20addf87d0945c18 --- library/xotcl/library/comm/Httpd.xotcl (.../Httpd.xotcl) (revision cfd89a8d725a1fb0134ec912dc24d807512243f3) +++ library/xotcl/library/comm/Httpd.xotcl (.../Httpd.xotcl) (revision 55d0e812c6b2d7895720b83d20addf87d0945c18) @@ -12,7 +12,7 @@ #package require xotcl::comm::httpAccess -package require xotcl::comm::connection +package require xotcl::comm::connection 1.2 package require xotcl::trace package require xotcl::comm::mime Index: library/xotcl/library/comm/pkgIndex.tcl =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r55d0e812c6b2d7895720b83d20addf87d0945c18 --- library/xotcl/library/comm/pkgIndex.tcl (.../pkgIndex.tcl) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/library/comm/pkgIndex.tcl (.../pkgIndex.tcl) (revision 55d0e812c6b2d7895720b83d20addf87d0945c18) @@ -8,10 +8,10 @@ # script is sourced, the variable $dir must contain the # full path name of this file's directory. -package ifneeded xotcl::comm::connection 1.1 [list source [file join $dir Connection.xotcl]] +package ifneeded xotcl::comm::connection 1.2 [list source [file join $dir Connection.xotcl]] package ifneeded xotcl::comm::dav 0.91 [list source [file join $dir Dav.xotcl]] package ifneeded xotcl::comm::ftp 0.91 [list source [file join $dir Ftp.xotcl]] -package ifneeded xotcl::comm::httpAccess 0.92 [list source [file join $dir Access.xotcl]] +package ifneeded xotcl::comm::httpAccess 1.2 [list source [file join $dir Access.xotcl]] package ifneeded xotcl::comm::httpd 1.2 [list source [file join $dir Httpd.xotcl]] package ifneeded xotcl::comm::imap 0.91 [list source [file join $dir Imap.xotcl]] package ifneeded xotcl::comm::ldap 0.91 [list source [file join $dir Ldap.xotcl]] Index: library/xotcl/library/xotcl2.tcl =================================================================== diff -u -N -r7495af656ca04a32826ecb0b6e207f886eaaa7f8 -r55d0e812c6b2d7895720b83d20addf87d0945c18 --- library/xotcl/library/xotcl2.tcl (.../xotcl2.tcl) (revision 7495af656ca04a32826ecb0b6e207f886eaaa7f8) +++ library/xotcl/library/xotcl2.tcl (.../xotcl2.tcl) (revision 55d0e812c6b2d7895720b83d20addf87d0945c18) @@ -99,7 +99,7 @@ # provide the standard command set for ::xotcl::Object foreach cmd [info command ::nsf::methods::object::*] { set cmdName [namespace tail $cmd] - if {$cmdName in {"setter" "requirenamespace"}} continue + if {$cmdName in {"cget" "setter" "requirenamespace"}} continue ::nsf::method::alias Object $cmdName $cmd } Index: library/xotcl/tests/xocomm.test =================================================================== diff -u -N -r9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0 -r55d0e812c6b2d7895720b83d20addf87d0945c18 --- library/xotcl/tests/xocomm.test (.../xocomm.test) (revision 9a0b8bb0992be0561d8187c275fc1d9b7e0bbcd0) +++ library/xotcl/tests/xocomm.test (.../xocomm.test) (revision 55d0e812c6b2d7895720b83d20addf87d0945c18) @@ -29,7 +29,7 @@ puts $startCmd } -package require xotcl::comm::httpAccess +package require xotcl::comm::httpAccess 1.2 package require xotcl::comm::ftp package require xotcl::trace @@ -101,8 +101,11 @@ nx::Test new -msg terminate -count 1 \ -setResult {set x 1} \ -cmd [list SimpleRequest r0 -url http://$protectedhostport/exit] \ - -post {set ::forever 1; exit} + -post {set ::forever 1} +#puts stderr "present [package present xotcl::comm::connection]" +#puts stderr "versions [package versions xotcl::comm::connection]" + after 1000 {nx::Test run} catch {vwait forever}