Index: openacs-4/packages/dotlrn-homework/dotlrn-homework.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/dotlrn-homework.info,v
diff -u -r1.19 -r1.19.2.1
--- openacs-4/packages/dotlrn-homework/dotlrn-homework.info	29 Mar 2018 23:07:34 -0000	1.19
+++ openacs-4/packages/dotlrn-homework/dotlrn-homework.info	8 Jan 2020 18:24:01 -0000	1.19.2.1
@@ -6,27 +6,29 @@
     <pretty-plural>dotLRN Homework</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
-
-    <version name="2.10.0d0" url="http://openacs.org/repository/download/apm/dotlrn-homework-2.10.0d0.apm">
+    <implements-subsite-p>f</implements-subsite-p>
+    <inherit-templates-p>t</inherit-templates-p>
+    
+    <version name="2.10.0d1" url="http://openacs.org/repository/download/apm/dotlrn-homework-2.10.0d1.apm">
         <owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
         <summary>Provides a homework assignment dropboxes for dotLRN classes.</summary>
         <release-date>2017-08-06</release-date>
         <vendor url="http://dotlrn.org">DotLRN Consortium</vendor>
         <maturity>2</maturity>
 
-        <provides url="dotlrn-homework" version="2.10.0d0"/>
+        <provides url="dotlrn-homework" version="2.10.0d1"/>
         <requires url="dotlrn" version="2.10.0d0"/>
         <requires url="dotlrn-fs" version="2.10.0d0"/>
         <requires url="new-portal" version="2.10.0d0"/>
 
         <callbacks>
-            <callback type="after-install"  proc="dotlrn_homework::apm_callbacks::package_install"/>
             <callback type="before-uninstall"  proc="dotlrn_homework::apm_callbacks::package_uninstall"/>
+            <callback type="after-install"  proc="dotlrn_homework::apm_callbacks::package_install"/>
+            <callback type="after-instantiate"  proc="dotlrn_homework::apm_callbacks::after_instantiate"/>
         </callbacks>
-
         <parameters>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="MaximumFileSize"  default="20000000" description="&quot;The maximum size, in bytes, of files that users are allowed to upload"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="StoreFilesInDatabaseP"  default="1" description="Flag to determine the storage type. A flag of 1 (true) will store the files in the database. If 0 (false) files are stored in the filesystem. ***This parameter should only be changed at package instance creation.***"/>
+            <parameter scope="instance" datatype="number"  min_n_values="1"  max_n_values="1"  name="MaximumFileSize"  default="20000000" description="&#34;The maximum size, in bytes, of files that users are allowed to upload"/>
+            <parameter scope="instance" datatype="number"  min_n_values="1"  max_n_values="1"  name="StoreFilesInDatabaseP"  default="1" description="Flag to determine the storage type. A flag of 1 (true) will store the files in the database. If 0 (false) files are stored in the filesystem. ***This parameter should only be changed at package instance creation.***"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/dotlrn-homework/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/tcl/apm-callback-procs.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/dotlrn-homework/tcl/apm-callback-procs.tcl	7 Aug 2017 23:48:10 -0000	1.6
+++ openacs-4/packages/dotlrn-homework/tcl/apm-callback-procs.tcl	8 Jan 2020 18:24:01 -0000	1.6.2.1
@@ -157,6 +157,21 @@
     }
 }
 
+ad_proc -private dotlrn_homework::apm_callbacks::after_instantiate {
+    -package_id:required
+} {
+
+    Post package instantiation procedure to insert a package_id,
+    folder_id pair in fs_root_folders.   The homework package wants its own root folder
+    because we don't want it to be visible to any mounted instance of file storage.
+
+    This proc is automatically called by the APM whenever an instance of dotlrn_homework
+    is mounted.
+
+} {
+    return [fs::new_root_folder -package_id $package_id]
+}
+
 ad_proc -private dotlrn_homework::apm_callbacks::package_uninstall {} {
 
     Delete dotLRN stuff defined in package_install above
Index: openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-procs.tcl,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-procs.tcl	7 Aug 2017 23:48:10 -0000	1.7
+++ openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-procs.tcl	8 Jan 2020 18:24:01 -0000	1.7.2.1
@@ -6,7 +6,7 @@
 
 }
 
-ad_proc dotlrn_homework_post_instantiation {
+ad_proc -deprecated dotlrn_homework_post_instantiation {
     package_id
 } {
 
@@ -17,6 +17,12 @@
     This proc is automatically called by the APM whenever an instance of dotlrn_homework
     is mounted.
 
+    DEPRECATED: this is probably the only leftover in current upstream
+    code of "old-style" after_instantiate callbacks. The previous
+    machinery was based on a naming convention, which would not be
+    compatible with OpenACS standard for proc naming.
+
+    @see dotlrn_homework::apm_callbacks::after_instantiate
 } {
     return [fs::new_root_folder -package_id $package_id]
 }