From 859bb904f21e52c90a445173572086b1ded1ade1 Mon Sep 17 00:00:00 2001
From: Jan Vonka <jan.vonka@alfresco.com>
Date: Thu, 4 Sep 2008 09:57:33 +0000
Subject: [PATCH] VS2 - fix ALFCOM-1912 (after recent node dao merge) & enhance
 info/warn messages

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10716 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/messages/version-service.properties  | 12 ++++++------
 .../alfresco/repo/version/MigrationCleanupJob.java   |  2 +-
 .../alfresco/repo/version/Version2ServiceImpl.java   |  4 ++--
 .../org/alfresco/repo/version/VersionMigrator.java   |  9 ++++++++-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/config/alfresco/messages/version-service.properties b/config/alfresco/messages/version-service.properties
index efa43c5e70..1593f6b295 100644
--- a/config/alfresco/messages/version-service.properties
+++ b/config/alfresco/messages/version-service.properties
@@ -9,11 +9,11 @@ version_service.err_revert_mismatch=The version provided to revert to does not c
 
 
 version_service.migration.patch.noop=Nothing to do (no version histories found in old version store)
-version_service.migration.patch.complete=Completed migration of {0} version histories (to new version store) in {1} secs
-version_service.migration.patch.warn.skip1=Skipped migration of {0} version histories (migrate failed)
-version_service.migration.patch.warn.skip2=Skipped migration of {0} version histories (already migrated)
+version_service.migration.patch.complete=Completed migration of {0} old version histories (to new version store) in {1} secs
+version_service.migration.patch.warn.skip1=Skipped migration of {0} old version histories (migrate failed)
+version_service.migration.patch.warn.skip2=Skipped migration of {0} old version histories (already migrated)
 
 version_service.migration.delete.progress=\t\tBackground deletion of migrated version histories (from old version store) {0}% complete, estimated complete at {1}
-version_service.migration.delete.complete=Completed deletion of {0} migrated version histories (from old version store) in {1} secs
-version_service.migration.delete.warn.skip1=Skipped deletion of {0} version histories (delete failed)
-version_service.migration.delete.warn.skip2=Skipped deletion of {0} version histories (not migrated)
\ No newline at end of file
+version_service.migration.delete.complete=Completed background deletion of {0} migrated version histories (from old version store) in {1} secs
+version_service.migration.delete.warn.skip1=Skipped background deletion of {0} old version histories (delete failed)
+version_service.migration.delete.warn.skip2=Skipped background deletion of {0} old version histories (not migrated)
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/version/MigrationCleanupJob.java b/source/java/org/alfresco/repo/version/MigrationCleanupJob.java
index 20a27152f1..f1f8e3fb64 100644
--- a/source/java/org/alfresco/repo/version/MigrationCleanupJob.java
+++ b/source/java/org/alfresco/repo/version/MigrationCleanupJob.java
@@ -54,7 +54,7 @@ public class MigrationCleanupJob implements Job
         }
         
         String batchSizeStr = (String)jobData.get(KEY_BATCHSIZE);
-        if (batchSizeStr == null)
+        if (batchSizeStr != null)
         {
             try
             {
diff --git a/source/java/org/alfresco/repo/version/Version2ServiceImpl.java b/source/java/org/alfresco/repo/version/Version2ServiceImpl.java
index 2cac7d5fa6..f6470cd385 100644
--- a/source/java/org/alfresco/repo/version/Version2ServiceImpl.java
+++ b/source/java/org/alfresco/repo/version/Version2ServiceImpl.java
@@ -390,7 +390,7 @@ public class Version2ServiceImpl extends VersionServiceImpl implements VersionSe
         Map<QName, Serializable> result = new HashMap<QName, Serializable>(10);
 
         // Set the version number
-        result.put(Version2Model.PROP_QNAME_VERSION_NUMBER, Integer.toString(versionNumber));
+        result.put(Version2Model.PROP_QNAME_VERSION_NUMBER, versionNumber);
         
         // Set the version label
         result.put(Version2Model.PROP_QNAME_VERSION_LABEL, versionLabel);
@@ -695,7 +695,7 @@ public class Version2ServiceImpl extends VersionServiceImpl implements VersionSe
                }
                else if (key.equals(Version2Model.PROP_QNAME_VERSION_NUMBER))
                {
-                   versionProperties.put(VersionBaseModel.PROP_VERSION_NUMBER, (String)value);
+                   versionProperties.put(VersionBaseModel.PROP_VERSION_NUMBER, (Integer)value);
                }
                else
                {
diff --git a/source/java/org/alfresco/repo/version/VersionMigrator.java b/source/java/org/alfresco/repo/version/VersionMigrator.java
index 710fde2fd5..76f7d42b9c 100644
--- a/source/java/org/alfresco/repo/version/VersionMigrator.java
+++ b/source/java/org/alfresco/repo/version/VersionMigrator.java
@@ -575,7 +575,14 @@ public class VersionMigrator
                                 logger.warn(I18NUtil.getMessage(MSG_DELETE_SKIP2, notMigratedCount));
                             }
                             
-                            logger.info(I18NUtil.getMessage(MSG_DELETE_COMPLETE, deletedCount, ((System.currentTimeMillis()-startTime)/1000)));
+                            if (deletedCount > 0)
+                            {
+                                logger.info(I18NUtil.getMessage(MSG_DELETE_COMPLETE, deletedCount, ((System.currentTimeMillis()-startTime)/1000)));
+                            }
+                            else if (logger.isDebugEnabled())
+                            {
+                                logger.debug(I18NUtil.getMessage(MSG_DELETE_COMPLETE, deletedCount, ((System.currentTimeMillis()-startTime)/1000)));
+                            }
                         }
                         
                         return null;