Index: openacs-4/packages/acs-admin/www/apm/apm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/apm.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-admin/www/apm/apm.adp	28 Sep 2013 12:09:59 -0000	1.1.2.1
@@ -0,0 +1,5 @@
+<master>
+<property name="doc(title)">@title@</property>
+<property name="context">@context;noquote@</property>
+
+@body;noquote@
Index: openacs-4/packages/acs-admin/www/apm/bulk-intall.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/bulk-intall.tcl,v
diff -u -N
--- openacs-4/packages/acs-admin/www/apm/bulk-intall.tcl	26 Feb 2005 17:52:20 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,95 +0,0 @@
-ad_page_contract {
-
-    Installs/enables packages, according to the information prompted for
-    in <code>packages-select</code>.
-
-} {
-    { install:multiple "" }
-    { enable:multiple "" }
-    { return_text "
-<form action=/>
-<input type=hidden name=done_p value=1>
-<center>
-<input type=submit value=\"Finish ->\">
-</center>
-
-[install_footer]
-"}
-
-}
-
-ns_write "[install_header 200 "Installing Packages"]
-
-<ul>
-"
-
-foreach version_id $install {
-    db_1row version_select {
-	select pretty_name, version_name, package_key
-	from apm_package_version_info i
-	where version_id = :version_id
-    }
-    ns_write "<p><li>Installing $pretty_name $version_name...\n"
-
-    set ul_p 0
-
-    foreach file [apm_get_package_files -package_key $package_key -file_type data_model_create] {
-	if { [string match *-drop.sql [file tail $file]] } {
-	    continue
-	}
-	if { !$ul_p } {
-	    ns_write "<ul>\n"
-	    set ul_p 1
-	}
-	ns_write "<li>Loading data model file $file...
-<blockquote><pre>
-"
-	cd "[acs_package_root_dir $package_key]"
-        db_source_sql_file -ns_write "[acs_root_dir]/packages/$package_key/$file"
-
-        ns_write "</pre></blockquote>\n"
-    }
-
-    foreach file [apm_get_package_files -package_key $package_key -file_type java_code] {
-	if { !$ul_p } {
-	    ns_write "<ul>\n"
-	    set ul_p 1
-	}
-	ns_write "<li>Loading java code file $file...
-<blockquote><pre>
-"
-        ns_write [db_source_sqlj_file  "[acs_root_dir]/packages/$package_key/$file"]
-
-        ns_write "</pre></blockquote>\n"
-    }
-
-    if { [lsearch $enable $version_id] >= 0 } {
-	if { !$ul_p } {
-	    ns_write "<ul>\n"
-	    set ul_p 1
-	}
-	ns_write "<li>Enabling package.\n"
-	apm_enable_version $version_id
-    }
-
-    if { $ul_p } {
-	ns_write "</ul>\n"
-    }
-}
-
-#### TEMPORARY ######
-# Because dependencies don't work yet, source the acs-core-ui file here.
-ns_write "<li>Loading data model for ACS-Core-UI...
-<blockquote><pre>
-"
-cd "[acs_package_root_dir acs-core-ui]"
-db_source_sql_file -ns_write "[acs_root_dir]/packages/acs-core-ui/sql/acs-core-ui-create.sql"
-ns_write "</pre></blockquote>\n"
-
-# Redirect to index.tcl?done_p=1. We do this so the user can just hit <i>Reload</i>
-# on their browser to get to the real site, once they restart the server.
-
-ns_write "</ul>
-
-Done installing packages.
-"
\ No newline at end of file
Index: openacs-4/packages/acs-admin/www/apm/bulk-intall.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/bulk-intall.xql,v
diff -u -N
--- openacs-4/packages/acs-admin/www/apm/bulk-intall.xql	27 Apr 2001 01:41:12 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<queryset>
-
-<fullquery name="version_select">      
-      <querytext>
-      
-	select pretty_name, version_name, package_key
-	from apm_package_version_info i
-	where version_id = :version_id
-    
-      </querytext>
-</fullquery>
-
- 
-</queryset>
Index: openacs-4/packages/acs-admin/www/apm/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/index.adp,v
diff -u -N -r1.1.22.2 -r1.1.22.3
--- openacs-4/packages/acs-admin/www/apm/index.adp	11 Sep 2013 18:40:05 -0000	1.1.22.2
+++ openacs-4/packages/acs-admin/www/apm/index.adp	28 Sep 2013 12:09:59 -0000	1.1.22.3
@@ -20,7 +20,7 @@
 
 <ul>
 <li><a href="package-add">Create a new package.</a>
-<li><a href="write-all-specs">Write new specification files for all installed, locally generated packages</a>
+<li><a href="write-all-specs">Write new specification files for all installed, locally generated packages.</a>
 <li><a href="package-load">Load a new package from a URL or local directory.</a>
 <li><a href="packages-install">Install packages.</a>
 </ul>
Index: openacs-4/packages/acs-admin/www/apm/package-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-add-2.tcl,v
diff -u -N -r1.10 -r1.10.4.1
--- openacs-4/packages/acs-admin/www/apm/package-add-2.tcl	17 Oct 2010 21:06:07 -0000	1.10
+++ openacs-4/packages/acs-admin/www/apm/package-add-2.tcl	28 Sep 2013 12:09:59 -0000	1.10.4.1
@@ -145,5 +145,4 @@
     ad_script_abort
 }
 
-db_release_unused_handles
 ad_returnredirect "version-view?version_id=$version_id"
Index: openacs-4/packages/acs-admin/www/apm/package-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/package-add.adp,v
diff -u -N
--- openacs-4/packages/acs-admin/www/apm/package-add.adp	27 Sep 2013 17:37:46 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-<master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context;noquote@</property>
-
-@body;noquote@
Index: openacs-4/packages/acs-admin/www/apm/package-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-add.tcl,v
diff -u -N -r1.12.4.5 -r1.12.4.6
--- openacs-4/packages/acs-admin/www/apm/package-add.tcl	27 Sep 2013 17:37:46 -0000	1.12.4.5
+++ openacs-4/packages/acs-admin/www/apm/package-add.tcl	28 Sep 2013 12:09:59 -0000	1.12.4.6
@@ -21,9 +21,8 @@
 		 $title]
 
 set body "<form action='package-add-2' method='post'>\n"
