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

@@ -15,7 +15,6 @@ CREATE TABLE alf_activity_feed
activity_summary TEXT,
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,
@@ -24,8 +23,7 @@ CREATE TABLE alf_activity_feed
KEY feed_postdate_idx (post_date),
KEY feed_postuserid_idx (post_user_id),
KEY feed_feeduserid_idx (feed_user_id),
KEY feed_sitenetwork_idx (site_network),
KEY feed_activityformat_idx (activity_format)
KEY feed_sitenetwork_idx (site_network)
) ENGINE=InnoDB;
CREATE TABLE alf_activity_feed_control

View File

@@ -38,6 +38,7 @@ CREATE TABLE alf_content_url
orphan_time BIGINT NULL,
UNIQUE INDEX idx_alf_conturl_cr (content_url_short, content_url_crc),
INDEX idx_alf_conturl_ot (orphan_time),
INDEX idx_alf_conturl_sz (content_size),
PRIMARY KEY (id)
) ENGINE=InnoDB;

View File

@@ -49,7 +49,6 @@ CREATE TABLE alf_qname
local_name VARCHAR(200) NOT NULL,
PRIMARY KEY (id),
UNIQUE KEY ns_id (ns_id, local_name),
KEY fk_alf_qname_ns (ns_id),
CONSTRAINT fk_alf_qname_ns FOREIGN KEY (ns_id) REFERENCES alf_namespace (id)
) ENGINE=InnoDB;
@@ -218,6 +217,11 @@ CREATE TABLE alf_node
KEY fk_alf_node_store (store_id),
KEY fk_alf_node_tqn (type_qname_id),
KEY fk_alf_node_loc (locale_id),
KEY idx_alf_node_mdq (store_id, type_qname_id),
KEY idx_alf_node_cor (audit_creator, store_id, type_qname_id),
KEY idx_alf_node_crd (audit_created, store_id, type_qname_id),
KEY idx_alf_node_mor (audit_modifier, store_id, type_qname_id),
KEY idx_alf_node_mod (audit_modified, store_id, type_qname_id),
CONSTRAINT fk_alf_node_acl FOREIGN KEY (acl_id) REFERENCES alf_access_control_list (id),
CONSTRAINT fk_alf_node_store FOREIGN KEY (store_id) REFERENCES alf_store (id),
CONSTRAINT fk_alf_node_tqn FOREIGN KEY (type_qname_id) REFERENCES alf_qname (id),
@@ -302,6 +306,8 @@ CREATE TABLE alf_node_properties
KEY fk_alf_nprop_n (node_id),
KEY fk_alf_nprop_qn (qname_id),
KEY fk_alf_nprop_loc (locale_id),
KEY idx_alf_nprop_s (qname_id, string_value(42)),
KEY idx_alf_nprop_l (qname_id, long_value),
CONSTRAINT fk_alf_nprop_loc FOREIGN KEY (locale_id) REFERENCES alf_locale (id),
CONSTRAINT fk_alf_nprop_n FOREIGN KEY (node_id) REFERENCES alf_node (id),
CONSTRAINT fk_alf_nprop_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (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">
@@ -294,6 +294,16 @@
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="CLAIM_TIME_" order="17">
<type>datetime</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="PRIMARY">
<columnnames>
@@ -921,6 +931,11 @@
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
<column name="PROC_INST_ID_" order="7">
<type>varchar(64)</type>
<nullable>true</nullable>
<autoincrement>false</autoincrement>
</column>
</columns>
<primarykey name="PRIMARY">
<columnnames>
@@ -938,6 +953,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_USER" unique="false">
@@ -960,6 +980,11 @@
<columnname>TASK_ID_</columnname>
</columnnames>
</index>
<index name="ACT_FK_IDL_PROCINST" unique="false">
<columnnames>
<columnname>PROC_INST_ID_</columnname>
</columnnames>
</index>
</indexes>
</table>
<table name="ACT_RU_JOB">
@@ -1300,6 +1325,62 @@
</columnnames>
</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="PRIMARY">
<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_actinst">
<columns>
@@ -1392,6 +1473,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_detail">

View File

@@ -351,27 +351,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>datetime</type>
<nullable>false</nullable>
<autoincrement>false</autoincrement>
@@ -404,11 +399,6 @@
<columnname>site_network</columnname>
</columnnames>
</index>
<index name="feed_activityformat_idx" unique="false">
<columnnames>
<columnname>activity_format</columnname>
</columnnames>
</index>
</indexes>
</table>
<table name="alf_activity_feed_control">
@@ -1146,6 +1136,11 @@
<columnname>orphan_time</columnname>
</columnnames>
</index>
<index name="idx_alf_conturl_sz" unique="false">
<columnnames>
<columnname>content_size</columnname>
</columnnames>
</index>
</indexes>
</table>
<table name="alf_encoding">
@@ -1522,6 +1517,40 @@
<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>
</columnnames>
</index>
<index name="idx_alf_node_cor" unique="false">
<columnnames>
<columnname>audit_creator</columnname>
<columnname>store_id</columnname>
<columnname>type_qname_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>
</columnnames>
</index>
<index name="idx_alf_node_mor" unique="false">
<columnnames>
<columnname>audit_modifier</columnname>
<columnname>store_id</columnname>
<columnname>type_qname_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>
</columnnames>
</index>
</indexes>
</table>
<table name="alf_node_aspects">
@@ -1755,6 +1784,18 @@
<columnname>locale_id</columnname>
</columnnames>
</index>
<index name="idx_alf_nprop_s" unique="false">
<columnnames>
<columnname>qname_id</columnname>
<columnname>string_value</columnname>
</columnnames>
</index>
<index name="idx_alf_nprop_l" unique="false">
<columnnames>
<columnname>qname_id</columnname>
<columnname>long_value</columnname>
</columnnames>
</index>
</indexes>
</table>
<table name="alf_permission">
@@ -2273,12 +2314,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>