Index: openacs-4/packages/acs-tcl/tcl/aolserver-3-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/aolserver-3-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-tcl/tcl/aolserver-3-procs.tcl	12 Feb 2009 15:38:41 -0000	1.5
+++ openacs-4/packages/acs-tcl/tcl/aolserver-3-procs.tcl	11 Mar 2010 11:03:01 -0000	1.6
@@ -135,32 +135,46 @@
 	ns_returnbadrequest $conn "Cannot PUT a script file"
 }
 
-ns_share NS
-set NS(months) [list January February March April May June \
-        July August September October November December]
+if {[ns_info name] ne "NaviServer"} {
+  #
+  # Naviserver has dropped support for ns_share.
+  #
+  ns_share NS
+  set NS(months) [list January February March April May June \
+                      July August September October November December]
+}
 
+# _ns_dateentrywidget is not very popular and is not
+# internationalized. We keep it in Naviserver for backward
+# compatibility. It should become deprecated.
 proc _ns_dateentrywidget {column} {
-    ns_share NS
 
-    set output "<SELECT name=$column.month>\n"
+    if {[ns_info name] ne "NaviServer"} {
+        ns_share NS
+    } else {
+        set NS(months) [list January February March April May June \
+                            July August September October November December]
+    }
+
+    set output "<select name='$column.month'>\n"
     for {set i 0} {$i < 12} {incr i} {
-	append output "<OPTION> [lindex $NS(months) $i]\n"
+        append output "<option> [lindex $NS(months) $i]\n"
     }
 
     append output \
-"</SELECT>&nbsp;<INPUT NAME=$column.day\
-TYPE=text SIZE=3 MAXLENGTH=2>&nbsp;<INPUT NAME=$column.year\
-TYPE=text SIZE=5 MAXLENGTH=4>"
+        "</select>&nbsp;<INPUT name='$column.day'\
+type='text' size='3' maxlength='2'>&nbsp;<input name='$column.year'\
+type='text' size='5' maxlength='4'>"
 
     return [ns_dbformvalueput $output $column date [lindex [split [ns_localsqltimestamp] " "] 0]]
 }
 
 proc _ns_timeentrywidget {column} {
     
-    set output "<INPUT NAME=$column.time TYPE=text SIZE=9>&nbsp;<SELECT NAME=$column.ampm>
-<OPTION> AM
-<OPTION> PM
-</SELECT>"
+    set output "<INPUT NAME='$column.time' type='text' size='9'>&nbsp;<select name='$column.ampm'>\
+<option> AM\
+<option> PM\
+</select>"
 
     return [ns_dbformvalueput $output $column time [lindex [split [ns_localsqltimestamp] " "] 1]]
 }
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.101 -r1.102
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	10 Mar 2010 00:44:03 -0000	1.101
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	11 Mar 2010 11:03:01 -0000	1.102
@@ -1529,14 +1529,17 @@
 if {[ns_info name] eq "NaviServer"} {
   # this is written for NaviServer 4.99.1 or newer
   foreach filter {rp_filter rp_resources_filter request_denied_filter} {
-    rename $filter ${filter}_aolserver
+    if {[info command ::${filter}_aolserver] eq ""} {
+      rename $filter ${filter}_aolserver
+    }
     proc $filter {why} [list ${filter}_aolserver \$why ]
   }
 
-  rename rp_invoke_filter rp_invoke_filter_conn
+  if {[info command rp_invoke_filter_conn] eq ""} {
+    rename rp_invoke_filter rp_invoke_filter_conn
+    rename rp_invoke_proc   rp_invoke_proc_conn
+  }
   proc   rp_invoke_filter { why filter_info} { rp_invoke_filter_conn _ $filter_info $why}
-  
-  rename rp_invoke_proc   rp_invoke_proc_conn
   proc   rp_invoke_proc   { argv }            { rp_invoke_proc_conn _ $argv }
 
 }
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -r1.119 -r1.120
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	10 Mar 2010 00:44:03 -0000	1.119
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	11 Mar 2010 11:03:01 -0000	1.120
@@ -3036,16 +3036,19 @@
 #     and whatever the user typed will be set in $expiration_date
 
 proc ad_dateentrywidget {column {default_date "1940-11-03"}} {
-    ns_share NS
-
+    if {[ns_info name] ne "NaviServer"} {
+        ns_share NS
+    } else {
+        set NS(months) [list January February March April May June \
+                            July August September October November December]
+    }
     set output "<select name=\"$column.month\">\n"
     for {set i 0} {$i < 12} {incr i} {
 	append output "<option> [lindex $NS(months) $i]</option>\n"
     }
 
     append output "</select>&nbsp;<input name=\"$column.day\" type=\"text\" size=\"3\" maxlength=\"2\">&nbsp;<input name=\"$column.year\" type=\"text\" size=\"5\" maxlength=\"4\">"
 
-
     return [ns_dbformvalueput $output $column date $default_date]
 }
 
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 -r1.15 -r1.16
--- openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl	13 Feb 2009 20:28:08 -0000	1.15
+++ openacs-4/packages/acs-tcl/tcl/widgets-procs.tcl	11 Mar 2010 11:03:01 -0000	1.16
@@ -131,9 +131,15 @@
 ad_proc ad_dateentrywidget {column { value 0 } } {
     Returns form pieces for a date entry widget. A null date may be selected.
 } {
-    ns_share NS
     # if you would like the default to be null, call with value= ""
 
+    if {[ns_info name] ne "NaviServer"} {
+        ns_share NS
+    } else {
+        set NS(months) [list January February March April May June \
+                            July August September October November December]
+    }
+
     if { $value == 0 } {
 	# no default, so use today
 	set value  [lindex [split [ns_localsqltimestamp] " "] 0]