-append body \
-    [export_vars -form {package_id version_id}] \
-    [subst {
+append body [subst {
+[export_vars -form {package_id version_id}] 
 <script type="text/javascript">
 function updateURLs() {
     // Update the package and version URL, if the package key and/or version name change.
@@ -255,10 +254,9 @@
 </tr>
 
 </table>
+}]
 
-"}]
+ad_return_template apm
 
 
 
-
-
Index: openacs-4/packages/acs-admin/www/apm/package-deinstall.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/package-deinstall.adp,v
diff -u -N
--- openacs-4/packages/acs-admin/www/apm/package-deinstall.adp	27 Sep 2013 18:47:52 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-<master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context;noquote@</property>
-
-@body;noquote@
Index: openacs-4/packages/acs-admin/www/apm/package-deinstall.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-deinstall.tcl,v
diff -u -N -r1.2.20.1 -r1.2.20.2
--- openacs-4/packages/acs-admin/www/apm/package-deinstall.tcl	27 Sep 2013 18:47:52 -0000	1.2.20.1
+++ openacs-4/packages/acs-admin/www/apm/package-deinstall.tcl	28 Sep 2013 12:09:59 -0000	1.2.20.2
@@ -17,19 +17,23 @@
 		 $title]
 
 db_transaction {
-    doc_body_append "<ul>"
-    apm_package_deinstall -callback apm_doc_body_callback $package_key
-    doc_body_append "</ul>"
+    append body "<ul>\n"
+    set ::__apm_body ""
+    apm_package_deinstall -callback apm_body_callback $package_key
+    append body $::__apm_body
+    append body "</ul>\n"
 } on_error {
     if {![apm_version_installed_p $version_id] } {
 	ad_return_complaint 1 "Database Error: The database returned the following error
 	message <pre><blockquote>[ad_quotehtml $errmsg]</blockquote></pre>"
     }
 }
 
-append body "<p>Return to the <a href='index'>index</a>"
+append body {
+    <p>Return to the <a href='index'>index</a>
+}
 
+ad_return_template apm
 
 
 
-
Index: openacs-4/packages/acs-admin/www/apm/package-delete-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/package-delete-2.adp,v
diff -u -N
--- openacs-4/packages/acs-admin/www/apm/package-delete-2.adp	27 Sep 2013 18:47:52 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-<master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context;noquote@</property>
-
-@body;noquote@
Index: openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl,v
diff -u -N -r1.7.12.1 -r1.7.12.2
--- openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl	27 Sep 2013 18:47:52 -0000	1.7.12.1
+++ openacs-4/packages/acs-admin/www/apm/package-delete-2.tcl	28 Sep 2013 12:09:59 -0000	1.7.12.2
@@ -24,14 +24,17 @@
     set title "Delete"
     set context [list [list "/acs-admin/apm/" "Package Manager"] $title]
     set body ""
+    set ::__apm_body ""
     if { [catch {apm_package_delete \
 		     -sql_drop_scripts $sql_drop_scripts \
 		     -remove_files=0 \
-		     -callback apm_doc_body_callback $package_key} errmsg] } {
+		     -callback apm_body_callback $package_key} errmsg] } {
 	append body [subst {
 	    We encountered the following error when deleting package "$package_key":
 	    <pre><blockquote>[ad_quotehtml $errmsg]</blockquote></pre>
 	}]
+	append body $::__apm_body
+	
     } else {
 	append body {
 	    </ul>
@@ -42,5 +45,7 @@
     }
 }
 
+ad_return_template apm
 
 
+
Index: openacs-4/packages/acs-admin/www/apm/package-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/package-delete.adp,v
diff -u -N
--- openacs-4/packages/acs-admin/www/apm/package-delete.adp	27 Sep 2013 18:47:52 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-<master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context;noquote@</property>
-
-@body;noquote@
Index: openacs-4/packages/acs-admin/www/apm/package-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-delete.tcl,v
diff -u -N -r1.9.8.5 -r1.9.8.6
--- openacs-4/packages/acs-admin/www/apm/package-delete.tcl	27 Sep 2013 18:47:52 -0000	1.9.8.5
+++ openacs-4/packages/acs-admin/www/apm/package-delete.tcl	28 Sep 2013 12:09:59 -0000	1.9.8.6
@@ -111,5 +111,6 @@
     </form>
 }]
 
+ad_return_template apm
 
 
Index: openacs-4/packages/acs-admin/www/apm/packages-install-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/packages-install-2.adp,v
diff -u -N
--- openacs-4/packages/acs-admin/www/apm/packages-install-2.adp	27 Sep 2013 18:47:52 -0000	1.1.4.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-<master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context;noquote@</property>
-
-@body;noquote@
Index: openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl,v
diff -u -N -r1.12.4.5 -r1.12.4.6
--- openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	27 Sep 2013 18:47:52 -0000	1.12.4.5
+++ openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	28 Sep 2013 12:10:00 -0000	1.12.4.6
@@ -134,3 +134,5 @@
 	    }]
     }
 }
+
+ad_return_template apm
Index: openacs-4/packages/acs-admin/www/apm/packages-install-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/packages-install-3.adp,v
diff -u -N
--- openacs-4/packages/acs-admin/www/apm/packages-install-3.adp	27 Sep 2013 18:47:52 -0000	1.1.4.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-<master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context;noquote@</property>
-
-@body;noquote@
Index: openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl,v
diff -u -N -r1.14.8.2 -r1.14.8.3
--- openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl	27 Sep 2013 18:47:52 -0000	1.14.8.2
+++ openacs-4/packages/acs-admin/www/apm/packages-install-3.tcl	28 Sep 2013 12:10:00 -0000	1.14.8.3
@@ -56,22 +56,28 @@
 	foreach file $data_model_files {
 	    set path [lindex $file 0]
 	    set file_type [lindex $file 1]
-	    append table_rows "  <tr>
-    <td><input type=checkbox checked name=\"sql_file\" value=\"$file_count\"></td>
-    <td>$path</td>
-    <td>[apm_pretty_name_for_file_type $file_type]</td>
-  </tr>"
+	    append table_rows [subst {
+		<tr>
+		<td><input type="checkbox" checked name="sql_file" value="$file_count"></td>
+		<td>$path</td>
+		<td>[apm_pretty_name_for_file_type $file_type]</td>
+		</tr>
+	    }]
 	    incr file_count
 	}
 
         if { $version(auto-mount) eq "" 
 	     && $version(package.type) eq "apm_application" 
 	   } {
-            set mount_html "<input type=\"checkbox\" name=\"mount_p\" value=\"$version(package.key)\" checked> Mount package under the main site at path <input type=\"text\" name=\"mount_path.$version(package.key)\" value=\"$version(package.key)\">"
+            set mount_html [subst {
+		<input type="checkbox" name="mount_p" value="$version(package.key)" checked> 
+		Mount package under the main site at path 
+		<input type="text" name="mount_path.$version(package.key)" value="$version(package.key)">
+	    }]
         } else {
             set mount_html ""
         }
-	append body "
+	append body [subst {
 	Select what data files to load for $version(package-name) $final_version_name
 	<blockquote>
 	<table cellpadding=3 cellspacing=3>
@@ -83,7 +89,8 @@
 	$table_rows
 	</table>
         $mount_html
-       </blockquote> <p>"
+        </blockquote> <p>
+	}]
     }
 }
 
@@ -98,3 +105,5 @@
     <input type=submit value="Install Packages">
     </form>
 }
+
+ad_return_template apm
Index: openacs-4/packages/acs-admin/www/apm/parameter-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-add.adp,v
diff -u -N
--- openacs-4/packages/acs-admin/www/apm/parameter-add.adp	11 Sep 2013 18:40:05 -0000	1.1.22.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-<master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
-
-@body;noquote@
Index: openacs-4/packages/acs-admin/www/apm/parameter-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-add.tcl,v
diff -u -N -r1.9.4.5 -r1.9.4.6
--- openacs-4/packages/acs-admin/www/apm/parameter-add.tcl	9 Sep 2013 16:44:16 -0000	1.9.4.5
+++ openacs-4/packages/acs-admin/www/apm/parameter-add.tcl	28 Sep 2013 12:10:00 -0000	1.9.4.6
@@ -11,14 +11,21 @@
 set user_id [ad_conn user_id]
 
 set parameter_id [db_nextval acs_object_id_seq]
-db_1row apm_get_name {}
-db_release_unused_handles
+db_1row apm_get_name {
+    select package_key, pretty_name, version_name
+    from apm_package_version_info
+    where version_id = :version_id
+}
 
