Index: openacs-4/packages/acs-kernel/sql/oracle/authentication-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/authentication-create.sql,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/acs-kernel/sql/oracle/authentication-create.sql 29 Aug 2003 15:21:57 -0000 1.6 +++ openacs-4/packages/acs-kernel/sql/oracle/authentication-create.sql 9 Sep 2003 11:15:00 -0000 1.7 @@ -43,7 +43,23 @@ register_impl_id integer constraint auth_authority_reg_impl_fk references acs_objects(object_id), - register_url varchar2(4000) + register_url varchar2(4000), + -- batch sync + -- Id of service contract getting batch sync doc + get_doc_impl_id integer references acs_objects(object_id), + -- Id of service contract processing batch sync doc + process_doc_impl_id integer references acs_objects(object_id), + -- Are batch syncs snapshots or of incremental type + snapshot_p char(1) default 'f' + constraint auth_authority_snapshot_p_nn + not null + constraint auth_authority_snapshot_p_ck + check (snapshot_p in ('t','f')), + batch_sync_enabled_p char(1) default 'f' + constraint auth_authority_bs_enabled_p_nn + not null + constraint auth_authority_bs_enabled_p_ck + check (batch_sync_enabled_p in ('t','f')) ); comment on column auth_authorities.help_contact_text is ' Index: openacs-4/packages/acs-kernel/sql/oracle/authentication-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/authentication-package-create.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-kernel/sql/oracle/authentication-package-create.sql 22 Aug 2003 11:38:08 -0000 1.1 +++ openacs-4/packages/acs-kernel/sql/oracle/authentication-package-create.sql 9 Sep 2003 11:15:00 -0000 1.2 @@ -19,6 +19,10 @@ register_impl_id in auth_authorities.register_impl_id%TYPE default null, register_url in auth_authorities.register_url%TYPE default null, help_contact_text in auth_authorities.help_contact_text%TYPE default null, + get_doc_impl_id in auth_authorities.get_doc_impl_id%TYPE default null, + process_doc_impl_id auth_authorities.process_doc_impl_id%TYPE default null, + snapshot_p auth_authorities.snapshot_p%TYPE default 'f', + batch_sync_enabled_p auth_authorities.batch_sync_enabled_p%TYPE default 'f', 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 @@ -48,6 +52,10 @@ register_impl_id in auth_authorities.register_impl_id%TYPE default null, register_url in auth_authorities.register_url%TYPE default null, help_contact_text in auth_authorities.help_contact_text%TYPE default null, + get_doc_impl_id in auth_authorities.get_doc_impl_id%TYPE default null, + process_doc_impl_id auth_authorities.process_doc_impl_id%TYPE default null, + snapshot_p auth_authorities.snapshot_p%TYPE default 'f', + batch_sync_enabled_p auth_authorities.batch_sync_enabled_p%TYPE default 'f', 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 @@ -68,11 +76,13 @@ insert into auth_authorities (authority_id, short_name, pretty_name, enabled_p, sort_order, auth_impl_id, pwd_impl_id, forgotten_pwd_url, change_pwd_url, register_impl_id, - help_contact_text) + help_contact_text, get_doc_impl_id, process_doc_impl_id, + snapshot_p, batch_sync_enabled_p) values (v_authority_id, new.short_name, new.pretty_name, new.enabled_p, new.sort_order, new.auth_impl_id, new.pwd_impl_id, new.forgotten_pwd_url, new.change_pwd_url, new.register_impl_id, - new.help_contact_text); + new.help_contact_text, new.get_doc_impl_id, new.process_doc_impl_id, + new.snapshot_p, new.batch_sync_enabled_p); return v_authority_id; end new; Index: openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.0d2-5.0d3.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.0d2-5.0d3.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.0d2-5.0d3.sql 22 Aug 2003 13:31:17 -0000 1.2 +++ openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.0d2-5.0d3.sql 9 Sep 2003 11:15:00 -0000 1.3 @@ -30,18 +30,34 @@ -- Cannot reference acs_sc_impls table as it doesn't exist yet auth_impl_id integer constraint auth_authority_auth_impl_fk - acs_objects(object_id), + references acs_objects(object_id), -- Id of the password management service contact implementation pwd_impl_id integer constraint auth_authority_pwd_impl_fk - acs_objects(object_id), + references acs_objects(object_id), forgotten_pwd_url varchar2(4000), change_pwd_url varchar2(4000), -- Id of the registration service contract implementation register_impl_id integer constraint auth_authority_reg_impl_fk - acs_objects(object_id), - register_url varchar2(4000) + references acs_objects(object_id), + register_url varchar2(4000), + -- batch sync + -- Id of service contract getting batch sync doc + get_doc_impl_id integer references acs_objects(object_id), + -- Id of service contract processing batch sync doc + process_doc_impl_id integer references acs_objects(object_id), + -- Are batch syncs snapshots or of incremental type + snapshot_p char(1) default 'f' + constraint auth_authority_snapshot_p_nn + not null + constraint auth_authority_snapshot_p_ck + check (snapshot_p in ('t','f')), + batch_sync_enabled_p char(1) default 'f' + constraint auth_authority_bs_enabled_p_nn + not null + constraint auth_authority_bs_enabled_p_ck + check (batch_sync_enabled_p in ('t','f')) ); comment on column auth_authorities.help_contact_text is ' @@ -94,6 +110,10 @@ register_impl_id in auth_authorities.register_impl_id%TYPE default null, register_url in auth_authorities.register_url%TYPE default null, help_contact_text in auth_authorities.help_contact_text%TYPE default null, + get_doc_impl_id in auth_authorities.get_doc_impl_id%TYPE default null, + process_doc_impl_id auth_authorities.process_doc_impl_id%TYPE default null, + snapshot_p auth_authorities.snapshot_p%TYPE default 'f', + batch_sync_enabled_p auth_authorities.batch_sync_enabled_p%TYPE default 'f', 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 @@ -123,6 +143,10 @@ register_impl_id in auth_authorities.register_impl_id%TYPE default null, register_url in auth_authorities.register_url%TYPE default null, help_contact_text in auth_authorities.help_contact_text%TYPE default null, + get_doc_impl_id in auth_authorities.get_doc_impl_id%TYPE default null, + process_doc_impl_id auth_authorities.process_doc_impl_id%TYPE default null, + snapshot_p auth_authorities.snapshot_p%TYPE default 'f', + batch_sync_enabled_p auth_authorities.batch_sync_enabled_p%TYPE default 'f', 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 @@ -143,11 +167,13 @@ insert into auth_authorities (authority_id, short_name, pretty_name, enabled_p, sort_order, auth_impl_id, pwd_impl_id, forgotten_pwd_url, change_pwd_url, register_impl_id, - help_contact_text) + help_contact_text, get_doc_impl_id, process_doc_impl_id, + snapshot_p, batch_sync_enabled_p) values (v_authority_id, new.short_name, new.pretty_name, new.enabled_p, new.sort_order, new.auth_impl_id, new.pwd_impl_id, new.forgotten_pwd_url, new.change_pwd_url, new.register_impl_id, - new.help_contact_text); + new.help_contact_text, new.get_doc_impl_id, new.process_doc_impl_id, + new.snapshot_p, new.batch_sync_enabled_p); return v_authority_id; end new; @@ -167,7 +193,6 @@ / show errors - -- Create the local authority declare v_authority_id integer; Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql,v diff -u -N -r1.19 -r1.20 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql 5 Sep 2003 13:26:12 -0000 1.19 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql 9 Sep 2003 11:15:00 -0000 1.20 @@ -389,6 +389,10 @@ null, -- register_impl_id null, -- register_url null, -- help_contact_text + null, -- get_doc_impl_id + null, -- process_doc_impl_id + 'f', -- snapshot_p + 'f', -- batch_sync_enabled_p null, -- creation_user null, -- creation_ip null -- context_id Index: openacs-4/packages/acs-kernel/sql/postgresql/authentication-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/authentication-create.sql,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/acs-kernel/sql/postgresql/authentication-create.sql 3 Sep 2003 19:52:38 -0000 1.7 +++ openacs-4/packages/acs-kernel/sql/postgresql/authentication-create.sql 9 Sep 2003 11:15:00 -0000 1.8 @@ -41,7 +41,19 @@ register_impl_id integer constraint auth_authority_reg_impl_fk references acs_objects(object_id), - register_url varchar(4000) + register_url varchar(4000), + -- batch sync + -- Id of service contract getting batch sync doc + get_doc_impl_id integer references acs_objects(object_id), + -- Id of service contract processing batch sync doc + process_doc_impl_id integer references acs_objects(object_id), + -- Are batch syncs snapshots or of incremental type + snapshot_p boolean default 'f' + constraint auth_authority_snapshot_p_nn + not null, + batch_sync_enabled_p boolean default 'f' + constraint auth_authority_bs_enabled_p_nn + not null ); comment on column auth_authorities.help_contact_text is ' @@ -95,4 +107,3 @@ -- Create PLSQL package \i authentication-package-create.sql - Index: openacs-4/packages/acs-kernel/sql/postgresql/authentication-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/authentication-package-create.sql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-kernel/sql/postgresql/authentication-package-create.sql 22 Aug 2003 11:38:08 -0000 1.1 +++ openacs-4/packages/acs-kernel/sql/postgresql/authentication-package-create.sql 9 Sep 2003 11:15:00 -0000 1.2 @@ -17,6 +17,10 @@ integer, -- register_impl_id varchar, -- register_url varchar, -- help_contact_text + integer, -- get_doc_impl_id + integer, -- process_doc_impl_id + boolean, -- snapshot_p + boolean, -- batch_sync_enabled_p integer, -- creation_user varchar, -- creation_ip integer -- context_id @@ -36,9 +40,13 @@ p_register_impl_id alias for $11; -- default null p_register_url alias for $12; -- default null p_help_contact_text alias for $13; -- default null, - p_creation_user alias for $14; -- default null - p_creation_ip alias for $15; -- default null - p_context_id alias for $16; -- default null + p_get_doc_impl_id alias for $14; -- default null + p_process_doc_impl_id alias for $15; -- default null + p_snapshot_p alias for $16; -- default ''f'' + p_batch_sync_enabled_p alias for $17; -- default ''f'' + p_creation_user alias for $18; -- default null + p_creation_ip alias for $19; -- default null + p_context_id alias for $20; -- default null v_authority_id integer; v_object_type varchar; @@ -64,11 +72,13 @@ insert into auth_authorities (authority_id, short_name, pretty_name, enabled_p, sort_order, auth_impl_id, pwd_impl_id, forgotten_pwd_url, change_pwd_url, register_impl_id, - help_contact_text) + help_contact_text, get_doc_impl_id, process_doc_impl_id, + snapshot_p, batch_sync_enabled_p) values (v_authority_id, p_short_name, p_pretty_name, p_enabled_p, p_sort_order, p_auth_impl_id, p_pwd_impl_id, p_forgotten_pwd_url, p_change_pwd_url, p_register_impl_id, - p_help_contact_text); + p_help_contact_text, p_get_doc_impl_id, p_process_doc_impl_id, + p_snapshot_p, p_batch_sync_enabled_p); return v_authority_id; end; Index: openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.0d2-5.0d3.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.0d2-5.0d3.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.0d2-5.0d3.sql 22 Aug 2003 13:31:17 -0000 1.2 +++ openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.0d2-5.0d3.sql 9 Sep 2003 11:15:00 -0000 1.3 @@ -28,18 +28,30 @@ -- Cannot reference acs_sc_impls table as it doesn't exist yet auth_impl_id integer constraint auth_authority_auth_impl_fk - acs_objects(object_id), + references acs_objects(object_id), -- Id of the password management service contact implementation pwd_impl_id integer constraint auth_authority_pwd_impl_fk - acs_objects(object_id), + references acs_objects(object_id), forgotten_pwd_url varchar(4000), change_pwd_url varchar(4000), -- Id of the registration service contract implementation register_impl_id integer constraint auth_authority_reg_impl_fk - acs_objects(object_id), - register_url varchar(4000) + references acs_objects(object_id), + register_url varchar(4000), + -- batch sync + -- Id of service contract getting batch sync doc + get_doc_impl_id integer references acs_objects(object_id), + -- Id of service contract processing batch sync doc + process_doc_impl_id integer references acs_objects(object_id), + -- Are batch syncs snapshots or of incremental type + snapshot_p boolean default 'f' + constraint auth_authority_snapshot_p_nn + not null, + batch_sync_enabled_p boolean default 'f' + constraint auth_authority_bs_enabled_p_nn + not null ); comment on column auth_authorities.help_contact_text is ' @@ -72,7 +84,7 @@ null ); --- Create PLSQL package +-- Create PLSQL functions create or replace function authority__new ( integer, -- authority_id varchar, -- object_type @@ -87,6 +99,10 @@ integer, -- register_impl_id varchar, -- register_url varchar, -- help_contact_text + integer, -- get_doc_impl_id + integer, -- process_doc_impl_id + boolean, -- snapshot_p + boolean, -- batch_sync_enabled_p integer, -- creation_user varchar, -- creation_ip integer -- context_id @@ -106,9 +122,13 @@ p_register_impl_id alias for $11; -- default null p_register_url alias for $12; -- default null p_help_contact_text alias for $13; -- default null, - p_creation_user alias for $14; -- default null - p_creation_ip alias for $15; -- default null - p_context_id alias for $16; -- default null + p_get_doc_impl_id alias for $14; -- default null + p_process_doc_impl_id alias for $15; -- default null + p_snapshot_p alias for $16; -- default ''f'' + p_batch_sync_enabled_p alias for $17; -- default ''f'' + p_creation_user alias for $18; -- default null + p_creation_ip alias for $19; -- default null + p_context_id alias for $20; -- default null v_authority_id integer; v_object_type varchar; @@ -134,11 +154,13 @@ insert into auth_authorities (authority_id, short_name, pretty_name, enabled_p, sort_order, auth_impl_id, pwd_impl_id, forgotten_pwd_url, change_pwd_url, register_impl_id, - help_contact_text) + help_contact_text, get_doc_impl_id, process_doc_impl_id, + snapshot_p, batch_sync_enabled_p) values (v_authority_id, p_short_name, p_pretty_name, p_enabled_p, p_sort_order, p_auth_impl_id, p_pwd_impl_id, p_forgotten_pwd_url, p_change_pwd_url, p_register_impl_id, - p_help_contact_text); + p_help_contact_text, p_get_doc_impl_id, p_process_doc_impl_id, + p_snapshot_p, p_batch_sync_enabled_p); return v_authority_id; end; @@ -170,13 +192,16 @@ null, -- register_impl_id null, -- register_url null, -- help_contact_text + null, -- get_doc_impl_id + null, -- process_doc_impl_id + 'f', -- snapshot_p + 'f', -- batch_sync_enabled_p null, -- creation_user null, -- creation_ip null -- context_id ); - -- ****** Changes to the users table alter table users add authority_id integer