inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

VS2 - fix ALFCOM-1912 (after recent node dao merge) & enhance info/warn messages

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10716 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2008-09-04 09:57:33 +00:00
parent 1f7a0bd016
commit 859bb904f2
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/alfresco/messages/version-service.properties
View File

@@ -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.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.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} version histories (migrate failed) 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} version histories (already migrated) 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.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.complete=Completed background 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.skip1=Skipped background deletion of {0} old version histories (delete failed)
version_service.migration.delete.warn.skip2=Skipped deletion of {0} version histories (not migrated) version_service.migration.delete.warn.skip2=Skipped background deletion of {0} old version histories (not migrated)

2
source/java/org/alfresco/repo/version/MigrationCleanupJob.java
View File

@@ -54,7 +54,7 @@ public class MigrationCleanupJob implements Job
} }
String batchSizeStr = (String)jobData.get(KEY_BATCHSIZE); String batchSizeStr = (String)jobData.get(KEY_BATCHSIZE);
if (batchSizeStr == null) if (batchSizeStr != null)
{ {
try try
{ {

4
source/java/org/alfresco/repo/version/Version2ServiceImpl.java
View File

@@ -390,7 +390,7 @@ public class Version2ServiceImpl extends VersionServiceImpl implements VersionSe
Map<QName, Serializable> result = new HashMap<QName, Serializable>(10); Map<QName, Serializable> result = new HashMap<QName, Serializable>(10);
// Set the version number // 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 // Set the version label
result.put(Version2Model.PROP_QNAME_VERSION_LABEL, versionLabel); 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)) 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 else
{ {

7
source/java/org/alfresco/repo/version/VersionMigrator.java
View File

@@ -575,8 +575,15 @@ public class VersionMigrator
logger.warn(I18NUtil.getMessage(MSG_DELETE_SKIP2, notMigratedCount)); logger.warn(I18NUtil.getMessage(MSG_DELETE_SKIP2, notMigratedCount));
} }
if (deletedCount > 0)
{
logger.info(I18NUtil.getMessage(MSG_DELETE_COMPLETE, deletedCount, ((System.currentTimeMillis()-startTime)/1000))); 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; return null;
} }