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.33.2.27 -r1.33.2.28 --- openacs-4/packages/acs-content-repository/acs-content-repository.info 14 Jan 2005 03:14:45 -0000 1.33.2.27 +++ openacs-4/packages/acs-content-repository/acs-content-repository.info 31 Jan 2005 07:29:16 -0000 1.33.2.28 @@ -7,7 +7,7 @@ t t - + Dan Wickstrom The canonical repository for OpenACS content. 2005-01-09 @@ -18,7 +18,7 @@ other CMS backing functionality. Utilized by Bug Tracker, File Storage, and other packages. - + @@ -31,7 +31,3 @@ - - - - Index: openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql,v diff -u -r1.8.2.6 -r1.8.2.7 --- openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql 24 Aug 2004 23:28:39 -0000 1.8.2.6 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-folder.sql 31 Jan 2005 07:29:16 -0000 1.8.2.7 @@ -22,7 +22,9 @@ folder_id in cr_folders.folder_id%TYPE default null, creation_date in acs_objects.creation_date%TYPE default sysdate, creation_user in acs_objects.creation_user%TYPE default null, - creation_ip in acs_objects.creation_ip%TYPE default null + creation_ip in acs_objects.creation_ip%TYPE default null, + security_inherit_p in acs_objects.security_inherit_p%TYPE default 't', + package_id in cr_folders.package_id%TYPE default null ) return cr_folders.folder_id%TYPE is v_folder_id cr_folders.folder_id%TYPE; v_context_id acs_objects.context_id%TYPE; @@ -52,13 +54,14 @@ creation_date => creation_date, creation_user => creation_user, creation_ip => creation_ip, - parent_id => parent_id + parent_id => parent_id, + security_inherit_p => security_inherit_p ); insert into cr_folders ( - folder_id, label, description + folder_id, label, description, package_id ) values ( - v_folder_id, label, description + v_folder_id, label, description, package_id ); -- inherit the attributes of the parent folder Index: openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql,v diff -u -r1.20.2.4 -r1.20.2.5 --- openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql 20 Jul 2004 15:03:14 -0000 1.20.2.4 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-item.sql 31 Jan 2005 07:29:16 -0000 1.20.2.5 @@ -78,7 +78,8 @@ data in cr_revisions.content%TYPE default null, relation_tag in cr_child_rels.relation_tag%TYPE default null, is_live in char default 'f', - storage_type in cr_items.storage_type%TYPE default 'lob' + storage_type in cr_items.storage_type%TYPE default 'lob', + security_inherit_p in acs_objects.security_inherit_p%TYPE default 't' ) return cr_items.item_id%TYPE is v_parent_id cr_items.parent_id%TYPE; @@ -174,7 +175,8 @@ context_id => v_context_id, creation_date => content_item.new.creation_date, creation_user => content_item.new.creation_user, - creation_ip => content_item.new.creation_ip + creation_ip => content_item.new.creation_ip, + security_inherit_p => content_item.new.security_inherit_p ); -- Turn off security inheritance if there is no security context Index: openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql,v diff -u -r1.17.2.2 -r1.17.2.3 --- openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql 3 Sep 2004 16:05:18 -0000 1.17.2.2 +++ openacs-4/packages/acs-content-repository/sql/oracle/packages-create.sql 31 Jan 2005 07:29:16 -0000 1.17.2.3 @@ -375,7 +375,8 @@ data in cr_revisions.content%TYPE default null, relation_tag in cr_child_rels.relation_tag%TYPE default null, is_live in char default 'f', - storage_type in cr_items.storage_type%TYPE default 'lob' + storage_type in cr_items.storage_type%TYPE default 'lob', + security_inherit_p in acs_objects.security_inherit_p%TYPE default 't' ) return cr_items.item_id%TYPE; @@ -1192,7 +1193,9 @@ folder_id in cr_folders.folder_id%TYPE default null, creation_date in acs_objects.creation_date%TYPE default sysdate, creation_user in acs_objects.creation_user%TYPE default null, - creation_ip in acs_objects.creation_ip%TYPE default null + creation_ip in acs_objects.creation_ip%TYPE default null, + security_inherit_p in acs_objects.security_inherit_p%TYPE default 't', + package_id in cr_folders.package_id%TYPE default null ) return cr_folders.folder_id%TYPE; procedure del ( Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-5.1.5d2-5.1.5d3.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-kernel/acs-kernel.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/acs-kernel.info,v diff -u -r1.57.2.16 -r1.57.2.17 --- openacs-4/packages/acs-kernel/acs-kernel.info 10 Jan 2005 01:57:08 -0000 1.57.2.16 +++ openacs-4/packages/acs-kernel/acs-kernel.info 31 Jan 2005 07:30:44 -0000 1.57.2.17 @@ -7,14 +7,14 @@ t t - + Don Baccus Routines and data models providing the foundation for OpenACS-based Web services. 2005-01-09 OpenACS The OpenACS kernel contains the core datamodel create and drop scripts for such things as objects, groups, partiies and the supporting PL/SQL and PL/pgSQL procedures. 3 - + @@ -81,7 +81,3 @@ - - - - Index: openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql,v diff -u -r1.16 -r1.16.2.1 --- openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql 4 Mar 2004 14:52:40 -0000 1.16 +++ openacs-4/packages/acs-kernel/sql/oracle/acs-objects-create.sql 31 Jan 2005 07:30:44 -0000 1.16.2.1 @@ -384,7 +384,8 @@ creation_user in acs_objects.creation_user%TYPE default null, creation_ip in acs_objects.creation_ip%TYPE default null, - context_id in acs_objects.context_id%TYPE default null + context_id in acs_objects.context_id%TYPE default null, + security_inherit_p in acs_objects.security_inherit_p%TYPE default 't' ) return acs_objects.object_id%TYPE; procedure del ( @@ -493,11 +494,13 @@ creation_user in acs_objects.creation_user%TYPE default null, creation_ip in acs_objects.creation_ip%TYPE default null, - context_id in acs_objects.context_id%TYPE default null + context_id in acs_objects.context_id%TYPE default null, + security_inherit_p in acs_objects.security_inherit_p%TYPE default 't' ) return acs_objects.object_id%TYPE is v_object_id acs_objects.object_id%TYPE; + v_creation_date acs_objects.creation_date%TYPE; begin if object_id is null then select acs_object_id_seq.nextval @@ -507,12 +510,18 @@ v_object_id := object_id; end if; + if creation_date is null then + select sysdate into v_creation_date from dual; + else + v_creation_date := creation_date; + end if; + insert into acs_objects - (object_id, object_type, context_id, - creation_date, creation_user, creation_ip) + (object_id, object_type, context_id, creation_date, + creation_user, creation_ip, security_inherit_p) values - (v_object_id, object_type, context_id, - creation_date, creation_user, creation_ip); + (v_object_id, object_type, context_id, v_creation_date, + creation_user, creation_ip, security_inherit_p); acs_object.initialize_attributes(v_object_id); Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.1.4-5.1.4d1.sql'. Fisheye: No comparison available. Pass `N' to diff?