Index: openacs-4/packages/acs-tcl/tcl/20-memoize-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/20-memoize-init.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-tcl/tcl/20-memoize-init.tcl	20 Sep 2007 12:33:33 -0000	1.3
+++ openacs-4/packages/acs-tcl/tcl/20-memoize-init.tcl	23 Dec 2008 12:23:00 -0000	1.4
@@ -1,11 +1,11 @@
 # Create the cache used by util_memoize.
 
-# Note: we must pass the package_id to ad_parameter, because
-# otherwise ad_parameter will end up calling util_memoize to figure
+# Note: we must pass the package_id to parameter::get, because
+# otherwise parameter::get will end up calling util_memoize to figure
 # out the package_id.
 
 ns_cache create util_memoize -size \
-    [ad_parameter -package_id [ad_acs_kernel_id] MaxSize memoize 200000]
+    [parameter::get -package_id [ad_acs_kernel_id] -parameter MaxSize -default 200000]
 
 
 # We construct the body of util_memoize_flush differently depending
Index: openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl,v
diff -u -N -r1.29 -r1.30
--- openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl	10 Jan 2007 21:22:11 -0000	1.29
+++ openacs-4/packages/acs-tcl/tcl/acs-permissions-procs.tcl	23 Dec 2008 12:22:59 -0000	1.30
@@ -19,7 +19,7 @@
     returns 0 or 1 depending if permission_p caching is enabled or disabled.
     by default caching is disabled.
 } {
-    set cache_p [ad_parameter -package_id [ad_acs_kernel_id] PermissionCacheP permissions 0]
+    set cache_p [parameter::get -package_id [ad_acs_kernel_id] -parameter PermissionCacheP -default 0]
     namespace eval ::permission [list proc cache_p {} "return $cache_p"]
     return $cache_p
 }
