Index: openacs-4/readme.txt
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/readme.txt,v
diff -u -r1.3.2.3 -r1.3.2.4
--- openacs-4/readme.txt 24 Feb 2003 21:53:43 -0000 1.3.2.3
+++ openacs-4/readme.txt 23 Mar 2003 01:59:21 -0000 1.3.2.4
@@ -1,6 +1,6 @@
This is the OpenACS - the Open Architecture Community System.
-Version 4.6b2
+Version 4.6.2
OpenACS is an advanced toolkit for building scalable,
community-oriented web applications.
Index: openacs-4/contrib/obsolete-packages/acs-content/acs-content.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-content/acs-content.info,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/contrib/obsolete-packages/acs-content/acs-content.info 9 Dec 2002 14:29:44 -0000 1.5.2.1
+++ openacs-4/contrib/obsolete-packages/acs-content/acs-content.info 23 Mar 2003 02:00:50 -0000 1.5.2.2
@@ -19,7 +19,7 @@
<description format="text/html">ACS content is a service for implementing side wide search.</description>
<provides url="acs-content" version="4.5"/>
- <requires url="acs-kernel" version="4.1"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<files>
<file type="package_spec" path="acs-content.info"/>
Index: openacs-4/contrib/obsolete-packages/acs-util/acs-util.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-util/acs-util.info,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/contrib/obsolete-packages/acs-util/acs-util.info 3 Aug 2002 17:54:06 -0000 1.5
+++ openacs-4/contrib/obsolete-packages/acs-util/acs-util.info 23 Mar 2003 02:06:59 -0000 1.5.2.1
@@ -18,7 +18,7 @@
<vendor url="http://www.openacs.org">OpenACS</vendor>
<provides url="acs-util" version="4.5"/>
- <requires url="acs-kernel" version="4.0"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<files>
<file type="package_spec" path="acs-util.info"/>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/acs-workflow.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/acs-workflow.info,v
diff -u -r1.14.2.1 -r1.14.2.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/acs-workflow.info 21 Jan 2003 17:28:01 -0000 1.14.2.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/acs-workflow.info 23 Mar 2003 02:07:15 -0000 1.14.2.2
@@ -20,7 +20,7 @@
<vendor url="http://www.openacs.org/">OpenACS</vendor>
<provides url="acs-workflow" version="4.5"/>
- <requires url="acs-kernel" version="4.1"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<requires url="acs-mail" version="4.1"/>
<files>
Index: openacs-4/contrib/obsolete-packages/bboard/bboard.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/bboard.info,v
diff -u -r1.4.4.1 -r1.4.4.2
--- openacs-4/contrib/obsolete-packages/bboard/bboard.info 9 Dec 2002 14:31:19 -0000 1.4.4.1
+++ openacs-4/contrib/obsolete-packages/bboard/bboard.info 23 Mar 2003 02:08:24 -0000 1.4.4.2
@@ -19,7 +19,7 @@
<vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
<description format="text/plain">This is the release candidate for bboard version 4.0.2. This package provides customizable discussion forums for a community of users.</description>
- <requires url="acs-kernel" version="4.0"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<requires url="acs-messaging" version="4.0.1"/>
<requires url="general-comments" version="4.0"/>
Index: openacs-4/packages/acs-admin/acs-admin.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/acs-admin.info,v
diff -u -r1.16.2.4 -r1.16.2.5
--- openacs-4/packages/acs-admin/acs-admin.info 5 Mar 2003 14:42:59 -0000 1.16.2.4
+++ openacs-4/packages/acs-admin/acs-admin.info 23 Mar 2003 01:59:49 -0000 1.16.2.5
@@ -19,6 +19,7 @@
<description format="text/html">A UI for administering the OpenACS system.</description>
<provides url="acs-admin" version="4.6.2"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<files>
<file type="package_spec" path="acs-admin.info"/>
Index: openacs-4/packages/acs-api-browser/acs-api-browser.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/acs-api-browser.info,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/acs-api-browser/acs-api-browser.info 23 Sep 2002 23:31:58 -0000 1.6
+++ openacs-4/packages/acs-api-browser/acs-api-browser.info 23 Mar 2003 02:00:08 -0000 1.6.2.1
@@ -17,7 +17,7 @@
<release-date>2002-05-15</release-date>
<vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
- <requires url="acs-kernel" version="4.0"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<files>
<file type="package_spec" path="acs-api-browser.info"/>
Index: openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info,v
diff -u -r1.7.2.2 -r1.7.2.3
--- openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info 5 Mar 2003 14:41:36 -0000 1.7.2.2
+++ openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info 23 Mar 2003 02:00:23 -0000 1.7.2.3
@@ -20,6 +20,7 @@
</description>
<provides url="acs-bootstrap-installer" version="4.6.2"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<files>
<file type="package_spec" path="acs-bootstrap-installer.info"/>
Index: openacs-4/packages/acs-bootstrap-installer/installer/install-data-model.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/Attic/install-data-model.tcl,v
diff -u -r1.5.4.2 -r1.5.4.3
--- openacs-4/packages/acs-bootstrap-installer/installer/install-data-model.tcl 20 Mar 2003 22:09:52 -0000 1.5.4.2
+++ openacs-4/packages/acs-bootstrap-installer/installer/install-data-model.tcl 23 Mar 2003 02:00:35 -0000 1.5.4.3
@@ -66,20 +66,8 @@
apm_version_enable -callback apm_ns_write_callback [apm_package_install -callback apm_ns_write_callback "[file join [acs_root_dir] packages acs-kernel acs-kernel.info]"]
-ns_write "<p>
+ns_write "<p>Loading package .info files.<p>"
-Loading package .info files - this will take a few minutes.
-
-<p>
-
-This might <b>really take a few minutes</b>, depending on your machine. Please be patient. Thanks.
-
-<p>
-
-...
-
-"
-
# Preload all the .info files so the next page is snappy.
apm_dependency_check -initial_install [apm_scan_packages -new [file join [acs_root_dir] packages]]
Index: openacs-4/packages/acs-content-repository/acs-content-repository.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/acs-content-repository.info,v
diff -u -r1.17.2.6 -r1.17.2.7
--- openacs-4/packages/acs-content-repository/acs-content-repository.info 20 Mar 2003 22:10:07 -0000 1.17.2.6
+++ openacs-4/packages/acs-content-repository/acs-content-repository.info 23 Mar 2003 02:01:12 -0000 1.17.2.7
@@ -15,7 +15,7 @@
<vendor url="http://openacs.org/">OpenACS</vendor>
<provides url="acs-content-repository" version="4.6.5"/>
- <requires url="acs-kernel" version="4.0"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<requires url="acs-service-contract" version="4.2"/>
<requires url="search" version="4.2"/>
Index: openacs-4/packages/acs-content-repository/tcl/item-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/Attic/item-procs.tcl,v
diff -u -r1.5.2.3 -r1.5.2.4
--- openacs-4/packages/acs-content-repository/tcl/item-procs.tcl 22 Mar 2003 08:20:38 -0000 1.5.2.3
+++ openacs-4/packages/acs-content-repository/tcl/item-procs.tcl 23 Mar 2003 02:01:41 -0000 1.5.2.4
@@ -282,4 +282,3 @@
db_exec_plsql copy_item {}
}
-
Index: openacs-4/packages/acs-core-docs/acs-core-docs.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/acs-core-docs.info,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/acs-core-docs/acs-core-docs.info 9 Dec 2002 14:29:53 -0000 1.5.2.1
+++ openacs-4/packages/acs-core-docs/acs-core-docs.info 23 Mar 2003 02:01:59 -0000 1.5.2.2
@@ -19,7 +19,7 @@
<vendor url="http://www.openacs.org/">OpenACS</vendor>
<provides url="acs-core-docs" version="4.5"/>
- <requires url="acs-kernel" version="4.1"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<requires url="acs-tcl" version="4.1"/>
<files>
Index: openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml 20 Dec 2002 04:39:50 -0000 1.4.2.1
+++ openacs-4/packages/acs-core-docs/www/xml/for-everyone/release-notes.xml 23 Mar 2003 02:02:12 -0000 1.4.2.2
@@ -15,14 +15,31 @@
Please report bugs using our
<ulink url="http://openacs.org/bugtracker/openacs/">
Bug Tracker</ulink> at the <ulink
- url="http://openacs.org/">OpenACS website</ulink>. The latest
- information on installing this release under Oracle 8.1.7
- or PostgreSQL 7.2.* can be found there as well. Currently the
- toolkit will not install under Oracle 9i due to Oracle having made
- "delete" an illegal name for PL/SQL procedures and functions.
+ url="http://openacs.org/">OpenACS website</ulink>. This version
+ of the OpenACS Toolkit supports PostgreSQL 7.2.3 and 7.3.2, and
+ Oracle 8i. It will not work with Oracle 9i (support is planned for
+ OpenACS 4.7.)
</para>
<para>
+ <emphasis role="bold">Upgrading from OpenACS 4.6.1</emphasis>
+ </para>
+ <para>
+ OpenACS 4.6.2 includes key datamodel changes to acs-kernel and other
+ packages. Your first step after downloading OpenACS 4.6.2 and restarting
+ AOLserver should be to visit the Package Manager, click on the "install
+ packages" link, and select the checkbox to upgrade acs-kernel. After
+ acs-kernel has been upgraded, return to the "install packages" page and
+ select the checkboxes for all other packages you have installed that
+ need upgrading (they are marked "upgrade" rather than "new install") and
+ perform the upgrade step.
+ </para>
+ <para>
+ After packages have been upgraded, your installation should run without
+ problems.
+ </para>
+
+ <para>
You may want to begin by reading our installation documentation for
<xref linkend="unix-install"/>. Note that the Windows documentation is
not current for OpenACS &version;, but an alternative is to use John
Index: openacs-4/packages/acs-datetime/acs-datetime.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/acs-datetime.info,v
diff -u -r1.7.2.2 -r1.7.2.3
--- openacs-4/packages/acs-datetime/acs-datetime.info 9 Dec 2002 14:30:04 -0000 1.7.2.2
+++ openacs-4/packages/acs-datetime/acs-datetime.info 23 Mar 2003 02:02:25 -0000 1.7.2.3
@@ -20,7 +20,7 @@
<provides url="acs-datetime" version="4.0"/>
<requires url="acs-events" version="0.1d"/>
- <requires url="acs-kernel" version="4.0"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<requires url="acs-templating" version="4.0.1"/>
<files>
Index: openacs-4/packages/acs-developer-support/acs-developer-support.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/acs-developer-support.info,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/acs-developer-support/acs-developer-support.info 23 Sep 2002 23:32:00 -0000 1.6
+++ openacs-4/packages/acs-developer-support/acs-developer-support.info 23 Mar 2003 02:02:40 -0000 1.6.2.1
@@ -18,7 +18,7 @@
<release-date>2001-01-24</release-date>
<vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
- <requires url="acs-kernel" version="4.0"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<files>
<file type="package_spec" path="acs-developer-support.info"/>
Index: openacs-4/packages/acs-interface/acs-interface.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-interface/acs-interface.info,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/acs-interface/acs-interface.info 9 Dec 2002 14:30:18 -0000 1.5.2.1
+++ openacs-4/packages/acs-interface/acs-interface.info 23 Mar 2003 02:03:06 -0000 1.5.2.2
@@ -17,7 +17,7 @@
<description format="text/html">Define interfaces for object types. Used by Site Wide Search.</description>
<provides url="acs-interface" version="4.0.1"/>
- <requires url="acs-kernel" version="4.0"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<files>
<file type="package_spec" path="acs-interface.info"/>
Index: openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql,v
diff -u -r1.29.2.4 -r1.29.2.5
--- openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 5 Mar 2003 14:38:24 -0000 1.29.2.4
+++ openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 23 Mar 2003 02:03:20 -0000 1.29.2.5
@@ -293,7 +293,7 @@
content_length integer,
distribution_uri varchar(1500),
distribution_date timestamptz,
- auto_mount varchar(50),
+ auto_mount varchar(50) default null,
constraint apm_package_vers_id_name_un unique(package_key, version_name)
);
Index: openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-4.6.1-4.6.2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-4.6.1-4.6.2.sql,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-4.6.1-4.6.2.sql 13 Mar 2003 15:59:52 -0000 1.1.2.3
+++ openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-4.6.1-4.6.2.sql 23 Mar 2003 02:03:34 -0000 1.1.2.4
@@ -27,12 +27,20 @@
-- Add column for auto-mount
alter table apm_package_versions add auto_mount varchar(50);
+-- DRB: Set it null for all existing versions (probably not necessary but doesn't hurt)
+update apm_package_versions set auto_mount = NULL;
+
comment on column apm_package_versions.auto_mount is '
A dir under the main site site node where an instance of the package will be mounted
automatically upon installation. Useful for site-wide services that need mounting
such as general-comments and notifications.
';
+-- DRB: Need to drop this view first in PG 7.3 since "cascade" isn't implemented in
+-- PG 7.2 and PG 7.3 doesn't let you drop a view if another depends on it.
+
+drop view apm_enabled_package_versions;
+
-- Recreate views for auto-mount
drop view apm_package_version_info;
create view apm_package_version_info as
@@ -46,10 +54,27 @@
from apm_package_types t, apm_package_versions v
where v.package_key = t.package_key;
-drop view apm_enabled_package_versions;
create view apm_enabled_package_versions as
select * from apm_package_version_info
where enabled_p = 't';
+
+create or replace function apm_package__highest_version (varchar) returns integer as '
+declare
+ highest_version__package_key alias for $1;
+ v_version_id apm_package_versions.version_id%TYPE;
+begin
+ select version_id into v_version_id
+ from apm_package_version_info i
+ where apm_package_version__sortable_version_name(version_name) =
+ (select max(apm_package_version__sortable_version_name(v.version_name))
+ from apm_package_version_info v where v.package_key = highest_version__package_key)
+ and package_key = highest_version__package_key;
+ if NOT FOUND then
+ return 0;
+ else
+ return v_version_id;
+ end if;
+end;' language 'plpgsql';
-- Recreate functions for auto-mount
create function apm_package_version__new (integer,varchar,varchar,varchar,varchar,varchar,varchar,timestamptz,varchar,varchar,varchar,boolean,boolean) returns integer as '
Index: openacs-4/packages/acs-lang/acs-lang.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/acs-lang.info,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/acs-lang/acs-lang.info 9 Dec 2002 14:30:30 -0000 1.6.2.1
+++ openacs-4/packages/acs-lang/acs-lang.info 23 Mar 2003 02:03:48 -0000 1.6.2.2
@@ -25,7 +25,7 @@
and must be run manually from a shell. See the README file
in that directory for details.</description>
- <requires url="acs-kernel" version="4.1"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<provides url="acs-lang" version="4.1b"/>
<files>
Index: openacs-4/packages/acs-ldap-authentication/acs-ldap-authentication.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-ldap-authentication/acs-ldap-authentication.info,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-ldap-authentication/acs-ldap-authentication.info 23 Sep 2002 23:32:04 -0000 1.3
+++ openacs-4/packages/acs-ldap-authentication/acs-ldap-authentication.info 23 Mar 2003 02:04:01 -0000 1.3.2.1
@@ -15,7 +15,7 @@
<release-date>2001-02-06</release-date>
<vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
- <requires url="acs-kernel" version="4.0"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<files>
<file type="package_spec" path="acs-ldap-authentication.info"/>
Index: openacs-4/packages/acs-mail/acs-mail.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/acs-mail.info,v
diff -u -r1.8.2.3 -r1.8.2.4
--- openacs-4/packages/acs-mail/acs-mail.info 3 Feb 2003 16:07:43 -0000 1.8.2.3
+++ openacs-4/packages/acs-mail/acs-mail.info 23 Mar 2003 02:04:18 -0000 1.8.2.4
@@ -21,7 +21,7 @@
<provides url="acs-mail" version="4.6.2"/>
<requires url="acs-content-repository" version="4.1"/>
- <requires url="acs-kernel" version="4.1"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<files>
<file type="package_spec" path="acs-mail.info"/>
Index: openacs-4/packages/acs-messaging/acs-messaging.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-messaging/acs-messaging.info,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/acs-messaging/acs-messaging.info 2 Feb 2003 21:30:26 -0000 1.6.2.1
+++ openacs-4/packages/acs-messaging/acs-messaging.info 23 Mar 2003 02:04:43 -0000 1.6.2.2
@@ -22,7 +22,7 @@
<provides url="acs-messaging" version="4.5"/>
<requires url="acs-content-repository" version="4.0.1"/>
- <requires url="acs-kernel" version="4.0"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<files>
<file type="package_spec" path="acs-messaging.info"/>
Index: openacs-4/packages/acs-person/acs-person.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-person/Attic/acs-person.info,v
diff -u -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/acs-person/acs-person.info 9 Dec 2002 14:30:41 -0000 1.2.2.2
+++ openacs-4/packages/acs-person/acs-person.info 23 Mar 2003 02:04:57 -0000 1.2.2.3
@@ -16,7 +16,7 @@
<vendor url="http://www.mayuli.com">Mayuli Enterprises LLC</vendor>
<description format="text/html">ACS Person follows the HR-XML PersonName DTD/Schema. It is used to add extended information to OpenACS.</description>
- <requires url="acs-kernel" version="4.5.1"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<files>
<file type="package_spec" path="acs-person.info"/>
Index: openacs-4/packages/acs-reference/acs-reference.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/acs-reference.info,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/acs-reference/acs-reference.info 23 Sep 2002 23:32:05 -0000 1.4
+++ openacs-4/packages/acs-reference/acs-reference.info 23 Mar 2003 02:05:09 -0000 1.4.2.1
@@ -27,7 +27,7 @@
</description>
<provides url="acs-reference" version="0.2d"/>
- <requires url="acs-kernel" version="4.1"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<files>
<file type="package_spec" path="acs-reference.info"/>
Index: openacs-4/packages/acs-service-contract/acs-service-contract.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/acs-service-contract.info,v
diff -u -r1.8.2.3 -r1.8.2.4
--- openacs-4/packages/acs-service-contract/acs-service-contract.info 5 Mar 2003 14:52:26 -0000 1.8.2.3
+++ openacs-4/packages/acs-service-contract/acs-service-contract.info 23 Mar 2003 02:05:22 -0000 1.8.2.4
@@ -19,7 +19,7 @@
<vendor url="http://www.openacs.org/">OpenACS</vendor>
<provides url="acs-service-contract" version="4.6.2"/>
- <requires url="acs-kernel" version="4.6"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<files>
<file type="package_spec" path="acs-service-contract.info"/>
Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -r1.35.2.9 -r1.35.2.10
--- openacs-4/packages/acs-subsite/acs-subsite.info 21 Mar 2003 09:54:48 -0000 1.35.2.9
+++ openacs-4/packages/acs-subsite/acs-subsite.info 23 Mar 2003 02:05:35 -0000 1.35.2.10
@@ -21,7 +21,7 @@
<provides url="acs-subsite" version="4.6.2"/>
<requires url="acs-content-repository" version="4.1"/>
- <requires url="acs-kernel" version="4.1"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<requires url="acs-tcl" version="4.1"/>
<files>
Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v
diff -u -r1.1.1.1.4.3 -r1.1.1.1.4.4
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 17 Mar 2003 02:26:21 -0000 1.1.1.1.4.3
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl 23 Mar 2003 02:05:57 -0000 1.1.1.1.4.4
@@ -35,7 +35,7 @@
} {
- if { [empty_string_p [application_group::group_id_from_package_id -package_id $package_id]] } {
+ if { [empty_string_p [application_group::group_id_from_package_id -no_complain -package_id $package_id]] } {
set subsite_name [db_string subsite_name_query {}]
Index: openacs-4/packages/acs-tcl/acs-tcl.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v
diff -u -r1.23.2.3 -r1.23.2.4
--- openacs-4/packages/acs-tcl/acs-tcl.info 6 Mar 2003 11:52:16 -0000 1.23.2.3
+++ openacs-4/packages/acs-tcl/acs-tcl.info 23 Mar 2003 02:06:17 -0000 1.23.2.4
@@ -19,7 +19,7 @@
<provides url="acs-tcl" version="4.6.2"/>
<requires url="acs-bootstrap-installer" version="4.2"/>
- <requires url="acs-kernel" version="4.1"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<files>
<file type="package_spec" path="acs-tcl.info"/>
Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs-oracle.xql,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs-oracle.xql 5 Mar 2003 14:40:42 -0000 1.4.2.1
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs-oracle.xql 23 Mar 2003 02:06:30 -0000 1.4.2.2
@@ -27,6 +27,29 @@
</querytext>
</fullquery>
+<fullquery name="apm_package_install_version.version_insert_4.6.1">
+ <querytext>
+
+ begin
+ :1 := apm_package_version.new(
+ version_id => :version_id,
+ package_key => :package_key,
+ version_name => :version_name,
+ version_uri => :version_uri,
+ summary => :summary,
+ description_format => :description_format,
+ description => :description,
+ release_date => :release_date,
+ vendor => :vendor,
+ vendor_uri => :vendor_uri,
+ installed_p => 't',
+ data_model_loaded_p => 't'
+ );
+ end;
+
+ </querytext>
+</fullquery>
+
<fullquery name="apm_package_delete.apm_package_delete">
<querytext>
Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql,v
diff -u -r1.9.2.1 -r1.9.2.2
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql 5 Mar 2003 14:40:42 -0000 1.9.2.1
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs-postgresql.xql 23 Mar 2003 02:06:30 -0000 1.9.2.2
@@ -23,6 +23,25 @@
</querytext>
</fullquery>
+<fullquery name="apm_package_install_version.version_insert_4.6.1">
+ <querytext>
+ select apm_package_version__new(
+ :version_id,
+ :package_key,
+ :version_name,
+ :version_uri,
+ :summary,
+ :description_format,
+ :description,
+ :release_date,
+ :vendor,
+ :vendor_uri,
+ 't',
+ 't'
+ );
+ </querytext>
+</fullquery>
+
<fullquery name="apm_package_delete.apm_package_delete">
<querytext>
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 -r1.15.2.3 -r1.15.2.4
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 11 Mar 2003 22:23:07 -0000 1.15.2.3
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 23 Mar 2003 02:06:30 -0000 1.15.2.4
@@ -466,7 +466,15 @@
if { $upgrade_p } {
# Run before-upgrade
- apm_invoke_callback_proc -version_id $version_id -type before-upgrade -arg_list [list from_version_name $upgrade_from_version_name to_version_name $version(name)]
+
+ # DRB: another one-time hack to allow the upgrade of acs-kernel 4.6.1 to 4.6.2 from the APM.
+ # We know that if the callback list is empty that we don't need to invoke any callbacks,
+ # and that acs-kernel has no APM callbacks defined (in 4.6.2 at least) ...
+
+ if { [llength $version(callbacks)] > 0 } {
+ apm_invoke_callback_proc -version_id $version_id -type before-upgrade -arg_list [list from_version_name $upgrade_from_version_name to_version_name $version(name)]
+ }
+
} else {
# Run before-install
apm_invoke_callback_proc -version_id $version_id -type before-install
@@ -556,17 +564,23 @@
@return The assigned version id.
} {
if { [empty_string_p $version_id] } {
- set version_id [db_null]
+ set version_id ""
}
if { [empty_string_p $release_date] } {
- set release_date [db_null]
+ set release_date ""
}
- return [db_exec_plsql version_insert {}]
+ # DRB: one time hack to allow us to upgrade from 4.6.1 to 4.6.2
+ # from the APM. This depends on the fact that the kernel itself
+ # doesn't require the new callback feature.
- # Every package provides by default the service that is the package itself
- # This spares the developer from having to visit the dependency page
- apm_interface_add $version_id $package_key $version_name
+ if { [catch {set ret [db_exec_plsql version_insert ""]} errmsg]} {
+ ns_log Notice "Version insert failed, trying OpenACS 4.6.1 version, errmsg: $errmsg"
+ return [db_exec_plsql version_insert_4.6.1 {}]
+ } else {
+ return $ret
+ }
+
}
@@ -890,9 +904,15 @@
@author Peter Marklund
} {
- db_dml delete_all_callbacks {
- delete from apm_package_callbacks
- where version_id = :version_id
+
+ # DRB: one-time hack to allow for the upgrading of the 4.6.1 kernel to
+ # 4.6.2 from the APM
+
+ with_catch errmsg {
+ db_dml delete_all_callbacks {}
+ } {
+ ns_log Notice "apm_package_install_callbacks failed (probably because you're upgrading from 4.6.1->4.6.2, if so ignore)"
+ ns_log Notice "the error message was: $errmsg"
}
foreach {type proc} $callback_list {
Index: openacs-4/packages/acs-templating/acs-templating.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/acs-templating.info,v
diff -u -r1.11.2.2 -r1.11.2.3
--- openacs-4/packages/acs-templating/acs-templating.info 7 Mar 2003 13:47:45 -0000 1.11.2.2
+++ openacs-4/packages/acs-templating/acs-templating.info 23 Mar 2003 02:06:46 -0000 1.11.2.3
@@ -20,6 +20,7 @@
specification for many physical pages, so the overall layout of a site can be more easily administered.</description>
<provides url="acs-templating" version="4.6.2"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<files>
<file type="package_spec" path="acs-templating.info"/>
Index: openacs-4/packages/address-book/address-book.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/address-book.info,v
diff -u -r1.5 -r1.5.4.1
--- openacs-4/packages/address-book/address-book.info 9 Mar 2002 02:00:02 -0000 1.5
+++ openacs-4/packages/address-book/address-book.info 23 Mar 2003 02:07:40 -0000 1.5.4.1
@@ -17,7 +17,7 @@
<description format="text/html">The Address Book is an application/service hybrid. As an application, it provides a complete UI for storing, retrieving and searching for individually permissioned contacts. As a service, Address Book provides a storage mechanism for contact information and associating it with other objects. Each contact has identity info as well as an arbitrary number of custom attributes (which may be used for phone numbers, email addresses, etc.) and an arbitrary number of street addresses.</description>
<provides url="address-book" version="4.0a2"/>
- <requires url="acs-kernel" version="4.0"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<files>
<file type="package_spec" path="address-book.info"/>
Index: openacs-4/packages/adserver/adserver.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/adserver.info,v
diff -u -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/adserver/adserver.info 9 Dec 2002 14:31:00 -0000 1.3.2.1
+++ openacs-4/packages/adserver/adserver.info 23 Mar 2003 02:07:59 -0000 1.3.2.2
@@ -19,7 +19,7 @@
<vendor url="www.furfly.net">furfly.net, LLC</vendor>
<provides url="adserver" version="4.2"/>
- <requires url="acs-kernel" version="4.0"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<files>
<file type="package_spec" path="adserver.info"/>
Index: openacs-4/packages/bookmarks/bookmarks.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/bookmarks.info,v
diff -u -r1.21.4.1 -r1.21.4.2
--- openacs-4/packages/bookmarks/bookmarks.info 29 Oct 2002 01:51:55 -0000 1.21.4.1
+++ openacs-4/packages/bookmarks/bookmarks.info 23 Mar 2003 02:08:45 -0000 1.21.4.2
@@ -40,7 +40,7 @@
Areas that need improvement: The query on the index page is a bit slow - closing and opening folders becomes impractible with for example 200 bookmarks. Users who have this many bookmarks can preferably use the Javascript version. </description>
- <requires url="acs-kernel" version="4.0b2"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<files>
<file type="package_spec" path="bookmarks.info"/>
Index: openacs-4/packages/bug-tracker/bug-tracker.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/bug-tracker.info,v
diff -u -r1.6.2.5 -r1.6.2.6
--- openacs-4/packages/bug-tracker/bug-tracker.info 17 Mar 2003 12:43:03 -0000 1.6.2.5
+++ openacs-4/packages/bug-tracker/bug-tracker.info 23 Mar 2003 02:09:11 -0000 1.6.2.6
@@ -19,7 +19,7 @@
<provides url="bug-tracker" version="1.2d7"/>
<requires url="acs-content-repository" version="4.6d1"/>
- <requires url="acs-kernel" version="4.6.2d"/>
+ <requires url="acs-kernel" version="4.6.2"/>
<requires url="acs-tcl" version="4.6.2d"/>
<requires url="notifications" version="0.2d"/>
<requires url="workflow" version="0.2d2"/>