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/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>