-set page_title "Add Parameter"
-set context [list [list "." "Package Manager"] [list [export_vars -base version-view { version_id }] "$pretty_name $version_name"] [list [export_vars -base version-parameters { version_id }] "Parameters"] $page_title]
+set title "Add Parameter"
+set context [list \
+		 [list "." "Package Manager"] \
+		 [list [export_vars -base version-view { version_id }] "$pretty_name $version_name"] \
+		 [list [export_vars -base version-parameters { version_id }] "Parameters"] \
+		 $title]
 
-append body "
-<form action=\"parameter-add-2\" method=\"post\">
+append body [subst {
+<form action="parameter-add-2" method="post">
 <blockquote>
 <table>
 [export_vars -form {package_key parameter_id version_id}]
@@ -32,8 +39,8 @@
 </tr>
 
 <tr>
-  <th align=right nowrap>Parameter Name:</th>
-  <td><input name=parameter_name size=50></td>
+  <th align="right" nowrap>Parameter Name:</th>
+  <td><input name="parameter_name" size="50"></td>
 </tr>
 
 <tr>
@@ -42,33 +49,35 @@
 </tr>
 
 <tr valign=top>
-  <th align=right><br>Description:</th>
-  <td><textarea name=description cols=60 rows=8></textarea>
+  <th align="right"><br>Description:</th>
+  <td><textarea name="description" cols="60" rows="8"></textarea>
 </td>
 </tr>
 
 
 <tr>
   <td></td>
-  <td>You may enter a section name to identify the parameter.  For example, the ACS Kernel has a \"security\" section
-to indicate which parameters pertain to security.
+  <td>You may enter a section name to identify the parameter.  
+   For example, the ACS Kernel has a "security" section
+   to indicate which parameters pertain to security.
 </tr>
 
-<tr valign=top>
-  <th align=right><br>Section Name:</th>
-<td><input name=section_name size=50 value=\"[ad_quotehtml $section_name]\"><br>
+<tr valign="top">
+  <th align="right"><br>Section Name:</th>
+<td><input name="section_name" size="50" value="[ad_quotehtml $section_name]"><br>
 </td>
 </tr>
 
 <tr>
   <td></td>
-  <td>Please indicate if the parameter is of \"global\" (has one system-wide value) or \"instance\" (a vlue for each package instance) scope.<br>
+  <td>Please indicate if the parameter is of "global" (has one system-wide value) 
+      or "instance" (a value for each package instance) scope.<br>
   </td>
 </tr>
 
 <tr>
-  <th align=right nowrap>Scope:</th>
-  <td><select name=scope>
+  <th align="right" nowrap>Scope:</th>
+  <td><select name="scope">
 [ad_generic_optionlist {instance global} {instance global}]
       </select>
   </td>
@@ -80,8 +89,8 @@
 </tr>
 
 <tr>
-  <th align=right nowrap>Type:</th>
-  <td><select name=datatype>
+  <th align="right" nowrap>Type:</th>
+  <td><select name="datatype">
 [ad_generic_optionlist {number string textarea} {number string text}]
       </select>
   </td>
@@ -96,15 +105,15 @@
 
 <tr>
   <th align=right nowrap>Default:</th>
-  <td><input name=default_value size=50></td>
+  <td><input name="default_value" size="50"></td>
 </tr>
 
-<tr><th colspan=2><input type=submit value=\"Add Parameter\"></th>
+<tr><th colspan="2"><input type="submit" value="Add Parameter"></th>
 </tr>
 </table>
 </blockquote>
 </form>
-"
+}]
 
+ad_return_template apm
 
-
Index: openacs-4/packages/acs-admin/www/apm/parameter-add.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-add.xql,v
diff -u -N
--- openacs-4/packages/acs-admin/www/apm/parameter-add.xql	4 Oct 2010 21:59:20 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<queryset>
-
-<fullquery name="apm_get_name">      
-      <querytext>
-       
-    select package_key, pretty_name, version_name
-      from apm_package_version_info
-     where version_id = :version_id
-
-      </querytext>
-</fullquery>
-
- 
-</queryset>
Index: openacs-4/packages/acs-admin/www/apm/parameter-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-delete.tcl,v
diff -u -N -r1.6 -r1.6.10.1
--- openacs-4/packages/acs-admin/www/apm/parameter-delete.tcl	10 Jan 2007 21:21:59 -0000	1.6
+++ openacs-4/packages/acs-admin/www/apm/parameter-delete.tcl	28 Sep 2013 12:10:00 -0000	1.6.10.1
@@ -12,8 +12,8 @@
 
 db_1row apm_package_by_version_id {
     select pretty_name, version_name, package_key
-      from apm_package_version_info 
-     where version_id = :version_id
+    from apm_package_version_info 
+    where version_id = :version_id
 }
 
 # LARS hack
@@ -50,6 +50,8 @@
 } -cancel_url $return_url
 
 set page_title "Confirm Deletion"
-set context [list [list "." "Package Manager"] [list [export_vars -base version-view { version_id }] "$pretty_name $version_name"] [list [export_vars -base version-parameters { version_id section_name }] "Parameters"] $page_title]
+set context [list [list "." "Package Manager"] \
+		 [list [export_vars -base version-view { version_id }] "$pretty_name $version_name"] \
+		 [list [export_vars -base version-parameters { version_id section_name }] "Parameters"] \
+		 $page_title]
 
-ad_return_template
Index: openacs-4/packages/acs-admin/www/apm/parameter-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-edit.adp,v
diff -u -N
--- openacs-4/packages/acs-admin/www/apm/parameter-edit.adp	11 Sep 2013 18:40:06 -0000	1.1.22.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-<master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
-
-@body;noquote@
Index: openacs-4/packages/acs-admin/www/apm/parameter-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-edit.tcl,v
diff -u -N -r1.6.10.5 -r1.6.10.6
--- openacs-4/packages/acs-admin/www/apm/parameter-edit.tcl	24 Sep 2013 11:00:53 -0000	1.6.10.5
+++ openacs-4/packages/acs-admin/www/apm/parameter-edit.tcl	28 Sep 2013 12:10:00 -0000	1.6.10.6
@@ -8,9 +8,6 @@
     version_id:notnull,naturalnum
 }
 
-
-set user_id [ad_conn user_id]
-
 db_1row param_info { 
     select parameter_name, datatype, description, default_value, min_n_values, max_n_values, parameter_id, 
     section_name, default_value
@@ -24,14 +21,12 @@
      where version_id = :version_id
 }
 
-db_release_unused_handles
-
-set page_title "Edit Parameter"
+set title "Edit Parameter"
 set context [list \
 		 [list "." "Package Manager"] \
 		 [list [export_vars -base version-view { version_id }] "$pretty_name $version_name"] \
 		 [list [export_vars -base version-parameters { version_id }] "Parameters"] \
-		 $page_title]
+		 $title]
 
 append body [subst {
 <form action="parameter-edit-2" method="post">
@@ -108,5 +103,4 @@
 </form>
 }]
 
-
-
+ad_return_template apm
Index: openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl,v
diff -u -N -r1.7.4.1 -r1.7.4.2
--- openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl	9 Sep 2013 16:44:17 -0000	1.7.4.1
+++ openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl	28 Sep 2013 12:10:00 -0000	1.7.4.2
@@ -7,12 +7,15 @@
     {version_id:integer}
 }
 
-db_1row  apm_package_info_by_version_id {}
+db_1row apm_package_info_by_version_id {}
 
