Merged V2.2 to HEAD

8397: Fix for AR-2003, AR-2127, AR-2128 (Hibernate patch)


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

config/alfresco/bootstrap-context.xml

@@ -33,6 +33,9 @@
        <property name="maximumStringLength">
           <value>${system.maximumStringLength}</value>
        </property>
+       <property name="hibernateMaxExecutions">
+          <value>${system.hibernateMaxExecutions}</value>
+       </property>
        <property name="updateSchema">
           <value>${db.schema.update}</value>
        </property>

config/alfresco/hibernate-context.xml

@@ -23,16 +23,31 @@
         </property>
     </bean>
 
+    <bean id="defaltOnLoadListsner" class="org.hibernate.event.def.DefaultLoadEventListener" />
+    
+    <bean id="clearCGLibThreadLocal" class="org.alfresco.repo.domain.hibernate.HibernateLoadListener" />
+    
     <!-- Hibernate session factory -->
     <bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean" parent="sessionFactoryBase">
         <property name="dataSource">
             <ref bean="dataSource" />
         </property>
     </bean>
+    
     <bean id="sessionFactoryBase" abstract="true">
         <property name="schemaUpdate">
            <value>false</value>
         </property>
+        <property name="eventListeners" >
+            <map>
+                <entry key="load">
+                    <list>
+                        <ref bean="defaltOnLoadListsner" />
+                        <ref bean="clearCGLibThreadLocal" />
+                    </list>
+                </entry>
+            </map>
+        </property>
         <property name="mappingResources">
             <list>
                 <!--  -->
@@ -289,13 +304,19 @@
         <property name="aclDaoComponent">
             <ref bean="aclDaoComponent"/>
         </property>
+        <property name="avmSnapShotTriggeredIndexingMethodInterceptor">
+            <ref bean="avmSnapShotTriggeredIndexingMethodInterceptor"/>
+        </property>
+        <property name="hibernateSessionHelper">
+            <ref bean="hibernateSessionHelper"/>
+        </property>
     </bean>
-
+
     <bean id="usageDeltaDao" class="org.alfresco.repo.usage.hibernate.HibernateUsageDeltaDAO">
-        <property name="sessionFactory">
-            <ref bean="sessionFactory"/>
-        </property>
-    </bean>
+         <property name="sessionFactory">
+             <ref bean="sessionFactory"/>
+         </property>
+   </bean>
     
    <bean id="nodeDaoServiceImpl" class="org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl">
       <property name="qnameDAO">
@@ -360,10 +381,17 @@
          </list>
       </property>
    </bean>
+   
    <bean id="contentUrlDAOImpl" class="org.alfresco.repo.domain.hibernate.HibernateContentUrlDAOImpl">
       <property name="sessionFactory">
          <ref bean="sessionFactory"/>
       </property>
    </bean>
+   
     
+   <bean id="hibernateSessionHelper" class="org.alfresco.repo.domain.hibernate.HibernateSessionHelper">
+       <property name="sessionFactory">
+           <ref bean="sessionFactory"/>
+       </property>
+   </bean> 
 </beans>

config/alfresco/messages/patch-service.properties

@@ -2,6 +2,7 @@
 patch.service.not_relevant=Not relevant to schema {0}
 patch.executer.checking=Checking for patches to apply ...
 patch.service.applying_patch=\tApplying patch ''{0}'' ({1}).
+patch.progress=\t\tPatch {0}% complete, estimated complete at {1}.
 patch.executer.no_patches_required=No patches were required.
 patch.executer.system_readonly=Patches cannot be applied to a read-only system.  Possible incompatibilities may exist between the application code and the existing data.
 patch.executer.not_executed =\n=== Recorded patch (not executed) === \nID: {0}\nRESULT: \n{1}\n=====================================

config/alfresco/patch/patch-services-context.xml

@@ -1268,6 +1268,9 @@
         <!-- helper beans -->
         <property name="accessControlListDao">
             <ref bean="avmACLDAO" />
+        </property>
+         <property name="aclDaoComponent">
+            <ref bean="aclDaoComponent" />
         </property>
         <property name="dependsOn" >
             <list>
@@ -1380,6 +1383,9 @@
         <property name="permissionService">
             <ref bean="permissionService" />
         </property>
+        <property name="aclDaoComponent">
+            <ref bean="aclDaoComponent" />
+        </property>
         <property name="avmSnapShotTriggeredIndexingMethodInterceptor">
             <ref bean="avmSnapShotTriggeredIndexingMethodInterceptor" />
         </property>

config/alfresco/repository.properties

@@ -74,6 +74,13 @@ system.acl.maxPermissionChecks=1000
 # org.alfresco.repo.domain.schema.SchemaBootstrap for V2.1.2
 system.maximumStringLength=-1
 
+#
+# Limit hibernate session size by trying to amalgamate events for the L2 session invalidation
+# - hibernate works as is up to this size 
+# - after the limit is hit events that can be grouped invalidate the L2 cache by type and not instance
+# events may not group if there are post action listener registered (this is not the case with the default distribution)
+system.hibernateMaxExecutions=20000
+
 # #################### #
 # Lucene configuration #
 # #################### #