Merged V2.2 to HEAD

8083: Merged V2.1 to V2.2
      8066: RM-31 and related issues (ACT-729)
      8068: Fix for AR-1997
   8084: Fixed script error on notify page of invite website user wizard
   8086: Merged V2.1 to V2.2
      8075: Clear()ing a hibernate session, is not always enough to guarantee that transactions not use unbounded amounts of memory
      8076: Turn off test that needs to be fixed real soon now.
   8092: Implementation for:   http://issues.alfresco.com/browse/AR-1744
   8093: Fixed upgrade scripts for V2.1.2 to V2.2 upgrades
   8096: Fix for AWC-1578 and AWC-1814
   8097: Added new indexes missing from scripts and made index names consistent.
   8098: Fix for AWC-1548
   8100: Removed use of QName from alf_permission table
   8102: Fix for AWC-1690
   8103: test was == on id that used to be long but is now a Long


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

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

@@ -92,9 +92,11 @@
                 <property name="indirectionVersion" type="int" column="indirection_version"/>
                 <!-- This marks a layered directory as either knowing itself what
                     it points at (true) or inheriting what it points at from its
-                    container (false). -->
+                    container (false).
+                    Ideally we would have the column 'indirection' in the index but it is too long.
+                -->
                 <property name="primaryIndirection"
-                    column="primary_indirection" type="boolean" index="idx_avm_lyr_indn" />
+                    column="primary_indirection" type="boolean" index="idx_avm_n_pi" />
                 <property name="opacity" column="opacity" type="boolean"/>
                 <!-- Map of names to DirectoryEntries. -->
             </subclass>
@@ -281,6 +283,27 @@
         where an.storeNew = :store
     ]]>
     </query>
+    <query name="AVMNode.ClearNewInStore">
+    <![CDATA[
+        update versioned AVMNodeImpl an
+        set an.storeNew = null
+        where an.storeNew = :store
+    ]]>
+    </query>
+    <query name="AVMNode.GetNewLayeredDirectory">
+    <![CDATA[
+        select an.id
+        from LayeredDirectoryNodeImpl an
+        where an.storeNew = :store
+    ]]>
+    </query>
+    <query name="AVMNode.GetNewLayeredFile">
+    <![CDATA[
+        select an.id
+        from LayeredFileNodeImpl an
+        where an.storeNew = :store
+    ]]>
+    </query>
     <query name="AVMNode.GetDescendents">
     <![CDATA[
         select hl.descendent

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

@@ -33,7 +33,12 @@ import org.alfresco.repo.avm.AVMStore;
 import org.alfresco.repo.avm.DirectoryNode;
 import org.alfresco.repo.avm.LayeredDirectoryNode;
 import org.alfresco.repo.avm.LayeredFileNode;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.hibernate.CacheMode;
 import org.hibernate.Query;
+import org.hibernate.impl.SessionImpl;
+import org.hibernate.stat.SessionStatistics;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 /**
@@ -43,6 +48,8 @@ import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 class AVMNodeDAOHibernate extends HibernateDaoSupport implements
         AVMNodeDAO
 {
+    private static Log fgLogger = LogFactory.getLog(AVMNodeDAOHibernate.class);
+
     /**
      * Do nothing constructor.
      */
@@ -232,4 +239,57 @@ class AVMNodeDAOHibernate extends HibernateDaoSupport implements
         getSession().flush();
         getSession().evict(node);
     }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.avm.AVMNodeDAO#clear()
+     */
+    public void clear()
+    {
+        fgLogger.error(getSession().getStatistics());
+        getSession().flush();
+        getSession().clear();
+        fgLogger.error(getSession().getStatistics());
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.avm.AVMNodeDAO#noCache()
+     */
+    public void noCache()
+    {
+        getSession().getSessionFactory().evict(AVMNodeImpl.class);
+        getSession().setCacheMode(CacheMode.IGNORE);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.avm.AVMNodeDAO#yesCache()
+     */
+    public void yesCache()
+    {
+        getSession().setCacheMode(CacheMode.NORMAL);
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.avm.AVMNodeDAO#clearNewInStore(org.alfresco.repo.avm.AVMStore)
+     */
+    public void clearNewInStore(AVMStore store)
+    {
+        Query query = getSession().getNamedQuery("AVMNode.ClearNewInStore");
+        query.setEntity("store", store);
+        query.executeUpdate();
+    }
+
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.avm.AVMNodeDAO#getNewLayeredInStoreIDs(org.alfresco.repo.avm.AVMStore)
+     */
+    @SuppressWarnings("unchecked")
+    public List<Long> getNewLayeredInStoreIDs(AVMStore store)
+    {
+        Query query = getSession().getNamedQuery("AVMNode.GetNewLayeredDirectory");
+        query.setEntity("store", store);
+        List<Long> ids = (List<Long>)query.list();
+        query = getSession().getNamedQuery("AVMNode.GetNewLayeredFile");
+        query.setEntity("store", store);
+        ids.addAll((List<Long>)query.list());
+        return ids;
+    }
 }