Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions

View File

@@ -16,7 +16,6 @@ CREATE TABLE alf_activity_feed
activity_summary VARCHAR(1024),
feed_user_id VARCHAR(255),
activity_type VARCHAR(255) NOT NULL,
activity_format VARCHAR(10),
site_network VARCHAR(255),
app_tool VARCHAR(36),
post_user_id VARCHAR(255) NOT NULL,
@@ -27,7 +26,6 @@ CREATE INDEX feed_postdate_idx ON alf_activity_feed (post_date);
CREATE INDEX feed_postuserid_idx ON alf_activity_feed (post_user_id);
CREATE INDEX feed_feeduserid_idx ON alf_activity_feed (feed_user_id);
CREATE INDEX feed_sitenetwork_idx ON alf_activity_feed (site_network);
CREATE INDEX feed_activityformat_idx ON alf_activity_feed (activity_format);
CREATE SEQUENCE alf_activity_feed_control_seq START WITH 1 INCREMENT BY 1;
CREATE TABLE alf_activity_feed_control

View File

@@ -43,6 +43,7 @@ CREATE TABLE alf_content_url
);
CREATE UNIQUE INDEX idx_alf_conturl_cr ON alf_content_url (content_url_short, content_url_crc);
CREATE INDEX idx_alf_conturl_ot ON alf_content_url (orphan_time);
CREATE INDEX idx_alf_conturl_sz ON alf_content_url (content_size, id);
CREATE SEQUENCE alf_content_data_seq START WITH 1 INCREMENT BY 1;
CREATE TABLE alf_content_data

View File

@@ -54,7 +54,6 @@ CREATE TABLE alf_qname
PRIMARY KEY (id)
);
CREATE UNIQUE INDEX ns_id ON alf_qname (ns_id, local_name);
CREATE INDEX fk_alf_qname_ns ON alf_qname (ns_id);
CREATE SEQUENCE alf_permission_seq START WITH 1 INCREMENT BY 1;
CREATE TABLE alf_permission
@@ -234,6 +233,11 @@ CREATE TABLE alf_node
CONSTRAINT fk_alf_node_loc FOREIGN KEY (locale_id) REFERENCES alf_locale (id)
);
CREATE UNIQUE INDEX store_id ON alf_node (store_id, uuid);
CREATE INDEX idx_alf_node_mdq ON alf_node (store_id, type_qname_id, id);
CREATE INDEX idx_alf_node_cor ON alf_node (audit_creator, store_id, type_qname_id, id);
CREATE INDEX idx_alf_node_crd ON alf_node (audit_created, store_id, type_qname_id, id);
CREATE INDEX idx_alf_node_mor ON alf_node (audit_modifier, store_id, type_qname_id, id);
CREATE INDEX idx_alf_node_mod ON alf_node (audit_modified, store_id, type_qname_id, id);
CREATE INDEX idx_alf_node_txn_type ON alf_node (transaction_id, type_qname_id);
CREATE INDEX fk_alf_node_acl ON alf_node (acl_id);
CREATE INDEX fk_alf_node_store ON alf_node (store_id);
@@ -324,3 +328,5 @@ CREATE TABLE alf_node_properties
CREATE INDEX fk_alf_nprop_n ON alf_node_properties (node_id);
CREATE INDEX fk_alf_nprop_qn ON alf_node_properties (qname_id);
CREATE INDEX fk_alf_nprop_loc ON alf_node_properties (locale_id);
CREATE INDEX idx_alf_nprop_s ON alf_node_properties (qname_id, string_value, node_id);
CREATE INDEX idx_alf_nprop_l ON alf_node_properties (qname_id, long_value, node_id);

View File

