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/PropertyValue.java

@@ -691,17 +691,17 @@ public class PropertyValue implements Cloneable, Serializable
     }
     
     /**
-     * Given an actual type qualified name, returns the <tt>String</tt> that represents it in
-     * the database.
+     * Given an actual type qualified name, returns the <tt>int</tt> ordinal number
+     * that represents it in the database.
      * 
      * @param typeQName the type qualified name
-     * @return Returns the <tt>String</tt> representation of the type,
-     *      e.g. <b>CONTENT</b> for type <b>d:content</b>.
+     * @return Returns the <tt>int</tt> representation of the type,
+     *      e.g. <b>CONTENT.getOrdinalNumber()</b> for type <b>d:content</b>.
      */
-    public static String getActualTypeString(QName typeQName)
+    public static int convertToTypeOrdinal(QName typeQName)
     {
         ValueType valueType = makeValueType(typeQName);
-        return valueType.toString();
+        return valueType.getOrdinalNumber();
     }
     
     @Override