From ec242b6090f9a784c4cb976ea08426ed4814e85a Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Sun, 27 Nov 2011 20:09:57 +0000
Subject: [PATCH] Merged DEV to HEAD    32207: Fix ALF-11644: AVM cleanup jobs
 run when WCM is not installed           - Moved scheduled jobs to installable
 wcm-bootstrap-context.xml           - Also got rid of orphan reaper warnings
 when running in a cluster (not ALF-11720, but mentioned in it)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32330 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/scheduled-jobs-context.xml    | 57 -------------------
 .../org/alfresco/repo/avm/OrphanReaper.java   |  4 +-
 2 files changed, 3 insertions(+), 58 deletions(-)

diff --git a/config/alfresco/scheduled-jobs-context.xml b/config/alfresco/scheduled-jobs-context.xml
index bc7f17c39f..e8a543d93d 100644
--- a/config/alfresco/scheduled-jobs-context.xml
+++ b/config/alfresco/scheduled-jobs-context.xml
@@ -128,57 +128,6 @@
         </property>
     </bean>
     
-    <bean id="avmOrphanReaperJob" class="org.alfresco.util.TriggerBean">
-        <property name="jobDetail">
-            <bean id="avmOrphanReaperJobDetail" class="org.springframework.scheduling.quartz.JobDetailBean">
-                <property name="jobClass">
-                    <value>org.alfresco.repo.avm.OrphanReaperJob</value>
-                </property>
-		        <property name="jobDataAsMap">
-            		<map>
-                		<entry key="orphanReaper">
-                    		<ref bean="orphanReaper"/>
-                		</entry>
-            		</map>
-        		</property>
-            </bean>
-        </property>
-        <property name="scheduler">
-            <ref bean="schedulerFactory"/>
-        </property>
-        <property name="startDelayMinutes">
-            <value>1</value>
-        </property>
-        <property name="repeatIntervalMinutes">
-            <value>1</value>
-        </property>
-    </bean>
-
-    <!-- Job to scan for expired content in website staging areas -->
-    <bean id="avmExpiredContentTrigger" class="org.alfresco.util.CronTriggerBean">
-        <property name="jobDetail">
-            <bean id="avmExpiredContentJobDetail" class="org.springframework.scheduling.quartz.JobDetailBean">
-                <property name="jobClass">
-                    <value>org.alfresco.repo.avm.AVMExpiredContentJob</value>
-                </property>
-                <property name="jobDataAsMap">
-                    <map>
-                       <entry key="expiredContentProcessor">
-                           <ref bean="avmExpiredContentProcessor" />
-                       </entry>
-                    </map>
-                </property>
-            </bean>
-        </property>
-        <property name="scheduler">
-            <ref bean="schedulerFactory" />
-        </property>
-        <!-- trigger at 3:30am each day -->
-        <property name="cronExpression">
-            <value>0 30 3 * * ?</value>
-        </property>
-    </bean>
-        
     <!-- enable scheduler property to activate -->
     <bean id="userUsageCollapseJob" class="org.alfresco.util.TriggerBean">
         <property name="jobDetail">
@@ -212,12 +161,6 @@
           
     </bean>
     
-    <!-- There is a job available to purge old deploymentattempt nodes  -->
-    <!-- from the repository. The maximum age of the node can be configured. -->
-    <!-- See the wiki (http://wiki.alfresco.com/wikiDeployment) for details -->
-    <!-- and the deployment-attempt-cleaner-context.xml.sample file. -->
-    
-    
     <!--  note: Activities (feed) jobs have moved to Activities subsystem (since 3.5) -->
     
     
diff --git a/source/java/org/alfresco/repo/avm/OrphanReaper.java b/source/java/org/alfresco/repo/avm/OrphanReaper.java
index 1b87f6ab46..7f6f45c2dc 100644
--- a/source/java/org/alfresco/repo/avm/OrphanReaper.java
+++ b/source/java/org/alfresco/repo/avm/OrphanReaper.java
@@ -288,7 +288,7 @@ public class OrphanReaper
                 String lockToken = getLock(20000L);
                 if (lockToken == null)
                 {
-                    fgLogger.warn("Can't get lock. Assume multiple reapers ...");
+                    fgLogger.info("Can't get lock. Assume multiple reapers ...");
                     fActive = false;
                     return null;
                 }
@@ -437,6 +437,8 @@ public class OrphanReaper
                     reapCnt++;
                 }
                 
+                jobLockService.releaseLock(lockToken, LOCK);
+                
                 if (fgLogger.isDebugEnabled())
                 {
                     fgLogger.debug("Reaped "+reapCnt+" nodes in "+(System.currentTimeMillis()-start)+" msecs");