-doc_body_append "[apm_header [list "version-view?version_id=$version_id" "$pretty_name $version_name"] "Dependencies"]
+set title "Dependencies"
+set context [list \
+		 [list "/acs-admin/apm/" "Package Manager"] \
+		 [list "version-view?version_id=$version_id" "$pretty_name $version_name"] \
+		 $title]
+set body ""
 
-"
-
 foreach dependency_type { provide require extend embed } {
 
     set dependency_type_prep "${dependency_type}s"
@@ -21,13 +24,14 @@
     } else {
         set dependency_type_prep_2 ${dependency_type}ed
     }
-    doc_body_append "<h3>Services [string totitle $dependency_type_prep_2]</h3><ul>\n"
+    append body "<h3>Services [string totitle $dependency_type_prep_2]</h3><ul>\n"
 
     db_foreach apm_all_dependencies {} {
-	doc_body_append "<li>[string totitle $dependency_type_prep] service $service_uri, version $service_version"
-
+	append body "<li>[string totitle $dependency_type_prep] service $service_uri, version $service_version "
+	
         if { $dependency_type ne "provide" } {
-            doc_body_append "(<a href=\"version-dependency-remove?[export_vars -url {package_key dependency_id version_id dependency_type}]\">remove</a>)\n"
+	    set qvars [export_vars -url {package_key dependency_id version_id dependency_type}]
+            append body "(<a href=\"version-dependency-remove?$qvars\">remove</a>)\n"
         }
 	
 	# If this package provides a service, show a list of all packages that require it,
@@ -42,31 +46,35 @@
 	db_foreach apm_specific_version_dependencies {} {
             incr counter
 	    if { $counter == 1 } {
-		doc_body_append "<ul>\n"
+		append body "<ul>\n"
 	    }
             switch $dep_type {
                 provides { set dep_d provided }
                 requires { set dep_d required }
                 extends { set dep_d extended }
                 embeds { set dep_d embeds }
             } 
-	    doc_body_append "<li>[string totitle $dep_d] by <a href=\"version-view?version_id=$dep_version_id\">$dep_pretty_name, version $dep_version_name</a>\n"
+	    append body [subst {
+		<li>[string totitle $dep_d] by <a href="version-view?version_id=$dep_version_id">$dep_pretty_name, 
+		version $dep_version_name</a>
+	    }]
 	}
 	if { $counter != 0 } {
-	    doc_body_append "</ul>\n"
-	}	
+	    append body "</ul>\n"
+	}
     } else {
-	doc_body_append "<li>This package does not $dependency_type any services.\n"
+	append body "<li>This package does not $dependency_type any services.\n"
     }
     if { $installed_p eq "t" && $dependency_type ne "provide"} {
-	doc_body_append "<li><a href=\"version-dependency-add?[export_vars -url {version_id dependency_type}]\">Add a service $dependency_type_prep_2 by this package</a>\n"
+	append body [subst {
+	    <li><a href="version-dependency-add?[export_vars -url {version_id dependency_type}]">Add a 
+	    service $dependency_type_prep_2 by this package</a>
+	}]
     }
-    doc_body_append "</ul>\n"
+    append body "</ul>\n"
 }
 
-db_release_unused_handles
-doc_body_append "
-</ul>
-[ad_footer]
-"
+append body "</ul>\n"
 
+ad_return_template apm
+
Index: openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl,v
diff -u -N -r1.4 -r1.4.6.1
--- openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl	5 Jan 2010 01:34:54 -0000	1.4
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-add.tcl	28 Sep 2013 12:10:00 -0000	1.4.6.1
@@ -12,26 +12,32 @@
 
 set dependency_id [db_nextval acs_object_id_seq] 
 
-doc_body_append "[apm_header -form "action=version-dependency-add-2" [list "version-view?version_id=$version_id" "$pretty_name $version_name"] [list "version-dependencies?version_id=$version_id" "Dependencies"] "Add a Dependency"]
+set title "Add a Dependency"
+set context [list \
+		 [list "/acs-admin/apm/" "Package Manager"] \
+		 [list "version-view?version_id=$version_id" "$pretty_name $version_name"] \
+		 [list "version-dependencies?version_id=$version_id" "Dependencies"] \
+		 $title]
 
-[export_vars -form {version_id dependency_type dependency_id {our_package_key $package_key}}]
+set body [subst {
+    <form action='version-dependency-add-2' method='post'>
+    [export_vars -form {version_id dependency_type dependency_id {our_package_key $package_key}}]
 
-$pretty_name ${dependency_type}s the following service:
-<p>
-<select name=service size=8>
-"
+    $pretty_name ${dependency_type}s the following service:
+    <p>
+    <select name="service" size="20">
+}]
 
 db_foreach apm_packages {} {
-    doc_body_append "<option value=\"$package_key;$version_name\">$package_key, version $version_name\n"
+    append body [subst {
+	<option value="$package_key;$version_name">$package_key, version $version_name
+    }]
 }
 
+append body [subst {
+    </select>
+    <br>
+    <input type="submit" value="Add Dependency">
+}]
 
-db_release_unused_handles
-
-doc_body_append "</select>
-<br>
-<input type=submit value=\"Add Dependency\">
-
-[ad_footer]
-"
-
+ad_return_template apm
Index: openacs-4/packages/acs-admin/www/apm/version-dependency-add.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-add.xql,v
diff -u -N -r1.1 -r1.1.28.1
--- openacs-4/packages/acs-admin/www/apm/version-dependency-add.xql	27 Apr 2001 01:41:12 -0000	1.1
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-add.xql	28 Sep 2013 12:10:00 -0000	1.1.28.1
@@ -4,8 +4,7 @@
 <fullquery name="apm_package_info_by_version_id_and_package">      
       <querytext>
       
-    select p.package_key, p.package_uri, 
-    p.pretty_name, v.version_name
+    select p.package_key, p.package_uri, p.pretty_name, v.version_name
     from   apm_package_types p, apm_package_versions v
     where  v.version_id = :version_id
     and    v.package_key = p.package_key
Index: openacs-4/packages/acs-admin/www/apm/version-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/version-edit.adp,v
diff -u -N
--- openacs-4/packages/acs-admin/www/apm/version-edit.adp	24 Sep 2013 11:00:53 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-<master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context;noquote@</property>
-
-@body;noquote@
Index: openacs-4/packages/acs-admin/www/apm/version-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-edit.tcl,v
diff -u -N -r1.10.8.5 -r1.10.8.6
--- openacs-4/packages/acs-admin/www/apm/version-edit.tcl	24 Sep 2013 11:00:53 -0000	1.10.8.5
+++ openacs-4/packages/acs-admin/www/apm/version-edit.tcl	28 Sep 2013 12:10:00 -0000	1.10.8.6
@@ -10,13 +10,21 @@
     {version_id:integer}
 }
 
-db_1row apm_all_version_info {}
+db_1row apm_all_version_info {
+    select version_id, package_key, package_uri, pretty_name, version_name,
+      version_uri, auto_mount, summary, description_format, description, release_date,
+      vendor, vendor_uri, enabled_p, installed_p, tagged_p, imported_p,
+      data_model_loaded_p, activation_date, tarball_length, 
+      deactivation_date, distribution_uri, distribution_date, singleton_p,
+      initial_install_p, implements_subsite_p, inherit_templates_p
+    from apm_package_version_info where version_id = :version_id
+}
 
 set title "Edit a Version"
 set context [list \
 		 [list "/acs-admin/apm/" "Package Manager"] \
-		 [list "version-view?version_id=$version_id" "View Package"] \
-		 "$pretty_name $version_name"]
+		 [list "version-view?version_id=$version_id" "$pretty_name $version_name"] \
+		 $title]
 
 set body "<form action='version-edit-2' method='post'>"
 