Index: openacs-4/packages/acs-tcl/tcl/acs-private-data-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-private-data-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-tcl/tcl/acs-private-data-procs.tcl	26 Feb 2004 15:28:54 -0000	1.5
+++ openacs-4/packages/acs-tcl/tcl/acs-private-data-procs.tcl	23 Dec 2008 12:23:00 -0000	1.6
@@ -16,13 +16,13 @@
         was in no way regulated.
     } {
         # If no parameter set, then we assume privacy control is DISABLED
-        return [ad_parameter -package_id [ad_acs_kernel_id] PrivacyControlEnabledP 0]
+        return [parameter::get -package_id [ad_acs_kernel_id] -parameter PrivacyControlEnabledP -default 0]
     }
 
     ad_proc -public privacy_control_set {val} {
         set the privacy control
     } {
-        ad_parameter -set $val -package_id [ad_acs_kernel_id] PrivacyControlEnabledP
+        return [parameter::get -set $val -package_id [ad_acs_kernel_id] -parameter PrivacyControlEnabledP]
     }
 
     ad_proc -public user_can_read_private_data_p {
Index: openacs-4/packages/acs-tcl/tcl/admin-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/admin-procs.tcl,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/acs-tcl/tcl/admin-procs.tcl	10 Jan 2007 21:22:11 -0000	1.18
+++ openacs-4/packages/acs-tcl/tcl/admin-procs.tcl	23 Dec 2008 12:23:00 -0000	1.19
@@ -27,7 +27,8 @@
 ad_proc -public ad_approval_system_inuse_p {} {
     Returns 1 if the system is configured to use and approval system.
 } {
-    if {[ad_parameter RegistrationRequiresEmailVerification] && [ad_parameter RegistrationRequiresApprovalP] } {
+    if {[parameter::get -parameter RegistrationRequiresEmailVerification] && 
+	[parameter::get -parameter RegistrationRequiresApprovalP] } {
 	return 1
     } else {
 	return 0
@@ -89,7 +90,7 @@
 		    lappend clauses "have an email address starting with $email_starts_with"
 		}	
 		"expensive" {
-		    lappend clauses "have accumulated unpaid charges of more than [ad_parameter ExpensiveThreshold "member-value"]"
+		    lappend clauses "have accumulated unpaid charges of more than [parameter::get -parameter ExpensiveThreshold]"
 		}
 		"user_state" {
 		    lappend clauses "have user state of $user_state"
@@ -273,7 +274,7 @@
 		}
 		"expensive" {
 		    if { [info exists count_only_p] && $count_only_p } {
-			lappend where_clauses "[ad_parameter ExpensiveThreshold "member-value"] < (select sum(amount) from users_charges where users_charges.user_id = users.user_id)"
+			lappend where_clauses "[parameter::get -parameter ExpensiveThreshold] < (select sum(amount) from users_charges where users_charges.user_id = users.user_id)"
 		    } else {
 			if {[lsearch $tables "user_charges"] == -1 } {
 			    lappend tables "users_charges"
@@ -282,7 +283,7 @@
 
 			set group_clauses [concat $group_clauses $user_columns]
 
-			lappend having_clauses "sum(users_charges.amount) > [ad_parameter ExpensiveThreshold "member-value"]"
+			lappend having_clauses "sum(users_charges.amount) > [parameter::get -parameter ExpensiveThreshold]"
 			# only the ones where they haven't paid
 			lappend where_clauses "users_charges.order_id is null"
 		    }
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 -N -r1.94 -r1.95
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	4 Dec 2008 17:34:48 -0000	1.94
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	23 Dec 2008 12:23:00 -0000	1.95
@@ -1415,7 +1415,7 @@
     if { ![file exists $root] } {
 	file mkdir $root
 # doesn't work under windows.  its not very useful anyway.
-#	file attributes $root -permissions [ad_parameter "InfoFilePermissionsMode" "apm" 0755]
+#	file attributes $root -permissions [parameter::get -parameter InfoFilePermissionsMode -default 0755]
     }
 
     db_transaction {
Index: openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl,v
diff -u -N -r1.25 -r1.26
--- openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	22 Sep 2008 19:47:59 -0000	1.25
+++ openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	23 Dec 2008 12:23:00 -0000	1.26
@@ -611,7 +611,7 @@
     append return_string "
     <TABLE border=0 cellpadding=0 cellspacing=0 height=24 width=\"100%\">
        <TR bgcolor=\"#000066\"><TD align=left valign=bottom><A href=#top onMouseOver=\"hiLite('back_to_top')\" onMouseOut=\"unhiLite('back_to_top')\"><img name=\"back_to_top\" src=\"/graphics/24_back_to_top.gif\" border=0 width=200 height=24 alt=\"top\"></A></TD>
-         <TD align=right valign=bottom><A href=\"[ad_parameter GlobalURLStub "" "/global"]/rules\" onMouseOver=\"hiLite('rules')\" onMouseOut=\"unhiLite('rules')\"><img name=\"rules\" src=\"/graphics/rules.gif\" border=0 width=96 height=24 valign=bottom alt=\"rules\"></A><A href=\"[ad_help_link $section]\" onMouseOver=\"hiLite('help')\" onMouseOut=\"unhiLite('help')\"><img name=\"help\" src=\"/graphics/help.gif\" border=0 width=30 height=24 align=bottom alt=\"help\"></A></TD></TR>
+         <TD align=right valign=bottom><A href=\"[parameter::get -parameter GlobalURLStub -default /global]/rules\" onMouseOver=\"hiLite('rules')\" onMouseOut=\"unhiLite('rules')\"><img name=\"rules\" src=\"/graphics/rules.gif\" border=0 width=96 height=24 valign=bottom alt=\"rules\"></A><A href=\"[ad_help_link $section]\" onMouseOver=\"hiLite('help')\" onMouseOut=\"unhiLite('help')\"><img name=\"help\" src=\"/graphics/help.gif\" border=0 width=30 height=24 align=bottom alt=\"help\"></A></TD></TR>
     </TABLE>"
     return $return_string
 }
Index: openacs-4/packages/acs-tcl/tcl/request-processor-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-init.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/acs-tcl/tcl/request-processor-init.tcl	10 Jan 2007 21:22:12 -0000	1.12
+++ openacs-4/packages/acs-tcl/tcl/request-processor-init.tcl	23 Dec 2008 12:23:00 -0000	1.13
@@ -10,7 +10,7 @@
 # These procedures are dynamically defined at startup to alleviate
 # lock contention. Thanks to davis@xarg.net.
 
-if { [ad_parameter -package_id [ad_acs_kernel_id] PerformanceModeP request-processor 0] } {
+if { [parameter::get -package_id [ad_acs_kernel_id] -parameter PerformanceModeP -default 0] } {
   ad_proc -private rp_performance_mode {} {
     Returns 1 if the request processor is in performance mode, 0 otherwise.
   } {
Index: openacs-4/packages/acs-tcl/tcl/rollout-email-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/rollout-email-procs.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-tcl/tcl/rollout-email-procs.tcl	10 Jan 2007 21:22:12 -0000	1.6
+++ openacs-4/packages/acs-tcl/tcl/rollout-email-procs.tcl	23 Dec 2008 12:23:00 -0000	1.7
@@ -82,7 +82,7 @@
     } {
 	set targets [ns_config ns/server/[ns_info server]/acs/acs-rollout-support EmailRedirectTo]
 	if { $targets ne "" } {
-	    set body "The following email would have been sent from \"[ad_parameter SystemName]\", but
+	    set body "The following email would have been sent from \"[parameter::get -parameter SystemName]\", but
 was instead redirected to you.
 
 [subst [ro::email::get_template]]
Index: openacs-4/packages/acs-tcl/tcl/security-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-init.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-tcl/tcl/security-init.tcl	10 Jan 2007 21:22:12 -0000	1.4
+++ openacs-4/packages/acs-tcl/tcl/security-init.tcl	23 Dec 2008 12:23:00 -0000	1.5
@@ -11,7 +11,7 @@
 }
 
 # Schedule a procedure to sweep for sessions.
-ad_schedule_proc -thread f [ad_parameter SessionSweepInterval security 7200] sec_sweep_sessions
+ad_schedule_proc -thread f [parameter::get -parameter SessionSweepInterval -default 7200] sec_sweep_sessions
 
 # Verify that the secret_tokens table is populated
 set secret_tokens_exists [db_string secret_tokens_exists "select decode(count(*),0,0,1) from secret_tokens"]
@@ -25,17 +25,17 @@
 ns_log Notice "security-init.tcl: Populating secret_tokens ns_cache..."
 populate_secret_tokens_cache
 
-# These procedures are dynamically defined so that ad_parameter
+# These procedures are dynamically defined so that parameter::get
 # does not need to be called directly in the RP. 
 proc sec_session_timeout {} "
-    return \"[ad_parameter -package_id [ad_acs_kernel_id] SessionTimeout security 1200]\"
+    return \"[parameter::get -package_id [ad_acs_kernel_id] -parameter SessionTimeout -default 1200]\"
 "
 
 proc sec_session_renew {} "
-    return \"[expr {[sec_session_timeout] - [ad_parameter -package_id [ad_acs_kernel_id] SessionRenew security 300]}]\"
+    return \"[expr {[sec_session_timeout] - [parameter::get -package_id [ad_acs_kernel_id] -parameter SessionRenew -default 300]}]\"
 "
 
 proc sec_login_timeout {} "
-    return \"[ad_parameter -package_id [ad_acs_kernel_id] LoginTimeout security 28800]\"
+    return \"[parameter::get -package_id [ad_acs_kernel_id] -parameter LoginTimeout -default 28800]\"
 "
 
Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -N -r1.53 -r1.54
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	16 Dec 2008 09:36:18 -0000	1.53
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	23 Dec 2008 12:23:00 -0000	1.54
@@ -59,7 +59,7 @@
     Returns the maximum lifetime, in seconds, for sessions.
 } {
     # default value is 7 days ( 7 * 24 * 60 * 60 )
-    return [ad_parameter -package_id [ad_acs_kernel_id] SessionLifetime security 604800]
+    return [parameter::get -package_id [ad_acs_kernel_id] -parameter SessionLifetime -default 604800]
 }
 
 ad_proc -private sec_sweep_sessions {} {
@@ -1040,7 +1040,7 @@
 
 } {
 
-    set num_tokens [ad_parameter -package_id [ad_acs_kernel_id] NumberOfCachedSecretTokens security 100]
+    set num_tokens [parameter::get -package_id [ad_acs_kernel_id] -parameter NumberOfCachedSecretTokens -default 100]
 
     # this is called directly from security-init.tcl,
     # so it runs during the install before the data model has been loaded
@@ -1065,7 +1065,7 @@
 
 } {
 
-    set num_tokens [ad_parameter -package_id [ad_acs_kernel_id] NumberOfCachedSecretTokens security 100]
+    set num_tokens [parameter::get -package_id [ad_acs_kernel_id] -parameter NumberOfCachedSecretTokens -default 100]
     # we assume sample size of 10%.
     set num_tokens [expr {$num_tokens * 10}]
     set counter 0
@@ -1617,9 +1617,10 @@
     if {![regexp {(http://|https://)(.*?):(.*?)/?} [util_current_location] discard host_protocol host_name host_port]} {
         regexp {(http://|https://)(.*?)/?} [util_current_location] discard host_protocol host_name
     }
-    # let's give a warning if util_current_location returns host_name not same as from config.tcl, may help with proxy issues etc
+    # let's give a warning if util_current_location returns host_name
+    # not same as from config.tcl, may help with proxy issues etc
     if {[ns_config ns/server/[ns_info server]/module/$driver Hostname] ne $host_name } {
-        ns_log Warning "security::locations host_name from config.tcl does not match from util_current_location: $host_name"
+        ns_log Warning "security::locations hostname '[ns_config ns/server/[ns_info server]/module/$driver Hostname]' from config.tcl does not match from util_current_location: $host_name"
     }
 
     # insecure locations
Index: openacs-4/packages/acs-tcl/tcl/server-cluster-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/server-cluster-procs.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-tcl/tcl/server-cluster-procs.tcl	27 Sep 2007 08:03:46 -0000	1.6
+++ openacs-4/packages/acs-tcl/tcl/server-cluster-procs.tcl	23 Dec 2008 12:23:00 -0000	1.7
@@ -7,14 +7,14 @@
 }    
 
 proc_doc server_cluster_enabled_p {} { Returns true if clustering is enabled. } {
-    return [ad_parameter -package_id [ad_acs_kernel_id] ClusterEnabledP server-cluster 0]
+    return [parameter::get -package_id [ad_acs_kernel_id] -parameter ClusterEnabledP -default 0]
 }
 
 proc_doc server_cluster_all_hosts {} { Returns a list of all hosts, possibly including this host, in the server cluster. } {
     if { ![server_cluster_enabled_p] } {
 	return [list]
     }
-    return [ad_parameter -package_id [ad_acs_kernel_id] ClusterPeerIP server-cluster]
+    return [parameter::get -package_id [ad_acs_kernel_id] -parameter ClusterPeerIP]
 }
 
 proc_doc server_cluster_peer_hosts {} { Returns a list of all hosts, excluding this host, in the server cluster. } {
@@ -44,7 +44,7 @@
 	return 1
     }
     # lsearch -glob appears to crash AOLserver 2. Oh well.
-    foreach glob [ad_parameter -package_id [ad_acs_kernel_id] ClusterAuthorizedIP server-cluster] {
+    foreach glob [parameter::get -package_id [ad_acs_kernel_id] -parameter ClusterAuthorizedIP] {
 	if { [string match $glob $ip] } {
 	    return 1
 	}
@@ -64,7 +64,7 @@
 }
 
 ad_proc -private server_cluster_logging_p {} { Returns true if we're logging cluster requests. } {
-    return [ad_parameter -package_id [ad_acs_kernel_id] EnableLoggingP server-cluster 0]
+    return [parameter::get -package_id [ad_acs_kernel_id] -parameter EnableLoggingP -default 0]
 }
 
 ad_proc -private server_cluster_httpget_from_peers {
@@ -90,7 +90,7 @@
     aolserver (for instance, if we have the aolservers sitting behind a
     load balancer).
 } {
-    set canonical_server [ad_parameter -package_id [ad_acs_kernel_id] CanonicalServer server-cluster]
+    set canonical_server [parameter::get -package_id [ad_acs_kernel_id] -parameter CanonicalServer]
     if { $canonical_server eq "" } {
 	ns_log Error "Your configuration is not correct for server clustering. Please ensure that you have the CanonicalServer parameter set correctly."
 	return 1
Index: openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl	29 Jul 2008 22:04:14 -0000	1.11
+++ openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl	23 Dec 2008 12:23:00 -0000	1.12
@@ -28,7 +28,7 @@
 
     set widget_value "<select name=\"$select_name\" $size_subtag>\n"
     if { $default eq "" } {
-        if { [ad_parameter SomeAmericanReadersP] } {
+        if { [parameter::get -parameter SomeAmericanReadersP] } {
 	    append widget_value "<option value=\"\">Choose a Country</option>
 <option value=\"us\" selected=\"selected\">United States</option>\n"
 	} else {
@@ -262,7 +262,7 @@
 
     set widget_value "<select name=\"$select_name\" $size_subtag>\n"
     if { $default eq "" } {
-        if { [ad_parameter SomeAmericanReadersP] } {
+        if { [parameter::get -parameter SomeAmericanReadersP] } {
 	    append widget_value "<option value=\"\">Currency</option>
 <option value=\"USD\" selected=\"selected\">United States Dollar</option>\n"
 	} else {