Index: openacs-4/packages/dotlrn-static/dotlrn-static.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-static/dotlrn-static.info,v
diff -u -r1.23.2.3 -r1.23.2.4
--- openacs-4/packages/dotlrn-static/dotlrn-static.info	16 Sep 2021 08:27:06 -0000	1.23.2.3
+++ openacs-4/packages/dotlrn-static/dotlrn-static.info	22 Mar 2023 16:06:04 -0000	1.23.2.4
@@ -7,17 +7,21 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="2.10.0" url="http://openacs.org/repository/download/apm/dotlrn-static-2.10.0.apm">
+    <version name="2.10.1" url="http://openacs.org/repository/download/apm/dotlrn-static-2.10.1.apm">
         <owner url="http://openacs.org">OpenACS</owner>
          <summary>DotLRN Applet Static Portlets</summary>
-        <release-date>2021-09-15</release-date>
+        <release-date>2023-03-22</release-date>
         <vendor url="http://dotlrn.org">DotLRN Consortium</vendor>
         <maturity>2</maturity>
 
-        <provides url="dotlrn-static" version="2.10.0"/>
+        <provides url="dotlrn-static" version="2.10.1"/>
         <requires url="dotlrn" version="2.10.0"/>
         <requires url="static-portlet" version="2.10.0"/>
 
+        <callbacks>
+            <callback type="after-upgrade"  proc="dotlrn_static::apm::upgrade"/>
+        </callbacks>
+
         <parameters>
         <!-- No version parameters -->
         </parameters>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn-static/tcl/apm-callback-procs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn-static/tcl/dotlrn-static-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-static/tcl/dotlrn-static-procs.tcl,v
diff -u -r1.39.2.4 -r1.39.2.5
--- openacs-4/packages/dotlrn-static/tcl/dotlrn-static-procs.tcl	23 Feb 2021 13:16:55 -0000	1.39.2.4
+++ openacs-4/packages/dotlrn-static/tcl/dotlrn-static-procs.tcl	22 Mar 2023 16:06:04 -0000	1.39.2.5
@@ -65,20 +65,28 @@
         Add the static applet to dotlrn - for one-time init
         Must be repeatable!
     } {
+        set applets_node [site_node::get -url [dotlrn_applet::get_url]/]
+        set applets_node_id [dict get $applets_node node_id]
 
-        if {![dotlrn_applet::applet_exists_p -applet_key [applet_key]]} {
+        set package_key [dotlrn_static::package_key]
 
+        if {![db_0or1row is_mounted {
+            select 1 from site_nodes n, apm_packages p
+            where n.parent_id = :applets_node_id
+            and p.package_id = n.object_id
+            and p.package_key = :package_key
+        }]} {
             db_transaction {
-                dotlrn_applet::mount \
-                    -package_key [package_key] \
-                    -url [package_key] \
-                    -pretty_name "#[pretty_name_key]#"
+                site_node::instantiate_and_mount \
+                    -node_name $package_key \
+                    -parent_node_id $applets_node_id \
+                    -package_key $package_key \
+                    -package_name "#[dotlrn_static::pretty_name_key]#"
 
                 dotlrn_applet::add_applet_to_dotlrn \
                     -applet_key [applet_key] \
                     -package_key [my_package_key]
             }
-
         }
     }
 
Index: openacs-4/packages/dotlrn-static/tcl/test/dotlrn-static-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-static/tcl/test/dotlrn-static-test-procs.tcl,v
diff -u -r1.1.2.5 -r1.1.2.6
--- openacs-4/packages/dotlrn-static/tcl/test/dotlrn-static-test-procs.tcl	25 Feb 2021 12:24:40 -0000	1.1.2.5
+++ openacs-4/packages/dotlrn-static/tcl/test/dotlrn-static-test-procs.tcl	22 Mar 2023 16:06:04 -0000	1.1.2.6
@@ -7,6 +7,24 @@
 
 }
 
+aa_register_case -cats {
+    smoke production_safe
+} dotlrn_static_mountpoint {
+    Make sure the applet is mounted correctly
+} {
+    set applets_node [site_node::get -url [dotlrn_applet::get_url]/]
+    set applets_node_id [dict get $applets_node node_id]
+
+    set package_key [dotlrn_static::package_key]
+
+    aa_true "Applet is mounted under /dotlrn/applets" [db_0or1row is_mounted {
+        select 1 from site_nodes n, apm_packages p
+        where n.parent_id = :applets_node_id
+        and p.package_id = n.object_id
+        and p.package_key = :package_key
+    }]
+}
+
 aa_register_case \
     -cats {api smoke production_safe} \
     -procs {