mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Merged V3.0 to HEAD
11550: Fixes for Site title/description related XSS issues. 11551: ETHREEOH-534 - Fix bootstrap errors when audit enabled 11552: Invitee link in activity list now directs you to the correct user when a user is invited to a site 11555: Disable usage checking and quotas and related jobs - ETHREEOH-653 11556: Upgrade scripts for Oracle and SQL Server. Fixes ETHREEOH-643 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12474 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
@@ -66,8 +66,7 @@
|
||||
<ref bean="patch.db-V2.2-0-CreateMissingTables" />
|
||||
<ref bean="patch.db-V2.2-Upgrade-From-2.1" />
|
||||
<ref bean="patch.db-V2.2-Upgrade-From-2.2SP1" />
|
||||
<ref bean="patch.db-V2.2-Person" />
|
||||
<ref bean="patch.db-V2.2-OrclBLOB" />
|
||||
<ref bean="patch.db-V2.2-Person" />
|
||||
</list>
|
||||
</property>
|
||||
<property name="postUpdateScriptPatches">
|
||||
|
||||
@@ -0,0 +1,192 @@
|
||||
--
|
||||
-- Title: Update for permissions schema changes
|
||||
-- Database: SQL Server
|
||||
-- Since: V2.2 Schema 85
|
||||
-- Author: Andy Hind
|
||||
--
|
||||
-- Please contact support@alfresco.com if you need assistance with the upgrade.
|
||||
--
|
||||
|
||||
CREATE TABLE alf_acl_change_set (
|
||||
id numeric(19,0) identity not null,
|
||||
version numeric(19,0) NOT NULL,
|
||||
primary key (id)
|
||||
);
|
||||
|
||||
-- Add to ACL
|
||||
ALTER TABLE alf_access_control_list ADD
|
||||
type INT NOT NULL DEFAULT 0,
|
||||
latest tinyint NOT NULL DEFAULT 1,
|
||||
acl_id nvarchar(36) NOT NULL DEFAULT 'UNSET',
|
||||
acl_version numeric(19,0) NOT NULL DEFAULT 1,
|
||||
inherited_acl numeric(19,0) null,
|
||||
is_versioned tinyint NOT NULL DEFAULT 0,
|
||||
requires_version tinyint NOT NULL DEFAULT 0,
|
||||
acl_change_set numeric(19,0) null,
|
||||
inherits_from numeric(19,0) null,
|
||||
CONSTRAINT fk_alf_acl_acs FOREIGN KEY (acl_change_set) REFERENCES alf_acl_change_set (id);
|
||||
CREATE INDEX fk_alf_acl_acs ON alf_access_control_list (acl_change_set);
|
||||
CREATE INDEX idx_alf_acl_inh ON alf_access_control_list (inherits, inherits_from);
|
||||
|
||||
UPDATE alf_access_control_list
|
||||
set acl_id = id;
|
||||
|
||||
ALTER TABLE alf_access_control_list
|
||||
ADD UNIQUE (acl_id, latest, acl_version);
|
||||
|
||||
-- restructure authority
|
||||
CREATE TABLE t_alf_authority (
|
||||
id numeric(19,0) identity not null,
|
||||
version numeric(19,0) not null,
|
||||
authority nvarchar(100) null,
|
||||
crc numeric(19,0) null,
|
||||
primary key (id),
|
||||
UNIQUE (authority, crc)
|
||||
);
|
||||
CREATE INDEX idx_alf_auth_aut ON t_alf_authority (authority);
|
||||
INSERT INTO t_alf_authority (version, authority)
|
||||
SELECT version, recipient FROM alf_authority;
|
||||
|
||||
-- Create ACE context
|
||||
CREATE TABLE alf_ace_context (
|
||||
id numeric(19,0) identity not null,
|
||||
version numeric(19,0) NOT NULL,
|
||||
class_context nvarchar(1024) null,
|
||||
property_context nvarchar(1024) null,
|
||||
kvp_context nvarchar(1024) null,
|
||||
primary key (id)
|
||||
);
|
||||
|
||||
-- Extend ACE
|
||||
create table t_alf_access_control_entry
|
||||
(
|
||||
id numeric(19,0) identity not null,
|
||||
version numeric(19,0) not null,
|
||||
acl_id numeric(19,0) not null,
|
||||
permission_id numeric(19,0) not null,
|
||||
allowed tinyint not null,
|
||||
authority_id numeric(19,0) NOT NULL DEFAULT -1,
|
||||
applies INT NOT NULL DEFAULT 0,
|
||||
context_id numeric(19,0) null
|
||||
primary key (id)
|
||||
CONSTRAINT fk_alf_ace_auth FOREIGN KEY (authority_id) REFERENCES t_alf_authority (id),
|
||||
CONSTRAINT fk_alf_ace_perm FOREIGN KEY (permission_id) REFERENCES alf_permission (id),
|
||||
CONSTRAINT fk_alf_ace_ctx FOREIGN KEY (context_id) REFERENCES alf_ace_context (id)
|
||||
);
|
||||
CREATE INDEX fk_alf_ace_auth ON t_alf_access_control_entry (authority_id);
|
||||
CREATE INDEX fk_alf_ace_perm ON t_alf_access_control_entry (permission_id);
|
||||
CREATE INDEX fk_alf_ace_ctx ON t_alf_access_control_entry (context_id);
|
||||
|
||||
-- Create ACL member list
|
||||
CREATE TABLE alf_acl_member (
|
||||
id numeric(19,0) identity not null,
|
||||
version numeric(19,0) NOT NULL,
|
||||
acl_id numeric(19,0) NOT NULL,
|
||||
ace_id numeric(19,0) NOT NULL,
|
||||
pos INT NOT NULL,
|
||||
CONSTRAINT fk_alf_aclm_acl FOREIGN KEY (acl_id) REFERENCES alf_access_control_list (id),
|
||||
CONSTRAINT fk_alf_aclm_ace FOREIGN KEY (ace_id) REFERENCES t_alf_access_control_entry (id),
|
||||
primary key (id),
|
||||
UNIQUE(acl_id, ace_id, pos)
|
||||
);
|
||||
CREATE INDEX fk_alf_aclm_acl ON alf_acl_member (acl_id);
|
||||
CREATE INDEX fk_alf_aclm_ace ON alf_acl_member (ace_id);
|
||||
|
||||
-- remove unused
|
||||
DROP TABLE alf_auth_ext_keys;
|
||||
|
||||
-- migrate data - fix up FK refs to authority
|
||||
INSERT INTO t_alf_access_control_entry (version, acl_id, permission_id, allowed, authority_id)
|
||||
SELECT ace.version, ace.acl_id, ace.permission_id, ace.allowed, a.id
|
||||
FROM alf_access_control_entry ace, t_alf_authority a
|
||||
WHERE a.authority = ace.authority_id;
|
||||
|
||||
-- migrate data - build equivalent ACL entries
|
||||
INSERT INTO alf_acl_member (version, acl_id, ace_id, pos)
|
||||
select 1, ace.acl_id, ace.id, 0 from t_alf_access_control_entry ace join alf_access_control_list acl on acl.id = ace.acl_id;
|
||||
|
||||
-- Create auth aliases table
|
||||
CREATE TABLE alf_authority_alias (
|
||||
id numeric(19,0) identity not null,
|
||||
version numeric(19,0) NOT NULL,
|
||||
auth_id numeric(19,0) NOT NULL,
|
||||
alias_id numeric(19,0) NOT NULL,
|
||||
CONSTRAINT fk_alf_autha_ali FOREIGN KEY (alias_id) REFERENCES t_alf_authority (id),
|
||||
CONSTRAINT fk_alf_autha_aut FOREIGN KEY (auth_id) REFERENCES t_alf_authority (id),
|
||||
primary key (id),
|
||||
UNIQUE (auth_id, alias_id)
|
||||
) ;
|
||||
CREATE INDEX fk_alf_autha_ali ON alf_authority_alias (alias_id);
|
||||
CREATE INDEX fk_alf_autha_aut ON alf_authority_alias (auth_id);
|
||||
|
||||
-- Tidy up unused cols on ace table
|
||||
ALTER TABLE t_alf_access_control_entry DROP
|
||||
COLUMN acl_id;
|
||||
|
||||
DROP TABLE alf_access_control_entry;
|
||||
EXEC sp_rename 't_alf_access_control_entry', 'alf_access_control_entry';
|
||||
|
||||
DROP TABLE alf_authority;
|
||||
EXEC sp_rename 't_alf_authority', 'alf_authority';
|
||||
|
||||
CREATE TABLE alf_tmp_min_ace (
|
||||
min numeric(19,0) NOT NULL,
|
||||
permission_id numeric(19,0) NOT NULL,
|
||||
authority_id numeric(19,0) NOT NULL,
|
||||
allowed tinyint NOT NULL,
|
||||
applies INT NOT NULL,
|
||||
UNIQUE (permission_id, authority_id, allowed, applies)
|
||||
);
|
||||
|
||||
INSERT INTO alf_tmp_min_ace (min, permission_id, authority_id, allowed, applies)
|
||||
SELECT
|
||||
min(ace1.id),
|
||||
ace1.permission_id,
|
||||
ace1.authority_id,
|
||||
ace1.allowed,
|
||||
ace1.applies
|
||||
FROM
|
||||
alf_access_control_entry ace1
|
||||
GROUP BY
|
||||
ace1.permission_id, ace1.authority_id, ace1.allowed, ace1.applies
|
||||
;
|
||||
|
||||
-- Update members to point to the first use of an access control entry
|
||||
UPDATE alf_acl_member
|
||||
SET ace_id = (SELECT help.min FROM alf_access_control_entry ace
|
||||
JOIN alf_tmp_min_ace help
|
||||
ON help.permission_id = ace.permission_id AND
|
||||
help.authority_id = ace.authority_id AND
|
||||
help.allowed = ace.allowed AND
|
||||
help.applies = ace.applies
|
||||
WHERE ace.id = alf_acl_member.ace_id );
|
||||
|
||||
DROP TABLE alf_tmp_min_ace;
|
||||
|
||||
-- Remove duplicate aces the mysql way (as you can not use the deleted table in the where clause ...)
|
||||
CREATE TABLE tmp_to_delete (
|
||||
id numeric(19,0),
|
||||
PRIMARY KEY (id)
|
||||
);
|
||||
INSERT INTO tmp_to_delete
|
||||
SELECT ace.id FROM alf_acl_member mem RIGHT OUTER JOIN alf_access_control_entry ace ON mem.ace_id = ace.id WHERE mem.ace_id IS NULL
|
||||
;
|
||||
DELETE FROM alf_access_control_entry WHERE id IN (SELECT id FROM tmp_to_delete);
|
||||
DROP TABLE tmp_to_delete;
|
||||
|
||||
-- Add constraint for duplicate acls
|
||||
|
||||
ALTER TABLE alf_access_control_entry
|
||||
ADD UNIQUE (permission_id, authority_id, allowed, applies, context_id);
|
||||
|
||||
--
|
||||
-- Record script finish
|
||||
--
|
||||
DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.2-ACL';
|
||||
INSERT INTO alf_applied_patch
|
||||
(id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
|
||||
VALUES
|
||||
(
|
||||
'patch.db-V2.2-ACL', 'Manually executed script upgrade V2.2: Update acl schema',
|
||||
0, 119, -1, 120, null, 'UNKOWN', 1, 1, 'Script completed'
|
||||
);
|
||||
@@ -0,0 +1,94 @@
|
||||
--
|
||||
-- Title: Create missing 2.1 tables
|
||||
-- Database: SQL Server
|
||||
-- Since: V2.2 Schema 86
|
||||
-- Author: Derek Hulley
|
||||
--
|
||||
-- Please contact support@alfresco.com if you need assistance with the upgrade.
|
||||
--
|
||||
-- Upgrade paths that bypass V2.1 will need to have a some tables added in order
|
||||
-- to simplify subsequent upgrade scripts.
|
||||
--
|
||||
|
||||
-- Fix alf_audit_date column names
|
||||
|
||||
EXEC sp_rename 'alf_audit_date.halfYear', 'half_year', 'COLUMN';
|
||||
EXEC sp_rename 'alf_audit_date.year', 'full_year', 'COLUMN';
|
||||
|
||||
-- create other new tables
|
||||
|
||||
create table avm_aspects (
|
||||
id numeric(19,0) identity not null,
|
||||
node_id numeric(19,0) null,
|
||||
qname nvarchar(200) null,
|
||||
primary key (id)
|
||||
); -- (optional)
|
||||
|
||||
create table avm_aspects_new (
|
||||
id numeric(19,0) not null,
|
||||
name nvarchar(200) not null,
|
||||
primary key (id, name)
|
||||
); -- (optional)
|
||||
|
||||
create table avm_node_properties (
|
||||
id numeric(19,0) identity not null,
|
||||
node_id numeric(19,0) null,
|
||||
qname nvarchar(200) null,
|
||||
actual_type nvarchar(15) not null,
|
||||
multi_valued tinyint not null,
|
||||
persisted_type nvarchar(15) not null,
|
||||
boolean_value tinyint null,
|
||||
long_value numeric(19,0) null,
|
||||
float_value float null,
|
||||
double_value double precision null,
|
||||
string_value text null,
|
||||
serializable_value image null,
|
||||
primary key (id)
|
||||
); -- (optional)
|
||||
|
||||
create table avm_node_properties_new (
|
||||
node_id numeric(19,0) not null,
|
||||
actual_type nvarchar(15) not null,
|
||||
multi_valued tinyint not null,
|
||||
persisted_type nvarchar(15) not null,
|
||||
boolean_value tinyint null,
|
||||
long_value numeric(19,0) null,
|
||||
float_value float null,
|
||||
double_value double precision null,
|
||||
string_value text null,
|
||||
serializable_value image null,
|
||||
qname nvarchar(200) not null,
|
||||
primary key (node_id, qname)
|
||||
); -- (optional)
|
||||
|
||||
create table avm_store_properties (
|
||||
id numeric(19,0) identity not null,
|
||||
avm_store_id numeric(19,0) null,
|
||||
qname nvarchar(200) null,
|
||||
actual_type nvarchar(15) not null,
|
||||
multi_valued tinyint not null,
|
||||
persisted_type nvarchar(15) not null,
|
||||
boolean_value tinyint null,
|
||||
long_value numeric(19,0) null,
|
||||
float_value float null,
|
||||
double_value double precision null,
|
||||
string_value text null,
|
||||
serializable_value image null,
|
||||
primary key (id)
|
||||
); -- (optional)
|
||||
|
||||
-- Add ACL column for AVM tables
|
||||
ALTER TABLE avm_stores
|
||||
ADD acl_id numeric(19,0) null;
|
||||
|
||||
--
|
||||
-- Record script finish
|
||||
--
|
||||
DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.2-0-CreateMissingTables';
|
||||
INSERT INTO alf_applied_patch
|
||||
(id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
|
||||
VALUES
|
||||
(
|
||||
'patch.db-V2.2-0-CreateMissingTables', 'Manually executed script upgrade V2.2: Created missing tables',
|
||||
0, 120, -1, 121, null, 'UNKOWN', 1, 1, 'Script completed'
|
||||
);
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,686 @@
|
||||
--
|
||||
-- Title: Upgrade V2.2 SP1 or SP2
|
||||
-- Database: MySQL
|
||||
-- Since: V2.2 Schema 91
|
||||
-- Author: Derek Hulley
|
||||
--
|
||||
-- MLText values must be pulled back from attributes into localizable properties.
|
||||
-- NodeStatus has been moved to alf_node.
|
||||
-- Auditable properties have been moved to alf_node.
|
||||
-- alf_node contains the old alf_node_status information.
|
||||
--
|
||||
-- Please contact support@alfresco.com if you need assistance with the upgrade.
|
||||
--
|
||||
|
||||
-- -------------------
|
||||
-- Build new Store --
|
||||
-- -------------------
|
||||
|
||||
CREATE TABLE t_alf_store
|
||||
(
|
||||
id numeric(19,0) identity not null,
|
||||
version numeric(19,0) NOT NULL,
|
||||
protocol nvarchar(50) NOT NULL,
|
||||
identifier nvarchar(100) NOT NULL,
|
||||
root_node_id numeric(19,0) null,
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE (protocol, identifier)
|
||||
);
|
||||
|
||||
-- --------------------------
|
||||
-- Populate the ADM nodes --
|
||||
-- --------------------------
|
||||
|
||||
CREATE TABLE t_alf_node (
|
||||
id numeric(19,0) identity not null,
|
||||
version numeric(19,0) NOT NULL,
|
||||
store_id numeric(19,0) NOT NULL,
|
||||
uuid nvarchar(36) NOT NULL,
|
||||
transaction_id numeric(19,0) NOT NULL,
|
||||
node_deleted tinyint NOT NULL,
|
||||
type_qname_id numeric(19,0) NOT NULL,
|
||||
acl_id numeric(19,0) null,
|
||||
audit_creator nvarchar(255) null,
|
||||
audit_created nvarchar(30) null,
|
||||
audit_modifier nvarchar(255) null,
|
||||
audit_modified nvarchar(30) null,
|
||||
audit_accessed nvarchar(30) null,
|
||||
CONSTRAINT fk_alf_node_acl FOREIGN KEY (acl_id) REFERENCES alf_access_control_list (id),
|
||||
CONSTRAINT fk_alf_node_tqn FOREIGN KEY (type_qname_id) REFERENCES alf_qname (id),
|
||||
CONSTRAINT fk_alf_node_txn FOREIGN KEY (transaction_id) REFERENCES alf_transaction (id),
|
||||
CONSTRAINT fk_alf_node_store FOREIGN KEY (store_id) REFERENCES t_alf_store (id),
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE (store_id, uuid)
|
||||
);
|
||||
CREATE INDEX idx_alf_node_del ON t_alf_node (node_deleted);
|
||||
CREATE INDEX fk_alf_node_acl ON t_alf_node (acl_id);
|
||||
CREATE INDEX fk_alf_node_tqn ON t_alf_node (type_qname_id);
|
||||
CREATE INDEX fk_alf_node_txn ON t_alf_node (transaction_id);
|
||||
CREATE INDEX fk_alf_node_store ON t_alf_node (store_id);
|
||||
|
||||
-- Fill the store table
|
||||
INSERT INTO t_alf_store (version, protocol, identifier, root_node_id)
|
||||
SELECT 1, protocol, identifier, root_node_id FROM alf_store
|
||||
;
|
||||
|
||||
-- Copy data over
|
||||
SET IDENTITY_INSERT t_alf_node ON;
|
||||
INSERT INTO t_alf_node
|
||||
(
|
||||
id, version, store_id, uuid, transaction_id, node_deleted, type_qname_id, acl_id,
|
||||
audit_creator, audit_created, audit_modifier, audit_modified
|
||||
)
|
||||
SELECT
|
||||
n.id, 1, s.id, n.uuid, nstat.transaction_id, 0, n.type_qname_id, n.acl_id,
|
||||
null, null, null, null
|
||||
FROM
|
||||
alf_node n
|
||||
JOIN alf_node_status nstat ON (nstat.node_id = n.id)
|
||||
JOIN t_alf_store s ON (s.protocol = nstat.protocol AND s.identifier = nstat.identifier)
|
||||
;
|
||||
SET IDENTITY_INSERT t_alf_node OFF;
|
||||
|
||||
-- Hook the store up to the root node
|
||||
CREATE INDEX fk_alf_store_root ON t_alf_store (root_node_id);
|
||||
ALTER TABLE t_alf_store
|
||||
ADD CONSTRAINT fk_alf_store_root FOREIGN KEY (root_node_id) REFERENCES t_alf_node (id)
|
||||
;
|
||||
|
||||
-- -----------------------------
|
||||
-- Populate Version Counter --
|
||||
-- -----------------------------
|
||||
|
||||
CREATE TABLE t_alf_version_count
|
||||
(
|
||||
id numeric(19,0) identity not null,
|
||||
version numeric(19,0) NOT NULL,
|
||||
store_id numeric(19,0) NOT NULL UNIQUE,
|
||||
version_count int NOT NULL,
|
||||
CONSTRAINT fk_alf_vc_store FOREIGN KEY (store_id) REFERENCES t_alf_store (id),
|
||||
PRIMARY KEY (id)
|
||||
);
|
||||
|
||||
INSERT INTO t_alf_version_count
|
||||
(
|
||||
version, store_id, version_count
|
||||
)
|
||||
SELECT
|
||||
1, s.id, vc.version_count
|
||||
FROM
|
||||
alf_version_count vc
|
||||
JOIN t_alf_store s ON (s.protocol = vc.protocol AND s.identifier = vc.identifier)
|
||||
;
|
||||
|
||||
DROP TABLE alf_version_count;
|
||||
EXEC sp_rename 't_alf_version_count', 'alf_version_count';
|
||||
|
||||
-- -----------------------------
|
||||
-- Populate the Child Assocs --
|
||||
-- -----------------------------
|
||||
|
||||
CREATE TABLE t_alf_child_assoc
|
||||
(
|
||||
id numeric(19,0) identity not null,
|
||||
version numeric(19,0) NOT NULL,
|
||||
parent_node_id numeric(19,0) NOT NULL,
|
||||
type_qname_id numeric(19,0) NOT NULL,
|
||||
child_node_name nvarchar(50) NOT NULL,
|
||||
child_node_name_crc numeric(19,0) NOT NULL,
|
||||
child_node_id numeric(19,0) NOT NULL,
|
||||
qname_ns_id numeric(19,0) NOT NULL,
|
||||
qname_localname nvarchar(100) NOT NULL,
|
||||
is_primary tinyint null,
|
||||
assoc_index int null,
|
||||
CONSTRAINT fk_alf_cass_pnode foreign key (parent_node_id) REFERENCES t_alf_node (id),
|
||||
CONSTRAINT fk_alf_cass_cnode foreign key (child_node_id) REFERENCES t_alf_node (id),
|
||||
CONSTRAINT fk_alf_cass_tqn foreign key (type_qname_id) REFERENCES alf_qname (id),
|
||||
CONSTRAINT fk_alf_cass_qnns foreign key (qname_ns_id) REFERENCES alf_namespace (id),
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE (parent_node_id, type_qname_id, child_node_name, child_node_name_crc)
|
||||
);
|
||||
CREATE INDEX idx_alf_cass_qnln ON t_alf_child_assoc (qname_localname);
|
||||
CREATE INDEX fk_alf_cass_pnode ON t_alf_child_assoc (parent_node_id);
|
||||
CREATE INDEX fk_alf_cass_cnode ON t_alf_child_assoc (child_node_id);
|
||||
CREATE INDEX fk_alf_cass_tqn ON t_alf_child_assoc (type_qname_id);
|
||||
CREATE INDEX fk_alf_cass_qnns ON t_alf_child_assoc (qname_ns_id);
|
||||
|
||||
SET IDENTITY_INSERT t_alf_child_assoc ON;
|
||||
INSERT INTO t_alf_child_assoc
|
||||
(
|
||||
id, version,
|
||||
parent_node_id, child_node_id,
|
||||
child_node_name, child_node_name_crc,
|
||||
type_qname_id,
|
||||
qname_ns_id, qname_localname,
|
||||
is_primary, assoc_index
|
||||
)
|
||||
SELECT
|
||||
ca.id, 1,
|
||||
ca.parent_node_id, ca.child_node_id,
|
||||
ca.child_node_name, child_node_name_crc,
|
||||
ca.type_qname_id,
|
||||
ca.qname_ns_id, ca.qname_localname,
|
||||
ca.is_primary, ca.assoc_index
|
||||
FROM
|
||||
alf_child_assoc ca
|
||||
;
|
||||
SET IDENTITY_INSERT t_alf_child_assoc OFF;
|
||||
|
||||
-- Clean up
|
||||
DROP TABLE alf_child_assoc;
|
||||
EXEC sp_rename 't_alf_child_assoc', 'alf_child_assoc';
|
||||
|
||||
-- ----------------------------
|
||||
-- Populate the Node Assocs --
|
||||
-- ----------------------------
|
||||
|
||||
CREATE TABLE t_alf_node_assoc
|
||||
(
|
||||
id numeric(19,0) identity not null,
|
||||
version numeric(19,0) NOT NULL,
|
||||
source_node_id numeric(19,0) NOT NULL,
|
||||
target_node_id numeric(19,0) NOT NULL,
|
||||
type_qname_id numeric(19,0) NOT NULL,
|
||||
CONSTRAINT fk_alf_nass_snode FOREIGN KEY (source_node_id) REFERENCES t_alf_node (id),
|
||||
CONSTRAINT fk_alf_nass_tnode FOREIGN KEY (target_node_id) REFERENCES t_alf_node (id),
|
||||
CONSTRAINT fk_alf_nass_tqn FOREIGN KEY (type_qname_id) REFERENCES alf_qname (id),
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE (source_node_id, target_node_id, type_qname_id)
|
||||
);
|
||||
CREATE INDEX fk_alf_nass_snode ON t_alf_node_assoc (source_node_id);
|
||||
CREATE INDEX fk_alf_nass_tnode ON t_alf_node_assoc (target_node_id);
|
||||
CREATE INDEX fk_alf_nass_tqn ON t_alf_node_assoc (type_qname_id);
|
||||
|
||||
SET IDENTITY_INSERT t_alf_node_assoc ON;
|
||||
INSERT INTO t_alf_node_assoc
|
||||
(
|
||||
id, version,
|
||||
source_node_id, target_node_id,
|
||||
type_qname_id
|
||||
)
|
||||
SELECT
|
||||
na.id, 1,
|
||||
na.source_node_id, na.source_node_id,
|
||||
na.type_qname_id
|
||||
FROM
|
||||
alf_node_assoc na
|
||||
;
|
||||
SET IDENTITY_INSERT t_alf_node_assoc OFF;
|
||||
|
||||
-- Clean up
|
||||
DROP TABLE alf_node_assoc;
|
||||
EXEC sp_rename 't_alf_node_assoc', 'alf_node_assoc';
|
||||
|
||||
-- ----------------------------
|
||||
-- Populate the Usage Deltas --
|
||||
-- ----------------------------
|
||||
|
||||
CREATE TABLE t_alf_usage_delta
|
||||
(
|
||||
id numeric(19,0) identity not null,
|
||||
version numeric(19,0) NOT NULL,
|
||||
node_id numeric(19,0) NOT NULL,
|
||||
delta_size numeric(19,0) NOT NULL,
|
||||
CONSTRAINT fk_alf_usaged_n FOREIGN KEY (node_id) REFERENCES t_alf_node (id),
|
||||
PRIMARY KEY (id)
|
||||
);
|
||||
CREATE INDEX fk_alf_usaged_n ON t_alf_usage_delta (node_id);
|
||||
|
||||
SET IDENTITY_INSERT t_alf_usage_delta ON;
|
||||
INSERT INTO t_alf_usage_delta
|
||||
(
|
||||
id, version,
|
||||
node_id,
|
||||
delta_size
|
||||
)
|
||||
SELECT
|
||||
ud.id, 1,
|
||||
ud.node_id,
|
||||
ud.delta_size
|
||||
FROM
|
||||
alf_usage_delta ud
|
||||
; -- (optional)
|
||||
SET IDENTITY_INSERT t_alf_usage_delta OFF;
|
||||
|
||||
-- Clean up
|
||||
DROP TABLE alf_usage_delta; -- (optional)
|
||||
EXEC sp_rename 't_alf_usage_delta', 'alf_usage_delta';
|
||||
|
||||
-- -----------------------------
|
||||
-- Populate the Node Aspects --
|
||||
-- -----------------------------
|
||||
|
||||
CREATE TABLE t_alf_node_aspects
|
||||
(
|
||||
node_id numeric(19,0) NOT NULL,
|
||||
qname_id numeric(19,0) NOT NULL,
|
||||
CONSTRAINT fk_alf_nasp_n FOREIGN KEY (node_id) REFERENCES t_alf_node (id),
|
||||
CONSTRAINT fk_alf_nasp_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id),
|
||||
PRIMARY KEY (node_id, qname_id)
|
||||
);
|
||||
CREATE INDEX fk_alf_nasp_n ON t_alf_node_aspects (node_id);
|
||||
CREATE INDEX fk_alf_nasp_qn ON t_alf_node_aspects (qname_id);
|
||||
|
||||
-- Note the omission of sys:referencable. This is implicit.
|
||||
INSERT INTO t_alf_node_aspects
|
||||
(
|
||||
node_id, qname_id
|
||||
)
|
||||
SELECT
|
||||
na.node_id,
|
||||
qname_id
|
||||
FROM
|
||||
alf_node_aspects na
|
||||
JOIN alf_qname qn ON (na.qname_id = qn.id)
|
||||
JOIN alf_namespace ns ON (qn.ns_id = ns.id)
|
||||
WHERE
|
||||
ns.uri != 'http://www.alfresco.org/model/system/1.0' OR
|
||||
qn.local_name != 'referenceable'
|
||||
;
|
||||
|
||||
-- Clean up
|
||||
DROP TABLE alf_node_aspects;
|
||||
EXEC sp_rename 't_alf_node_aspects', 'alf_node_aspects';
|
||||
|
||||
-- ---------------------------------
|
||||
-- Populate the AVM Node Aspects --
|
||||
-- ---------------------------------
|
||||
|
||||
CREATE TABLE t_avm_aspects
|
||||
(
|
||||
node_id numeric(19,0) NOT NULL,
|
||||
qname_id numeric(19,0) NOT NULL,
|
||||
CONSTRAINT fk_avm_nasp_n FOREIGN KEY (node_id) REFERENCES avm_nodes (id),
|
||||
CONSTRAINT fk_avm_nasp_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id),
|
||||
PRIMARY KEY (node_id, qname_id)
|
||||
);
|
||||
CREATE INDEX fk_avm_nasp_n ON t_avm_aspects (node_id);
|
||||
CREATE INDEX fk_avm_nasp_qn ON t_avm_aspects (qname_id);
|
||||
|
||||
INSERT INTO t_avm_aspects
|
||||
(
|
||||
node_id, qname_id
|
||||
)
|
||||
SELECT
|
||||
anew.id,
|
||||
anew.qname_id
|
||||
FROM
|
||||
avm_aspects_new anew
|
||||
;
|
||||
|
||||
-- Clean up
|
||||
DROP TABLE avm_aspects;
|
||||
DROP TABLE avm_aspects_new;
|
||||
EXEC sp_rename 't_avm_aspects', 'avm_aspects';
|
||||
|
||||
-- ----------------------------------
|
||||
-- Migrate Sundry Property Tables --
|
||||
-- ----------------------------------
|
||||
|
||||
-- Modify the avm_store_properties table
|
||||
CREATE TABLE t_avm_store_properties
|
||||
(
|
||||
id numeric(19,0) identity not null,
|
||||
avm_store_id numeric(19,0),
|
||||
qname_id numeric(19,0) NOT NULL,
|
||||
actual_type_n int NOT NULL,
|
||||
persisted_type_n int NOT NULL,
|
||||
multi_valued tinyint NOT NULL,
|
||||
boolean_value tinyint null,
|
||||
long_value numeric(19,0) null,
|
||||
float_value float null,
|
||||
double_value DOUBLE PRECISION null,
|
||||
string_value nvarchar(1024) null,
|
||||
serializable_value image null,
|
||||
CONSTRAINT fk_avm_sprop_store FOREIGN KEY (avm_store_id) REFERENCES avm_stores (id),
|
||||
CONSTRAINT fk_avm_sprop_qname FOREIGN KEY (qname_id) REFERENCES alf_qname (id),
|
||||
PRIMARY KEY (id)
|
||||
);
|
||||
CREATE INDEX fk_avm_sprop_store ON t_avm_store_properties (avm_store_id);
|
||||
CREATE INDEX fk_avm_sprop_qname ON t_avm_store_properties (qname_id);
|
||||
|
||||
INSERT INTO t_avm_store_properties
|
||||
(
|
||||
avm_store_id,
|
||||
qname_id,
|
||||
actual_type_n, persisted_type_n,
|
||||
multi_valued, boolean_value, long_value, float_value, double_value, string_value, serializable_value
|
||||
)
|
||||
SELECT
|
||||
p.avm_store_id,
|
||||
p.qname_id,
|
||||
p.actual_type_n, p.persisted_type_n,
|
||||
p.multi_valued, p.boolean_value, p.long_value, p.float_value, p.double_value, p.string_value, p.serializable_value
|
||||
FROM
|
||||
avm_store_properties p
|
||||
;
|
||||
DROP TABLE avm_store_properties;
|
||||
EXEC sp_rename 't_avm_store_properties', 'avm_store_properties';
|
||||
|
||||
-- Modify the avm_node_properties_new table
|
||||
CREATE TABLE t_avm_node_properties
|
||||
(
|
||||
node_id numeric(19,0) NOT NULL,
|
||||
actual_type_n int NOT NULL,
|
||||
persisted_type_n int NOT NULL,
|
||||
multi_valued tinyint NOT NULL,
|
||||
boolean_value tinyint null,
|
||||
long_value numeric(19,0) null,
|
||||
float_value FLOAT null,
|
||||
double_value DOUBLE PRECISION null,
|
||||
string_value nvarchar(1024) null,
|
||||
serializable_value image null,
|
||||
qname_id numeric(19,0) NOT NULL,
|
||||
CONSTRAINT fk_avm_nprop_n FOREIGN KEY (node_id) REFERENCES avm_nodes (id),
|
||||
CONSTRAINT fk_avm_nprop_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id),
|
||||
PRIMARY KEY (node_id, qname_id)
|
||||
);
|
||||
CREATE INDEX fk_avm_nprop_n ON t_avm_node_properties (node_id);
|
||||
CREATE INDEX fk_avm_nprop_qn ON t_avm_node_properties (qname_id);
|
||||
INSERT INTO t_avm_node_properties
|
||||
(
|
||||
node_id,
|
||||
qname_id,
|
||||
actual_type_n, persisted_type_n,
|
||||
multi_valued, boolean_value, long_value, float_value, double_value, string_value, serializable_value
|
||||
)
|
||||
SELECT
|
||||
p.node_id,
|
||||
p.qname_id,
|
||||
p.actual_type_n, p.persisted_type_n,
|
||||
p.multi_valued, p.boolean_value, p.long_value, p.float_value, p.double_value, p.string_value, p.serializable_value
|
||||
FROM
|
||||
avm_node_properties_new p
|
||||
;
|
||||
|
||||
DROP TABLE avm_node_properties_new;
|
||||
DROP TABLE avm_node_properties;
|
||||
EXEC sp_rename 't_avm_node_properties', 'avm_node_properties';
|
||||
|
||||
|
||||
-- -----------------
|
||||
-- Build Locales --
|
||||
-- -----------------
|
||||
|
||||
CREATE TABLE alf_locale
|
||||
(
|
||||
id numeric(19,0) identity not null,
|
||||
version numeric(19,0) NOT NULL DEFAULT 1,
|
||||
locale_str nvarchar(20) NOT NULL,
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE (locale_str)
|
||||
);
|
||||
|
||||
SET IDENTITY_INSERT alf_locale ON;
|
||||
INSERT INTO alf_locale (id, locale_str) VALUES (1, '.default');
|
||||
SET IDENTITY_INSERT alf_locale OFF;
|
||||
|
||||
-- Locales come from the attribute table which was used to support MLText persistence
|
||||
INSERT INTO alf_locale (locale_str)
|
||||
SELECT DISTINCT(ma.mkey)
|
||||
FROM alf_node_properties np
|
||||
JOIN alf_attributes a1 ON (np.attribute_value = a1.id)
|
||||
JOIN alf_map_attribute_entries ma ON (ma.map_id = a1.id)
|
||||
;
|
||||
|
||||
-- -------------------------------
|
||||
-- Migrate ADM Property Tables --
|
||||
-- -------------------------------
|
||||
|
||||
CREATE TABLE t_alf_node_properties
|
||||
(
|
||||
node_id numeric(19,0) NOT NULL,
|
||||
qname_id numeric(19,0) NOT NULL,
|
||||
locale_id numeric(19,0) NOT NULL,
|
||||
list_index int NOT NULL,
|
||||
actual_type_n int NOT NULL,
|
||||
persisted_type_n int NOT NULL,
|
||||
boolean_value tinyint null,
|
||||
long_value numeric(19,0) null,
|
||||
float_value FLOAT null,
|
||||
double_value DOUBLE PRECISION null,
|
||||
string_value nvarchar(1024) null,
|
||||
serializable_value image null,
|
||||
CONSTRAINT fk_alf_nprop_n FOREIGN KEY (node_id) REFERENCES t_alf_node (id),
|
||||
CONSTRAINT fk_alf_nprop_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id),
|
||||
CONSTRAINT fk_alf_nprop_loc FOREIGN KEY (locale_id) REFERENCES alf_locale (id),
|
||||
PRIMARY KEY (node_id, qname_id, list_index, locale_id)
|
||||
);
|
||||
CREATE INDEX fk_alf_nprop_n ON t_alf_node_properties (node_id);
|
||||
CREATE INDEX fk_alf_nprop_qn ON t_alf_node_properties (qname_id);
|
||||
CREATE INDEX fk_alf_nprop_loc ON t_alf_node_properties (locale_id);
|
||||
|
||||
-- Copy values over
|
||||
INSERT INTO t_alf_node_properties
|
||||
(
|
||||
node_id, qname_id, list_index, locale_id,
|
||||
actual_type_n, persisted_type_n,
|
||||
boolean_value, long_value, float_value, double_value,
|
||||
string_value,
|
||||
serializable_value
|
||||
)
|
||||
SELECT
|
||||
np.node_id, np.qname_id, -1, 1,
|
||||
np.actual_type_n, np.persisted_type_n,
|
||||
np.boolean_value, np.long_value, np.float_value, np.double_value,
|
||||
np.string_value,
|
||||
np.serializable_value
|
||||
FROM
|
||||
alf_node_properties np
|
||||
WHERE
|
||||
np.attribute_value IS NULL
|
||||
;
|
||||
-- Update cm:auditable properties on the nodes
|
||||
UPDATE t_alf_node SET audit_creator =
|
||||
(
|
||||
SELECT
|
||||
string_value
|
||||
FROM
|
||||
t_alf_node_properties np
|
||||
JOIN alf_qname qn ON (np.qname_id = qn.id)
|
||||
JOIN alf_namespace ns ON (qn.ns_id = ns.id)
|
||||
WHERE
|
||||
np.node_id = t_alf_node.id AND
|
||||
ns.uri = 'http://www.alfresco.org/model/content/1.0' AND
|
||||
qn.local_name = 'creator'
|
||||
);
|
||||
UPDATE t_alf_node SET audit_created =
|
||||
(
|
||||
SELECT
|
||||
string_value
|
||||
FROM
|
||||
t_alf_node_properties np
|
||||
JOIN alf_qname qn ON (np.qname_id = qn.id)
|
||||
JOIN alf_namespace ns ON (qn.ns_id = ns.id)
|
||||
WHERE
|
||||
np.node_id = t_alf_node.id AND
|
||||
ns.uri = 'http://www.alfresco.org/model/content/1.0' AND
|
||||
qn.local_name = 'created'
|
||||
);
|
||||
UPDATE t_alf_node SET audit_modifier =
|
||||
(
|
||||
SELECT
|
||||
string_value
|
||||
FROM
|
||||
t_alf_node_properties np
|
||||
JOIN alf_qname qn ON (np.qname_id = qn.id)
|
||||
JOIN alf_namespace ns ON (qn.ns_id = ns.id)
|
||||
WHERE
|
||||
np.node_id = t_alf_node.id AND
|
||||
ns.uri = 'http://www.alfresco.org/model/content/1.0' AND
|
||||
qn.local_name = 'modifier'
|
||||
);
|
||||
UPDATE t_alf_node SET audit_modified =
|
||||
(
|
||||
SELECT
|
||||
string_value
|
||||
FROM
|
||||
t_alf_node_properties np
|
||||
JOIN alf_qname qn ON (np.qname_id = qn.id)
|
||||
JOIN alf_namespace ns ON (qn.ns_id = ns.id)
|
||||
WHERE
|
||||
np.node_id = t_alf_node.id AND
|
||||
ns.uri = 'http://www.alfresco.org/model/content/1.0' AND
|
||||
qn.local_name = 'modified'
|
||||
);
|
||||
-- Remove the unused cm:auditable properties
|
||||
DELETE t_alf_node_properties
|
||||
FROM t_alf_node_properties
|
||||
JOIN alf_qname ON (t_alf_node_properties.qname_id = alf_qname.id)
|
||||
JOIN alf_namespace ON (alf_qname.ns_id = alf_namespace.id)
|
||||
WHERE
|
||||
alf_namespace.uri = 'http://www.alfresco.org/model/content/1.0' AND
|
||||
alf_qname.local_name IN ('creator', 'created', 'modifier', 'modified')
|
||||
;
|
||||
|
||||
-- Copy all MLText values over
|
||||
INSERT INTO t_alf_node_properties
|
||||
(
|
||||
node_id, qname_id, list_index, locale_id,
|
||||
actual_type_n, persisted_type_n,
|
||||
boolean_value, long_value, float_value, double_value,
|
||||
string_value,
|
||||
serializable_value
|
||||
)
|
||||
SELECT
|
||||
np.node_id, np.qname_id, -1, loc.id,
|
||||
-1, 0,
|
||||
0, 0, 0, 0,
|
||||
a2.string_value,
|
||||
a2.serializable_value
|
||||
FROM
|
||||
alf_node_properties np
|
||||
JOIN alf_attributes a1 ON (np.attribute_value = a1.id)
|
||||
JOIN alf_map_attribute_entries ma ON (ma.map_id = a1.id)
|
||||
JOIN alf_locale loc ON (ma.mkey = loc.locale_str)
|
||||
JOIN alf_attributes a2 ON (ma.attribute_id = a2.id)
|
||||
; -- (OPTIONAL)
|
||||
UPDATE t_alf_node_properties
|
||||
SET actual_type_n = 6, persisted_type_n = 6, serializable_value = NULL
|
||||
WHERE actual_type_n = -1 AND string_value IS NOT NULL
|
||||
;
|
||||
UPDATE t_alf_node_properties
|
||||
SET actual_type_n = 9, persisted_type_n = 9
|
||||
WHERE actual_type_n = -1 AND serializable_value IS NOT NULL
|
||||
;
|
||||
|
||||
-- Delete the node properties and move the fixed values over
|
||||
DROP TABLE alf_node_properties;
|
||||
EXEC sp_rename 't_alf_node_properties', 'alf_node_properties';
|
||||
|
||||
CREATE TABLE t_del_attributes
|
||||
(
|
||||
id numeric(19,0) NOT NULL,
|
||||
PRIMARY KEY (id)
|
||||
);
|
||||
INSERT INTO t_del_attributes
|
||||
SELECT id FROM alf_attributes WHERE type = 'M'
|
||||
;
|
||||
DELETE t_del_attributes
|
||||
FROM t_del_attributes
|
||||
JOIN alf_map_attribute_entries ma ON (ma.attribute_id = t_del_attributes.id)
|
||||
;
|
||||
DELETE t_del_attributes
|
||||
FROM t_del_attributes
|
||||
JOIN alf_list_attribute_entries la ON (la.attribute_id = t_del_attributes.id)
|
||||
;
|
||||
DELETE t_del_attributes
|
||||
FROM t_del_attributes
|
||||
JOIN alf_global_attributes ga ON (ga.attribute = t_del_attributes.id)
|
||||
;
|
||||
INSERT INTO t_del_attributes
|
||||
SELECT a.id FROM t_del_attributes t
|
||||
JOIN alf_map_attribute_entries ma ON (ma.map_id = t.id)
|
||||
JOIN alf_attributes a ON (ma.attribute_id = a.id)
|
||||
;
|
||||
DELETE alf_map_attribute_entries
|
||||
FROM alf_map_attribute_entries
|
||||
JOIN t_del_attributes t ON (alf_map_attribute_entries.map_id = t.id)
|
||||
;
|
||||
DELETE alf_attributes
|
||||
FROM alf_attributes
|
||||
JOIN t_del_attributes t ON (alf_attributes.id = t.id)
|
||||
;
|
||||
DROP TABLE t_del_attributes;
|
||||
|
||||
-- ------------------
|
||||
-- Final clean up --
|
||||
-- ------------------
|
||||
DROP TABLE alf_node_status;
|
||||
ALTER TABLE alf_store DROP CONSTRAINT fk_alf_store_rn;
|
||||
DROP TABLE alf_node;
|
||||
EXEC sp_rename 't_alf_node', 'alf_node';
|
||||
DROP TABLE alf_store;
|
||||
EXEC sp_rename 't_alf_store', 'alf_store';
|
||||
|
||||
-- ----------------
|
||||
-- JBPM Differences
|
||||
-- ----------------
|
||||
|
||||
-- We need to remove a unique index and unfortunately we don't know its name so let's just rebuild the table!
|
||||
create table T_JBPM_PROCESSINSTANCE (
|
||||
ID_ numeric(19,0) identity not null,
|
||||
VERSION_ int not null,
|
||||
KEY_ nvarchar(255) null,
|
||||
START_ datetime null,
|
||||
END_ datetime null,
|
||||
ISSUSPENDED_ tinyint null,
|
||||
PROCESSDEFINITION_ numeric(19,0) null,
|
||||
ROOTTOKEN_ numeric(19,0) null,
|
||||
SUPERPROCESSTOKEN_ numeric(19,0) null,
|
||||
primary key (ID_),
|
||||
);
|
||||
SET IDENTITY_INSERT T_JBPM_PROCESSINSTANCE ON;
|
||||
INSERT INTO T_JBPM_PROCESSINSTANCE (ID_, VERSION_, KEY_, START_, END_, ISSUSPENDED_, PROCESSDEFINITION_, ROOTTOKEN_, SUPERPROCESSTOKEN_)
|
||||
SELECT ID_, VERSION_, KEY_, START_, END_, ISSUSPENDED_, PROCESSDEFINITION_, ROOTTOKEN_, SUPERPROCESSTOKEN_
|
||||
FROM JBPM_PROCESSINSTANCE
|
||||
;
|
||||
SET IDENTITY_INSERT T_JBPM_PROCESSINSTANCE OFF;
|
||||
|
||||
alter table JBPM_JOB drop constraint FK_JOB_PRINST;
|
||||
alter table JBPM_JOB
|
||||
add constraint FK_JOB_PRINST foreign key (PROCESSINSTANCE_) references T_JBPM_PROCESSINSTANCE
|
||||
;
|
||||
alter table JBPM_MODULEINSTANCE drop constraint FK_MODINST_PRCINST;
|
||||
alter table JBPM_MODULEINSTANCE
|
||||
add constraint FK_MODINST_PRCINST foreign key (PROCESSINSTANCE_) references T_JBPM_PROCESSINSTANCE
|
||||
;
|
||||
alter table JBPM_RUNTIMEACTION drop constraint FK_RTACTN_PROCINST;
|
||||
alter table JBPM_RUNTIMEACTION
|
||||
add constraint FK_RTACTN_PROCINST foreign key (PROCESSINSTANCE_) references T_JBPM_PROCESSINSTANCE;
|
||||
alter table JBPM_TASKINSTANCE drop constraint FK_TSKINS_PRCINS;
|
||||
alter table JBPM_TASKINSTANCE
|
||||
add constraint FK_TSKINS_PRCINS foreign key (PROCINST_) references T_JBPM_PROCESSINSTANCE;
|
||||
alter table JBPM_TOKEN drop constraint FK_TOKEN_PROCINST;
|
||||
alter table JBPM_TOKEN
|
||||
add constraint FK_TOKEN_PROCINST foreign key (PROCESSINSTANCE_) references T_JBPM_PROCESSINSTANCE;
|
||||
alter table JBPM_VARIABLEINSTANCE drop constraint FK_VARINST_PRCINST;
|
||||
alter table JBPM_VARIABLEINSTANCE
|
||||
add constraint FK_VARINST_PRCINST foreign key (PROCESSINSTANCE_) references T_JBPM_PROCESSINSTANCE;
|
||||
alter table JBPM_TOKEN drop constraint FK_TOKEN_SUBPI;
|
||||
alter table JBPM_TOKEN
|
||||
add constraint FK_TOKEN_SUBPI foreign key (SUBPROCESSINSTANCE_) references T_JBPM_PROCESSINSTANCE;
|
||||
|
||||
DROP TABLE JBPM_PROCESSINSTANCE;
|
||||
EXEC sp_rename 'T_JBPM_PROCESSINSTANCE', 'JBPM_PROCESSINSTANCE';
|
||||
|
||||
ALTER TABLE JBPM_PROCESSINSTANCE ADD
|
||||
constraint FK_PROCIN_PROCDEF foreign key (PROCESSDEFINITION_) references JBPM_PROCESSDEFINITION,
|
||||
constraint FK_PROCIN_ROOTTKN foreign key (ROOTTOKEN_) references JBPM_TOKEN,
|
||||
constraint FK_PROCIN_SPROCTKN foreign key (SUPERPROCESSTOKEN_) references JBPM_TOKEN;
|
||||
create index IDX_PROCIN_ROOTTK on JBPM_PROCESSINSTANCE (ROOTTOKEN_);
|
||||
create index IDX_PROCIN_SPROCTK on JBPM_PROCESSINSTANCE (SUPERPROCESSTOKEN_);
|
||||
create index IDX_PROCIN_KEY on JBPM_PROCESSINSTANCE (KEY_);
|
||||
create index IDX_PROCIN_PROCDEF on JBPM_PROCESSINSTANCE (PROCESSDEFINITION_);
|
||||
|
||||
--
|
||||
-- Record script finish
|
||||
--
|
||||
DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.2-Upgrade-From-2.2SP1';
|
||||
INSERT INTO alf_applied_patch
|
||||
(id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
|
||||
VALUES
|
||||
(
|
||||
'patch.db-V2.2-Upgrade-From-2.2SP1', 'Manually executed script upgrade V2.2: Upgraded V2.2 SP1 or SP2',
|
||||
86, 90, -1, 91, null, 'UNKOWN', 1, 1, 'Script completed'
|
||||
);
|
||||
@@ -1,21 +0,0 @@
|
||||
--
|
||||
-- Title: Change Oracle LONG RAW columns to BLOB
|
||||
-- Database: Generic
|
||||
-- Since: V2.2 Schema 92
|
||||
-- Author: Derek Hulley
|
||||
--
|
||||
-- Please contact support@alfresco.com if you need assistance with the upgrade.
|
||||
--
|
||||
-- No effect on non-Oracle DBs
|
||||
|
||||
--
|
||||
-- Record script finish
|
||||
--
|
||||
DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.2-OrclBLOB';
|
||||
INSERT INTO alf_applied_patch
|
||||
(id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
|
||||
VALUES
|
||||
(
|
||||
'patch.db-V2.2-OrclBLOB', 'Did nothing for non-Oracle DB.',
|
||||
0, 91, -1, 92, null, 'UNKOWN', 1, 1, 'Script completed'
|
||||
);
|
||||
@@ -9,9 +9,9 @@
|
||||
-- Path was previously unused and unindex - new we use it the index is required.
|
||||
|
||||
UPDATE
|
||||
alf_child_assoc c
|
||||
alf_child_assoc
|
||||
SET
|
||||
c.qname_ns_id =
|
||||
qname_ns_id =
|
||||
(
|
||||
SELECT
|
||||
id
|
||||
@@ -19,7 +19,7 @@ UPDATE
|
||||
alf_namespace n
|
||||
WHERE
|
||||
n.uri = 'http://www.alfresco.org/model/content/1.0'),
|
||||
c.qname_localname =
|
||||
qname_localname =
|
||||
(
|
||||
SELECT
|
||||
p.string_value
|
||||
@@ -28,7 +28,7 @@ UPDATE
|
||||
JOIN alf_qname q on p.qname_id = q.id
|
||||
JOIN alf_namespace n on q.ns_id = n.id
|
||||
WHERE
|
||||
p.node_id = c.child_node_id AND
|
||||
p.node_id = alf_child_assoc.child_node_id AND
|
||||
q.local_name ='userName' AND n.uri = 'http://www.alfresco.org/model/content/1.0'
|
||||
)
|
||||
WHERE exists
|
||||
@@ -39,7 +39,7 @@ UPDATE
|
||||
JOIN alf_qname qq on pp.qname_id = qq.id
|
||||
JOIN alf_namespace nn on qq.ns_id = nn.id
|
||||
WHERE
|
||||
pp.node_id = c.child_node_id AND
|
||||
pp.node_id = alf_child_assoc.child_node_id AND
|
||||
qq.local_name ='userName' AND
|
||||
nn.uri = 'http://www.alfresco.org/model/content/1.0'
|
||||
)
|
||||
|
||||
@@ -902,6 +902,7 @@ ALTER TABLE t_alf_store RENAME TO alf_store;
|
||||
-- Modify index and constraint names --
|
||||
-- -------------------------------------
|
||||
ALTER TABLE alf_attributes DROP INDEX fk_attributes_n_acl, DROP FOREIGN KEY fk_attributes_n_acl; -- (optional)
|
||||
ALTER TABLE alf_attributes DROP INDEX fk_attr_n_acl; -- (optional)
|
||||
ALTER TABLE alf_attributes
|
||||
ADD INDEX fk_alf_attr_acl (acl_id)
|
||||
;
|
||||
|
||||
@@ -422,7 +422,7 @@ CREATE TABLE t_alf_node_properties
|
||||
node_id BIGINT NOT NULL,
|
||||
qname_id BIGINT NOT NULL,
|
||||
locale_id BIGINT NOT NULL,
|
||||
list_index smallint NOT NULL,
|
||||
list_index INTEGER NOT NULL,
|
||||
actual_type_n INTEGER NOT NULL,
|
||||
persisted_type_n INTEGER NOT NULL,
|
||||
boolean_value BIT,
|
||||
@@ -602,7 +602,13 @@ DROP TABLE alf_node;
|
||||
ALTER TABLE t_alf_node RENAME TO alf_node;
|
||||
DROP TABLE alf_store;
|
||||
ALTER TABLE t_alf_store RENAME TO alf_store;
|
||||
CREATE INDEX idx_alf_auth_aut ON alf_authority (authority); -- (optional)
|
||||
|
||||
-- ----------------
|
||||
-- JBPM Differences
|
||||
-- ----------------
|
||||
ALTER TABLE jbpm_processinstance DROP INDEX key_; -- (optional)
|
||||
CREATE INDEX idx_procin_key ON jbpm_processinstance (key_); -- (optional)
|
||||
|
||||
--
|
||||
-- Record script finish
|
||||
|
||||
@@ -77,7 +77,7 @@ ALTER TABLE alf_authority ADD (
|
||||
UPDATE alf_authority SET id = hibernate_sequence.nextval;
|
||||
ALTER TABLE alf_authority RENAME COLUMN recipient TO authority;
|
||||
ALTER TABLE alf_authority MODIFY (
|
||||
authority VARCHAR(100)
|
||||
authority VARCHAR(100 char) NULL
|
||||
);
|
||||
ALTER TABLE alf_authority ADD PRIMARY KEY (id);
|
||||
ALTER TABLE alf_authority ADD UNIQUE (authority, crc);
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
--
|
||||
-- Title: Change Oracle LONG RAW columns to BLOB
|
||||
-- Database: Generic
|
||||
-- Since: V2.2 Schema 92
|
||||
-- Author: Derek Hulley
|
||||
--
|
||||
-- Please contact support@alfresco.com if you need assistance with the upgrade.
|
||||
|
||||
-- TODO: This needs to be replaced with a creation of new tables, copying values over with TO_LOB and then
|
||||
-- renaming the values back.
|
||||
|
||||
ALTER TABLE alf_attributes MODIFY (serializable_value BLOB NULL);
|
||||
ALTER TABLE avm_node_properties MODIFY (serializable_value BLOB NULL);
|
||||
ALTER TABLE avm_node_properties_new MODIFY (serializable_value BLOB NULL);
|
||||
ALTER TABLE avm_store_properties MODIFY (serializable_value BLOB NULL);
|
||||
|
||||
--
|
||||
-- Record script finish
|
||||
--
|
||||
DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.2-OrclBLOB';
|
||||
INSERT INTO alf_applied_patch
|
||||
(id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
|
||||
VALUES
|
||||
(
|
||||
'patch.db-V2.2-OrclBLOB', 'Modified serializable_value columns from LONG RAW to BLOB.',
|
||||
0, 91, -1, 92, null, 'UNKOWN', 1, 1, 'Script completed'
|
||||
);
|
||||
@@ -12,8 +12,8 @@
|
||||
|
||||
-- Fix alf_audit_date column names
|
||||
|
||||
ALTER TABLE alf_audit_date RENAME COLUMN halfYear TO half_year;
|
||||
ALTER TABLE alf_audit_date RENAME COLUMN year TO full_year;
|
||||
alter table alf_audit_date RENAME COLUMN halfyear to half_year;
|
||||
alter table alf_audit_date RENAME COLUMN year to full_year;
|
||||
|
||||
-- create other new tables
|
||||
|
||||
@@ -22,21 +22,21 @@ ALTER TABLE alf_audit_date RENAME COLUMN year TO full_year;
|
||||
node_id number(19,0),
|
||||
qname varchar2(200 char),
|
||||
primary key (id)
|
||||
); -- (optional)
|
||||
); -- (optional)
|
||||
|
||||
create table avm_aspects_new (
|
||||
id number(19,0) not null,
|
||||
name varchar2(200 char) not null,
|
||||
primary key (id, name)
|
||||
); -- (optional)
|
||||
); -- (optional)
|
||||
|
||||
create table avm_node_properties (
|
||||
id number(19,0) not null,
|
||||
node_id number(19,0),
|
||||
qname varchar2(200 char),
|
||||
actual_type_n number(10,0) not null,
|
||||
persisted_type_n number(10,0) not null,
|
||||
actual_type varchar2(15 char) not null,
|
||||
multi_valued number(1,0) not null,
|
||||
persisted_type varchar2(15 char) not null,
|
||||
boolean_value number(1,0),
|
||||
long_value number(19,0),
|
||||
float_value float,
|
||||
@@ -44,13 +44,13 @@ ALTER TABLE alf_audit_date RENAME COLUMN year TO full_year;
|
||||
string_value varchar2(1024 char),
|
||||
serializable_value long raw,
|
||||
primary key (id)
|
||||
); -- (optional)
|
||||
); -- (optional)
|
||||
|
||||
create table avm_node_properties_new (
|
||||
node_id number(19,0) not null,
|
||||
actual_type_n number(10,0) not null,
|
||||
persisted_type_n number(10,0) not null,
|
||||
actual_type varchar2(15 char) not null,
|
||||
multi_valued number(1,0) not null,
|
||||
persisted_type varchar2(15 char) not null,
|
||||
boolean_value number(1,0),
|
||||
long_value number(19,0),
|
||||
float_value float,
|
||||
@@ -59,15 +59,15 @@ ALTER TABLE alf_audit_date RENAME COLUMN year TO full_year;
|
||||
serializable_value long raw,
|
||||
qname varchar2(200 char) not null,
|
||||
primary key (node_id, qname)
|
||||
); -- (optional)
|
||||
); -- (optional)
|
||||
|
||||
create table avm_store_properties (
|
||||
id number(19,0) not null,
|
||||
avm_store_id number(19,0),
|
||||
qname varchar2(200 char) not null,
|
||||
actual_type_n number(10,0) not null,
|
||||
persisted_type_n number(10,0) not null,
|
||||
qname varchar2(200 char),
|
||||
actual_type varchar2(15 char) not null,
|
||||
multi_valued number(1,0) not null,
|
||||
persisted_type varchar2(15 char) not null,
|
||||
boolean_value number(1,0),
|
||||
long_value number(19,0),
|
||||
float_value float,
|
||||
@@ -75,7 +75,11 @@ ALTER TABLE alf_audit_date RENAME COLUMN year TO full_year;
|
||||
string_value varchar2(1024 char),
|
||||
serializable_value long raw,
|
||||
primary key (id)
|
||||
); -- (optional)
|
||||
); -- (optional)
|
||||
|
||||
-- Add ACL column for AVM tables
|
||||
ALTER TABLE avm_stores
|
||||
ADD (acl_id number(19,0));
|
||||
|
||||
--
|
||||
-- Record script finish
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,697 @@
|
||||
--
|
||||
-- Title: Upgrade V2.2 SP1 or SP2
|
||||
-- Database: Oracle
|
||||
-- Since: V2.2 Schema 91
|
||||
-- Author: Derek Hulley
|
||||
--
|
||||
-- MLText values must be pulled back from attributes into localizable properties.
|
||||
-- NodeStatus has been moved to alf_node.
|
||||
-- Auditable properties have been moved to alf_node.
|
||||
-- alf_node contains the old alf_node_status information.
|
||||
--
|
||||
-- Please contact support@alfresco.com if you need assistance with the upgrade.
|
||||
--
|
||||
|
||||
-- -------------------
|
||||
-- Build new Store --
|
||||
-- -------------------
|
||||
|
||||
CREATE TABLE t_alf_store
|
||||
(
|
||||
id number(19,0) NOT NULL,
|
||||
version number(19,0) NOT NULL,
|
||||
protocol varchar2(50 char) NOT NULL,
|
||||
identifier varchar2(100 char) NOT NULL,
|
||||
root_node_id number(19,0),
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE (protocol, identifier)
|
||||
);
|
||||
|
||||
-- --------------------------
|
||||
-- Populate the ADM nodes --
|
||||
-- --------------------------
|
||||
|
||||
CREATE TABLE t_alf_node (
|
||||
id number(19,0) NOT NULL,
|
||||
version number(19,0) NOT NULL,
|
||||
store_id number(19,0) NOT NULL,
|
||||
uuid varchar2(36 char) NOT NULL,
|
||||
transaction_id number(19,0) NOT NULL,
|
||||
node_deleted NUMBER(1) NOT NULL,
|
||||
type_qname_id number(19,0) NOT NULL,
|
||||
acl_id number(19,0),
|
||||
audit_creator varchar2(255 char),
|
||||
audit_created varchar2(30 char),
|
||||
audit_modifier varchar2(255 char),
|
||||
audit_modified varchar2(30 char),
|
||||
audit_accessed varchar2(30 char),
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE (store_id, uuid)
|
||||
);
|
||||
|
||||
CREATE INDEX idx_alf_node_del on t_alf_node (node_deleted);
|
||||
CREATE INDEX fk_alf_node_acl on t_alf_node (acl_id);
|
||||
CREATE INDEX fk_alf_node_tqn on t_alf_node (type_qname_id);
|
||||
CREATE INDEX fk_alf_node_txn on t_alf_node (transaction_id);
|
||||
CREATE INDEX fk_alf_node_store on t_alf_node (store_id);
|
||||
ALTER TABLE t_alf_node
|
||||
ADD CONSTRAINT fk_alf_node_acl FOREIGN KEY (acl_id) REFERENCES alf_access_control_list (id)
|
||||
ADD CONSTRAINT fk_alf_node_tqn FOREIGN KEY (type_qname_id) REFERENCES alf_qname (id)
|
||||
ADD CONSTRAINT fk_alf_node_txn FOREIGN KEY (transaction_id) REFERENCES alf_transaction (id)
|
||||
ADD CONSTRAINT fk_alf_node_store FOREIGN KEY (store_id) REFERENCES t_alf_store (id)
|
||||
;
|
||||
|
||||
-- Fill the store table
|
||||
INSERT INTO t_alf_store (id, version, protocol, identifier, root_node_id)
|
||||
SELECT hibernate_sequence.nextval, 1, protocol, identifier, root_node_id FROM alf_store
|
||||
;
|
||||
|
||||
-- Copy data over
|
||||
INSERT INTO t_alf_node
|
||||
(
|
||||
id, version, store_id, uuid, transaction_id, node_deleted, type_qname_id, acl_id,
|
||||
audit_creator, audit_created, audit_modifier, audit_modified
|
||||
)
|
||||
SELECT
|
||||
n.id, 1, s.id, n.uuid, nstat.transaction_id, 0, n.type_qname_id, n.acl_id,
|
||||
null, null, null, null
|
||||
FROM
|
||||
alf_node n
|
||||
JOIN alf_node_status nstat ON (nstat.node_id = n.id)
|
||||
JOIN t_alf_store s ON (s.protocol = nstat.protocol AND s.identifier = nstat.identifier)
|
||||
;
|
||||
|
||||
-- Hook the store up to the root node
|
||||
CREATE INDEX fk_alf_store_root ON t_alf_store (root_node_id);
|
||||
ALTER TABLE t_alf_store
|
||||
ADD CONSTRAINT fk_alf_store_root FOREIGN KEY (root_node_id) REFERENCES t_alf_node (id)
|
||||
;
|
||||
|
||||
-- -----------------------------
|
||||
-- Populate Version Counter --
|
||||
-- -----------------------------
|
||||
|
||||
CREATE TABLE t_alf_version_count
|
||||
(
|
||||
id number(19,0) NOT NULL,
|
||||
version number(19,0) NOT NULL,
|
||||
store_id number(19,0) NOT NULL UNIQUE,
|
||||
version_count number(10,0) NOT NULL,
|
||||
PRIMARY KEY (id)
|
||||
);
|
||||
ALTER TABLE t_alf_version_count
|
||||
ADD CONSTRAINT fk_alf_vc_store FOREIGN KEY (store_id) REFERENCES t_alf_store (id)
|
||||
;
|
||||
|
||||
INSERT INTO t_alf_version_count
|
||||
(
|
||||
id, version, store_id, version_count
|
||||
)
|
||||
SELECT
|
||||
hibernate_sequence.nextval, 1, s.id, vc.version_count
|
||||
FROM
|
||||
alf_version_count vc
|
||||
JOIN t_alf_store s ON (s.protocol = vc.protocol AND s.identifier = vc.identifier)
|
||||
;
|
||||
|
||||
DROP TABLE alf_version_count;
|
||||
ALTER TABLE t_alf_version_count RENAME TO alf_version_count;
|
||||
|
||||
-- -----------------------------
|
||||
-- Populate the Child Assocs --
|
||||
-- -----------------------------
|
||||
|
||||
CREATE TABLE t_alf_child_assoc
|
||||
(
|
||||
id number(19,0) NOT NULL,
|
||||
version number(19,0) NOT NULL,
|
||||
parent_node_id number(19,0) NOT NULL,
|
||||
type_qname_id number(19,0) NOT NULL,
|
||||
child_node_name varchar2(50 char) NOT NULL,
|
||||
child_node_name_crc number(19,0) NOT NULL,
|
||||
child_node_id number(19,0) NOT NULL,
|
||||
qname_ns_id number(19,0) NOT NULL,
|
||||
qname_localname varchar2(100 char) NOT NULL,
|
||||
is_primary number(1),
|
||||
assoc_index number(10,0),
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE (parent_node_id, type_qname_id, child_node_name, child_node_name_crc)
|
||||
);
|
||||
CREATE INDEX idx_alf_cass_qnln on t_alf_child_assoc (qname_localname);
|
||||
CREATE INDEX fk_alf_cass_pnode on t_alf_child_assoc (parent_node_id);
|
||||
CREATE INDEX fk_alf_cass_cnode on t_alf_child_assoc (child_node_id);
|
||||
CREATE INDEX fk_alf_cass_tqn on t_alf_child_assoc (type_qname_id);
|
||||
CREATE INDEX fk_alf_cass_qnns on t_alf_child_assoc (qname_ns_id);
|
||||
ALTER TABLE t_alf_child_assoc
|
||||
ADD CONSTRAINT fk_alf_cass_pnode FOREIGN KEY (parent_node_id) REFERENCES t_alf_node (id)
|
||||
ADD CONSTRAINT fk_alf_cass_cnode FOREIGN KEY (child_node_id) REFERENCES t_alf_node (id)
|
||||
ADD CONSTRAINT fk_alf_cass_tqn FOREIGN KEY (type_qname_id) REFERENCES alf_qname (id)
|
||||
ADD CONSTRAINT fk_alf_cass_qnns FOREIGN KEY (qname_ns_id) REFERENCES alf_namespace (id)
|
||||
;
|
||||
|
||||
INSERT INTO t_alf_child_assoc
|
||||
(
|
||||
id, version,
|
||||
parent_node_id, child_node_id,
|
||||
child_node_name, child_node_name_crc,
|
||||
type_qname_id,
|
||||
qname_ns_id, qname_localname,
|
||||
is_primary, assoc_index
|
||||
)
|
||||
SELECT
|
||||
ca.id, 1,
|
||||
ca.parent_node_id, ca.child_node_id,
|
||||
ca.child_node_name, child_node_name_crc,
|
||||
ca.type_qname_id,
|
||||
ca.qname_ns_id, ca.qname_localname,
|
||||
ca.is_primary, ca.assoc_index
|
||||
FROM
|
||||
alf_child_assoc ca
|
||||
;
|
||||
|
||||
-- Clean up
|
||||
DROP TABLE alf_child_assoc;
|
||||
ALTER TABLE t_alf_child_assoc RENAME TO alf_child_assoc;
|
||||
|
||||
-- ----------------------------
|
||||
-- Populate the Node Assocs --
|
||||
-- ----------------------------
|
||||
|
||||
CREATE TABLE t_alf_node_assoc
|
||||
(
|
||||
id number(19,0) NOT NULL,
|
||||
version number(19,0) NOT NULL,
|
||||
source_node_id number(19,0) NOT NULL,
|
||||
target_node_id number(19,0) NOT NULL,
|
||||
type_qname_id number(19,0) NOT NULL,
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE (source_node_id, target_node_id, type_qname_id)
|
||||
);
|
||||
CREATE INDEX fk_alf_nass_snode on t_alf_node_assoc (source_node_id);
|
||||
CREATE INDEX fk_alf_nass_tnode on t_alf_node_assoc (target_node_id);
|
||||
CREATE INDEX fk_alf_nass_tqn on t_alf_node_assoc (type_qname_id);
|
||||
ALTER TABLE t_alf_node_assoc
|
||||
ADD CONSTRAINT fk_alf_nass_snode FOREIGN KEY (source_node_id) REFERENCES t_alf_node (id)
|
||||
ADD CONSTRAINT fk_alf_nass_tnode FOREIGN KEY (target_node_id) REFERENCES t_alf_node (id)
|
||||
ADD CONSTRAINT fk_alf_nass_tqn FOREIGN KEY (type_qname_id) REFERENCES alf_qname (id)
|
||||
;
|
||||
|
||||
INSERT INTO t_alf_node_assoc
|
||||
(
|
||||
id, version,
|
||||
source_node_id, target_node_id,
|
||||
type_qname_id
|
||||
)
|
||||
SELECT
|
||||
na.id, 1,
|
||||
na.source_node_id, na.source_node_id,
|
||||
na.type_qname_id
|
||||
FROM
|
||||
alf_node_assoc na
|
||||
;
|
||||
|
||||
-- Clean up
|
||||
DROP TABLE alf_node_assoc;
|
||||
ALTER TABLE t_alf_node_assoc RENAME TO alf_node_assoc;
|
||||
|
||||
-- ----------------------------
|
||||
-- Populate the Usage Deltas --
|
||||
-- ----------------------------
|
||||
|
||||
CREATE TABLE t_alf_usage_delta
|
||||
(
|
||||
id number(19,0) NOT NULL,
|
||||
version number(19,0) NOT NULL,
|
||||
node_id number(19,0) NOT NULL,
|
||||
delta_size number(19,0) NOT NULL,
|
||||
PRIMARY KEY (id)
|
||||
);
|
||||
CREATE INDEX fk_alf_usaged_n on t_alf_usage_delta (node_id);
|
||||
ALTER TABLE t_alf_usage_delta
|
||||
ADD CONSTRAINT fk_alf_usaged_n FOREIGN KEY (node_id) REFERENCES t_alf_node (id)
|
||||
;
|
||||
|
||||
INSERT INTO t_alf_usage_delta
|
||||
(
|
||||
id, version,
|
||||
node_id,
|
||||
delta_size
|
||||
)
|
||||
SELECT
|
||||
ud.id, 1,
|
||||
ud.node_id,
|
||||
ud.delta_size
|
||||
FROM
|
||||
alf_usage_delta ud
|
||||
; -- (optional)
|
||||
|
||||
-- Clean up
|
||||
DROP TABLE alf_usage_delta; -- (optional)
|
||||
ALTER TABLE t_alf_usage_delta RENAME TO alf_usage_delta;
|
||||
|
||||
-- -----------------------------
|
||||
-- Populate the Node Aspects --
|
||||
-- -----------------------------
|
||||
|
||||
CREATE TABLE t_alf_node_aspects
|
||||
(
|
||||
node_id number(19,0) NOT NULL,
|
||||
qname_id number(19,0) NOT NULL,
|
||||
PRIMARY KEY (node_id, qname_id)
|
||||
);
|
||||
CREATE INDEX fk_alf_nasp_n on t_alf_node_aspects (node_id);
|
||||
CREATE INDEX fk_alf_nasp_qn on t_alf_node_aspects (qname_id);
|
||||
ALTER TABLE t_alf_node_aspects
|
||||
ADD CONSTRAINT fk_alf_nasp_n FOREIGN KEY (node_id) REFERENCES t_alf_node (id)
|
||||
ADD CONSTRAINT fk_alf_nasp_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id)
|
||||
;
|
||||
|
||||
-- Note the omission of sys:referencable. This is implicit.
|
||||
INSERT INTO t_alf_node_aspects
|
||||
(
|
||||
node_id, qname_id
|
||||
)
|
||||
SELECT
|
||||
na.node_id,
|
||||
qname_id
|
||||
FROM
|
||||
alf_node_aspects na
|
||||
JOIN alf_qname qn ON (na.qname_id = qn.id)
|
||||
JOIN alf_namespace ns ON (qn.ns_id = ns.id)
|
||||
WHERE
|
||||
ns.uri != 'http://www.alfresco.org/model/system/1.0' OR
|
||||
qn.local_name != 'referenceable'
|
||||
;
|
||||
|
||||
-- Clean up
|
||||
DROP TABLE alf_node_aspects;
|
||||
ALTER TABLE t_alf_node_aspects RENAME TO alf_node_aspects;
|
||||
|
||||
-- ---------------------------------
|
||||
-- Populate the AVM Node Aspects --
|
||||
-- ---------------------------------
|
||||
|
||||
CREATE TABLE t_avm_aspects
|
||||
(
|
||||
node_id number(19,0) NOT NULL,
|
||||
qname_id number(19,0) NOT NULL,
|
||||
PRIMARY KEY (node_id, qname_id)
|
||||
);
|
||||
CREATE INDEX fk_avm_nasp_n on t_avm_aspects (node_id);
|
||||
CREATE INDEX fk_avm_nasp_qn on t_avm_aspects (qname_id);
|
||||
ALTER TABLE t_avm_aspects
|
||||
ADD CONSTRAINT fk_avm_nasp_n FOREIGN KEY (node_id) REFERENCES avm_nodes (id)
|
||||
ADD CONSTRAINT fk_avm_nasp_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id)
|
||||
;
|
||||
|
||||
INSERT INTO t_avm_aspects
|
||||
(
|
||||
node_id, qname_id
|
||||
)
|
||||
SELECT
|
||||
anew.id,
|
||||
anew.qname_id
|
||||
FROM
|
||||
avm_aspects_new anew
|
||||
;
|
||||
|
||||
-- Clean up
|
||||
DROP TABLE avm_aspects;
|
||||
DROP TABLE avm_aspects_new;
|
||||
ALTER TABLE t_avm_aspects RENAME TO avm_aspects;
|
||||
|
||||
-- ----------------------------------
|
||||
-- Migrate Sundry Property Tables --
|
||||
-- ----------------------------------
|
||||
|
||||
-- Modify the avm_store_properties table
|
||||
CREATE TABLE t_avm_store_properties
|
||||
(
|
||||
id number(19,0) NOT NULL,
|
||||
avm_store_id number(19,0),
|
||||
qname_id number(19,0) NOT NULL,
|
||||
actual_type_n number(10,0) NOT NULL,
|
||||
persisted_type_n number(10,0) NOT NULL,
|
||||
multi_valued number(1) NOT NULL,
|
||||
boolean_value number(1),
|
||||
long_value number(19,0),
|
||||
float_value float,
|
||||
double_value DOUBLE PRECISION,
|
||||
string_value varchar2(1024 char),
|
||||
serializable_value blob,
|
||||
PRIMARY KEY (id)
|
||||
);
|
||||
CREATE INDEX fk_avm_sprop_store on t_avm_store_properties (avm_store_id);
|
||||
CREATE INDEX fk_avm_sprop_qname on t_avm_store_properties (qname_id);
|
||||
ALTER TABLE t_avm_store_properties
|
||||
ADD CONSTRAINT fk_avm_sprop_store FOREIGN KEY (avm_store_id) REFERENCES avm_stores (id)
|
||||
ADD CONSTRAINT fk_avm_sprop_qname FOREIGN KEY (qname_id) REFERENCES alf_qname (id)
|
||||
;
|
||||
|
||||
INSERT INTO t_avm_store_properties
|
||||
(
|
||||
id,
|
||||
avm_store_id,
|
||||
qname_id,
|
||||
actual_type_n, persisted_type_n,
|
||||
multi_valued, boolean_value, long_value, float_value, double_value, string_value, serializable_value
|
||||
)
|
||||
SELECT
|
||||
hibernate_sequence.nextval,
|
||||
p.avm_store_id,
|
||||
p.qname_id,
|
||||
p.actual_type_n, p.persisted_type_n,
|
||||
p.multi_valued, p.boolean_value, p.long_value, p.float_value, p.double_value, p.string_value, TO_LOB(p.serializable_value)
|
||||
FROM
|
||||
avm_store_properties p
|
||||
;
|
||||
DROP TABLE avm_store_properties;
|
||||
ALTER TABLE t_avm_store_properties RENAME TO avm_store_properties;
|
||||
|
||||
-- Modify the avm_node_properties_new table
|
||||
CREATE TABLE t_avm_node_properties
|
||||
(
|
||||
node_id number(19,0) NOT NULL,
|
||||
actual_type_n number(10,0) NOT NULL,
|
||||
persisted_type_n number(10,0) NOT NULL,
|
||||
multi_valued number(1) NOT NULL,
|
||||
boolean_value number(1),
|
||||
long_value number(19,0),
|
||||
float_value FLOAT,
|
||||
double_value DOUBLE PRECISION,
|
||||
string_value varchar2(1024 char),
|
||||
serializable_value BLOB,
|
||||
qname_id number(19,0) NOT NULL,
|
||||
PRIMARY KEY (node_id, qname_id)
|
||||
);
|
||||
CREATE INDEX fk_avm_nprop_n on t_avm_node_properties (node_id);
|
||||
CREATE INDEX fk_avm_nprop_qn on t_avm_node_properties (qname_id);
|
||||
ALTER TABLE t_avm_node_properties
|
||||
ADD CONSTRAINT fk_avm_nprop_n FOREIGN KEY (node_id) REFERENCES avm_nodes (id)
|
||||
ADD CONSTRAINT fk_avm_nprop_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id)
|
||||
;
|
||||
|
||||
INSERT INTO t_avm_node_properties
|
||||
(
|
||||
node_id,
|
||||
qname_id,
|
||||
actual_type_n, persisted_type_n,
|
||||
multi_valued, boolean_value, long_value, float_value, double_value, string_value, serializable_value
|
||||
)
|
||||
SELECT
|
||||
p.node_id,
|
||||
p.qname_id,
|
||||
p.actual_type_n, p.persisted_type_n,
|
||||
p.multi_valued, p.boolean_value, p.long_value, p.float_value, p.double_value, p.string_value, TO_LOB(p.serializable_value)
|
||||
FROM
|
||||
avm_node_properties_new p
|
||||
;
|
||||
|
||||
DROP TABLE avm_node_properties_new;
|
||||
DROP TABLE avm_node_properties;
|
||||
ALTER TABLE t_avm_node_properties RENAME TO avm_node_properties;
|
||||
|
||||
|
||||
-- -----------------
|
||||
-- Build Locales --
|
||||
-- -----------------
|
||||
|
||||
CREATE TABLE alf_locale
|
||||
(
|
||||
id number(19,0) NOT NULL,
|
||||
version number(19,0) DEFAULT 1 NOT NULL,
|
||||
locale_str varchar2(20 char) NOT NULL,
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE (locale_str)
|
||||
);
|
||||
|
||||
INSERT INTO alf_locale (id, locale_str) VALUES (1, '.default');
|
||||
|
||||
-- Locales come from the attribute table which was used to support MLText persistence
|
||||
INSERT INTO alf_locale (id, locale_str)
|
||||
SELECT hibernate_sequence.nextval, mkey
|
||||
FROM (
|
||||
SELECT DISTINCT(ma.mkey)
|
||||
FROM alf_node_properties np
|
||||
JOIN alf_attributes a1 ON (np.attribute_value = a1.id)
|
||||
JOIN alf_map_attribute_entries ma ON (ma.map_id = a1.id)
|
||||
)
|
||||
;
|
||||
|
||||
-- -------------------------------
|
||||
-- Migrate ADM Property Tables --
|
||||
-- -------------------------------
|
||||
|
||||
CREATE TABLE t_alf_node_properties
|
||||
(
|
||||
node_id number(19,0) NOT NULL,
|
||||
qname_id number(19,0) NOT NULL,
|
||||
locale_id number(19,0) NOT NULL,
|
||||
list_index number(10,0) NOT NULL,
|
||||
actual_type_n number(10,0) NOT NULL,
|
||||
persisted_type_n number(10,0) NOT NULL,
|
||||
boolean_value number(1),
|
||||
long_value number(19,0),
|
||||
float_value FLOAT,
|
||||
double_value DOUBLE PRECISION,
|
||||
string_value varchar2(1024 char),
|
||||
serializable_value BLOB,
|
||||
PRIMARY KEY (node_id, qname_id, list_index, locale_id)
|
||||
);
|
||||
CREATE INDEX fk_alf_nprop_n on t_alf_node_properties (node_id);
|
||||
CREATE INDEX fk_alf_nprop_qn on t_alf_node_properties (qname_id);
|
||||
CREATE INDEX fk_alf_nprop_loc on t_alf_node_properties (locale_id);
|
||||
ALTER TABLE t_alf_node_properties
|
||||
ADD CONSTRAINT fk_alf_nprop_n FOREIGN KEY (node_id) REFERENCES t_alf_node (id)
|
||||
ADD CONSTRAINT fk_alf_nprop_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id)
|
||||
ADD CONSTRAINT fk_alf_nprop_loc FOREIGN KEY (locale_id) REFERENCES alf_locale (id)
|
||||
;
|
||||
|
||||
-- Copy values over
|
||||
INSERT INTO t_alf_node_properties
|
||||
(
|
||||
node_id, qname_id, list_index, locale_id,
|
||||
actual_type_n, persisted_type_n,
|
||||
boolean_value, long_value, float_value, double_value,
|
||||
string_value,
|
||||
serializable_value
|
||||
)
|
||||
SELECT
|
||||
np.node_id, np.qname_id, -1, 1,
|
||||
np.actual_type_n, np.persisted_type_n,
|
||||
np.boolean_value, np.long_value, np.float_value, np.double_value,
|
||||
np.string_value,
|
||||
TO_LOB(np.serializable_value)
|
||||
FROM
|
||||
alf_node_properties np
|
||||
WHERE
|
||||
np.attribute_value IS NULL
|
||||
;
|
||||
-- Update cm:auditable properties on the nodes
|
||||
UPDATE t_alf_node n SET audit_creator =
|
||||
(
|
||||
SELECT
|
||||
string_value
|
||||
FROM
|
||||
t_alf_node_properties np
|
||||
JOIN alf_qname qn ON (np.qname_id = qn.id)
|
||||
JOIN alf_namespace ns ON (qn.ns_id = ns.id)
|
||||
WHERE
|
||||
np.node_id = n.id AND
|
||||
ns.uri = 'http://www.alfresco.org/model/content/1.0' AND
|
||||
qn.local_name = 'creator'
|
||||
);
|
||||
UPDATE t_alf_node n SET audit_created =
|
||||
(
|
||||
SELECT
|
||||
string_value
|
||||
FROM
|
||||
t_alf_node_properties np
|
||||
JOIN alf_qname qn ON (np.qname_id = qn.id)
|
||||
JOIN alf_namespace ns ON (qn.ns_id = ns.id)
|
||||
WHERE
|
||||
np.node_id = n.id AND
|
||||
ns.uri = 'http://www.alfresco.org/model/content/1.0' AND
|
||||
qn.local_name = 'created'
|
||||
);
|
||||
UPDATE t_alf_node n SET audit_modifier =
|
||||
(
|
||||
SELECT
|
||||
string_value
|
||||
FROM
|
||||
t_alf_node_properties np
|
||||
JOIN alf_qname qn ON (np.qname_id = qn.id)
|
||||
JOIN alf_namespace ns ON (qn.ns_id = ns.id)
|
||||
WHERE
|
||||
np.node_id = n.id AND
|
||||
ns.uri = 'http://www.alfresco.org/model/content/1.0' AND
|
||||
qn.local_name = 'modifier'
|
||||
);
|
||||
UPDATE t_alf_node n SET audit_modified =
|
||||
(
|
||||
SELECT
|
||||
string_value
|
||||
FROM
|
||||
t_alf_node_properties np
|
||||
JOIN alf_qname qn ON (np.qname_id = qn.id)
|
||||
JOIN alf_namespace ns ON (qn.ns_id = ns.id)
|
||||
WHERE
|
||||
np.node_id = n.id AND
|
||||
ns.uri = 'http://www.alfresco.org/model/content/1.0' AND
|
||||
qn.local_name = 'modified'
|
||||
);
|
||||
-- Remove the unused cm:auditable properties
|
||||
DELETE
|
||||
FROM t_alf_node_properties
|
||||
WHERE EXISTS
|
||||
(
|
||||
SELECT 1
|
||||
FROM alf_qname, alf_namespace
|
||||
WHERE t_alf_node_properties.qname_id = alf_qname.id
|
||||
AND alf_qname.ns_id = alf_namespace.id
|
||||
AND alf_namespace.uri = 'http://www.alfresco.org/model/content/1.0'
|
||||
AND alf_qname.local_name IN ('creator', 'created', 'modifier', 'modified')
|
||||
)
|
||||
;
|
||||
|
||||
-- Copy all MLText values over
|
||||
INSERT INTO t_alf_node_properties
|
||||
(
|
||||
node_id, qname_id, list_index, locale_id,
|
||||
actual_type_n, persisted_type_n,
|
||||
boolean_value, long_value, float_value, double_value,
|
||||
string_value,
|
||||
serializable_value
|
||||
)
|
||||
SELECT
|
||||
np.node_id, np.qname_id, -1, loc.id,
|
||||
-1, 0,
|
||||
0, 0, 0, 0,
|
||||
a2.string_value,
|
||||
TO_LOB(a2.serializable_value)
|
||||
FROM
|
||||
alf_node_properties np
|
||||
JOIN alf_attributes a1 ON (np.attribute_value = a1.id)
|
||||
JOIN alf_map_attribute_entries ma ON (ma.map_id = a1.id)
|
||||
JOIN alf_locale loc ON (ma.mkey = loc.locale_str)
|
||||
JOIN alf_attributes a2 ON (ma.attribute_id = a2.id)
|
||||
; -- (OPTIONAL)
|
||||
UPDATE t_alf_node_properties
|
||||
SET actual_type_n = 6, persisted_type_n = 6, serializable_value = NULL
|
||||
WHERE actual_type_n = -1 AND string_value IS NOT NULL
|
||||
;
|
||||
UPDATE t_alf_node_properties
|
||||
SET actual_type_n = 9, persisted_type_n = 9
|
||||
WHERE actual_type_n = -1 AND serializable_value IS NOT NULL
|
||||
;
|
||||
|
||||
-- Delete the node properties and move the fixed values over
|
||||
DROP TABLE alf_node_properties;
|
||||
ALTER TABLE t_alf_node_properties RENAME TO alf_node_properties;
|
||||
|
||||
CREATE TABLE t_del_attributes
|
||||
(
|
||||
id number(19,0) NOT NULL,
|
||||
PRIMARY KEY (id)
|
||||
);
|
||||
INSERT INTO t_del_attributes
|
||||
SELECT id FROM alf_attributes WHERE type = 'M'
|
||||
;
|
||||
DELETE
|
||||
FROM t_del_attributes
|
||||
WHERE EXISTS
|
||||
(
|
||||
SELECT 1 FROM alf_map_attribute_entries ma WHERE ma.attribute_id = t_del_attributes.id
|
||||
)
|
||||
;
|
||||
DELETE
|
||||
FROM t_del_attributes
|
||||
WHERE EXISTS
|
||||
(
|
||||
SELECT 1 FROM alf_list_attribute_entries la WHERE la.attribute_id = t_del_attributes.id
|
||||
)
|
||||
;
|
||||
DELETE
|
||||
FROM t_del_attributes
|
||||
WHERE EXISTS
|
||||
(
|
||||
SELECT 1 FROM alf_global_attributes ga WHERE ga.attribute = t_del_attributes.id
|
||||
)
|
||||
;
|
||||
INSERT INTO t_del_attributes
|
||||
SELECT a.id FROM t_del_attributes t
|
||||
JOIN alf_map_attribute_entries ma ON (ma.map_id = t.id)
|
||||
JOIN alf_attributes a ON (ma.attribute_id = a.id)
|
||||
;
|
||||
DELETE
|
||||
FROM alf_map_attribute_entries
|
||||
WHERE EXISTS
|
||||
(
|
||||
SELECT 1 FROM t_del_attributes t WHERE alf_map_attribute_entries.map_id = t.id
|
||||
)
|
||||
;
|
||||
DELETE
|
||||
FROM alf_attributes
|
||||
WHERE EXISTS
|
||||
(
|
||||
SELECT 1 FROM t_del_attributes t WHERE alf_attributes.id = t.id
|
||||
)
|
||||
;
|
||||
DROP TABLE t_del_attributes;
|
||||
|
||||
-- ------------------
|
||||
-- Final clean up --
|
||||
-- ------------------
|
||||
DROP TABLE alf_node_status;
|
||||
ALTER TABLE alf_store DROP CONSTRAINT fk_alf_store_rn;
|
||||
DROP TABLE alf_node;
|
||||
ALTER TABLE t_alf_node RENAME TO alf_node;
|
||||
DROP TABLE alf_store;
|
||||
ALTER TABLE t_alf_store RENAME TO alf_store;
|
||||
|
||||
-- 2.2.0 ACL fix ups
|
||||
CREATE INDEX idx_alf_auth_aut ON alf_authority (authority); -- (optional)
|
||||
ALTER TABLE alf_authority MODIFY (authority VARCHAR(100 char) NULL); -- (optional)
|
||||
|
||||
-- ----------------------------------
|
||||
-- Convert alf_attributes to use BLOB
|
||||
-- ----------------------------------
|
||||
-- Changing a column type to a blob disturbs a table's indexes, so we have to rebuild them
|
||||
ALTER TABLE alf_map_attribute_entries DROP CONSTRAINT fk_alf_matt_att;
|
||||
ALTER TABLE alf_map_attribute_entries DROP CONSTRAINT fk_alf_matt_matt;
|
||||
ALTER TABLE alf_global_attributes DROP CONSTRAINT fk_alf_gatt_att;
|
||||
ALTER TABLE alf_list_attribute_entries DROP CONSTRAINT fk_alf_lent_att;
|
||||
ALTER TABLE alf_list_attribute_entries DROP CONSTRAINT fk_alf_lent_latt;
|
||||
ALTER TABLE alf_attributes DROP PRIMARY KEY DROP INDEX;
|
||||
ALTER TABLE alf_attributes MODIFY (serializable_value BLOB NULL); -- (optional)
|
||||
ALTER TABLE alf_attributes ADD PRIMARY KEY (id);
|
||||
ALTER TABLE alf_map_attribute_entries
|
||||
ADD CONSTRAINT fk_alf_matt_matt FOREIGN KEY (map_id) REFERENCES alf_attributes (id)
|
||||
ADD CONSTRAINT fk_alf_matt_att FOREIGN KEY (attribute_id) REFERENCES alf_attributes (id)
|
||||
;
|
||||
ALTER TABLE alf_global_attributes
|
||||
ADD CONSTRAINT fk_alf_gatt_att FOREIGN KEY (attribute) REFERENCES alf_attributes (id)
|
||||
;
|
||||
ALTER TABLE alf_list_attribute_entries
|
||||
ADD CONSTRAINT fk_alf_lent_att FOREIGN KEY (attribute_id) REFERENCES alf_attributes (id)
|
||||
ADD CONSTRAINT fk_alf_lent_latt FOREIGN KEY (list_id) REFERENCES alf_attributes (id)
|
||||
;
|
||||
ALTER INDEX fk_alf_attr_acl REBUILD;
|
||||
|
||||
-- ----------------
|
||||
-- JBPM Differences
|
||||
-- ----------------
|
||||
ALTER TABLE jbpm_processinstance DROP UNIQUE (key_, processdefinition_); -- (optional)
|
||||
CREATE INDEX idx_procin_key ON jbpm_processinstance (key_); -- (optional)
|
||||
|
||||
--
|
||||
-- Record script finish
|
||||
--
|
||||
DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.2-Upgrade-From-2.2SP1';
|
||||
INSERT INTO alf_applied_patch
|
||||
(id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
|
||||
VALUES
|
||||
(
|
||||
'patch.db-V2.2-Upgrade-From-2.2SP1', 'Manually executed script upgrade V2.2: Upgraded V2.2 SP1 or SP2',
|
||||
86, 90, -1, 91, null, 'UNKOWN', 1, 1, 'Script completed'
|
||||
);
|
||||
@@ -1521,23 +1521,7 @@
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="patch.db-V2.2-OrclBLOB" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
|
||||
<property name="id"><value>patch.db-V2.2-OrclBLOB</value></property>
|
||||
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
|
||||
<property name="fixesFromSchema"><value>0</value></property>
|
||||
<property name="fixesToSchema"><value>134</value></property>
|
||||
<property name="targetSchema"><value>135</value></property>
|
||||
<property name="scriptUrl">
|
||||
<value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/AlfrescoSchemaUpdate-OrclBLOB.sql</value>
|
||||
</property>
|
||||
<property name="dependsOn" >
|
||||
<list>
|
||||
<ref bean="patch.db-V2.2-Person" />
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="patch.redeploySubmitProcess4" class="org.alfresco.repo.admin.patch.impl.GenericWorkflowPatch" parent="basePatch" >
|
||||
<bean id="patch.redeploySubmitProcess4" class="org.alfresco.repo.admin.patch.impl.GenericWorkflowPatch" parent="basePatch" >
|
||||
<property name="id"><value>patch.redeploySubmitProcess4</value></property>
|
||||
<property name="description"><value>patch.redeploySubmitProcess.description</value></property>
|
||||
<property name="fixesFromSchema"><value>0</value></property>
|
||||
|
||||
@@ -228,7 +228,7 @@ user.name.caseSensitive=false
|
||||
avm.remote.idlestream.timeout=30000
|
||||
|
||||
# ECM content usages/quotas
|
||||
system.usages.enabled=true
|
||||
system.usages.enabled=false
|
||||
|
||||
# Repository endpoint - used by Activity Service
|
||||
repo.remote.endpoint.url=http://localhost:8080/alfresco/service
|
||||
|
||||
@@ -327,9 +327,11 @@
|
||||
|
||||
<!-- enable this to activate bean -->
|
||||
|
||||
<!--
|
||||
<property name="scheduler">
|
||||
<ref bean="schedulerFactory" />
|
||||
</property>
|
||||
-->
|
||||
|
||||
<!-- start after 5 minutes and repeat every 5 minutes -->
|
||||
<property name="startDelayMinutes">
|
||||
@@ -360,9 +362,11 @@
|
||||
|
||||
<!-- enable this to activate bean -->
|
||||
|
||||
<!--
|
||||
<property name="scheduler">
|
||||
<ref bean="schedulerFactory" />
|
||||
</property>
|
||||
-->
|
||||
|
||||
<!-- start after bootstrap (0 minutes) and run once -->
|
||||
<property name="startDelayMinutes">
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
<property name="authorityService" ref="authorityService"/>
|
||||
<property name="authenticationService" ref="authenticationService"/>
|
||||
<property name="policyComponent" ref="policyComponent"/>
|
||||
<property name="contentUsageService" ref="ContentUsageService"/>
|
||||
<property name="contentUsageService" ref="contentUsageImpl"/>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
|
||||
@@ -989,6 +989,7 @@ public class SiteServiceImpl implements SiteService, SiteModel
|
||||
{
|
||||
JSONObject activityData = new JSONObject();
|
||||
activityData.put("role", role);
|
||||
activityData.put("memberUserName", userName);
|
||||
activityData.put("memberFirstName", memberFN);
|
||||
activityData.put("memberLastName", memberLN);
|
||||
activityData.put("title", (memberFN + " " + memberLN + " (" + userName + ")").trim());
|
||||
|
||||
Reference in New Issue
Block a user