@@ -219,3 +227,5 @@
 </table>
 </form>
 }]
+
+ad_return_template apm
\ No newline at end of file
Index: openacs-4/packages/acs-admin/www/apm/version-edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-edit.xql,v
diff -u -N
--- openacs-4/packages/acs-admin/www/apm/version-edit.xql	13 Apr 2009 23:10:27 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<queryset>
-
-<fullquery name="apm_all_version_info">      
-      <querytext>
-      
-    select version_id, package_key, package_uri, pretty_name, version_name,
-      version_uri, auto_mount, summary, description_format, description, release_date,
-      vendor, vendor_uri, enabled_p, installed_p, tagged_p, imported_p,
-      data_model_loaded_p, activation_date, tarball_length, 
-      deactivation_date, distribution_uri, distribution_date, singleton_p,
-      initial_install_p, implements_subsite_p, inherit_templates_p
-    from apm_package_version_info where version_id = :version_id
-
-      </querytext>
-</fullquery>
-
- 
-<fullquery name="apm_all_owners">      
-      <querytext>
-      
-    select owner_name, owner_uri from apm_package_owners where version_id = :version_id
-
-      </querytext>
-</fullquery>
-
- 
-</queryset>
Index: openacs-4/packages/acs-admin/www/apm/version-files.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-files.adp,v
diff -u -N
--- openacs-4/packages/acs-admin/www/apm/version-files.adp	11 Sep 2013 18:40:06 -0000	1.1.22.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-<master>
-  <property name="doc(title)">@page_title;noquote@</property>
-  <property name="context">@context;noquote@</property>
-
-@body;noquote@
Index: openacs-4/packages/acs-admin/www/apm/version-files.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-files.tcl,v
diff -u -N -r1.16.8.1 -r1.16.8.2
--- openacs-4/packages/acs-admin/www/apm/version-files.tcl	28 Sep 2013 08:36:17 -0000	1.16.8.1
+++ openacs-4/packages/acs-admin/www/apm/version-files.tcl	28 Sep 2013 12:10:01 -0000	1.16.8.2
@@ -12,12 +12,12 @@
 
 set return_url "[ad_conn url]?[ad_conn query]"
 
-set page_title "Files"
+set title "Files"
 set context [list \
 		 [list "../developer" "Developer's Administration"] \
 		 [list "/acs-admin/apm/" "Package Manager"] \
 		 [list [export_vars -base version-view { version_id }] "$pretty_name $version_name"] \
-		 $page_title]
+		 $title]
 set body {
     <blockquote>
     <table cellspacing="0" cellpadding="0">
@@ -142,3 +142,4 @@
 }
 
 
+ad_return_template apm
Index: openacs-4/packages/acs-admin/www/apm/version-parameters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-parameters.tcl,v
diff -u -N -r1.8.4.3 -r1.8.4.4
--- openacs-4/packages/acs-admin/www/apm/version-parameters.tcl	9 Sep 2013 16:44:17 -0000	1.8.4.3
+++ openacs-4/packages/acs-admin/www/apm/version-parameters.tcl	28 Sep 2013 12:10:01 -0000	1.8.4.4
@@ -14,8 +14,8 @@
 
 db_1row apm_package_by_version_id {
     select pretty_name, version_name, package_key
-      from apm_package_version_info 
-     where version_id = :version_id
+    from apm_package_version_info 
+    where version_id = :version_id
 }
 
 
Index: openacs-4/packages/acs-admin/www/apm/version-parameters.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-parameters.xql,v
diff -u -N -r1.2 -r1.2.4.1
--- openacs-4/packages/acs-admin/www/apm/version-parameters.xql	17 Oct 2010 21:06:07 -0000	1.2
+++ openacs-4/packages/acs-admin/www/apm/version-parameters.xql	28 Sep 2013 12:10:01 -0000	1.2.4.1
@@ -1,16 +1,6 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="apm_package_by_version_id">      
-      <querytext>
-      
-    select pretty_name, version_name, package_key
-      from apm_package_version_info 
-     where version_id = :version_id
-
-      </querytext>
-</fullquery>
-
 <fullquery name="parameter_table">
   <querytext>
 
Index: openacs-4/packages/acs-admin/www/apm/version-reload.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-reload.adp,v
diff -u -N
--- openacs-4/packages/acs-admin/www/apm/version-reload.adp	11 Sep 2013 18:40:06 -0000	1.1.22.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-<master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
-
-@body;noquote@
Index: openacs-4/packages/acs-admin/www/apm/version-reload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-reload.tcl,v
diff -u -N -r1.9 -r1.9.20.1
--- openacs-4/packages/acs-admin/www/apm/version-reload.tcl	30 Jan 2004 09:54:20 -0000	1.9
+++ openacs-4/packages/acs-admin/www/apm/version-reload.tcl	28 Sep 2013 12:10:01 -0000	1.9.20.1
@@ -12,8 +12,12 @@
 
 apm_version_info $version_id
 
-set page_title "Reload $pretty_name"
-set context [list [list "../developer" "Developer's Administration"] [list "/acs-admin/apm/" "Package Manager"] [list [export_vars -base version-view { version_id }] "$pretty_name $version_name"] $page_title]
+set title "Reload $pretty_name"
+set context [list \
+		 [list "../developer" "Developer's Administration"] \
+		 [list "/acs-admin/apm/" "Package Manager"] \
+		 [list [export_vars -base version-view { version_id }] "$pretty_name $version_name"] \
+		 $title]
 
 # files in $files.
 apm_mark_version_for_reload $version_id files
@@ -35,7 +39,9 @@
             # Remove the two first elements of the path, namely packages/package-key/
             set local_path [eval [concat file join [lrange [file split $file] 2 end]]]
 
-	    append body " (<a href=\"file-watch?[export_vars { version_id { paths $local_path } }]\">watch this file</a>)"
+	    append body [subst {
+		(<a href="file-watch?[export_vars { version_id { paths $local_path } }]">watch this file</a>)
+	    }]
             lappend files_to_watch $local_path
 	}
 	append body "\n"
@@ -45,16 +51,21 @@
 
 
 if { [info exists files_to_watch_p] } {
-    append body "If you know you're going to be modifying one of the above files frequently,
-    select the \"watch this file\" link next to a filename to cause the interpreters to
+    append body [subst {
+	If you know you're going to be modifying one of the above files frequently,
+    select the "watch this file" link next to a filename to cause the interpreters to
     reload the file immediately whenever it is changed.<p>
-    <ul class=\"action-links\">
-    <li><a href=\"file-watch?[export_vars { version_id { paths:multiple $files_to_watch } }]\">Watch all above files</a></li>"
+    <ul class="action-links">
+    <li><a href="file-watch?[export_vars { version_id { paths:multiple $files_to_watch } }]">Watch 
+	all above files</a></li>
+    }]
 } else {
     append body "<ul class=\"action-links\">"
 }
 
-append body "
-<li><a href=\"$return_url\">Return</a></li>
-</ul>"
+append body [subst {
+    <li><a href="$return_url">Return</a></li>
+    </ul>
+}]
 
