Index: openacs-4/packages/news/news.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/news.info,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/news/news.info	26 Mar 2005 13:49:54 -0000	1.18
+++ openacs-4/packages/news/news.info	4 Aug 2005 02:09:17 -0000	1.19
@@ -13,6 +13,7 @@
         <release-date>2003-11-10</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/plain">News publication tool.  Publication of plain text or html news items with support for scheduled publication and commentability.</description>
+        <maturity>0</maturity>
 
         <provides url="news" version="5.2.0d3"/>
         <requires url="acs-content-repository" version="5.2.0d15"/>
@@ -21,22 +22,22 @@
         <requires url="general-comments" version="4.6.1"/>
         <requires url="rss-support" version="0.3d5"/>
 
-
         <callbacks>
-            <callback type="after-install"  proc="news::install::after_install"/>
-            <callback type="before-uninstall"  proc="news::sc::unregister_news_fts_impl"/>
             <callback type="after-mount"  proc="news::install::after_mount"/>
+            <callback type="before-uninstall"  proc="news::sc::unregister_news_fts_impl"/>
+            <callback type="after-install"  proc="news::install::after_install"/>
             <callback type="after-upgrade"  proc="news::install::after_upgrade"/>
+            <callback type="before-uninstantiate"  proc="news::install::before_uninstantiate"/>
         </callbacks>
         <parameters>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ActiveDays"  default="14" description="Default days between release date and archive date."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ApprovalPolicy"  default="wait" description="Approval policy of submitted news items. It must be either of [open|wait|closed]. Submission by the administrator are ApprovalPolicy = 'open'.This approval policy applies only, if we let 'registered users' upload news items."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="DisplayMax"  default="10" description="Number of news item headlines displayed per page at most."/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ImageFormat"  default="jpg" description="Image format to use when converting images, e.g. png, gif, jpg"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ImageGeometry"  default="120x150" description="Geometry specification for scaling images in news, e.g. 120x150 scales images to have a maximum width of 120 px and a maximum height of 150 px."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="MaxFileSizekB"  default="1024" description="maximum filesize in kB"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowSearchInterfaceP"  default="1" description="Interfacing to site-wide-search with a Search-box. (SWS is required)."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SolicitCommentsP"  default="1" description="Whether we allow comments on news items."/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ImageFormat"  default="jpg" description="Image format to use when converting images, e.g. png, gif, jpg"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ImageGeometry"  default="120x150" description="Geometry specification for scaling images in news, e.g. 120x150 scales images to have a maximum width of 120 px and a maximum height of 150 px."/>
         </parameters>
 
     </version>
Index: openacs-4/packages/news/tcl/news-apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/news-apm-callback-procs.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/news/tcl/news-apm-callback-procs.tcl	24 Feb 2005 13:33:23 -0000	1.2
+++ openacs-4/packages/news/tcl/news-apm-callback-procs.tcl	4 Aug 2005 02:10:00 -0000	1.3
@@ -75,3 +75,22 @@
 	    }
 	}
 }
+
+ad_proc -private news::install::before_uninstantiate {
+    -package_id
+} {
+    Delete RSS feed per package instance
+    Delete News items per package instance
+
+    @author Stan Kaufman (skaufman@epimetrics.com)
+    @creation-date 2005-08-03
+    
+    @param package_id
+
+    @return 
+    
+    @error 
+} {
+    news_items_delete [db_list dead_news ""]
+    rss_support::del_subscription -summary_context_id $package_id -owner news -impl_name news
+}
Index: openacs-4/packages/news/tcl/news-apm-callback-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/news-apm-callback-procs.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/news/tcl/news-apm-callback-procs.xql	4 Aug 2005 02:10:32 -0000	1.1
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!DOCTYPE queryset PUBLIC "-//OpenACS//DTD XQL 1.0//EN" "http://www.thecodemill.biz/repository/xql.dtd">
+<!-- packages/news/tcl/news-apm-callback-procs.xql -->
+<!-- @author Stan Kaufman (skaufman@epimetrics.com) -->
+<!-- @creation-date 2005-08-03 -->
+<!-- @arch-tag: 5AB8567C-0484-11DA-9C6A-000A95C482A6 -->
+<!-- @cvs-id $Id: news-apm-callback-procs.xql,v 1.1 2005/08/04 02:10:32 skaufman Exp $ -->
+
+<queryset>
+
+  <fullquery name="news::install::before_uninstantiate.dead_news">
+    <querytext>
+      select i.item_id
+      from cr_items i, acs_objects o
+      where o.package_id = :package_id
+      and i.item_id = o.object_id
+      </querytext>
+  </fullquery>
+
+</queryset>