Change to mapping of AVM aspects.

This seems to make indexing a bit quicker, and at least doesn't make other things
slower. Bulk import now just sucks; it used to be an order of magnitude suckier.
98% of that is due to Andy's recent changes.


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

source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml

@@ -46,6 +46,11 @@
 		<!-- ACL -->
 		<many-to-one name="acl" column="acl_id" foreign-key="fk_avm_n_acl"
 			class="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl"/>
+		<set name="aspects" fetch="join" lazy="false" table="avm_aspects_new" cascade="all" optimistic-lock="true">
+			<cache usage="read-write"/>
+			<key column="id"/>
+			<element type="QName" not-null="true" column="name" length="200"/>
+		</set>
 		<!-- Deleted nodes -->
 		<subclass name="DeletedNodeImpl"
 			  proxy="DeletedNode"

source/java/org/alfresco/repo/avm/hibernate/AVMAspectNameDAOHibernate.java

@@ -23,6 +23,7 @@
 
 package org.alfresco.repo.avm.hibernate;
 
+import java.util.Iterator;
 import java.util.List;
 
 import org.alfresco.repo.avm.AVMAspectName;
@@ -113,4 +114,15 @@ public class AVMAspectNameDAOHibernate extends HibernateDaoSupport
         query.setParameter("name", name);
         return query.uniqueResult() != null;
     }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.avm.AVMAspectNameDAO#iterator()
+     */
+    @SuppressWarnings("unchecked")
+    public Iterator<AVMAspectName> iterator()
+    {
+        Query query =
+            getSession().createQuery("from AVMAspectNameImpl aa");
+        return (Iterator<AVMAspectName>)query.iterate();
+    }
 }