Index: openacs-4/packages/edit-this-page/edit-this-page.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/edit-this-page.info,v
diff -u -r1.4.4.5 -r1.4.4.6
--- openacs-4/packages/edit-this-page/edit-this-page.info	15 Apr 2003 11:55:57 -0000	1.4.4.5
+++ openacs-4/packages/edit-this-page/edit-this-page.info	2 May 2003 16:05:17 -0000	1.4.4.6
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="1.3" url="http://openacs.org/repository/download/apm/edit-this-page-1.3.apm">
+    <version name="1.4" url="http://openacs.org/repository/download/apm/edit-this-page-1.4.apm">
     <database-support>
         <database>postgresql</database>
     </database-support>
@@ -17,7 +17,9 @@
         <summary>An easy-to-use content management system.</summary>
         <description format="text/html">Easy to use publishing system</description>
 
+        <provides url="edit-this-page" version="1.4"/>
         <requires url="acs-kernel" version="4.6.2"/>
+        <requires url="acs-subsite" version="4.6.3"/>
         <requires url="acs-templating" version="4.1.2"/>
         
         <files>
Index: openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql,v
diff -u -r1.5.4.1 -r1.5.4.2
--- openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql	26 Jan 2003 03:09:36 -0000	1.5.4.1
+++ openacs-4/packages/edit-this-page/sql/oracle/edit-this-page-create.sql	2 May 2003 16:05:37 -0000	1.5.4.2
@@ -424,42 +424,7 @@
 /
 show errors
 
--- add the ETP parameters to the acs-subsite package so that
--- we can serve the site's home page and top level pages.
 
--- DRB: this was trying to set the parameter values to their default value but they
--- already (quite logically) are set by apm.register_parameter ...
-
-declare
-  v_parameter_id apm_parameters.parameter_id%TYPE;
-
-begin
-  v_parameter_id := apm.register_parameter(
-       package_key         => 'acs-subsite',
-       parameter_name      => 'application',
-       description         => 'Name of the ETP application to use (default, faq, wiki, or create your own with the etp::define_applicaton procedure)',
-       datatype            => 'string',
-       default_value       => 'default',
-       section_name        => 'EditThisPage',
-       min_n_values        => 1,
-       max_n_values        => 1
-  );
-
-  v_parameter_id := apm.register_parameter(
-       package_key         => 'acs-subsite',
-       parameter_name      => 'subtopic_application',
-       description         => 'Name of the ETP application to use when creating a subtopic',
-       datatype            => 'string',
-       default_value       => 'default',
-       section_name        => 'EditThisPage',
-       min_n_values        => 1,
-       max_n_values        => 1
-  );
-
-end;
-/
-show errors;
-
 -- create a folder with magic folder_id of -400 where we
 -- will put all deleted content items so they'll be recoverable.
 
Index: openacs-4/packages/edit-this-page/sql/postgresql/edit-this-page-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/sql/postgresql/edit-this-page-create.sql,v
diff -u -r1.7.4.6 -r1.7.4.7
--- openacs-4/packages/edit-this-page/sql/postgresql/edit-this-page-create.sql	15 Apr 2003 11:51:04 -0000	1.7.4.6
+++ openacs-4/packages/edit-this-page/sql/postgresql/edit-this-page-create.sql	2 May 2003 16:06:07 -0000	1.7.4.7
@@ -378,50 +378,6 @@
 
 
 
--- add the ETP parameters to the acs-subsite package so that
--- we can serve the site's home page and top level pages.
-
--- DRB: This page was setting the parameter default values explicitly.   apm__register_parameter
--- is supposed to do this - there was a mistake in the Oracle->PostgreSQL port of this function.
--- I fixed the bug and removed the code that was here ...
-
-create function inline_0 () 
-returns integer as '
-declare
-  ss_package_id integer;
-  cur_val record;
-begin
-  perform apm__register_parameter(
-       NULL,
-       ''acs-subsite'',
-       ''application'',
-       ''Name of the ETP application to use (default, faq, wiki, or create your own with the etp::define_applicaton procedure)'',
-       ''string'',
-       ''default'',
-       ''EditThisPage'',
-       1,
-       1
-      );
-  perform apm__register_parameter(
-       NULL,
-       ''acs-subsite'',
-       ''subtopic_application'',
-       ''Name of the ETP application to use when creating a subtopic'',
-       ''string'',
-       ''default'',
-       ''EditThisPage'',
-       1,
-       1
-      );
-
-  return 0;
-end;
-' language 'plpgsql';
-
-select inline_0 ();
-drop function inline_0 ();
-
-
 -- create a folder with magic folder_id of -400 where we
 -- will put all deleted content items so they'll be recoverable.