From f9ff45eda18a85607aa950f52efc87a06e0e9f22 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 11 Nov 2015 18:01:59 +0000
Subject: [PATCH] Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)    117253
 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )       114523
 adavis: Merged BCRYPT to 5.0.2-CLOUD          114045 gcornwell: MNT-14892:
 Enabled the UpgradePasswordHashJob (it won't run until 2099 though due to the
 default cron experssion) and tweaked log statements.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117346 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/scheduled-jobs-context.xml        |  6 ++----
 .../authentication/UpgradePasswordHashWorker.java | 15 +++++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/config/alfresco/scheduled-jobs-context.xml b/config/alfresco/scheduled-jobs-context.xml
index 4ce4db0240..c1cc42628b 100644
--- a/config/alfresco/scheduled-jobs-context.xml
+++ b/config/alfresco/scheduled-jobs-context.xml
@@ -282,11 +282,10 @@
         </property>
     </bean>
     
-    <!-- Definition for the upgrade password hash job -->
-    <!--  
+    <!-- Definition for the upgrade password hash job -->  
     <bean id="upgradePasswordHashJobDetail" class="org.springframework.scheduling.quartz.JobDetailBean">
         <property name="jobClass" 
-                  value="org.alfresco.repo.security.authenticationUpgradePasswordHashWorker$UpgradePasswordHashJob" />
+                  value="org.alfresco.repo.security.authentication.UpgradePasswordHashWorker$UpgradePasswordHashJob" />
         <property name="jobDataAsMap">
             <map>
                 <entry key="upgradePasswordHashWorker" value-ref="upgradePasswordHashWorker" />
@@ -299,6 +298,5 @@
         <property name="cronExpression" value="${system.upgradePasswordHash.jobCronExpression}" />
         <property name="startDelayMinutes" value="${system.cronJob.startDelayMinutes}" />
     </bean>
-    -->
     
 </beans>
diff --git a/source/java/org/alfresco/repo/security/authentication/UpgradePasswordHashWorker.java b/source/java/org/alfresco/repo/security/authentication/UpgradePasswordHashWorker.java
index 0a38e7aaa7..b8fd3ae73d 100644
--- a/source/java/org/alfresco/repo/security/authentication/UpgradePasswordHashWorker.java
+++ b/source/java/org/alfresco/repo/security/authentication/UpgradePasswordHashWorker.java
@@ -235,9 +235,9 @@ public class UpgradePasswordHashWorker implements ApplicationContextAware, Initi
             doWork(progress);
             
             // Done
-            if (logger.isDebugEnabled())
+            if (logger.isInfoEnabled())
             {
-                logger.debug("Upgrade password hash job " + progress);
+                logger.info("Finished upgrade password hash job: " + progress);
             }
         }
         catch (LockAcquisitionException e)
@@ -359,6 +359,11 @@ public class UpgradePasswordHashWorker implements ApplicationContextAware, Initi
             this.progress = progress;
             this.maxNodeId = patchDAO.getMaxAdmNodeID();
             this.userTypeId = qnameDAO.getQName(ContentModel.TYPE_USER);
+            
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Max NodeID: " + this.maxNodeId);
+            }
         }
         
         @Override
@@ -367,12 +372,6 @@ public class UpgradePasswordHashWorker implements ApplicationContextAware, Initi
             // execute a query to get total number of user nodes in the system.
             long totalUserCount = patchDAO.getCountNodesWithTypId(ContentModel.TYPE_USER);
             
-            if (logger.isDebugEnabled())
-            {
-                logger.debug("Max NodeID: " + this.maxNodeId);
-                logger.debug("Total number of users: " + totalUserCount);
-            }
-            
             return (int)totalUserCount;
         }