+ad_return_template apm
Index: openacs-4/packages/acs-admin/www/apm/version-upgrade.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-upgrade.tcl,v
diff -u -N -r1.1.1.1 -r1.1.1.1.28.1
--- openacs-4/packages/acs-admin/www/apm/version-upgrade.tcl	13 Mar 2001 22:59:26 -0000	1.1.1.1
+++ openacs-4/packages/acs-admin/www/apm/version-upgrade.tcl	28 Sep 2013 12:10:01 -0000	1.1.1.1.28.1
@@ -11,15 +11,21 @@
 }
 apm_version_info $version_id
 
+set title "Upgrading to $pretty_name $version_name"
+set context [list \
+		 [list "/acs-admin/apm/" "Package Manager"] \
+		 [list "version-view?version_id=$version_id" "$pretty_name $version_name"] \
+		 $title]
+
 # Disable all previous versions of this packae.
 apm_version_upgrade $version_id
 
 # Instruct user to run SQL upgrade scripts.
+set body [subst {
+    <p>
+    $pretty_name $version_name has been enabled.  Please run any necessary
+    SQL upgrade scripts to finish updating the data model and restart
+    the server.
+}]
 
-doc_body_append "[apm_header "Upgrading to $pretty_name $version_name"]
-<p>
-$pretty_name $version_name has been enabled.  Please run any necessary
-SQL upgrade scripts to finish updating the data model and restart
-the server.
-[ad_footer]
-"
+ad_return_template apm
Index: openacs-4/packages/acs-admin/www/apm/version-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-view.adp,v
diff -u -N
--- openacs-4/packages/acs-admin/www/apm/version-view.adp	11 Sep 2013 18:40:06 -0000	1.1.22.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-<master>
-<property name="doc(title)">@page_title;noquote@</property>
-<property name="context">@context;noquote@</property>
-
-@body;noquote@
Index: openacs-4/packages/acs-admin/www/apm/version-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-view.tcl,v
diff -u -N -r1.20.8.1 -r1.20.8.2
--- openacs-4/packages/acs-admin/www/apm/version-view.tcl	27 Aug 2013 11:44:43 -0000	1.20.8.1
+++ openacs-4/packages/acs-admin/www/apm/version-view.tcl	28 Sep 2013 12:10:01 -0000	1.20.8.2
@@ -7,7 +7,19 @@
     {version_id:integer}
 }
 
-db_1row apm_all_version_info {}
+db_1row apm_all_version_info {
+    select version_id, package_key, package_uri, pretty_name, version_name, version_uri,
+    summary, description_format, description, singleton_p, initial_install_p,
+    implements_subsite_p, inherit_templates_p,
+    to_char(release_date, 'Month DD, YYYY') as release_date , vendor, vendor_uri, auto_mount,
+    enabled_p, installed_p, tagged_p, imported_p, data_model_loaded_p, 
+    to_char(activation_date, 'Month DD, YYYY') as activation_date,
+    tarball_length, distribution_uri,
+    to_char(deactivation_date, 'Month DD, YYYY') as deactivation_date,
+    to_char(distribution_date, 'Month DD, YYYY') as distribution_date
+ from apm_package_version_info 
+ where version_id = :version_id
+}
 
 set downloaded_p [ad_decode $version_uri "" 0 1]
 
@@ -51,11 +63,16 @@
 
 if { ![info exists installed_version_id] } {
     if { !$downloaded_p } {
-	set status "No version of this package is installed: there is no <tt>.info</tt> file in the
-<tt>packages/$package_key</tt> directory. If you're building the package now, you probably
-want to <a href=\"version-generate-info?version_id=$version_id&write_p=1\">generate one</a>."
+	set status [subst {
+	    No version of this package is installed: there is no <tt>.info</tt> file in the
+	    <tt>packages/$package_key</tt> directory. If you're building the package now, you probably
+	    want to <a href="version-generate-info?version_id=$version_id&write_p=1">generate one</a>.
+	}]
     } else {
-	set status "No version of this package is installed. You may <a href=\"version-install\?version_id=$version_id\">install this package now</a>."
+	set status [subst {
+	    No version of this package is installed. You may 
+	    <a href="version-install?version_id=$version_id">install this package now</a>.
+	}]
     }
     lappend prompts $status
 } elseif { $installed_version_id == $version_id } {
@@ -68,18 +85,21 @@
 	set can_enable_p 1
     }
 } else {
-    set status "[ad_decode $version_name_greater -1 "An older" "A newer"] version of this package,
-version $installed_version_name, is installed and [ad_decode $installed_enabled_p "t" "enabled" "disabled"]."
+    set status [subst {
+	[ad_decode $version_name_greater -1 "An older" "A newer"] version of this package,
+	version $installed_version_name, is installed and [ad_decode $installed_enabled_p "t" "enabled" "disabled"].
+    }]
     if { $version_name_greater < 0 } {
-	append body " You may <a href=\"version-upgrade?version_id=$version_id\">upgrade to this version now</a>."
+	append body [subst {
+	    You may <a href="version-upgrade?version_id=$version_id">upgrade to this version now</a>.
+	}]
     }
 }
 
 if { ![info exists data_model_installed_version] } {
     set data_model_status " No version of the data model for this package has been loaded."
 } elseif {$data_model_installed_version ne $version_name  } {
-    set data_model_status " The data model for version $data_model_installed_version of this package has been
-loaded."
+    set data_model_status " The data model for version $data_model_installed_version of this package has been loaded."
 } else {
     set data_model_status " The data model for this version of this package has been loaded."
 }
@@ -113,29 +133,29 @@
     set prompt_text "<ul><li>[join $prompts "\n<li>"]</ul>"
 }
 
-db_release_unused_handles
+set title "$pretty_name $version_name"
+set context [list \
+		 [list "../developer" "Developer's Administration"] \
+		 [list "/acs-admin/apm/" "Package Manager"] \
+		 $title]
 
-set page_title "$pretty_name $version_name"
-set context [list [list "../developer" "Developer's Administration"] [list "/acs-admin/apm/" "Package Manager"] $page_title]
-
-
-append body "
+append body [subst {
 $prompt_text
 
 <h3>Package Information</h3>
 
 <blockquote>
 <table>
-<tr valign=baseline><th align=left>Package Name:</th><td>$pretty_name</td></th></tr>
-<tr valign=baseline><th align=left>Version:</th><td>$version_name</td></tr>
-<tr valign=baseline><th align=left>OpenACS Core:</th><td>[ad_decode $initial_install_p "t" "Yes" "No"]</td></tr>
-<tr valign=baseline><th align=left>Singleton:</th><td>[ad_decode $singleton_p "t" "Yes" "No"]</td></tr>
-<tr valign=baseline><th align=left>Implements Subsite:</th><td>[ad_decode $implements_subsite_p t Yes No]</td></tr>
-<tr valign=baseline><th align=left>Inherit Templates:</th><td>[ad_decode $inherit_templates_p t Yes No]</td></tr>
-<tr valign=baseline><th align=left>Auto-mount:</th><td>$auto_mount</td></tr>
-<tr valign=baseline><th align=left>Status:</th><td>$status</td></tr>
-<tr valign=baseline><th align=left>Data Model:</th><td>$data_model_status</td></th></tr>
-"
+<tr valign="baseline"><th align="left">Package Name:</th><td>$pretty_name</td></th></tr>
+<tr valign="baseline"><th align="left">Version:</th><td>$version_name</td></tr>
+<tr valign="baseline"><th align="left">OpenACS Core:</th><td>[ad_decode $initial_install_p "t" "Yes" "No"]</td></tr>
+<tr valign="baseline"><th align="left">Singleton:</th><td>[ad_decode $singleton_p "t" "Yes" "No"]</td></tr>
+<tr valign="baseline"><th align="left">Implements Subsite:</th><td>[ad_decode $implements_subsite_p t Yes No]</td></tr>
+<tr valign="baseline"><th align="left">Inherit Templates:</th><td>[ad_decode $inherit_templates_p t Yes No]</td></tr>
+<tr valign="baseline"><th align="left">Auto-mount:</th><td>$auto_mount</td></tr>
+<tr valign="baseline"><th align="left">Status:</th><td>$status</td></tr>
+<tr valign="baseline"><th align="left">Data Model:</th><td>$data_model_status</td></th></tr>
+}]
 
 set supported_databases_list [apm_package_supported_databases $package_key]
 if { $supported_databases_list eq "" } {
@@ -144,37 +164,39 @@
     set supported_databases [join $supported_databases_list ", "]
 }
 