@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.alfresco.org/repo/db-schema db-schema.xsd"
name=""
dbprefix="act_"
version="6023"
version="6024"
tablecolumnorder="false">
<validators>
<validator class="org.alfresco.util.schemacomp.validator.NameValidator">
@@ -186,6 +186,12 @@
<columnname>act_id_</columnname>
</columnnames>
</index>
<index name="act_idx_hi_act_inst_exec" unique="false">
<columnnames>
<columnname>execution_id_</columnname>
<columnname>act_id_</columnname>
</columnnames>
</index>
</indexes>
</table>
<table name="act_hi_attachment">
@@ -592,6 +598,16 @@
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="claim_time_" order="17">
<type>timestamp</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="form_key_" order="18">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
</columns>
<primarykey name="act_hi_taskinst_pkey">
<columnnames>
@@ -1227,6 +1243,11 @@
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="proc_inst_id_" order="8">
<type>varchar(64)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
</columns>
<primarykey name="act_ru_identitylink_pkey">
<columnnames>
@@ -1244,6 +1265,11 @@
<targettable>act_ru_task</targettable>
<targetcolumn>id_</targetcolumn>
</foreignkey>
<foreignkey name="act_fk_idl_procinst">
<localcolumn>proc_inst_id_</localcolumn>
<targettable>act_ru_execution</targettable>
<targetcolumn>id_</targetcolumn>
</foreignkey>
</foreignkeys>
<indexes>
<index name="act_idx_ident_lnk_group" unique="false">
@@ -1266,6 +1292,11 @@
<columnname>task_id_</columnname>
</columnnames>
</index>
<index name="act_idx_idl_procinst" unique="false">
<columnnames>
<columnname>proc_inst_id_</columnname>
</columnnames>
</index>
</indexes>
</table>
<table name="act_ru_job">
@@ -1607,6 +1638,62 @@
</index>
</indexes>
</table>
<table name="act_hi_identitylink">
<columns>
<column name="id_" order="1">
<type>varchar(64)</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="group_id_" order="2">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="type_" order="3">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="user_id_" order="4">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="task_id_" order="5">
<type>varchar(64)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="proc_inst_id_" order="6">
<type>varchar(64)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
</columns>
<primarykey name="act_hi_identitylink_pkey">
<columnnames>
<columnname order="1">id_</columnname>
</columnnames>
</primarykey>
<indexes>
<index name="act_idx_hi_ident_lnk_user" unique="false">
<columnnames>
<columnname>user_id_</columnname>
</columnnames>
</index>
<index name="act_idx_hi_ident_lnk_task" unique="false">
<columnnames>
<columnname>task_id_</columnname>
</columnnames>
</index>
<index name="act_idx_hi_ident_lnk_procinst" unique="false">
<columnnames>
<columnname>proc_inst_id_</columnname>
</columnnames>
</index>
</indexes>
</table>
<table name="act_hi_varinst">
<columns>
<column name="id_" order="1">

View File

@@ -388,27 +388,22 @@
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="activity_format" order="7">
<type>varchar(10)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="site_network" order="8">
<column name="site_network" order="7">
<type>varchar(255)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="app_tool" order="9">
<column name="app_tool" order="8">
<type>varchar(36)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="post_user_id" order="10">
<column name="post_user_id" order="9">
<type>varchar(255)</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="feed_date" order="11">
<column name="feed_date" order="10">
<type>timestamp</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
@@ -421,11 +416,6 @@
</primarykey>
<foreignkeys/>
<indexes>
<index name="feed_activityformat_idx" unique="false">
<columnnames>
<columnname>activity_format</columnname>
</columnnames>
</index>
<index name="feed_feeduserid_idx" unique="false">
<columnnames>
<columnname>feed_user_id</columnname>
@@ -1183,6 +1173,12 @@
<columnname>orphan_time</columnname>
</columnnames>
</index>
<index name="idx_alf_conturl_sz" unique="false">
<columnnames>
<columnname>content_size</columnname>
<columnname>id</columnname>
</columnnames>
</index>
</indexes>
</table>
<table name="alf_encoding">
@@ -1566,6 +1562,45 @@
<columnname>type_qname_id</columnname>
</columnnames>
</index>
<index name="idx_alf_node_mdq" unique="false">
<columnnames>
<columnname>store_id</columnname>
<columnname>type_qname_id</columnname>
<columnname>id</columnname>
</columnnames>
</index>
<index name="idx_alf_node_cor" unique="false">
<columnnames>
<columnname>audit_creator</columnname>
<columnname>store_id</columnname>
<columnname>type_qname_id</columnname>
<columnname>id</columnname>
</columnnames>
</index>
<index name="idx_alf_node_crd" unique="false">
<columnnames>
<columnname>audit_created</columnname>
<columnname>store_id</columnname>
<columnname>type_qname_id</columnname>
<columnname>id</columnname>
</columnnames>
</index>
<index name="idx_alf_node_mor" unique="false">
<columnnames>
<columnname>audit_modifier</columnname>
<columnname>store_id</columnname>
<columnname>type_qname_id</columnname>
<columnname>id</columnname>
</columnnames>
</index>
<index name="idx_alf_node_mod" unique="false">
<columnnames>
<columnname>audit_modified</columnname>
<columnname>store_id</columnname>
<columnname>type_qname_id</columnname>
<columnname>id</columnname>
</columnnames>
</index>
</indexes>
</table>
<table name="alf_node_aspects">
@@ -1806,6 +1841,20 @@
<columnname>qname_id</columnname>
</columnnames>
</index>
<index name="idx_alf_nprop_s" unique="false">
<columnnames>
<columnname>qname_id</columnname>
<columnname>string_value</columnname>
<columnname>node_id</columnname>
</columnnames>
</index>
<index name="idx_alf_nprop_l" unique="false">
<columnnames>
<columnname>qname_id</columnname>
<columnname>long_value</columnname>
<columnname>node_id</columnname>
</columnnames>
</index>
</indexes>
</table>
<table name="alf_permission">
@@ -2324,12 +2373,7 @@
<columnname>local_name</columnname>
</columnnames>
</index>
<index name="fk_alf_qname_ns" unique="false">
<columnnames>
<columnname>ns_id</columnname>
</columnnames>
</index>
</indexes>
</indexes>
</table>
<table name="alf_server">
<columns>