Merged V2.2 to HEAD

7653: Update and added deployment icons
   7655: Fixed multithreaded test case to handle case where threads can't get started due to lack of available DB connections.
   7657: AR-1903: Text attachments should be treated the same way as other attachments.
   7661: Fixed duplicate index creation for column that is also declared unique
   7662: Additional indexes related to permissions
   7664: Fixed query for specific property types
   7667: Used existing attachable aspect for email attachments - effectively reversing association direction.
   7682: Added AVM Console page to webapp (admin user protected)
   7683: Merged V2.1 to V2.2
      7642: Fix for WCM-949
      7668: Debugging output for getAPath(). Possible partial fix for LazyInitialization errors seen by some customers
      7672: Fixed sub optimal tree pruning in filesystem deployment


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8442 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-2.2-ACL.sql

@@ -7,6 +7,12 @@
 -- Please contact support@alfresco.com if you need assistance with the upgrade.
 --
 
+-- Add index support for AVM
+-- Ideally we would have the indirection in the index but it is too long for mysql
+-- CREATE INDEX idx_avm_lyr_indn on avm_nodes (primary_indirection, indirection(128));
+-- This matches the hibernate schema and should be good enough for the standard WCM use cases
+CREATE INDEX idx_avm_lyr_indn on avm_nodes (primary_indirection);
+
 CREATE TABLE alf_acl_change_set (
    id BIGINT NOT NULL AUTO_INCREMENT,
    version BIGINT NOT NULL,
@@ -26,6 +32,7 @@ ALTER TABLE alf_access_control_list
    ADD COLUMN acl_change_set BIGINT,
    ADD COLUMN inherits_from BIGINT;
 CREATE INDEX fk_alf_acl_acs ON alf_access_control_list (acl_change_set);
+CREATE INDEX idx_pm_acl_inh ON alf_access_control_list (inherits, inherits_from);
 ALTER TABLE alf_access_control_list ADD CONSTRAINT fk_alf_acl_acs FOREIGN KEY (acl_change_set) REFERENCES alf_acl_change_set (id);
 
 UPDATE alf_access_control_list acl