-append body "
-<tr valign=baseline><th align=left>Database Support:</th><td>$supported_databases</td></th></tr>
-"
+append body [subst {
+<tr valign="baseline"><th align="left">Database Support:</th><td>$supported_databases</td></th></tr>
+<tr valign="baseline"><th align="left">CVS:</th><td>$cvs_status</td></tr>
+<tr valign="baseline"><th align="left">[ad_decode [llength $owners] 1 "Owner" "Owners"]:</th><td>[join $owners "<br>"]</td></th></tr>
+<tr valign="baseline"><th align="left">Package Key:</th><td>$package_key</td></th></tr>
+<tr valign="baseline"><th align="left">Summary:</th><td>$summary</td></tr>
+<tr valign="baseline"><th align="left">Description:</th><td>$description</td></tr>
+<tr valign="baseline"><th align="left">Release Date:</th><td>$release_date</td></tr>
+}]
 
-append body "
-<tr valign=baseline><th align=left>CVS:</th><td>$cvs_status</td></tr>
-<tr valign=baseline><th align=left>[ad_decode [llength $owners] 1 "Owner" "Owners"]:</th><td>[join $owners "<br>"]</td></th></tr>
-<tr valign=baseline><th align=left>Package Key:</th><td>$package_key</td></th></tr>
-<tr valign=baseline><th align=left>Summary:</th><td>$summary</td></tr>
-<tr valign=baseline><th align=left>Description:</th><td>$description</td></tr>
-<tr valign=baseline><th align=left>Release Date:</th><td>$release_date</td></tr>"
-
 # Dynamic package version attributes
 array set all_attributes [apm::package_version::attributes::get_spec]
 array set attributes [apm::package_version::attributes::get \
                           -version_id $version_id \
                           -array attributes]
 foreach attribute_name [array names attributes] {
     array set attribute $all_attributes($attribute_name)
-
-    append body "<tr valign=baseline><th align=left>$attribute(pretty_name)</th><td>$attributes($attribute_name)</td></tr>"
+    append body [subst {
+	<tr valign="baseline"><th align="left">$attribute(pretty_name)</th><td>$attributes($attribute_name)</td></tr>
+    }]
 }
 
