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

source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml

@@ -451,8 +451,8 @@
          node.properties prop
       where
          (
-            prop.actualType = :actualTypeString or
-            prop.actualType = 'SERIALIZABLE'
+            prop.actualType = :actualType or
+            prop.actualType = 9
          ) and
          prop.persistedType != 0
    </query>

source/java/org/alfresco/repo/domain/hibernate/Permission.hbm.xml

@@ -54,9 +54,9 @@
         
         <version column="version" name="version" type="long" />
 
-        <property name="inherits" column="inherits" type="boolean" not-null="true" />
+        <property name="inherits" column="inherits" type="boolean" not-null="true" index="idx_pm_acl_inh" />
         
-        <property name="inheritsFrom" column="inherits_from" type="long" not-null="false" />
+        <property name="inheritsFrom" column="inherits_from" type="long" not-null="false" index="idx_pm_acl_inh" />
         
         <property name="type" column="type" type="int" not-null="true" />