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/create/2.2/org.hibernate.dialect.Dialect/AlfrescoPostCreate-2.2-MappedFKIndexes.sql

@@ -9,24 +9,29 @@
 -- Please contact support@alfresco.com if you need assistance with the upgrade.
 --
 
-CREATE INDEX fk_alf_acl_entr ON alf_access_control_entry (acl_id);
-CREATE INDEX fk_alf_ace_perm ON alf_access_control_entry (permission_id);
 CREATE INDEX fk_alf_ace_auth ON alf_access_control_entry (authority_id);
+CREATE INDEX fk_alf_ace_perm ON alf_access_control_entry (permission_id);
+CREATE INDEX fk_alf_ace_ctx ON alf_access_control_entry (context_id);
 
-CREATE INDEX fk_alf_attr_acl ON alf_attributes (acl_id);
+CREATE INDEX fk_alf_acl_acs ON alf_access_control_list (acl_change_set);
+
+CREATE INDEX fk_alf_aclm_acl ON alf_acl_member (acl_id);
+CREATE INDEX fk_alf_aclm_ace ON alf_acl_member (ace_id);
 
 CREATE INDEX fk_alf_adtf_src ON alf_audit_fact (audit_source_id);
 CREATE INDEX fk_alf_adtf_date ON alf_audit_fact (audit_date_id);
 CREATE INDEX fk_alf_adtf_conf ON alf_audit_fact (audit_conf_id);
 
-CREATE INDEX fk_alf_auth_ext ON alf_auth_ext_keys (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);
 
 CREATE INDEX fk_alf_ca_pnode ON alf_child_assoc (parent_node_id);
 CREATE INDEX fk_alf_ca_tqn ON alf_child_assoc (type_qname_id);
 CREATE INDEX fk_alf_ca_qn_ns ON alf_child_assoc (qname_ns_id);
 CREATE INDEX fk_alf_ca_cnode ON alf_child_assoc (child_node_id);
 
-CREATE INDEX fk_alf_gatt_att ON alf_global_attributes (attribute);
+-- alf_global_attributes.attribute is declared unique.  Indexes may automatically have been created.
+CREATE INDEX fk_alf_gatt_att ON alf_global_attributes (attribute);  -- (optional)
 
 CREATE INDEX fk_alf_lent_att ON alf_list_attribute_entries (attribute_id);
 

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

config/alfresco/messages/content-model.properties

@@ -214,6 +214,8 @@ cm_contentmodel.property.cm_categories.description=Categories
 
 cm_contentmodel.aspect.cm_attachable.title=Attachable
 cm_contentmodel.aspect.cm_attachable.description=Allows other repository objects to be attached
+cm_contentmodel.association.cm_attachments.title=Attachments
+cm_contentmodel.association.cm_attachments.description=Attached repository objects
 
 cm_contentmodel.aspect.cm_emailed.title=Emailed
 cm_contentmodel.aspect.cm_emailed.description=Emailed

config/alfresco/model/deprecated/deprecated_contentModel.xml

@@ -9,6 +9,7 @@
       <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
       <import uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/>
       <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
+		<import uri="http://www.alfresco.org/model/emailserver/1.0" prefix="emailserver" />
    </imports>
    
    <aspects>
@@ -44,6 +45,24 @@
          </associations>
       </aspect>
             
+		<aspect name="emailserver:attached">
+			<title>Attached</title>
+			<associations>
+				<association name="emailserver:attachment">
+					<title>Attachment</title>
+					<source>	
+						<mandatory>true</mandatory>
+						<many>true</many>
+					</source>
+					<target>
+						<class>cm:content</class>						
+						<mandatory>false</mandatory>
+						<many>false</many>
+					</target>
+				</association>
+			</associations>
+		</aspect>
+		
    </aspects>
 
 </model>

config/alfresco/model/emailServerModel.xml

@@ -34,24 +34,6 @@
    
 	<aspects>
 
-		<aspect name="emailserver:attached">
-			<title>Attached</title>
-			<associations>
-				<association name="emailserver:attachment">
-					<title>Attachment</title>
-					<source>	
-						<mandatory>true</mandatory>
-						<many>true</many>
-					</source>
-					<target>
-						<class>cm:content</class>						
-						<mandatory>false</mandatory>
-						<many>false</many>
-					</target>
-				</association>
-			</associations>
-		</aspect>
-		
 		<aspect name="emailserver:emailed">
 			<title>Emailed</title>
 			<parent>cm:emailed</parent>