Index: openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl,v diff -u -r1.35.8.9 -r1.35.8.10 --- openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 2 Oct 2013 22:55:54 -0000 1.35.8.9 +++ openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 16 Oct 2013 19:49:09 -0000 1.35.8.10 @@ -32,7 +32,7 @@ Return the path to the apm-workspace, creating the directory if necessary. } { - set path [file join [acs_root_dir] apm-workspace] + set path [file join $::acs::rootdir apm-workspace] if { [file isdirectory $path] } { return $path } else { @@ -179,11 +179,11 @@ # # Note that -C changes the working directory before compressing the next # file; we need this to ensure that the tarballs are relative to the - # package root directory ([acs_root_dir]/packages). + # package root directory ($::acs::rootdir/packages). set cmd [list exec [apm_tar_cmd] cf - 2> [apm_dev_null]] foreach file $files { - lappend cmd -C "[acs_root_dir]/packages" + lappend cmd -C "$::acs::rootdir/packages" lappend cmd "$package_key/$file" } @@ -285,11 +285,11 @@ lassign $file_info package_key path if { $force_reload_p || ![nsv_exists apm_library_mtime packages/$package_key/$path] } { - if { [file exists "[acs_root_dir]/packages/$package_key/$path"] } { + if { [file exists "$::acs::rootdir/packages/$package_key/$path"] } { apm_callback_and_log $callback "Loading packages/$package_key/$path..." set apm_current_package_key $package_key - apm_source "[acs_root_dir]/packages/$package_key/$path" + apm_source "$::acs::rootdir/packages/$package_key/$path" # Release outstanding database handles (in case this file # used the db_* database API and a subsequent one uses @@ -358,7 +358,7 @@ # The apm_guess procs need package_key and a path relative to package root # so parse those out of the given path if { [regexp {^packages/([^/]+)/(.*)$} $path match package_key package_rel_path] } { - if { ![file exists "[acs_root_dir]/$path"] } { + if { ![file exists "$::acs::rootdir/$path"] } { error "apm_file_watchable_p: path $path does not correspond to an existing file" } } else { @@ -422,7 +422,7 @@ } { set watchable_files [list] - set files [ad_find_all_files [acs_root_dir]/packages/$package_key] + set files [ad_find_all_files $::acs::rootdir/packages/$package_key] foreach file [lsort $files] { set rel_path [ad_make_relative_path $file] if { [apm_file_watchable_p $rel_path] } { Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v diff -u -r1.108.2.11 -r1.108.2.12 --- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 10 Oct 2013 20:44:07 -0000 1.108.2.11 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 16 Oct 2013 19:49:09 -0000 1.108.2.12 @@ -675,7 +675,7 @@ Simple basic package install function. Wraps up basically what the old install xml action did. } { - set package_info_path "[acs_root_dir]/packages/${package_key}/*.info" + set package_info_path "$::acs::rootdir/packages/${package_key}/*.info" set install_spec_files [list] foreach install_spec_file [glob -nocomplain $package_info_path] { @@ -695,7 +695,7 @@ } set pkg_info_list [list] - foreach spec_file [glob -nocomplain "[acs_root_dir]/packages/*/*.info"] { + foreach spec_file [glob -nocomplain "$::acs::rootdir/packages/*/*.info"] { # Get package info, and find out if this is a package we should install if { [catch { array set package [apm_read_package_info_file $spec_file] @@ -774,8 +774,8 @@ } # Move the package into the packages dir - #exec "mv" "$package_path" "[acs_root_dir]/packages" - file rename $package_path [acs_root_dir]/packages + #exec "mv" "$package_path" "$::acs::rootdir/packages" + file rename $package_path $::acs::rootdir/packages # We moved the spec file, so update its path set package_path $old_package_path @@ -1092,7 +1092,7 @@ apm_callback_and_log $callback "
  • Moving packages/$package_key to $backup_dir... " - if { [catch { file rename "[acs_root_dir]/packages/$package_key" $backup_dir } error] } { + if { [catch { file rename "$::acs::rootdir/packages/$package_key" $backup_dir } error] } { apm_callback_and_log $callback "[ns_quotehtml $error]" } else { apm_callback_and_log $callback "moved." @@ -2111,7 +2111,7 @@ } } else { # Parse spec files - foreach spec_file [apm_scan_packages "[acs_root_dir]/packages"] { + foreach spec_file [apm_scan_packages "$::acs::rootdir/packages"] { with_catch errmsg { array unset version array set version [apm_read_package_info_file $spec_file] @@ -2167,7 +2167,7 @@ @creation-date 2003-10-30 } { # Abort if there is no install.xml file - set filename [acs_root_dir]$filename + set filename $::acs::rootdir$filename if { ![file exists $filename] } { error "File $filename not found" Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v diff -u -r1.94.2.9 -r1.94.2.10 --- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 12 Oct 2013 13:55:17 -0000 1.94.2.9 +++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl 16 Oct 2013 19:49:09 -0000 1.94.2.10 @@ -201,7 +201,7 @@ } switch $dependency_type { extends - - "" { lappend apm_package_url_resolution [acs_root_dir]/packages/$package_key/www } + "" { lappend apm_package_url_resolution $::acs::rootdir/packages/$package_key/www } embeds { # Reference to an embedded package is through URLs relative to the embedding @@ -213,18 +213,18 @@ # as the request processor will not perform the expected permission check. lappend apm_package_url_resolution \ - [list [acs_root_dir]/packages/$package_key/embed/admin admin/$package_key] + [list $::acs::rootdir/packages/$package_key/embed/admin admin/$package_key] lappend apm_package_url_resolution \ [list "" $package_key/admin] lappend apm_package_url_resolution \ - [list [acs_root_dir]/packages/$package_key/embed/sitewide-admin \ + [list $::acs::rootdir/packages/$package_key/embed/sitewide-admin \ sitewide-admin/$package_key] lappend apm_package_url_resolution \ [list "" $package_key/sitewide-admin] lappend apm_package_url_resolution \ - [list [acs_root_dir]/packages/$package_key/embed $package_key] + [list $::acs::rootdir/packages/$package_key/embed $package_key] } default { error "apm_package_list_url_resolution: dependency type is $dependency_type" @@ -392,7 +392,7 @@ } { set changed_files [list] foreach relative_path $file_list { - set full_path "[acs_root_dir]/$relative_path" + set full_path "$::acs::rootdir/$relative_path" # If the file exists, and either has never been loaded or has an mtime # which differs the mtime it had when last loaded, mark to be loaded. @@ -668,12 +668,12 @@ set files [list] foreach package $packages { - set files [ad_find_all_files [acs_root_dir]/packages/$package] + set files [ad_find_all_files $::acs::rootdir/packages/$package] if { [llength $files] == 0 } { - ns_log Error "apm_load_queries: Unable to locate [acs_root_dir]/packages/$package/*. when scanning for SQL queries to load." + ns_log Error "apm_load_queries: Unable to locate $::acs::rootdir/packages/$package/*. when scanning for SQL queries to load." } - set testdir "[acs_root_dir]/packages/$package/tcl/test" + set testdir "$::acs::rootdir/packages/$package/tcl/test" set testlength [string length $testdir] foreach file [lsort $files] { @@ -770,7 +770,7 @@ # changed. set files_to_reload [list] foreach file [nsv_array names apm_reload_watch] { - set path "[acs_root_dir]/$file" + set path "$::acs::rootdir/$file" ns_log Debug "APM: File being watched: $path" if { [file exists $path] @@ -810,7 +810,7 @@ ns_log Notice "apm_load_any_changed_libraries: Reloading *-procs.tcl files in this interpreter..." } # File is usually of form packages/package_key - set file_path "[acs_root_dir]/$file" + set file_path "$::acs::rootdir/$file" set file_ext [file extension $file_path] switch $file_ext { Index: openacs-4/packages/acs-tcl/tcl/document-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/document-procs.tcl,v diff -u -r1.5 -r1.5.8.1 --- openacs-4/packages/acs-tcl/tcl/document-procs.tcl 13 Feb 2009 20:28:08 -0000 1.5 +++ openacs-4/packages/acs-tcl/tcl/document-procs.tcl 16 Oct 2013 19:49:10 -0000 1.5.8.1 @@ -133,7 +133,7 @@ } ad_proc doc_find_template { filename } { Finds a master.adp file which can be used as a master template, looking in the directory containing $filename and working our way down the directory tree. } { - set path_root [acs_root_dir] + set path_root $::acs::rootdir set start [clock clicks -milliseconds] Index: openacs-4/packages/acs-tcl/tcl/install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/install-procs.tcl,v diff -u -r1.29 -r1.29.6.1 --- openacs-4/packages/acs-tcl/tcl/install-procs.tcl 31 Mar 2010 23:33:24 -0000 1.29 +++ openacs-4/packages/acs-tcl/tcl/install-procs.tcl 16 Oct 2013 19:49:10 -0000 1.29.6.1 @@ -66,11 +66,11 @@ switch -exact $type { tcl { - set code [template::util::read_file [acs_root_dir]$src] + set code [template::util::read_file $::acs::rootdir$src] set out [eval $code] } sql { - db_source_sql_file [acs_root_dir]$src + db_source_sql_file $::acs::rootdir$src set out "$src completed" } install.xml { Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v diff -u -r1.113.2.17 -r1.113.2.18 --- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 16 Oct 2013 11:18:49 -0000 1.113.2.17 +++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 16 Oct 2013 19:49:10 -0000 1.113.2.18 @@ -58,7 +58,7 @@ # it's a relative path, prepend the current location set path "[file dirname [ad_conn file]]/$path" } else { - set path "[acs_root_dir]$path" + set path "$::acs::rootdir$path" } } @@ -506,7 +506,7 @@ return filter_return } - set path "[acs_root_dir]/www/resources/[join [lrange [ns_conn urlv] 1 end] /]" + set path "$::acs::rootdir/www/resources/[join [lrange [ns_conn urlv] 1 end] /]" if { [file isfile $path] } { ns_returnfile 200 [ns_guesstype $path] $path return filter_return Index: openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl,v diff -u -r1.9.4.1 -r1.9.4.2 --- openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl 12 Oct 2013 13:55:19 -0000 1.9.4.1 +++ openacs-4/packages/acs-tcl/tcl/test/file-test-procs.tcl 16 Oct 2013 19:49:10 -0000 1.9.4.2 @@ -18,8 +18,8 @@ return [expr {[string match {*.tcl} $file] || [file isdirectory $file]}] } - # if startdir is not [acs_root_dir]/packages, then somebody checked in the wrong thing by accident - set startdir [acs_root_dir]/packages + # if startdir is not $::acs::rootdir/packages, then somebody checked in the wrong thing by accident + set startdir $::acs::rootdir/packages aa_log "Checks starting from $startdir" @@ -51,8 +51,8 @@ return [expr {[string match {*.tcl} $file] || [file isdirectory $file]}] } - # if startdir is not [acs_root_dir]/packages, then somebody checked in the wrong thing by accident - set startdir [acs_root_dir]/packages + # if startdir is not $::acs::rootdir/packages, then somebody checked in the wrong thing by accident + set startdir $::acs::rootdir/packages aa_log "Checks starting from $startdir" set count 0 @@ -80,7 +80,7 @@ @author Jeff Davis davis@xarg.net } { - foreach spec_file [glob -nocomplain "[acs_root_dir]/packages/*/*.info"] { + foreach spec_file [glob -nocomplain "$::acs::rootdir/packages/*/*.info"] { set errp 0 if { [catch {array set version [apm_read_package_info_file $spec_file]} errMsg] } { aa_log_result fail "$spec_file returned $errMsg" @@ -129,7 +129,7 @@ @author Jeff Davis davis@xarg.net } { - foreach dir [lsort [glob -nocomplain -types f "[acs_root_dir]/packages/*/*.info"]] { + foreach dir [lsort [glob -nocomplain -types f "$::acs::rootdir/packages/*/*.info"]] { set error_p 0 @@ -201,8 +201,8 @@ return [expr {[string match {*.xql} $file] || [file isdirectory $file]}] } - # if startdir is not [acs_root_dir]/packages, then somebody checked in the wrong thing by accident - set startdir [acs_root_dir]/packages + # if startdir is not $::acs::rootdir/packages, then somebody checked in the wrong thing by accident + set startdir $::acs::rootdir/packages aa_log "Checks starting from $startdir" Index: openacs-4/packages/acs-tcl/tcl/test/log-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/Attic/log-test-procs.tcl,v diff -u -r1.5 -r1.5.8.1 --- openacs-4/packages/acs-tcl/tcl/test/log-test-procs.tcl 4 Mar 2008 13:08:38 -0000 1.5 +++ openacs-4/packages/acs-tcl/tcl/test/log-test-procs.tcl 16 Oct 2013 19:49:10 -0000 1.5.8.1 @@ -14,7 +14,7 @@ set logfile [ns_info log] if {$logfile eq "STDOUT"} { - set logfile "[acs_root_dir]/log/error/current" + set logfile "$::acs::rootdir/log/error/current" } set fd [open $logfile r] Index: openacs-4/packages/acs-templating/tcl/filter-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/filter-procs.tcl,v diff -u -r1.15.10.2 -r1.15.10.3 --- openacs-4/packages/acs-templating/tcl/filter-procs.tcl 10 Oct 2013 21:20:10 -0000 1.15.10.2 +++ openacs-4/packages/acs-templating/tcl/filter-procs.tcl 16 Oct 2013 19:56:14 -0000 1.15.10.3 @@ -76,7 +76,7 @@ set url [ns_conn url] regsub {.cmp} $url {} url_stub regexp {^/([^/]*)(.*)} $url_stub all package_key rest - set file_stub "[acs_root_dir]/packages/$package_key/www$rest" + set file_stub "$::acs::rootdir/packages/$package_key/www$rest" set beginTime [clock clicks -milliseconds] @@ -102,7 +102,7 @@ set url [ns_conn url] regsub {.dat} $url {} url_stub regexp {^/([^/]*)(.*)} $url_stub all package_key rest - set code_stub "[acs_root_dir]/packages/$package_key/www$rest" + set code_stub "$::acs::rootdir/packages/$package_key/www$rest" set beginTime [clock clicks -milliseconds] @@ -136,7 +136,7 @@ set url [ns_conn url] regsub {.frm} $url {} url_stub regexp {^/([^/]*)(.*)} $url_stub all package_key rest - set __adp_stub "[acs_root_dir]/packages/$package_key/www$rest" + set __adp_stub "$::acs::rootdir/packages/$package_key/www$rest" # Set the parse level lappend ::templating::parse_level [info level] Index: openacs-4/packages/acs-templating/tcl/form-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/form-procs.tcl,v diff -u -r1.45.2.7 -r1.45.2.8 --- openacs-4/packages/acs-templating/tcl/form-procs.tcl 16 Oct 2013 10:16:16 -0000 1.45.2.7 +++ openacs-4/packages/acs-templating/tcl/form-procs.tcl 16 Oct 2013 19:56:15 -0000 1.45.2.8 @@ -340,7 +340,7 @@ # Added support for storing form templates outside acs-templating if {[regexp {^/(.*)} $style path]} { - set file_stub "[acs_root_dir]$path" + set file_stub "$::acs::rootdir$path" } else { set file_stub [template::get_resource_path]/forms/$style } Index: openacs-4/packages/acs-templating/tcl/list-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/list-procs.tcl,v diff -u -r1.57.8.6 -r1.57.8.7 --- openacs-4/packages/acs-templating/tcl/list-procs.tcl 16 Oct 2013 10:16:16 -0000 1.57.8.6 +++ openacs-4/packages/acs-templating/tcl/list-procs.tcl 16 Oct 2013 19:56:15 -0000 1.57.8.7 @@ -1121,7 +1121,7 @@ # Added support for storing form templates outside acs-templating if {[regexp {^/(.*)} $style path]} { - set file_stub "[acs_root_dir]$path" + set file_stub "$::acs::rootdir$path" } else { set file_stub [template::get_resource_path]/lists/$style } @@ -1780,7 +1780,7 @@ } # Added support for storing form templates outside acs-templating if {[regexp {^/(.*)} $style path]} { - set file_stub "[acs_root_dir]$path" + set file_stub "$::acs::rootdir$path" } else { set file_stub [template::get_resource_path]/lists/$style } Index: openacs-4/packages/acs-templating/tcl/spellcheck-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/spellcheck-procs.tcl,v diff -u -r1.21.2.3 -r1.21.2.4 --- openacs-4/packages/acs-templating/tcl/spellcheck-procs.tcl 23 Sep 2013 09:41:52 -0000 1.21.2.3 +++ openacs-4/packages/acs-templating/tcl/spellcheck-procs.tcl 16 Oct 2013 19:56:15 -0000 1.21.2.4 @@ -200,7 +200,7 @@ # the HOME environment set, and setting env(HOME) doesn't appear # to work from AOLserver. - set spelling_wrapper [file join [acs_root_dir] bin webspell] + set spelling_wrapper [file join $::acs::rootdir bin webspell] if {![file executable $spelling_wrapper]} { # @@ -211,7 +211,7 @@ if {!$no_abort_p} { ad_return_error "Webspell could not be executed" \ "Spell-checking is enabled but the spell-check wrapper\ - ([acs_root_dir]/bin/webspell) returns not be executed.\ + ($::acs::rootdir/bin/webspell) returns not be executed.\ Check that the wrapper exists, and that its permissions are correct." ad_script_abort } else { Index: openacs-4/packages/acs-templating/tcl/tag-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-init.tcl,v diff -u -r1.35 -r1.35.2.1 --- openacs-4/packages/acs-templating/tcl/tag-init.tcl 8 Dec 2012 17:50:20 -0000 1.35 +++ openacs-4/packages/acs-templating/tcl/tag-init.tcl 16 Oct 2013 19:56:15 -0000 1.35.2.1 @@ -150,9 +150,9 @@ template_tag multiple { chunk params } { - set name [template::get_attribute multiple $params name ] - set startrow [template::get_attribute multiple $params startrow 0] - set maxrows [template::get_attribute multiple $params maxrows -1]; #unlimit + set name [template::get_attribute multiple $params name ] + set startrow [template::get_attribute multiple $params startrow 0] + set maxrows [template::get_attribute multiple $params maxrows -1]; #unlimit set delimiter [template::get_attribute multiple $params delimiter ""] set tag_id [template::current_tag] Index: openacs-4/packages/acs-templating/tcl/util-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/util-procs.tcl,v diff -u -r1.26.2.6 -r1.26.2.7 --- openacs-4/packages/acs-templating/tcl/util-procs.tcl 16 Oct 2013 10:55:59 -0000 1.26.2.6 +++ openacs-4/packages/acs-templating/tcl/util-procs.tcl 16 Oct 2013 19:56:15 -0000 1.26.2.7 @@ -492,7 +492,7 @@ } else { - set path [get_server_root]/$url + set path $::acs::rootdir/$url } return [ns_normalizepath $path] Index: openacs-4/packages/acs-templating/www/doc/gen/generate-docs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/gen/generate-docs.tcl,v diff -u -r1.1.1.1 -r1.1.1.1.28.1 --- openacs-4/packages/acs-templating/www/doc/gen/generate-docs.tcl 13 Mar 2001 22:59:27 -0000 1.1.1.1 +++ openacs-4/packages/acs-templating/www/doc/gen/generate-docs.tcl 16 Oct 2013 19:56:15 -0000 1.1.1.1.28.1 @@ -45,7 +45,7 @@ set tcl_lvl [info level] set adp_lvl [adp_level] set file_list [list] -set doc_root [get_server_root]/packages/acs-templating/www/doc +set doc_root $::acs::rootdir/packages/acs-templating/www/doc #debugging: template::util::display_value doc_root @@ -56,7 +56,7 @@ set dir [ns_library private] # debugging -set svr_root [get_server_root] +set svr_root $::acs::rootdir set dir [list $svr_root/packages/cms/tcl $svr_root/packages/acs-templating/tcl]