-append body "
-<tr valign=baseline><th align=left>Vendor:</th><td>[ad_decode $vendor_uri "" $vendor "<a href=\"$vendor_uri\">$vendor</a>"]</td></tr>
-<tr valign=baseline><th align=left>Package URL:</th><td><a href=\"$package_uri\">$package_uri</a></td></th></tr>
-<tr valign=baseline><th align=left>Version URL:</th><td><a href=\"$version_uri\">$version_uri</a></td></th></tr>
-<tr valign=baseline><th align=left>Distribution File:</th><td>"
+append body [subst {
+<tr valign="baseline"><th align="left">Vendor:</th><td>[ad_decode $vendor_uri "" $vendor "<a href=\"$vendor_uri\">$vendor</a>"]</td></tr>
+<tr valign="baseline"><th align="left">Package URL:</th><td><a href="$package_uri">$package_uri</a></td></th></tr>
+<tr valign="baseline"><th align="left">Version URL:</th><td><a href="$version_uri">$version_uri</a></td></th></tr>
+<tr valign="baseline"><th align="left">Distribution File:</th><td>
+}]
 
 if { $tarball_length ne "" && $tarball_length > 0 } {
-    append body "<a href=\"packages/[file tail $version_uri]?version_id=$version_id\">[format "%.1f" [expr { $tarball_length / 1024.0 }]]KB</a> "
+    append body [subst {
+	<a href="packages/[file tail $version_uri]?version_id=$version_id">[format "%.1f" [expr { $tarball_length / 1024.0 }]]KB</a> 
+    }]
     if { $distribution_uri eq "" } {
 	append body "(generated on this system"
 	if { $distribution_date ne "" } {
@@ -191,73 +213,86 @@
 } else {
     append body "None available"
     if { $installed_p eq "t" } {
-	append body " (<a href=\"version-generate-tarball?version_id=$version_id\">generate one now</a> from the filesystem)"
+	append body [subst {
+	    (<a href="version-generate-tarball?version_id=$version_id">generate one now</a> from the filesystem)
+	}]
     }
 }
 
-append body "
+append body [subst {
 </td></tr>
-
 </table>
-"
-
-append body "
 </blockquote>
 
 <ul>
-<li><a href=\"version-edit?[export_vars { version_id }]\">Edit above information</a> (Also use this to create a new version)
+<li><a href="version-edit?[export_vars { version_id }]">Edit above information</a> (Also use this to create a new version)
 </ul>
 <h4>Manage</h4>
 <ul>
-<li><a href=\"version-files?[export_vars { version_id }]\">Files</a>
-<li><a href=\"version-dependencies?[export_vars { version_id }]\">Dependencies and Provides</a>
-<li><a href=\"version-parameters?[export_vars { version_id }]\">Parameters</a>
-<li><a href=\"version-callbacks?[export_vars { version_id }]\">Tcl Callbacks (install, instantiate, mount)</a>
-<li><a href=\"version-i18n-index?[export_vars { version_id }]\">Internationalization</a>
+<li><a href="version-files?[export_vars { version_id }]">Files</a>
+<li><a href="version-dependencies?[export_vars { version_id }]">Dependencies and Provides</a>
+<li><a href="version-parameters?[export_vars { version_id }]">Parameters</a>
+<li><a href="version-callbacks?[export_vars { version_id }]">Tcl Callbacks (install, instantiate, mount)</a>
+<li><a href="version-i18n-index?[export_vars { version_id }]">Internationalization</a>
 </ul>
 <h4>Reload</h4>
 <ul>
-<li><a href=\"[export_vars -base version-reload { version_id {return_url [ad_return_url]}}]\">Reload this package</a>
-<li><a href=\"[export_vars -base package-watch { package_key {return_url [ad_return_url]}}]\">Watch all files in package</a>
+<li><a href="[export_vars -base version-reload { version_id {return_url [ad_return_url]}}]">Reload this package</a>
+<li><a href="[export_vars -base package-watch { package_key {return_url [ad_return_url]}}]">Watch all files in package</a>
 </ul>
 <h4>XML .info package specification file</h4>
 <ul>
-<li><a href=\"version-generate-info?[export_vars { version_id }]\">Display an XML package specification file for this version</a>
-"
+<li><a href="version-generate-info?[export_vars { version_id }]">Display an XML package specification file for this version</a>
+}]
 
-if { ![info exists installed_version_id] || $installed_version_id == $version_id && \
-	$distribution_uri eq "" } {
+if { ![info exists installed_version_id] || $installed_version_id == $version_id && 
+     $distribution_uri eq "" } {
     # As long as there isn't a different installed version, and this package is being
     # generated locally, allow the user to write a specification file for this version
     # of the package.
-    append body "<li><a href=\"version-generate-info?[export_vars { version_id }]&write_p=1\">Write an XML package specification to the <tt>packages/$package_key/$package_key.info</tt> file</a>\n"
+    append body [subst {
+	<li><a href="version-generate-info?[export_vars { version_id }]&write_p=1">Write 
+	an XML package specification to the <tt>packages/$package_key/$package_key.info</tt> file</a>
+    }]
 }
 
 if { $installed_p eq "t" } {
     if { $distribution_uri eq "" } {
 	# The distribution tarball was either (a) never generated, or (b) generated on this
 	# system. Allow the user to make a tarball based on files in the filesystem.
-	append body "<p><li><a href=\"version-generate-tarball?[export_vars { version_id }]\">Generate a distribution file for this package from the filesystem</a>\n"
+	append body [subst {
+	    <p><li><a href="version-generate-tarball?[export_vars { version_id }]">Generate 
+	    a distribution file for this package from the filesystem</a>
+	}]
     }
 
     append body "</ul><h4>Disable/Uninstall</h4><ul>"
 
     if { [info exists can_disable_p] } {
-	append body "<p><li><a href=\"version-disable?[export_vars { version_id }]\">Disable this version of the package</a>\n"
+	append body [subst {
+	    <p><li><a href="version-disable?[export_vars { version_id }]">Disable 
+	    this version of the package</a>
+	}]
     }
     if { [info exists can_enable_p] } {
-	append body "<p><li><a href=\"version-enable?[export_vars { version_id }]\">Enable this version of the package</a>\n"
+	append body [subst {
+	    <p><li><a href="version-enable?[export_vars { version_id }]">Enable 
+	    this version of the package</a>
+	}]
     }
     
     append body "<p>"
     
     if { $installed_p eq "t" } {	
-	append body "
-	<li><a href=\"package-delete?[export_vars { version_id }]\">Uninstall this package from your system.</a> (be very careful!)\n"
-	
+	append body [subst {
+	    <li><a href="package-delete?[export_vars { version_id }]">Uninstall 
+	    this package from your system</a> (be very careful!)
+	}]
     }
 }
 
-append body "
-</ul>
-"
+append body {
+    </ul>
+}
+
+ad_return_template apm
Index: openacs-4/packages/acs-admin/www/apm/version-view.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-view.xql,v
diff -u -N
--- openacs-4/packages/acs-admin/www/apm/version-view.xql	13 Apr 2009 23:10:27 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<queryset>
-
-<fullquery name="apm_all_version_info">      
-      <querytext>
-      
-    select version_id, package_key, package_uri, pretty_name, version_name, version_uri,
-    summary, description_format, description, singleton_p, initial_install_p,
-    implements_subsite_p, inherit_templates_p,
-    to_char(release_date, 'Month DD, YYYY') as release_date , vendor, vendor_uri, auto_mount,
-    enabled_p, installed_p, tagged_p, imported_p, data_model_loaded_p, 
-    to_char(activation_date, 'Month DD, YYYY') as activation_date,
-    tarball_length, distribution_uri,
-    to_char(deactivation_date, 'Month DD, YYYY') as deactivation_date,
-    to_char(distribution_date, 'Month DD, YYYY') as distribution_date
- from apm_package_version_info 
- where version_id = :version_id
-
-      </querytext>
-</fullquery>
-
- 
-<fullquery name="supported_databases">      
-      <querytext>
-      
-    select pretty_db_name
-    from apm_package_db_types
-    where exists (select 1
-                  from apm_package_files
-                  where version_id = :version_id
-                  and   db_type = db_type_key)
-
-      </querytext>
-</fullquery>
-
- 
-<fullquery name="apm_all_owners">      
-      <querytext>
-      
-    select owner_uri, owner_name from apm_package_owners where version_id = :version_id
-
-      </querytext>
-</fullquery>
-
- 
-</queryset>
Index: openacs-4/packages/acs-admin/www/apm/write-all-specs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/write-all-specs.tcl,v
diff -u -N -r1.6 -r1.6.10.1
--- openacs-4/packages/acs-admin/www/apm/write-all-specs.tcl	10 Jan 2007 21:21:59 -0000	1.6
+++ openacs-4/packages/acs-admin/www/apm/write-all-specs.tcl	28 Sep 2013 12:10:01 -0000	1.6.10.1
@@ -35,7 +35,6 @@
     }
 }
 
-db_release_unused_handles
 ns_write "</ul>
 
 <a href=\"./\">Return to the Package Manager</a>
Index: openacs-4/packages/acs-admin/www/apm/packages/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages/index.vuh,v
diff -u -N -r1.2 -r1.2.28.1
--- openacs-4/packages/acs-admin/www/apm/packages/index.vuh	5 May 2001 17:39:19 -0000	1.2
+++ openacs-4/packages/acs-admin/www/apm/packages/index.vuh	28 Sep 2013 12:10:01 -0000	1.2.28.1
@@ -11,26 +11,25 @@
 }
 
 if { [db_string apm_archive_exist_p {
- select count(*) 
-   from cr_revisions 
-  where revision_id = (select content_item.get_latest_revision(item_id) 
+    select count(*) 
+    from cr_revisions 
+    where revision_id = (select content_item.get_latest_revision(item_id) 
                          from apm_package_versions
-                  	where version_id = :version_id)
+			 where version_id = :version_id)
 } -default 0] } {
 
     set file [ns_tmpnam]
 
-    db_blob_get_file apm_archive_serve "
- select content 
-   from cr_revisions 
-  where revision_id = (select content_item.get_latest_revision(item_id) 
-                         from apm_package_versions
-                  	where version_id = :version_id)
-    " -file $file
-    db_release_unused_handles
+    db_blob_get_file apm_archive_serve {
+	select content 
+	from cr_revisions 
+	where revision_id = (select content_item.get_latest_revision(item_id) 
+			     from apm_package_versions
+			     where version_id = :version_id)
+    } -file $file
     ns_returnfile 200 application/octet-stream $file
 } else {
-  ad_return_complaint "No Archive Available" "There is no APM archive for the version you requested."
+    ad_return_complaint "No Archive Available" "There is no APM archive for the version you requested."
 }
 
 
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.108.2.6 -r1.108.2.7
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	27 Sep 2013 16:16:08 -0000	1.108.2.6
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	28 Sep 2013 12:10:01 -0000	1.108.2.7
@@ -1065,9 +1065,8 @@
 
 
 ad_proc -private apm_package_deinstall {
-    {
-	-callback apm_dummy_callback
-    } package_key
+    {-callback apm_dummy_callback} 
+    package_key
 } {
 
     Deinstalls a package from the filesystem.
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 -N -r1.94.2.4 -r1.94.2.5
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	17 Sep 2013 11:18:09 -0000	1.94.2.4
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	28 Sep 2013 12:10:01 -0000	1.94.2.5
@@ -122,6 +122,13 @@
     ns_write $string
 }
 
+ad_proc -public apm_body_callback { string } {
+    This callback uses the document api to append more text to the stream.
+} {
+    append ::__apm_body $string
+}
+
+
 ad_proc -public apm_doc_body_callback { string } {
     This callback uses the document api to append more text to the stream.
 } {