diff --git a/config/alfresco/messages/data-list-model_fr.properties b/config/alfresco/messages/data-list-model_fr.properties
index 988b174dd7..a514552584 100755
--- a/config/alfresco/messages/data-list-model_fr.properties
+++ b/config/alfresco/messages/data-list-model_fr.properties
@@ -77,7 +77,7 @@ dl_datalistmodel.property.dl_eventNote.title=Notes
# Location
dl_datalistmodel.type.dl_location.title=Carnet d'adresses
dl_datalistmodel.type.dl_location.description=Carnet d'adresses
-dl_datalistmodel.property.dl_locationAddress1.title=Adresse (ligne\u00a01)
+dl_datalistmodel.property.dl_locationAddress1.title=Adresse (ligne 1)
dl_datalistmodel.property.dl_locationAddress2.title=Adresse (ligne 2)
dl_datalistmodel.property.dl_locationAddress3.title=Adresse (ligne 3)
dl_datalistmodel.property.dl_locationZip.title=Code postal
diff --git a/config/alfresco/messages/data-list-model_ja.properties b/config/alfresco/messages/data-list-model_ja.properties
index 43e625de89..98f7000968 100755
--- a/config/alfresco/messages/data-list-model_ja.properties
+++ b/config/alfresco/messages/data-list-model_ja.properties
@@ -101,4 +101,4 @@ dl_datalistmodel.property.dl_eventAgendaEndTime.title=\u7d42\u4e86\u6642\u523b
dl_datalistmodel.property.dl_eventAgendaSessionName.title=\u30bb\u30c3\u30b7\u30e7\u30f3\u540d
dl_datalistmodel.property.dl_eventAgendaPresenter.title=\u30d7\u30ec\u30bc\u30f3\u30bf
dl_datalistmodel.property.dl_eventAgendaAudience.title=\u30aa\u30fc\u30c7\u30a3\u30a8\u30f3\u30b9
-dl_datalistmodel.property.dl_eventAgendaNotes.title=\u30e1\u30e2
+dl_datalistmodel.property.dl_eventAgendaNotes.title=\u30e1\u30e2
\ No newline at end of file
diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index 3e057e4aa7..222057b7ea 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -187,7 +187,7 @@ patch.webscripts3.description=Update Web Scripts ReadMe.
patch.webscriptsExtension.description=Adds Web Scripts Extension to Data Dictionary.
patch.imap.messages.share.description=Adds email template for txt files to the Imap Configs/Templates
patch.imap.clear.old.messages.description=Remove old IMAP message templates
-patch.imap.clear.old.messages.description.cleared=Old IMAP message templates no more exists in repo
+patch.imap.clear.old.messages.description.cleared=Old IMAP message templates have been removed from the repository
patch.AVMLayeredSnapshot.description=Set indirectionVersion on Layered Nodes.
patch.AVMLayeredSnapshot.result=Layered Node indirectionVersions set.
diff --git a/config/alfresco/messages/patch-service_de.properties b/config/alfresco/messages/patch-service_de.properties
deleted file mode 100755
index fcc7939517..0000000000
--- a/config/alfresco/messages/patch-service_de.properties
+++ /dev/null
@@ -1,395 +0,0 @@
-# PatchService messages
-patch.service.preceeded_by_alternative=Preceded by alternative patch ''{0}''.
-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} {1}% complete, estimated complete at {2}.
-patch.validation.failed=Validation of patch ''{0}'' failed. Patch is applicable to a newer schema than the schema of this build ({1}).\nfixesToSchema: {2}\ntargetSchema: {3}.\nIf this patch should always be run once on every installation, please ensure that the ''fixesToSchema'' value is set to '''${version.schema}'''.
-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=====================================
-patch.executer.executed =\n=== Applied patch === \nID: {0}\nRESULT: \n{1}\n=====================================
-patch.executer.failed =\n=== Failed to apply patch === \nID: {0}\nRESULT: \n{1}\n=====================================
-patch.noLongerSupportedPatch.err.use_incremental_upgrade = \nPatch ''{0}'' was last supported on version {1}.\n Please follow an incremental upgrade using version {2}.
-
-# General patch messages
-
-patch.genericBootstrap.result.exists=Bootstrap location already exists: {0}
-patch.genericBootstrap.result.created=Imported view into bootstrap location: {0} ({1})
-patch.genericBootstrap.err.multiple_found=Multiple nodes found: {0}
-
-patch.general.property_not_set=Patch property ''{0}'' has not been set on this patch: {1}
-
-patch.QNamePatch.result=Successfully updated the ''{0}'' QName to ''{1}''.
-
-patch.genericMimetypeUpdate.start=Updating mimetypes.
-patch.genericMimetypeUpdate.updated=\n\tUpdated {0} content references with mimetype ''{1}'' to use ''{2}''.
-patch.genericMimetypeUpdate.indexed=\n\tIndexed {0} nodes in store ''{1}''.
-patch.genericMimetypeUpdate.done=\n\tFinished updating mimetypes.
-patch.genericMimetypeUpdate.doneReindex=\n\tFinished updating mimetypes. Selective reindexing was disabled; a reindex is required to search for the new mimetype(s).
-
-# Individual patch messages
-
-patch.noOpPatch.description=A placeholder patch; usually marks a superceded patch.
-patch.noOpPatch.result=No-op patch
-
-patch.marker.description=Marker patch to record installations and upgrades
-patch.marker.result=Marker patch applied
-
-patch.savedSearchesFolder.description=Ensures the existence of the 'Saved Searches' folder.
-patch.savedSearchesFolder.result.exists=The saved searches folder already exists: {0}
-patch.savedSearchesFolder.result.created=The saved searches folder was successfully created: {0}
-
-patch.savedSearchesPermission.description=Sets required permissions on 'Saved Searches' folder.
-patch.savedSearchesPermission.result.applied=Granted CONTRIBUTOR role to EVERYONE on 'Saved Searches' folder: {0}.
-patch.savedSearchesPermission.err.not_found='Saved Searches' folder could not be found.
-
-patch.updatePermissionData.description=Update permissions from 'folder' to 'cmobject' [JIRA: AR-344].
-patch.updatePermissionData.result=Changed {0} 'folder' access control entries to 'cmobject'.
-
-patch.authoritiesFolder.description=Ensures the existence of the user authorities folder [JIRA: AR-497].
-
-patch.authoritiesFolderPermission.description=Ensures group authorities are visible to everyone.
-
-patch.guestUser.description=Add the guest user, guest home space; and fix permissions on company home, guest home and guest person.
-patch.guestUser.result=Added guest user and fixed permissions.
-
-patch.fixNodeSerializableValues.description=Ensure that property values are not stored as Serializable if at all possible
-patch.fixNodeSerializableValues.result=Fixed {0} node property serialized values
-
-patch.updateGuestPermission.description=Rename guest permission from 'Guest' to 'Consumer'
-patch.updateGuestPermission.result=Changed {0} 'Guest' access control entries to 'Consumer'.
-
-patch.categoryRootPermission.description=Sets required permissions on 'Category Root' folder.
-patch.categoryRootPermission.result=Granted CONSUMER role to GUEST on 'Category Root' folder: {0}.
-patch.categoryRootPermission.err.not_found='Category Root' folder ({0}) could not be found.
-
-patch.guestPersonPermission.description=Change Guest Person permission from 'Consumer' to 'Read'
-patch.guestPersonPermission.result=Updated Guest Person permission from 'Consumer' to 'Read'
-
-patch.spacesRootPermission.description=Change Spaces store root permission from 'Consumer' to 'Read'
-patch.spacesRootPermission.result=Updated Spaces store root permission from 'Consumer' to 'Read'
-
-patch.contentPermission.description=Update permission entries from 'cm:content' to 'sys:base'.
-patch.contentPermission.result=Changed {0} 'cm:content' access control entries to 'sys:base'.
-
-patch.forumsIcons.description=Updates forums icon references
-patch.forumsIcons.result=Updated {0} icon references
-
-patch.emailTemplatesFolder.description=Ensures the existence of the 'Email Templates' folder.
-patch.emailTemplatesFolder.result.exists=The email templates folder already exists: {0}
-patch.emailTemplatesFolder.result.created=The email templates folder was successfully created: {0}
-
-patch.emailInviteAndNotifyTemplatesFolder.description=Ensures the existence of the 'Email Invite Templates' and 'Email Notify Templates' folders.
-patch.emailNotifyTemplatesFolder.result.exists=The Email Notify Templates folder already exists: {0}
-patch.emailNotifyTemplatesFolder.result.created=The Email Notify Templates folder was successfully created: {0}
-patch.emailInviteTemplatesFolder.result.exists=The Email Invite Templates folder already exists: {0}
-patch.emailInviteTemplatesFolder.result.created=The Email Invite Templates folder was successfully created: {0}
-
-patch.emailTemplatesContent.description=Loads the email templates into the Email Templates folder.
-patch.emailTemplatesContent.result=Imported the Email Templates into the default folder.
-
-patch.descriptorUpdate.description=Update Repository descriptor
-patch.descriptorUpdate.result=Repository descriptor updated
-
-patch.scriptsFolder.description=Ensures the existence of the 'Scripts' folder.
-patch.scriptsFolder.result.exists=The scripts folder already exists: {0}
-patch.scriptsFolder.result.created=The scripts folder was successfully created: {0}
-
-patch.topLevelGroupParentChildAssociationTypePatch.description=Ensure top level groups have the correct child association type.
-patch.topLevelGroupParentChildAssociationTypePatch.result=Fixed {0} top level groups child association types.
-patch.topLevelGroupParentChildAssociationTypePatch.err.sys_path_not_found=Required authority system path not found: {0}
-patch.topLevelGroupParentChildAssociationTypePatch.err.auth_path_not_found=Required authority path not found: {0}
-
-patch.actionRuleDecouplingPatch.description=Migrate existing rules to the updated model where rules are decoupled from actions.
-patch.actionRuleDecouplingPatch.result=Updated {0} rules.
-
-patch.systemWorkflowFolder.description=Ensures the existence of the system workflow container.
-patch.systemWorkflowFolder.result.created=Created system workflow container {0}.
-
-patch.rssTemplatesFolder.description=Ensures the existence of the 'RSS Templates' folder.
-patch.rssTemplatesFolder.result.exists=The RSS Templates folder already exists: {0}. Re-applying guest permissions.
-patch.rssTemplatesFolder.result.created=The RSS Templates folder was successfully created: {0}
-
-patch.rendition.rendering_actions.exists=The Rendering Actions folder already exists: {0}.
-patch.rendition.rendering_actions.created=The Rendering Actions folder was successfully created: {0}
-patch.rendition.rendering_actions.description=Creates the Rendering Actions folder.
-
-patch.replication.replication_actions.exists=The Replication Actions folder already exists: {0}.
-patch.replication.replication_actions.created=The Replication Actions folder was successfully created: {0}
-patch.replication.replication_actions.description=Creates the Replication Actions folder.
-
-patch.uifacetsAspectRemovalPatch.description=Removes the incorrectly applied uifacets aspect from presentation template files.
-patch.uifacetsAspectRemovalPatch.updated=Successfully removed the uifacets aspect from {0} presentation template files.
-
-patch.guestPersonPermission2.description=Change Guest Person permission to visible by all users as 'Consumer'.
-patch.guestPersonPermission2.result=Updated Guest Person permission to visible by all users as 'Consumer'.
-
-patch.schemaUpgradeScript.description=Ensures that the database upgrade script has been run.
-patch.schemaUpgradeScript.err.not_executed=The schema upgrade script, ''{0}'', has not been run against this database.
-
-patch.uniqueChildName.description=Checks and renames duplicate children.
-patch.uniqueChildName.copyOf=({0}-{1})
-patch.uniqueChildName.result=Checked {0} associations and fixed {1} duplicates. See file {2} for details.
-patch.uniqueChildName.err.unable_to_fix=Auto-fixing of duplicate names failed. See file {0} for details.
-
-patch.invalidNameEnding.description=Fixes names ending with a space or full stop.
-patch.invalidNameEnding.result=Fixed {0} names ending with a space or full stop. See file {1} for details.
-patch.invalidNameEnding.err.unable_to_fix=Auto-fixing of names ending with a space or full stop failed. See file {0} for details.
-patch.invalidNameEnding.rewritten=Name ''{0}'' rewritten to ''{1}''
-
-patch.systemDescriptorContent.description=Adds the version properties content to the system descriptor.
-patch.systemDescriptorContent.result=Added the version properties content to the system descriptor.
-patch.systemDescriptorContent.err.no_version_properties=The version.properties resource could not be found.
-patch.systemDescriptorContent.err.no_descriptor=The system descriptor could not be found.
-
-patch.versionHistoryPerformance.description=Improves the performance of version history lookups.
-patch.versionHistoryPerformance.result=Updated {0} version history objects to improve performance.
-
-patch.multilingualBootstrap.description=Bootstraps the node that will hold the multilingual containers.
-
-patch.siteLoadPatch.description=Loads a sample site into the repository.
-patch.siteLoadPatch.exists=The Site {0} already exists and so could not be imported
-patch.siteLoadPatch.noBootstrapViews=No bootstrap views were given for importing Site {0} - please check the bootstrap extension bean configuration
-patch.siteLoadPatch.result=Site {0} imported.
-
-patch.wcmFolders.description=Ensures the existance of the WCM specific 'Web Projects' and 'Web Forms' folders.
-patch.wcmFolders.webprojects.result.exists=The Web Projects folder already exists: {0}
-patch.wcmFolders.webprojects.result.created=The Web Projects folder was successfully created: {0}
-patch.wcmFolders.webforms.result.exists=The Web Forms folder already exists: {0}
-patch.wcmFolders.webforms.result.created=The Web Forms folder was successfully created: {0}
-
-patch.linkNodeExtension.description=Fixes link node file extensions to have a .url extension.
-patch.linkNodeExtension.result=Fixed {0} link node file extensions. See file {1} for details.
-patch.linkNodeExtension.err.unable_to_fix=Auto-fixing of link node file extensions failed. See file {0} for details.
-patch.linkNodeExtension.rewritten=Name ''{0}'' rewritten to ''{1}''
-
-patch.systemRegistryBootstrap.description=Bootstraps the node that will hold system registry metadata.
-
-patch.userAndPersonUserNamesAsIdentifiers.description=Reindex usr:user and cm:person uids as identifiers
-patch.userAndPersonUserNamesAsIdentifiers.result=Reindexed user:user and cm:person uids as identifiers
-
-patch.contentFormFolderType.description=Update WCM Content Form folder type.
-patch.contentFormFolderType.result=Updated {0} WCM Content Form objects to 'wcm:formfolder' type.
-
-patch.groupNamesAsIdentifiers.description=Reindex usr:authorityContainer gids as identifiers
-patch.groupNamesAsIdentifiers.result=Reindexed usr:authorityContainer with identifiers
-
-patch.invalidUserPersonAndGroup.description=Fix up invalid uids for people and users; and invalid gids for groups
-patch.invalidUserPersonAndGroup.result=Fixed ''{0}'' invalid user nodes, ''{1}'' invalid person nodes and ''{2}'' invalid authority nodes.
-
-patch.AVMGuidPatch.description=Set GUIDs on AVM nodes.
-patch.AVMGuidPatch.result=AVM GUIDS set.
-
-patch.webscripts.description=Adds Web Scripts to Data Dictionary.
-patch.webscripts2.description=Adds Web Scripts (second set) to Data Dictionary.
-patch.webscripts3.description=Update Web Scripts ReadMe.
-patch.webscriptsExtension.description=Adds Web Scripts Extension to Data Dictionary.
-
-patch.AVMLayeredSnapshot.description=Set indirectionVersion on Layered Nodes.
-patch.AVMLayeredSnapshot.result=Layered Node indirectionVersions set.
-
-patch.groupMembersAsIdentifiers.description=Reindex usr:authorityContainer members as identifiers
-
-patch.genericWorkflow.result.deployed=Re-deployed {0} workflows.
-
-patch.redeploySubmitProcess.description=Re-deploy WCM Submit Process Definition.
-patch.deploySubmitDirectProcess.description=Deploy WCM Direct Submit Process Definition.
-
-patch.AVMAspects.description=Changes storage of aspects on AVM Nodes.
-patch.AVMAspects.result=Aspects were moved.
-
-patch.ReadmeTemplate.description=Deployed ReadMe Template
-patch.webScriptsReadme.description=Applied ReadMe template to Web Scripts folders
-
-patch.AVMProperties.description=Changes storage of properties on AVM Nodes.
-patch.AVMProperties.result=Properties were moved.
-
-patch.customModels.description=Adds 'Models' folder to Data Dictionary
-patch.customMessages.description=Adds 'Messages' folder to Data Dictionary
-patch.customWebClientExtension.description=Adds 'Web Client Extension' folder to Data Dictionary
-
-patch.customWorkflowDefs.description=Adds 'Workflow Definitions' folder to Data Dictionary.
-
-patch.emailContributorGroup.description=Adds the 'GROUP_EMAIL_CONTRIBUTORS' group.
-
-patch.avmStoreAsIdentifier.description=Reindex wca:webfolder to make wca:avmstore an identifier
-patch.avmStoreAsIdentifier.result=Reindexed wca:webfolder to make wca:avmstore an identifier
-
-patch.avmFormPropertyIdentifier.description=Reindex wca:webform to make wca:formname an identifier
-patch.avmFormPropertyIdentifier.result=Reindexed wca:webform to make wca:formname an identifier
-
-patch.formsFolder.description=Adds 'Forms' folder to Data Dictionary.
-
-patch.tagRootCategory.description=Adds 'Tags' as new top-level category root.
-
-patch.sitesFolder.description=Adds 'Sites' folder to Company Home.
-
-patch.deploymentMigration.description=Migrates deployment data to the new model.
-patch.deploymentMigration.webProjectName=Migrating deployment data for web project ''{0}''
-patch.deploymentMigration.serverMigrated=Server ''{0}'' from web project ''{1}'' has been migrated
-patch.deploymentMigration.reportMigrated=Deployment report for ''{0}'' from web project ''{1}'' has been migrated
-patch.deploymentMigration.result=Deployment data has been migrated.
-
-patch.updateAvmPermissionData.description=Update avm permissions from 'webfolder' to 'cmobject'.
-patch.updateAvmPermissionData.result=Changed {0} 'webfolder' access control entries to 'cmobject'.
-
-patch.updateAvmPermissions.description=Update ACLs on all avm objects to the new 2.2 permission model
-patch.updateAvmPermissions.result=Updated ACLs. Created {0} defining and {1} layered ACLs.
-
-patch.wcmPermissionPatch.description=Fix ACLs so they are only set on the staging area store.
-patch.wcmPermissionPatch.result=Updated ACLs: ACLS are moved to the staging area store and removed from all other stores. They are now applied via layering.
-
-patch.avmWebProjectInheritPermissions.description=Break inheritance of permissions on wca:webfolder object to hide access by default.
-patch.avmWebProjectInheritPermissions.result=Removed inheritance of permissions on all wca:webfolder objects.
-
-patch.wcmPostPermissionSnapshotPatch.description=Snapshot stores (after fixing ACLs so they are only set on the staging area store).
-patch.wcmPostPermissionSnapshotPatch.result=Snapshot complete after WCM ACL changes.
-
-patch.updateDmPermissions.description=Update ACLs on all DM node objects to the new 3.0 permission model
-patch.updateDmPermissions.result=Updated ACLs. Created {0} defining ACLs.
-
-patch.db-V3.0-0-CreateActivitiesExtras.description=Replaced by 'patch.db-V3.0-ActivityTables', which must run first.
-
-patch.createSiteStore.description=Create the AVM store for site data structure for 3.0 web-tier clients.
-patch.createSiteStore.result=Created the AVM site data store.
-
-patch.sitePermissionRefactorPatch.description=Create permission groups for sites.
-patch.sitePermissionRefactorPatch.result=Groups have been created for all sites and user's allocated accordingly.
-
-patch.migrateVersionStore.description=Version Store migration (from lightWeightVersionStore to version2Store)
-patch.migrateVersionStore.incomplete=Version Store migration incomplete.
-patch.migrateVersionStore.done=Version Store migration completed.
-patch.migrateVersionStore.bypassingPatch=Bypass Version Store migration patch since scheduled to run as job
-
-patch.inviteEmailTemplate.description=Adds invite email template to invite space
-
-patch.calendarModelNamespacePatch.description=Update the Calendar model namespace URI and reindex all calendar objects.
-patch.calendarModelNamespacePatch.result=Updated the Calendar model namespace URI to http://www.alfresco.org/model/calendar and reindexed {0} calendar objects.
-
-patch.spacesStoreGuestPermission.description=Sets READ permissions for GUEST on root node of the SpacesStore.
-patch.spacesStoreGuestPermission.result=Granted READ permissions for GUEST on root node of the SpacesStore.
-
-patch.administratorGroup.description=Adds the 'ALFRESCO_ADMINISTRATORS' group.
-
-patch.resetWCMToGroupBasedPermissionsPatch.description=Reset WCM to group based permissions.
-patch.resetWCMToGroupBasedPermissionsPatch.result=WCM reset to group based permissions.
-
-patch.migrateVersionStoreUpdateCounter.description=Update internal version2Store counter (if needed).
-patch.migrateVersionStoreUpdateCounter.result=Update internal version2Store counter (if needed): {0}
-
-patch.invitationMigration.description=Migrate invitations from old invite service to invitation service
-patch.invitationMigration.result=Migrated {0} invitations from old invite service to invitation service.
-patch.invitationMigration.no_invites=No invitations require migrating old invite service to invitation service.
-
-patch.webSiteAddModerated.description=Changing Web Site visibility from a boolean to enum.
-patch.webSiteAddModerated.result=Changed Web Site visibility.
-
-patch.mtShareExistingTenants.description=Update existing tenants for MT Share.
-patch.mtShareExistingTenants.result=Update existing tenants for MT Share.
-patch.mtShareExistingTenants.result.not_applicable=Patch applied, although no changes made since MT is not enabled.
-
-patch.redeployInvitationProcess.description=Re-deploy Invitation Process Definitions.
-
-patch.imapFolders.description=Creates folders tree necessary for IMAP functionality
-patch.imapFolders.result.exists=The 'Imap Configs' folder already exists
-patch.imapFolders.result.created=The 'Imap Configs' folder was successfully created
-
-patch.zonedAuthorities.description=Adds the remodelled cm:authority container to the spaces store
-
-patch.authorityMigration.description=Copies any old authorities from the user store to the spaces store.
-patch.authorityMigration.process.name=Authority Migration
-patch.authorityMigration.warning.assoc=Ignoring group memberships of non-existent user {1}
-patch.authorityMigration.result=Migrated {0} groups and {1} group associations to the spaces store.
-
-patch.authorityDefaultZonesPatch.description=Adds groups and people to the appropriate zones for wcm, share and everything else.
-patch.authorityDefaultZonesPatch.result=Unzoned groups and people added to the default zones.
-patch.authorityDefaultZonesPatch.users= Adding users to zones ...
-patch.authorityDefaultZonesPatch.groups= Adding groups to zones ...
-
-patch.fixNameCrcValues.description=Fixes name and qname CRC32 values to match UTF-8 encoding.
-patch.fixNameCrcValues.result=Fixed CRC32 values for UTF-8 encoding for {0} node child associations. See file {1} for details.
-patch.fixNameCrcValues.fixed=Updated CRC32 values for association ID {0}, name ''{1}'': {2} -> {3}, qname ''{4}'': {5} -> {6}.
-patch.fixNameCrcValues.unableToChange=Failed to update the CRC32 value for association ID {0}: \n Node name: {1} \n name CRC old: {2} \n name CRC new: {3} \n qname: {4} \n qname CRC old: {5} \n qname CRC new: {6} \n Error: {7}
-patch.fixNameCrcValues.fixingLocalname=Fixing invalid localname for association ID {0}: \n Was: ''{1}'' \n Now: ''{2}''
-patch.fixNameCrcValues.associationTypeNotDefined=Association type ''{0}'' has not been defined for child association ID {1}.
-patch.fixNameCrcValues.associationTypeNotChild=Association type ''{0}'' does not represent a child association but is used as one; for child association ID {1}.
-
-patch.personUsagePatch.description=Add person 'cm:sizeCurrent' property (if missing).
-patch.personUsagePatch.result1=Added 'cm:sizeCurrent' property to {0} people that were missing this property.
-patch.personUsagePatch.result2=No people were missing the 'cm:sizeCurrent' property.
-
-patch.redeployNominatedInvitationProcessWithPropsForShare.description=Redeploy nominated invitation workflow
-patch.redeployNominatedInvitationProcessWithPropsForShare.result=Nominated invitation workflow redeployed
-
-patch.transferDefinitions.description=Add transfer definitions folder to data dictionary.
-patch.transferDefinitions.result=Transfer definitions folder added to data dictionary.
-
-patch.redeployNominatedInvitationProcessWithPropsForShare.description=Redeploy nominated invitation workflow
-patch.redeployNominatedInvitationProcessWithPropsForShare.result=Nominated invitation workflow redeployed
-
-patch.thumbnailsAssocQName.description=Update the 'cm:thumbnails' association QName to 'rn:rendition'.
-
-patch.convertContentUrls.description=Converts pre-3.2 content URLs to use the alf_content_data table. The conversion work can also be done on a schedule; please contact Alfresco Support for further details.
-patch.convertContentUrls.bypassingPatch=Content URL conversion was NOT performed by this patch. Activate the scheduled job 'contentUrlConverterTrigger'.
-patch.convertContentUrls.start=Content URL conversion progress:
-patch.convertContentUrls.error=Content URL conversion failed: {0}
-patch.convertContentUrls.inProgress=Content URL conversion increment completed. Awaiting next scheduled call...
-patch.convertContentUrls.done=Content URL conversion completed.
-patch.convertContentUrls.adm.start=\tProcessing ADM Content URLs.
-patch.convertContentUrls.adm.done=\tFinished processing ADM nodes up to ID {0}.
-patch.convertContentUrls.avm.start=\tProcessing AVM Content URLs.
-patch.convertContentUrls.avm.done=\tFinished processing AVM nodes up to ID {0}.
-patch.convertContentUrls.store.start=\tReading content URLs from store {0}.
-patch.convertContentUrls.store.readOnly=\tNo content URLs will be marked for deletion. The content store is read-only.
-patch.convertContentUrls.store.pending=\tContent URLs will be marked for deletion once the URL conversion process is complete.
-patch.convertContentUrls.store.noSupport=\tNo content URLs will be marked for deletion. The store does not support URL enumeration.
-patch.convertContentUrls.store.progress=\t\tProcessed {0} content URLs from store.
-patch.convertContentUrls.store.scheduled=\tScheduled {0} content URLs for deletion from store: {1}
-patch.convertContentUrls.store.done=This job is complete. Deactivate the scheduled job 'contentUrlConverterTrigger'.
-
-patch.fixAuthoritiesCrcValues.description=Fixes authority CRC32 values to match UTF-8 encoding.
-patch.fixAuthoritiesCrcValues.result=Fixed CRC32 values for UTF-8 encoding for {0} authorities. See file {1} for details.
-patch.fixAuthoritiesCrcValues.fixed=Updated CRC32 values for authority '{0}'.
-patch.fixAuthoritiesCrcValues.unableToChange=Failed to update the CRC32 value for authority: \n Authority: {0} \n Error: {1}
-
-patch.updateMimetypes1.description=Fix mimetypes for Excel and Powerpoint.
-patch.updateMimetypes2.description=Fix mimetypes for Excel and Powerpoint.
-
-patch.db-V3.2-AddFKIndexes.description=Fixes ALF-3189: Added missing FK indexes. Note: The script is empty for MySQL.
-
-patch.eliminateDuplicates.description=Fixes ALF-4203: Searches for AVM duplicate nodes and changes their name
-
-patch.migrateAttrTenants.description=Migrate old Tenant attributes
-patch.migrateAttrTenants.result=Processed {0} attributes
-
-patch.migrateAttrAVMLocks.description=Migrate old AVM Lock attributes
-patch.migrateAttrAVMLocks.result=Processed {0} attributes
-
-patch.migrateAttrPropBackedBeans.description=Migrate old Property-Backed Bean component attributes
-patch.migrateAttrPropBackedBeans.result=Processed {0} attributes ({1} properties)
-
-patch.migrateAttrChainingURS.description=Migrate old Chaining User Registry Synchronizer attributes
-patch.migrateAttrChainingURS.result=Processed {0} attributes
-
-patch.migrateAttrDelete.description=Delete old attributes (if any) after they have been migrated
-patch.migrateAttrDelete.result=Old attributes were deleted (if any)
-
-patch.transfer.targetrulefolder.description=Creates the transfer target rule folder for the default transfer group.
-
-patch.transfer.targetrule.description=Creates the transfer target rule for the default transfer group.
-
-patch.actions.scheduledfolder.description=Creates the scheduled actions folder in the Data Dictionary.
-
-patch.removingLinkValidationMetadata.description=Fixes ALF-5185: Removes all Link Validation reports from schema
-
-patch.varcharFieldSizesQuadrupleIncreasing.description=ALF-4300: Increasing 'VARCHAR' field sizes quadruply for DB2 dialect
-
-patch.mtFixAdminExistingTenants.description=Fix bootstrapped creator/modifier
-patch.mtFixAdminExistingTenants.result=Fix bootstrapped creator/modifier
-
-patch.fixUserQNames.description=Fixes user store qnames to improve native authentication performance
-patch.fixUserQNames.result=Generated qnames for {0} users.
-
-patch.fixAclInheritance.description=Fixes any ACL inheritance issues.
-patch.fixAclInheritance.result=Fixed {0} ACLs.
diff --git a/config/alfresco/messages/patch-service_es.properties b/config/alfresco/messages/patch-service_es.properties
deleted file mode 100755
index fcc7939517..0000000000
--- a/config/alfresco/messages/patch-service_es.properties
+++ /dev/null
@@ -1,395 +0,0 @@
-# PatchService messages
-patch.service.preceeded_by_alternative=Preceded by alternative patch ''{0}''.
-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} {1}% complete, estimated complete at {2}.
-patch.validation.failed=Validation of patch ''{0}'' failed. Patch is applicable to a newer schema than the schema of this build ({1}).\nfixesToSchema: {2}\ntargetSchema: {3}.\nIf this patch should always be run once on every installation, please ensure that the ''fixesToSchema'' value is set to '''${version.schema}'''.
-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=====================================
-patch.executer.executed =\n=== Applied patch === \nID: {0}\nRESULT: \n{1}\n=====================================
-patch.executer.failed =\n=== Failed to apply patch === \nID: {0}\nRESULT: \n{1}\n=====================================
-patch.noLongerSupportedPatch.err.use_incremental_upgrade = \nPatch ''{0}'' was last supported on version {1}.\n Please follow an incremental upgrade using version {2}.
-
-# General patch messages
-
-patch.genericBootstrap.result.exists=Bootstrap location already exists: {0}
-patch.genericBootstrap.result.created=Imported view into bootstrap location: {0} ({1})
-patch.genericBootstrap.err.multiple_found=Multiple nodes found: {0}
-
-patch.general.property_not_set=Patch property ''{0}'' has not been set on this patch: {1}
-
-patch.QNamePatch.result=Successfully updated the ''{0}'' QName to ''{1}''.
-
-patch.genericMimetypeUpdate.start=Updating mimetypes.
-patch.genericMimetypeUpdate.updated=\n\tUpdated {0} content references with mimetype ''{1}'' to use ''{2}''.
-patch.genericMimetypeUpdate.indexed=\n\tIndexed {0} nodes in store ''{1}''.
-patch.genericMimetypeUpdate.done=\n\tFinished updating mimetypes.
-patch.genericMimetypeUpdate.doneReindex=\n\tFinished updating mimetypes. Selective reindexing was disabled; a reindex is required to search for the new mimetype(s).
-
-# Individual patch messages
-
-patch.noOpPatch.description=A placeholder patch; usually marks a superceded patch.
-patch.noOpPatch.result=No-op patch
-
-patch.marker.description=Marker patch to record installations and upgrades
-patch.marker.result=Marker patch applied
-
-patch.savedSearchesFolder.description=Ensures the existence of the 'Saved Searches' folder.
-patch.savedSearchesFolder.result.exists=The saved searches folder already exists: {0}
-patch.savedSearchesFolder.result.created=The saved searches folder was successfully created: {0}
-
-patch.savedSearchesPermission.description=Sets required permissions on 'Saved Searches' folder.
-patch.savedSearchesPermission.result.applied=Granted CONTRIBUTOR role to EVERYONE on 'Saved Searches' folder: {0}.
-patch.savedSearchesPermission.err.not_found='Saved Searches' folder could not be found.
-
-patch.updatePermissionData.description=Update permissions from 'folder' to 'cmobject' [JIRA: AR-344].
-patch.updatePermissionData.result=Changed {0} 'folder' access control entries to 'cmobject'.
-
-patch.authoritiesFolder.description=Ensures the existence of the user authorities folder [JIRA: AR-497].
-
-patch.authoritiesFolderPermission.description=Ensures group authorities are visible to everyone.
-
-patch.guestUser.description=Add the guest user, guest home space; and fix permissions on company home, guest home and guest person.
-patch.guestUser.result=Added guest user and fixed permissions.
-
-patch.fixNodeSerializableValues.description=Ensure that property values are not stored as Serializable if at all possible
-patch.fixNodeSerializableValues.result=Fixed {0} node property serialized values
-
-patch.updateGuestPermission.description=Rename guest permission from 'Guest' to 'Consumer'
-patch.updateGuestPermission.result=Changed {0} 'Guest' access control entries to 'Consumer'.
-
-patch.categoryRootPermission.description=Sets required permissions on 'Category Root' folder.
-patch.categoryRootPermission.result=Granted CONSUMER role to GUEST on 'Category Root' folder: {0}.
-patch.categoryRootPermission.err.not_found='Category Root' folder ({0}) could not be found.
-
-patch.guestPersonPermission.description=Change Guest Person permission from 'Consumer' to 'Read'
-patch.guestPersonPermission.result=Updated Guest Person permission from 'Consumer' to 'Read'
-
-patch.spacesRootPermission.description=Change Spaces store root permission from 'Consumer' to 'Read'
-patch.spacesRootPermission.result=Updated Spaces store root permission from 'Consumer' to 'Read'
-
-patch.contentPermission.description=Update permission entries from 'cm:content' to 'sys:base'.
-patch.contentPermission.result=Changed {0} 'cm:content' access control entries to 'sys:base'.
-
-patch.forumsIcons.description=Updates forums icon references
-patch.forumsIcons.result=Updated {0} icon references
-
-patch.emailTemplatesFolder.description=Ensures the existence of the 'Email Templates' folder.
-patch.emailTemplatesFolder.result.exists=The email templates folder already exists: {0}
-patch.emailTemplatesFolder.result.created=The email templates folder was successfully created: {0}
-
-patch.emailInviteAndNotifyTemplatesFolder.description=Ensures the existence of the 'Email Invite Templates' and 'Email Notify Templates' folders.
-patch.emailNotifyTemplatesFolder.result.exists=The Email Notify Templates folder already exists: {0}
-patch.emailNotifyTemplatesFolder.result.created=The Email Notify Templates folder was successfully created: {0}
-patch.emailInviteTemplatesFolder.result.exists=The Email Invite Templates folder already exists: {0}
-patch.emailInviteTemplatesFolder.result.created=The Email Invite Templates folder was successfully created: {0}
-
-patch.emailTemplatesContent.description=Loads the email templates into the Email Templates folder.
-patch.emailTemplatesContent.result=Imported the Email Templates into the default folder.
-
-patch.descriptorUpdate.description=Update Repository descriptor
-patch.descriptorUpdate.result=Repository descriptor updated
-
-patch.scriptsFolder.description=Ensures the existence of the 'Scripts' folder.
-patch.scriptsFolder.result.exists=The scripts folder already exists: {0}
-patch.scriptsFolder.result.created=The scripts folder was successfully created: {0}
-
-patch.topLevelGroupParentChildAssociationTypePatch.description=Ensure top level groups have the correct child association type.
-patch.topLevelGroupParentChildAssociationTypePatch.result=Fixed {0} top level groups child association types.
-patch.topLevelGroupParentChildAssociationTypePatch.err.sys_path_not_found=Required authority system path not found: {0}
-patch.topLevelGroupParentChildAssociationTypePatch.err.auth_path_not_found=Required authority path not found: {0}
-
-patch.actionRuleDecouplingPatch.description=Migrate existing rules to the updated model where rules are decoupled from actions.
-patch.actionRuleDecouplingPatch.result=Updated {0} rules.
-
-patch.systemWorkflowFolder.description=Ensures the existence of the system workflow container.
-patch.systemWorkflowFolder.result.created=Created system workflow container {0}.
-
-patch.rssTemplatesFolder.description=Ensures the existence of the 'RSS Templates' folder.
-patch.rssTemplatesFolder.result.exists=The RSS Templates folder already exists: {0}. Re-applying guest permissions.
-patch.rssTemplatesFolder.result.created=The RSS Templates folder was successfully created: {0}
-
-patch.rendition.rendering_actions.exists=The Rendering Actions folder already exists: {0}.
-patch.rendition.rendering_actions.created=The Rendering Actions folder was successfully created: {0}
-patch.rendition.rendering_actions.description=Creates the Rendering Actions folder.
-
-patch.replication.replication_actions.exists=The Replication Actions folder already exists: {0}.
-patch.replication.replication_actions.created=The Replication Actions folder was successfully created: {0}
-patch.replication.replication_actions.description=Creates the Replication Actions folder.
-
-patch.uifacetsAspectRemovalPatch.description=Removes the incorrectly applied uifacets aspect from presentation template files.
-patch.uifacetsAspectRemovalPatch.updated=Successfully removed the uifacets aspect from {0} presentation template files.
-
-patch.guestPersonPermission2.description=Change Guest Person permission to visible by all users as 'Consumer'.
-patch.guestPersonPermission2.result=Updated Guest Person permission to visible by all users as 'Consumer'.
-
-patch.schemaUpgradeScript.description=Ensures that the database upgrade script has been run.
-patch.schemaUpgradeScript.err.not_executed=The schema upgrade script, ''{0}'', has not been run against this database.
-
-patch.uniqueChildName.description=Checks and renames duplicate children.
-patch.uniqueChildName.copyOf=({0}-{1})
-patch.uniqueChildName.result=Checked {0} associations and fixed {1} duplicates. See file {2} for details.
-patch.uniqueChildName.err.unable_to_fix=Auto-fixing of duplicate names failed. See file {0} for details.
-
-patch.invalidNameEnding.description=Fixes names ending with a space or full stop.
-patch.invalidNameEnding.result=Fixed {0} names ending with a space or full stop. See file {1} for details.
-patch.invalidNameEnding.err.unable_to_fix=Auto-fixing of names ending with a space or full stop failed. See file {0} for details.
-patch.invalidNameEnding.rewritten=Name ''{0}'' rewritten to ''{1}''
-
-patch.systemDescriptorContent.description=Adds the version properties content to the system descriptor.
-patch.systemDescriptorContent.result=Added the version properties content to the system descriptor.
-patch.systemDescriptorContent.err.no_version_properties=The version.properties resource could not be found.
-patch.systemDescriptorContent.err.no_descriptor=The system descriptor could not be found.
-
-patch.versionHistoryPerformance.description=Improves the performance of version history lookups.
-patch.versionHistoryPerformance.result=Updated {0} version history objects to improve performance.
-
-patch.multilingualBootstrap.description=Bootstraps the node that will hold the multilingual containers.
-
-patch.siteLoadPatch.description=Loads a sample site into the repository.
-patch.siteLoadPatch.exists=The Site {0} already exists and so could not be imported
-patch.siteLoadPatch.noBootstrapViews=No bootstrap views were given for importing Site {0} - please check the bootstrap extension bean configuration
-patch.siteLoadPatch.result=Site {0} imported.
-
-patch.wcmFolders.description=Ensures the existance of the WCM specific 'Web Projects' and 'Web Forms' folders.
-patch.wcmFolders.webprojects.result.exists=The Web Projects folder already exists: {0}
-patch.wcmFolders.webprojects.result.created=The Web Projects folder was successfully created: {0}
-patch.wcmFolders.webforms.result.exists=The Web Forms folder already exists: {0}
-patch.wcmFolders.webforms.result.created=The Web Forms folder was successfully created: {0}
-
-patch.linkNodeExtension.description=Fixes link node file extensions to have a .url extension.
-patch.linkNodeExtension.result=Fixed {0} link node file extensions. See file {1} for details.
-patch.linkNodeExtension.err.unable_to_fix=Auto-fixing of link node file extensions failed. See file {0} for details.
-patch.linkNodeExtension.rewritten=Name ''{0}'' rewritten to ''{1}''
-
-patch.systemRegistryBootstrap.description=Bootstraps the node that will hold system registry metadata.
-
-patch.userAndPersonUserNamesAsIdentifiers.description=Reindex usr:user and cm:person uids as identifiers
-patch.userAndPersonUserNamesAsIdentifiers.result=Reindexed user:user and cm:person uids as identifiers
-
-patch.contentFormFolderType.description=Update WCM Content Form folder type.
-patch.contentFormFolderType.result=Updated {0} WCM Content Form objects to 'wcm:formfolder' type.
-
-patch.groupNamesAsIdentifiers.description=Reindex usr:authorityContainer gids as identifiers
-patch.groupNamesAsIdentifiers.result=Reindexed usr:authorityContainer with identifiers
-
-patch.invalidUserPersonAndGroup.description=Fix up invalid uids for people and users; and invalid gids for groups
-patch.invalidUserPersonAndGroup.result=Fixed ''{0}'' invalid user nodes, ''{1}'' invalid person nodes and ''{2}'' invalid authority nodes.
-
-patch.AVMGuidPatch.description=Set GUIDs on AVM nodes.
-patch.AVMGuidPatch.result=AVM GUIDS set.
-
-patch.webscripts.description=Adds Web Scripts to Data Dictionary.
-patch.webscripts2.description=Adds Web Scripts (second set) to Data Dictionary.
-patch.webscripts3.description=Update Web Scripts ReadMe.
-patch.webscriptsExtension.description=Adds Web Scripts Extension to Data Dictionary.
-
-patch.AVMLayeredSnapshot.description=Set indirectionVersion on Layered Nodes.
-patch.AVMLayeredSnapshot.result=Layered Node indirectionVersions set.
-
-patch.groupMembersAsIdentifiers.description=Reindex usr:authorityContainer members as identifiers
-
-patch.genericWorkflow.result.deployed=Re-deployed {0} workflows.
-
-patch.redeploySubmitProcess.description=Re-deploy WCM Submit Process Definition.
-patch.deploySubmitDirectProcess.description=Deploy WCM Direct Submit Process Definition.
-
-patch.AVMAspects.description=Changes storage of aspects on AVM Nodes.
-patch.AVMAspects.result=Aspects were moved.
-
-patch.ReadmeTemplate.description=Deployed ReadMe Template
-patch.webScriptsReadme.description=Applied ReadMe template to Web Scripts folders
-
-patch.AVMProperties.description=Changes storage of properties on AVM Nodes.
-patch.AVMProperties.result=Properties were moved.
-
-patch.customModels.description=Adds 'Models' folder to Data Dictionary
-patch.customMessages.description=Adds 'Messages' folder to Data Dictionary
-patch.customWebClientExtension.description=Adds 'Web Client Extension' folder to Data Dictionary
-
-patch.customWorkflowDefs.description=Adds 'Workflow Definitions' folder to Data Dictionary.
-
-patch.emailContributorGroup.description=Adds the 'GROUP_EMAIL_CONTRIBUTORS' group.
-
-patch.avmStoreAsIdentifier.description=Reindex wca:webfolder to make wca:avmstore an identifier
-patch.avmStoreAsIdentifier.result=Reindexed wca:webfolder to make wca:avmstore an identifier
-
-patch.avmFormPropertyIdentifier.description=Reindex wca:webform to make wca:formname an identifier
-patch.avmFormPropertyIdentifier.result=Reindexed wca:webform to make wca:formname an identifier
-
-patch.formsFolder.description=Adds 'Forms' folder to Data Dictionary.
-
-patch.tagRootCategory.description=Adds 'Tags' as new top-level category root.
-
-patch.sitesFolder.description=Adds 'Sites' folder to Company Home.
-
-patch.deploymentMigration.description=Migrates deployment data to the new model.
-patch.deploymentMigration.webProjectName=Migrating deployment data for web project ''{0}''
-patch.deploymentMigration.serverMigrated=Server ''{0}'' from web project ''{1}'' has been migrated
-patch.deploymentMigration.reportMigrated=Deployment report for ''{0}'' from web project ''{1}'' has been migrated
-patch.deploymentMigration.result=Deployment data has been migrated.
-
-patch.updateAvmPermissionData.description=Update avm permissions from 'webfolder' to 'cmobject'.
-patch.updateAvmPermissionData.result=Changed {0} 'webfolder' access control entries to 'cmobject'.
-
-patch.updateAvmPermissions.description=Update ACLs on all avm objects to the new 2.2 permission model
-patch.updateAvmPermissions.result=Updated ACLs. Created {0} defining and {1} layered ACLs.
-
-patch.wcmPermissionPatch.description=Fix ACLs so they are only set on the staging area store.
-patch.wcmPermissionPatch.result=Updated ACLs: ACLS are moved to the staging area store and removed from all other stores. They are now applied via layering.
-
-patch.avmWebProjectInheritPermissions.description=Break inheritance of permissions on wca:webfolder object to hide access by default.
-patch.avmWebProjectInheritPermissions.result=Removed inheritance of permissions on all wca:webfolder objects.
-
-patch.wcmPostPermissionSnapshotPatch.description=Snapshot stores (after fixing ACLs so they are only set on the staging area store).
-patch.wcmPostPermissionSnapshotPatch.result=Snapshot complete after WCM ACL changes.
-
-patch.updateDmPermissions.description=Update ACLs on all DM node objects to the new 3.0 permission model
-patch.updateDmPermissions.result=Updated ACLs. Created {0} defining ACLs.
-
-patch.db-V3.0-0-CreateActivitiesExtras.description=Replaced by 'patch.db-V3.0-ActivityTables', which must run first.
-
-patch.createSiteStore.description=Create the AVM store for site data structure for 3.0 web-tier clients.
-patch.createSiteStore.result=Created the AVM site data store.
-
-patch.sitePermissionRefactorPatch.description=Create permission groups for sites.
-patch.sitePermissionRefactorPatch.result=Groups have been created for all sites and user's allocated accordingly.
-
-patch.migrateVersionStore.description=Version Store migration (from lightWeightVersionStore to version2Store)
-patch.migrateVersionStore.incomplete=Version Store migration incomplete.
-patch.migrateVersionStore.done=Version Store migration completed.
-patch.migrateVersionStore.bypassingPatch=Bypass Version Store migration patch since scheduled to run as job
-
-patch.inviteEmailTemplate.description=Adds invite email template to invite space
-
-patch.calendarModelNamespacePatch.description=Update the Calendar model namespace URI and reindex all calendar objects.
-patch.calendarModelNamespacePatch.result=Updated the Calendar model namespace URI to http://www.alfresco.org/model/calendar and reindexed {0} calendar objects.
-
-patch.spacesStoreGuestPermission.description=Sets READ permissions for GUEST on root node of the SpacesStore.
-patch.spacesStoreGuestPermission.result=Granted READ permissions for GUEST on root node of the SpacesStore.
-
-patch.administratorGroup.description=Adds the 'ALFRESCO_ADMINISTRATORS' group.
-
-patch.resetWCMToGroupBasedPermissionsPatch.description=Reset WCM to group based permissions.
-patch.resetWCMToGroupBasedPermissionsPatch.result=WCM reset to group based permissions.
-
-patch.migrateVersionStoreUpdateCounter.description=Update internal version2Store counter (if needed).
-patch.migrateVersionStoreUpdateCounter.result=Update internal version2Store counter (if needed): {0}
-
-patch.invitationMigration.description=Migrate invitations from old invite service to invitation service
-patch.invitationMigration.result=Migrated {0} invitations from old invite service to invitation service.
-patch.invitationMigration.no_invites=No invitations require migrating old invite service to invitation service.
-
-patch.webSiteAddModerated.description=Changing Web Site visibility from a boolean to enum.
-patch.webSiteAddModerated.result=Changed Web Site visibility.
-
-patch.mtShareExistingTenants.description=Update existing tenants for MT Share.
-patch.mtShareExistingTenants.result=Update existing tenants for MT Share.
-patch.mtShareExistingTenants.result.not_applicable=Patch applied, although no changes made since MT is not enabled.
-
-patch.redeployInvitationProcess.description=Re-deploy Invitation Process Definitions.
-
-patch.imapFolders.description=Creates folders tree necessary for IMAP functionality
-patch.imapFolders.result.exists=The 'Imap Configs' folder already exists
-patch.imapFolders.result.created=The 'Imap Configs' folder was successfully created
-
-patch.zonedAuthorities.description=Adds the remodelled cm:authority container to the spaces store
-
-patch.authorityMigration.description=Copies any old authorities from the user store to the spaces store.
-patch.authorityMigration.process.name=Authority Migration
-patch.authorityMigration.warning.assoc=Ignoring group memberships of non-existent user {1}
-patch.authorityMigration.result=Migrated {0} groups and {1} group associations to the spaces store.
-
-patch.authorityDefaultZonesPatch.description=Adds groups and people to the appropriate zones for wcm, share and everything else.
-patch.authorityDefaultZonesPatch.result=Unzoned groups and people added to the default zones.
-patch.authorityDefaultZonesPatch.users= Adding users to zones ...
-patch.authorityDefaultZonesPatch.groups= Adding groups to zones ...
-
-patch.fixNameCrcValues.description=Fixes name and qname CRC32 values to match UTF-8 encoding.
-patch.fixNameCrcValues.result=Fixed CRC32 values for UTF-8 encoding for {0} node child associations. See file {1} for details.
-patch.fixNameCrcValues.fixed=Updated CRC32 values for association ID {0}, name ''{1}'': {2} -> {3}, qname ''{4}'': {5} -> {6}.
-patch.fixNameCrcValues.unableToChange=Failed to update the CRC32 value for association ID {0}: \n Node name: {1} \n name CRC old: {2} \n name CRC new: {3} \n qname: {4} \n qname CRC old: {5} \n qname CRC new: {6} \n Error: {7}
-patch.fixNameCrcValues.fixingLocalname=Fixing invalid localname for association ID {0}: \n Was: ''{1}'' \n Now: ''{2}''
-patch.fixNameCrcValues.associationTypeNotDefined=Association type ''{0}'' has not been defined for child association ID {1}.
-patch.fixNameCrcValues.associationTypeNotChild=Association type ''{0}'' does not represent a child association but is used as one; for child association ID {1}.
-
-patch.personUsagePatch.description=Add person 'cm:sizeCurrent' property (if missing).
-patch.personUsagePatch.result1=Added 'cm:sizeCurrent' property to {0} people that were missing this property.
-patch.personUsagePatch.result2=No people were missing the 'cm:sizeCurrent' property.
-
-patch.redeployNominatedInvitationProcessWithPropsForShare.description=Redeploy nominated invitation workflow
-patch.redeployNominatedInvitationProcessWithPropsForShare.result=Nominated invitation workflow redeployed
-
-patch.transferDefinitions.description=Add transfer definitions folder to data dictionary.
-patch.transferDefinitions.result=Transfer definitions folder added to data dictionary.
-
-patch.redeployNominatedInvitationProcessWithPropsForShare.description=Redeploy nominated invitation workflow
-patch.redeployNominatedInvitationProcessWithPropsForShare.result=Nominated invitation workflow redeployed
-
-patch.thumbnailsAssocQName.description=Update the 'cm:thumbnails' association QName to 'rn:rendition'.
-
-patch.convertContentUrls.description=Converts pre-3.2 content URLs to use the alf_content_data table. The conversion work can also be done on a schedule; please contact Alfresco Support for further details.
-patch.convertContentUrls.bypassingPatch=Content URL conversion was NOT performed by this patch. Activate the scheduled job 'contentUrlConverterTrigger'.
-patch.convertContentUrls.start=Content URL conversion progress:
-patch.convertContentUrls.error=Content URL conversion failed: {0}
-patch.convertContentUrls.inProgress=Content URL conversion increment completed. Awaiting next scheduled call...
-patch.convertContentUrls.done=Content URL conversion completed.
-patch.convertContentUrls.adm.start=\tProcessing ADM Content URLs.
-patch.convertContentUrls.adm.done=\tFinished processing ADM nodes up to ID {0}.
-patch.convertContentUrls.avm.start=\tProcessing AVM Content URLs.
-patch.convertContentUrls.avm.done=\tFinished processing AVM nodes up to ID {0}.
-patch.convertContentUrls.store.start=\tReading content URLs from store {0}.
-patch.convertContentUrls.store.readOnly=\tNo content URLs will be marked for deletion. The content store is read-only.
-patch.convertContentUrls.store.pending=\tContent URLs will be marked for deletion once the URL conversion process is complete.
-patch.convertContentUrls.store.noSupport=\tNo content URLs will be marked for deletion. The store does not support URL enumeration.
-patch.convertContentUrls.store.progress=\t\tProcessed {0} content URLs from store.
-patch.convertContentUrls.store.scheduled=\tScheduled {0} content URLs for deletion from store: {1}
-patch.convertContentUrls.store.done=This job is complete. Deactivate the scheduled job 'contentUrlConverterTrigger'.
-
-patch.fixAuthoritiesCrcValues.description=Fixes authority CRC32 values to match UTF-8 encoding.
-patch.fixAuthoritiesCrcValues.result=Fixed CRC32 values for UTF-8 encoding for {0} authorities. See file {1} for details.
-patch.fixAuthoritiesCrcValues.fixed=Updated CRC32 values for authority '{0}'.
-patch.fixAuthoritiesCrcValues.unableToChange=Failed to update the CRC32 value for authority: \n Authority: {0} \n Error: {1}
-
-patch.updateMimetypes1.description=Fix mimetypes for Excel and Powerpoint.
-patch.updateMimetypes2.description=Fix mimetypes for Excel and Powerpoint.
-
-patch.db-V3.2-AddFKIndexes.description=Fixes ALF-3189: Added missing FK indexes. Note: The script is empty for MySQL.
-
-patch.eliminateDuplicates.description=Fixes ALF-4203: Searches for AVM duplicate nodes and changes their name
-
-patch.migrateAttrTenants.description=Migrate old Tenant attributes
-patch.migrateAttrTenants.result=Processed {0} attributes
-
-patch.migrateAttrAVMLocks.description=Migrate old AVM Lock attributes
-patch.migrateAttrAVMLocks.result=Processed {0} attributes
-
-patch.migrateAttrPropBackedBeans.description=Migrate old Property-Backed Bean component attributes
-patch.migrateAttrPropBackedBeans.result=Processed {0} attributes ({1} properties)
-
-patch.migrateAttrChainingURS.description=Migrate old Chaining User Registry Synchronizer attributes
-patch.migrateAttrChainingURS.result=Processed {0} attributes
-
-patch.migrateAttrDelete.description=Delete old attributes (if any) after they have been migrated
-patch.migrateAttrDelete.result=Old attributes were deleted (if any)
-
-patch.transfer.targetrulefolder.description=Creates the transfer target rule folder for the default transfer group.
-
-patch.transfer.targetrule.description=Creates the transfer target rule for the default transfer group.
-
-patch.actions.scheduledfolder.description=Creates the scheduled actions folder in the Data Dictionary.
-
-patch.removingLinkValidationMetadata.description=Fixes ALF-5185: Removes all Link Validation reports from schema
-
-patch.varcharFieldSizesQuadrupleIncreasing.description=ALF-4300: Increasing 'VARCHAR' field sizes quadruply for DB2 dialect
-
-patch.mtFixAdminExistingTenants.description=Fix bootstrapped creator/modifier
-patch.mtFixAdminExistingTenants.result=Fix bootstrapped creator/modifier
-
-patch.fixUserQNames.description=Fixes user store qnames to improve native authentication performance
-patch.fixUserQNames.result=Generated qnames for {0} users.
-
-patch.fixAclInheritance.description=Fixes any ACL inheritance issues.
-patch.fixAclInheritance.result=Fixed {0} ACLs.
diff --git a/config/alfresco/messages/patch-service_fr.properties b/config/alfresco/messages/patch-service_fr.properties
deleted file mode 100755
index fcc7939517..0000000000
--- a/config/alfresco/messages/patch-service_fr.properties
+++ /dev/null
@@ -1,395 +0,0 @@
-# PatchService messages
-patch.service.preceeded_by_alternative=Preceded by alternative patch ''{0}''.
-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} {1}% complete, estimated complete at {2}.
-patch.validation.failed=Validation of patch ''{0}'' failed. Patch is applicable to a newer schema than the schema of this build ({1}).\nfixesToSchema: {2}\ntargetSchema: {3}.\nIf this patch should always be run once on every installation, please ensure that the ''fixesToSchema'' value is set to '''${version.schema}'''.
-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=====================================
-patch.executer.executed =\n=== Applied patch === \nID: {0}\nRESULT: \n{1}\n=====================================
-patch.executer.failed =\n=== Failed to apply patch === \nID: {0}\nRESULT: \n{1}\n=====================================
-patch.noLongerSupportedPatch.err.use_incremental_upgrade = \nPatch ''{0}'' was last supported on version {1}.\n Please follow an incremental upgrade using version {2}.
-
-# General patch messages
-
-patch.genericBootstrap.result.exists=Bootstrap location already exists: {0}
-patch.genericBootstrap.result.created=Imported view into bootstrap location: {0} ({1})
-patch.genericBootstrap.err.multiple_found=Multiple nodes found: {0}
-
-patch.general.property_not_set=Patch property ''{0}'' has not been set on this patch: {1}
-
-patch.QNamePatch.result=Successfully updated the ''{0}'' QName to ''{1}''.
-
-patch.genericMimetypeUpdate.start=Updating mimetypes.
-patch.genericMimetypeUpdate.updated=\n\tUpdated {0} content references with mimetype ''{1}'' to use ''{2}''.
-patch.genericMimetypeUpdate.indexed=\n\tIndexed {0} nodes in store ''{1}''.
-patch.genericMimetypeUpdate.done=\n\tFinished updating mimetypes.
-patch.genericMimetypeUpdate.doneReindex=\n\tFinished updating mimetypes. Selective reindexing was disabled; a reindex is required to search for the new mimetype(s).
-
-# Individual patch messages
-
-patch.noOpPatch.description=A placeholder patch; usually marks a superceded patch.
-patch.noOpPatch.result=No-op patch
-
-patch.marker.description=Marker patch to record installations and upgrades
-patch.marker.result=Marker patch applied
-
-patch.savedSearchesFolder.description=Ensures the existence of the 'Saved Searches' folder.
-patch.savedSearchesFolder.result.exists=The saved searches folder already exists: {0}
-patch.savedSearchesFolder.result.created=The saved searches folder was successfully created: {0}
-
-patch.savedSearchesPermission.description=Sets required permissions on 'Saved Searches' folder.
-patch.savedSearchesPermission.result.applied=Granted CONTRIBUTOR role to EVERYONE on 'Saved Searches' folder: {0}.
-patch.savedSearchesPermission.err.not_found='Saved Searches' folder could not be found.
-
-patch.updatePermissionData.description=Update permissions from 'folder' to 'cmobject' [JIRA: AR-344].
-patch.updatePermissionData.result=Changed {0} 'folder' access control entries to 'cmobject'.
-
-patch.authoritiesFolder.description=Ensures the existence of the user authorities folder [JIRA: AR-497].
-
-patch.authoritiesFolderPermission.description=Ensures group authorities are visible to everyone.
-
-patch.guestUser.description=Add the guest user, guest home space; and fix permissions on company home, guest home and guest person.
-patch.guestUser.result=Added guest user and fixed permissions.
-
-patch.fixNodeSerializableValues.description=Ensure that property values are not stored as Serializable if at all possible
-patch.fixNodeSerializableValues.result=Fixed {0} node property serialized values
-
-patch.updateGuestPermission.description=Rename guest permission from 'Guest' to 'Consumer'
-patch.updateGuestPermission.result=Changed {0} 'Guest' access control entries to 'Consumer'.
-
-patch.categoryRootPermission.description=Sets required permissions on 'Category Root' folder.
-patch.categoryRootPermission.result=Granted CONSUMER role to GUEST on 'Category Root' folder: {0}.
-patch.categoryRootPermission.err.not_found='Category Root' folder ({0}) could not be found.
-
-patch.guestPersonPermission.description=Change Guest Person permission from 'Consumer' to 'Read'
-patch.guestPersonPermission.result=Updated Guest Person permission from 'Consumer' to 'Read'
-
-patch.spacesRootPermission.description=Change Spaces store root permission from 'Consumer' to 'Read'
-patch.spacesRootPermission.result=Updated Spaces store root permission from 'Consumer' to 'Read'
-
-patch.contentPermission.description=Update permission entries from 'cm:content' to 'sys:base'.
-patch.contentPermission.result=Changed {0} 'cm:content' access control entries to 'sys:base'.
-
-patch.forumsIcons.description=Updates forums icon references
-patch.forumsIcons.result=Updated {0} icon references
-
-patch.emailTemplatesFolder.description=Ensures the existence of the 'Email Templates' folder.
-patch.emailTemplatesFolder.result.exists=The email templates folder already exists: {0}
-patch.emailTemplatesFolder.result.created=The email templates folder was successfully created: {0}
-
-patch.emailInviteAndNotifyTemplatesFolder.description=Ensures the existence of the 'Email Invite Templates' and 'Email Notify Templates' folders.
-patch.emailNotifyTemplatesFolder.result.exists=The Email Notify Templates folder already exists: {0}
-patch.emailNotifyTemplatesFolder.result.created=The Email Notify Templates folder was successfully created: {0}
-patch.emailInviteTemplatesFolder.result.exists=The Email Invite Templates folder already exists: {0}
-patch.emailInviteTemplatesFolder.result.created=The Email Invite Templates folder was successfully created: {0}
-
-patch.emailTemplatesContent.description=Loads the email templates into the Email Templates folder.
-patch.emailTemplatesContent.result=Imported the Email Templates into the default folder.
-
-patch.descriptorUpdate.description=Update Repository descriptor
-patch.descriptorUpdate.result=Repository descriptor updated
-
-patch.scriptsFolder.description=Ensures the existence of the 'Scripts' folder.
-patch.scriptsFolder.result.exists=The scripts folder already exists: {0}
-patch.scriptsFolder.result.created=The scripts folder was successfully created: {0}
-
-patch.topLevelGroupParentChildAssociationTypePatch.description=Ensure top level groups have the correct child association type.
-patch.topLevelGroupParentChildAssociationTypePatch.result=Fixed {0} top level groups child association types.
-patch.topLevelGroupParentChildAssociationTypePatch.err.sys_path_not_found=Required authority system path not found: {0}
-patch.topLevelGroupParentChildAssociationTypePatch.err.auth_path_not_found=Required authority path not found: {0}
-
-patch.actionRuleDecouplingPatch.description=Migrate existing rules to the updated model where rules are decoupled from actions.
-patch.actionRuleDecouplingPatch.result=Updated {0} rules.
-
-patch.systemWorkflowFolder.description=Ensures the existence of the system workflow container.
-patch.systemWorkflowFolder.result.created=Created system workflow container {0}.
-
-patch.rssTemplatesFolder.description=Ensures the existence of the 'RSS Templates' folder.
-patch.rssTemplatesFolder.result.exists=The RSS Templates folder already exists: {0}. Re-applying guest permissions.
-patch.rssTemplatesFolder.result.created=The RSS Templates folder was successfully created: {0}
-
-patch.rendition.rendering_actions.exists=The Rendering Actions folder already exists: {0}.
-patch.rendition.rendering_actions.created=The Rendering Actions folder was successfully created: {0}
-patch.rendition.rendering_actions.description=Creates the Rendering Actions folder.
-
-patch.replication.replication_actions.exists=The Replication Actions folder already exists: {0}.
-patch.replication.replication_actions.created=The Replication Actions folder was successfully created: {0}
-patch.replication.replication_actions.description=Creates the Replication Actions folder.
-
-patch.uifacetsAspectRemovalPatch.description=Removes the incorrectly applied uifacets aspect from presentation template files.
-patch.uifacetsAspectRemovalPatch.updated=Successfully removed the uifacets aspect from {0} presentation template files.
-
-patch.guestPersonPermission2.description=Change Guest Person permission to visible by all users as 'Consumer'.
-patch.guestPersonPermission2.result=Updated Guest Person permission to visible by all users as 'Consumer'.
-
-patch.schemaUpgradeScript.description=Ensures that the database upgrade script has been run.
-patch.schemaUpgradeScript.err.not_executed=The schema upgrade script, ''{0}'', has not been run against this database.
-
-patch.uniqueChildName.description=Checks and renames duplicate children.
-patch.uniqueChildName.copyOf=({0}-{1})
-patch.uniqueChildName.result=Checked {0} associations and fixed {1} duplicates. See file {2} for details.
-patch.uniqueChildName.err.unable_to_fix=Auto-fixing of duplicate names failed. See file {0} for details.
-
-patch.invalidNameEnding.description=Fixes names ending with a space or full stop.
-patch.invalidNameEnding.result=Fixed {0} names ending with a space or full stop. See file {1} for details.
-patch.invalidNameEnding.err.unable_to_fix=Auto-fixing of names ending with a space or full stop failed. See file {0} for details.
-patch.invalidNameEnding.rewritten=Name ''{0}'' rewritten to ''{1}''
-
-patch.systemDescriptorContent.description=Adds the version properties content to the system descriptor.
-patch.systemDescriptorContent.result=Added the version properties content to the system descriptor.
-patch.systemDescriptorContent.err.no_version_properties=The version.properties resource could not be found.
-patch.systemDescriptorContent.err.no_descriptor=The system descriptor could not be found.
-
-patch.versionHistoryPerformance.description=Improves the performance of version history lookups.
-patch.versionHistoryPerformance.result=Updated {0} version history objects to improve performance.
-
-patch.multilingualBootstrap.description=Bootstraps the node that will hold the multilingual containers.
-
-patch.siteLoadPatch.description=Loads a sample site into the repository.
-patch.siteLoadPatch.exists=The Site {0} already exists and so could not be imported
-patch.siteLoadPatch.noBootstrapViews=No bootstrap views were given for importing Site {0} - please check the bootstrap extension bean configuration
-patch.siteLoadPatch.result=Site {0} imported.
-
-patch.wcmFolders.description=Ensures the existance of the WCM specific 'Web Projects' and 'Web Forms' folders.
-patch.wcmFolders.webprojects.result.exists=The Web Projects folder already exists: {0}
-patch.wcmFolders.webprojects.result.created=The Web Projects folder was successfully created: {0}
-patch.wcmFolders.webforms.result.exists=The Web Forms folder already exists: {0}
-patch.wcmFolders.webforms.result.created=The Web Forms folder was successfully created: {0}
-
-patch.linkNodeExtension.description=Fixes link node file extensions to have a .url extension.
-patch.linkNodeExtension.result=Fixed {0} link node file extensions. See file {1} for details.
-patch.linkNodeExtension.err.unable_to_fix=Auto-fixing of link node file extensions failed. See file {0} for details.
-patch.linkNodeExtension.rewritten=Name ''{0}'' rewritten to ''{1}''
-
-patch.systemRegistryBootstrap.description=Bootstraps the node that will hold system registry metadata.
-
-patch.userAndPersonUserNamesAsIdentifiers.description=Reindex usr:user and cm:person uids as identifiers
-patch.userAndPersonUserNamesAsIdentifiers.result=Reindexed user:user and cm:person uids as identifiers
-
-patch.contentFormFolderType.description=Update WCM Content Form folder type.
-patch.contentFormFolderType.result=Updated {0} WCM Content Form objects to 'wcm:formfolder' type.
-
-patch.groupNamesAsIdentifiers.description=Reindex usr:authorityContainer gids as identifiers
-patch.groupNamesAsIdentifiers.result=Reindexed usr:authorityContainer with identifiers
-
-patch.invalidUserPersonAndGroup.description=Fix up invalid uids for people and users; and invalid gids for groups
-patch.invalidUserPersonAndGroup.result=Fixed ''{0}'' invalid user nodes, ''{1}'' invalid person nodes and ''{2}'' invalid authority nodes.
-
-patch.AVMGuidPatch.description=Set GUIDs on AVM nodes.
-patch.AVMGuidPatch.result=AVM GUIDS set.
-
-patch.webscripts.description=Adds Web Scripts to Data Dictionary.
-patch.webscripts2.description=Adds Web Scripts (second set) to Data Dictionary.
-patch.webscripts3.description=Update Web Scripts ReadMe.
-patch.webscriptsExtension.description=Adds Web Scripts Extension to Data Dictionary.
-
-patch.AVMLayeredSnapshot.description=Set indirectionVersion on Layered Nodes.
-patch.AVMLayeredSnapshot.result=Layered Node indirectionVersions set.
-
-patch.groupMembersAsIdentifiers.description=Reindex usr:authorityContainer members as identifiers
-
-patch.genericWorkflow.result.deployed=Re-deployed {0} workflows.
-
-patch.redeploySubmitProcess.description=Re-deploy WCM Submit Process Definition.
-patch.deploySubmitDirectProcess.description=Deploy WCM Direct Submit Process Definition.
-
-patch.AVMAspects.description=Changes storage of aspects on AVM Nodes.
-patch.AVMAspects.result=Aspects were moved.
-
-patch.ReadmeTemplate.description=Deployed ReadMe Template
-patch.webScriptsReadme.description=Applied ReadMe template to Web Scripts folders
-
-patch.AVMProperties.description=Changes storage of properties on AVM Nodes.
-patch.AVMProperties.result=Properties were moved.
-
-patch.customModels.description=Adds 'Models' folder to Data Dictionary
-patch.customMessages.description=Adds 'Messages' folder to Data Dictionary
-patch.customWebClientExtension.description=Adds 'Web Client Extension' folder to Data Dictionary
-
-patch.customWorkflowDefs.description=Adds 'Workflow Definitions' folder to Data Dictionary.
-
-patch.emailContributorGroup.description=Adds the 'GROUP_EMAIL_CONTRIBUTORS' group.
-
-patch.avmStoreAsIdentifier.description=Reindex wca:webfolder to make wca:avmstore an identifier
-patch.avmStoreAsIdentifier.result=Reindexed wca:webfolder to make wca:avmstore an identifier
-
-patch.avmFormPropertyIdentifier.description=Reindex wca:webform to make wca:formname an identifier
-patch.avmFormPropertyIdentifier.result=Reindexed wca:webform to make wca:formname an identifier
-
-patch.formsFolder.description=Adds 'Forms' folder to Data Dictionary.
-
-patch.tagRootCategory.description=Adds 'Tags' as new top-level category root.
-
-patch.sitesFolder.description=Adds 'Sites' folder to Company Home.
-
-patch.deploymentMigration.description=Migrates deployment data to the new model.
-patch.deploymentMigration.webProjectName=Migrating deployment data for web project ''{0}''
-patch.deploymentMigration.serverMigrated=Server ''{0}'' from web project ''{1}'' has been migrated
-patch.deploymentMigration.reportMigrated=Deployment report for ''{0}'' from web project ''{1}'' has been migrated
-patch.deploymentMigration.result=Deployment data has been migrated.
-
-patch.updateAvmPermissionData.description=Update avm permissions from 'webfolder' to 'cmobject'.
-patch.updateAvmPermissionData.result=Changed {0} 'webfolder' access control entries to 'cmobject'.
-
-patch.updateAvmPermissions.description=Update ACLs on all avm objects to the new 2.2 permission model
-patch.updateAvmPermissions.result=Updated ACLs. Created {0} defining and {1} layered ACLs.
-
-patch.wcmPermissionPatch.description=Fix ACLs so they are only set on the staging area store.
-patch.wcmPermissionPatch.result=Updated ACLs: ACLS are moved to the staging area store and removed from all other stores. They are now applied via layering.
-
-patch.avmWebProjectInheritPermissions.description=Break inheritance of permissions on wca:webfolder object to hide access by default.
-patch.avmWebProjectInheritPermissions.result=Removed inheritance of permissions on all wca:webfolder objects.
-
-patch.wcmPostPermissionSnapshotPatch.description=Snapshot stores (after fixing ACLs so they are only set on the staging area store).
-patch.wcmPostPermissionSnapshotPatch.result=Snapshot complete after WCM ACL changes.
-
-patch.updateDmPermissions.description=Update ACLs on all DM node objects to the new 3.0 permission model
-patch.updateDmPermissions.result=Updated ACLs. Created {0} defining ACLs.
-
-patch.db-V3.0-0-CreateActivitiesExtras.description=Replaced by 'patch.db-V3.0-ActivityTables', which must run first.
-
-patch.createSiteStore.description=Create the AVM store for site data structure for 3.0 web-tier clients.
-patch.createSiteStore.result=Created the AVM site data store.
-
-patch.sitePermissionRefactorPatch.description=Create permission groups for sites.
-patch.sitePermissionRefactorPatch.result=Groups have been created for all sites and user's allocated accordingly.
-
-patch.migrateVersionStore.description=Version Store migration (from lightWeightVersionStore to version2Store)
-patch.migrateVersionStore.incomplete=Version Store migration incomplete.
-patch.migrateVersionStore.done=Version Store migration completed.
-patch.migrateVersionStore.bypassingPatch=Bypass Version Store migration patch since scheduled to run as job
-
-patch.inviteEmailTemplate.description=Adds invite email template to invite space
-
-patch.calendarModelNamespacePatch.description=Update the Calendar model namespace URI and reindex all calendar objects.
-patch.calendarModelNamespacePatch.result=Updated the Calendar model namespace URI to http://www.alfresco.org/model/calendar and reindexed {0} calendar objects.
-
-patch.spacesStoreGuestPermission.description=Sets READ permissions for GUEST on root node of the SpacesStore.
-patch.spacesStoreGuestPermission.result=Granted READ permissions for GUEST on root node of the SpacesStore.
-
-patch.administratorGroup.description=Adds the 'ALFRESCO_ADMINISTRATORS' group.
-
-patch.resetWCMToGroupBasedPermissionsPatch.description=Reset WCM to group based permissions.
-patch.resetWCMToGroupBasedPermissionsPatch.result=WCM reset to group based permissions.
-
-patch.migrateVersionStoreUpdateCounter.description=Update internal version2Store counter (if needed).
-patch.migrateVersionStoreUpdateCounter.result=Update internal version2Store counter (if needed): {0}
-
-patch.invitationMigration.description=Migrate invitations from old invite service to invitation service
-patch.invitationMigration.result=Migrated {0} invitations from old invite service to invitation service.
-patch.invitationMigration.no_invites=No invitations require migrating old invite service to invitation service.
-
-patch.webSiteAddModerated.description=Changing Web Site visibility from a boolean to enum.
-patch.webSiteAddModerated.result=Changed Web Site visibility.
-
-patch.mtShareExistingTenants.description=Update existing tenants for MT Share.
-patch.mtShareExistingTenants.result=Update existing tenants for MT Share.
-patch.mtShareExistingTenants.result.not_applicable=Patch applied, although no changes made since MT is not enabled.
-
-patch.redeployInvitationProcess.description=Re-deploy Invitation Process Definitions.
-
-patch.imapFolders.description=Creates folders tree necessary for IMAP functionality
-patch.imapFolders.result.exists=The 'Imap Configs' folder already exists
-patch.imapFolders.result.created=The 'Imap Configs' folder was successfully created
-
-patch.zonedAuthorities.description=Adds the remodelled cm:authority container to the spaces store
-
-patch.authorityMigration.description=Copies any old authorities from the user store to the spaces store.
-patch.authorityMigration.process.name=Authority Migration
-patch.authorityMigration.warning.assoc=Ignoring group memberships of non-existent user {1}
-patch.authorityMigration.result=Migrated {0} groups and {1} group associations to the spaces store.
-
-patch.authorityDefaultZonesPatch.description=Adds groups and people to the appropriate zones for wcm, share and everything else.
-patch.authorityDefaultZonesPatch.result=Unzoned groups and people added to the default zones.
-patch.authorityDefaultZonesPatch.users= Adding users to zones ...
-patch.authorityDefaultZonesPatch.groups= Adding groups to zones ...
-
-patch.fixNameCrcValues.description=Fixes name and qname CRC32 values to match UTF-8 encoding.
-patch.fixNameCrcValues.result=Fixed CRC32 values for UTF-8 encoding for {0} node child associations. See file {1} for details.
-patch.fixNameCrcValues.fixed=Updated CRC32 values for association ID {0}, name ''{1}'': {2} -> {3}, qname ''{4}'': {5} -> {6}.
-patch.fixNameCrcValues.unableToChange=Failed to update the CRC32 value for association ID {0}: \n Node name: {1} \n name CRC old: {2} \n name CRC new: {3} \n qname: {4} \n qname CRC old: {5} \n qname CRC new: {6} \n Error: {7}
-patch.fixNameCrcValues.fixingLocalname=Fixing invalid localname for association ID {0}: \n Was: ''{1}'' \n Now: ''{2}''
-patch.fixNameCrcValues.associationTypeNotDefined=Association type ''{0}'' has not been defined for child association ID {1}.
-patch.fixNameCrcValues.associationTypeNotChild=Association type ''{0}'' does not represent a child association but is used as one; for child association ID {1}.
-
-patch.personUsagePatch.description=Add person 'cm:sizeCurrent' property (if missing).
-patch.personUsagePatch.result1=Added 'cm:sizeCurrent' property to {0} people that were missing this property.
-patch.personUsagePatch.result2=No people were missing the 'cm:sizeCurrent' property.
-
-patch.redeployNominatedInvitationProcessWithPropsForShare.description=Redeploy nominated invitation workflow
-patch.redeployNominatedInvitationProcessWithPropsForShare.result=Nominated invitation workflow redeployed
-
-patch.transferDefinitions.description=Add transfer definitions folder to data dictionary.
-patch.transferDefinitions.result=Transfer definitions folder added to data dictionary.
-
-patch.redeployNominatedInvitationProcessWithPropsForShare.description=Redeploy nominated invitation workflow
-patch.redeployNominatedInvitationProcessWithPropsForShare.result=Nominated invitation workflow redeployed
-
-patch.thumbnailsAssocQName.description=Update the 'cm:thumbnails' association QName to 'rn:rendition'.
-
-patch.convertContentUrls.description=Converts pre-3.2 content URLs to use the alf_content_data table. The conversion work can also be done on a schedule; please contact Alfresco Support for further details.
-patch.convertContentUrls.bypassingPatch=Content URL conversion was NOT performed by this patch. Activate the scheduled job 'contentUrlConverterTrigger'.
-patch.convertContentUrls.start=Content URL conversion progress:
-patch.convertContentUrls.error=Content URL conversion failed: {0}
-patch.convertContentUrls.inProgress=Content URL conversion increment completed. Awaiting next scheduled call...
-patch.convertContentUrls.done=Content URL conversion completed.
-patch.convertContentUrls.adm.start=\tProcessing ADM Content URLs.
-patch.convertContentUrls.adm.done=\tFinished processing ADM nodes up to ID {0}.
-patch.convertContentUrls.avm.start=\tProcessing AVM Content URLs.
-patch.convertContentUrls.avm.done=\tFinished processing AVM nodes up to ID {0}.
-patch.convertContentUrls.store.start=\tReading content URLs from store {0}.
-patch.convertContentUrls.store.readOnly=\tNo content URLs will be marked for deletion. The content store is read-only.
-patch.convertContentUrls.store.pending=\tContent URLs will be marked for deletion once the URL conversion process is complete.
-patch.convertContentUrls.store.noSupport=\tNo content URLs will be marked for deletion. The store does not support URL enumeration.
-patch.convertContentUrls.store.progress=\t\tProcessed {0} content URLs from store.
-patch.convertContentUrls.store.scheduled=\tScheduled {0} content URLs for deletion from store: {1}
-patch.convertContentUrls.store.done=This job is complete. Deactivate the scheduled job 'contentUrlConverterTrigger'.
-
-patch.fixAuthoritiesCrcValues.description=Fixes authority CRC32 values to match UTF-8 encoding.
-patch.fixAuthoritiesCrcValues.result=Fixed CRC32 values for UTF-8 encoding for {0} authorities. See file {1} for details.
-patch.fixAuthoritiesCrcValues.fixed=Updated CRC32 values for authority '{0}'.
-patch.fixAuthoritiesCrcValues.unableToChange=Failed to update the CRC32 value for authority: \n Authority: {0} \n Error: {1}
-
-patch.updateMimetypes1.description=Fix mimetypes for Excel and Powerpoint.
-patch.updateMimetypes2.description=Fix mimetypes for Excel and Powerpoint.
-
-patch.db-V3.2-AddFKIndexes.description=Fixes ALF-3189: Added missing FK indexes. Note: The script is empty for MySQL.
-
-patch.eliminateDuplicates.description=Fixes ALF-4203: Searches for AVM duplicate nodes and changes their name
-
-patch.migrateAttrTenants.description=Migrate old Tenant attributes
-patch.migrateAttrTenants.result=Processed {0} attributes
-
-patch.migrateAttrAVMLocks.description=Migrate old AVM Lock attributes
-patch.migrateAttrAVMLocks.result=Processed {0} attributes
-
-patch.migrateAttrPropBackedBeans.description=Migrate old Property-Backed Bean component attributes
-patch.migrateAttrPropBackedBeans.result=Processed {0} attributes ({1} properties)
-
-patch.migrateAttrChainingURS.description=Migrate old Chaining User Registry Synchronizer attributes
-patch.migrateAttrChainingURS.result=Processed {0} attributes
-
-patch.migrateAttrDelete.description=Delete old attributes (if any) after they have been migrated
-patch.migrateAttrDelete.result=Old attributes were deleted (if any)
-
-patch.transfer.targetrulefolder.description=Creates the transfer target rule folder for the default transfer group.
-
-patch.transfer.targetrule.description=Creates the transfer target rule for the default transfer group.
-
-patch.actions.scheduledfolder.description=Creates the scheduled actions folder in the Data Dictionary.
-
-patch.removingLinkValidationMetadata.description=Fixes ALF-5185: Removes all Link Validation reports from schema
-
-patch.varcharFieldSizesQuadrupleIncreasing.description=ALF-4300: Increasing 'VARCHAR' field sizes quadruply for DB2 dialect
-
-patch.mtFixAdminExistingTenants.description=Fix bootstrapped creator/modifier
-patch.mtFixAdminExistingTenants.result=Fix bootstrapped creator/modifier
-
-patch.fixUserQNames.description=Fixes user store qnames to improve native authentication performance
-patch.fixUserQNames.result=Generated qnames for {0} users.
-
-patch.fixAclInheritance.description=Fixes any ACL inheritance issues.
-patch.fixAclInheritance.result=Fixed {0} ACLs.
diff --git a/config/alfresco/messages/patch-service_it.properties b/config/alfresco/messages/patch-service_it.properties
deleted file mode 100755
index 31c276b5e9..0000000000
--- a/config/alfresco/messages/patch-service_it.properties
+++ /dev/null
@@ -1,396 +0,0 @@
-# PatchService messages
-patch.service.preceeded_by_alternative=Preceded by alternative patch ''{0}''.
-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} {1}% complete, estimated complete at {2}.
-patch.validation.failed=Validation of patch ''{0}'' failed. Patch is applicable to a newer schema than the schema of this build ({1}).\nfixesToSchema: {2}\ntargetSchema: {3}.\nIf this patch should always be run once on every installation, please ensure that the ''fixesToSchema'' value is set to '''${version.schema}'''.
-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=====================================
-patch.executer.executed =\n=== Applied patch === \nID: {0}\nRESULT: \n{1}\n=====================================
-patch.executer.failed =\n=== Failed to apply patch === \nID: {0}\nRESULT: \n{1}\n=====================================
-patch.noLongerSupportedPatch.err.use_incremental_upgrade = \nPatch ''{0}'' was last supported on version {1}.\n Please follow an incremental upgrade using version {2}.
-
-# General patch messages
-
-patch.genericBootstrap.result.exists=Bootstrap location already exists: {0}
-patch.genericBootstrap.result.created=Imported view into bootstrap location: {0} ({1})
-patch.genericBootstrap.err.multiple_found=Multiple nodes found: {0}
-
-patch.general.property_not_set=Patch property ''{0}'' has not been set on this patch: {1}
-
-patch.QNamePatch.result=Successfully updated the ''{0}'' QName to ''{1}''.
-
-patch.genericMimetypeUpdate.start=Updating mimetypes.
-patch.genericMimetypeUpdate.updated=\n\tUpdated {0} content references with mimetype ''{1}'' to use ''{2}''.
-patch.genericMimetypeUpdate.indexed=\n\tIndexed {0} nodes in store ''{1}''.
-patch.genericMimetypeUpdate.done=\n\tFinished updating mimetypes.
-patch.genericMimetypeUpdate.doneReindex=\n\tFinished updating mimetypes. Selective reindexing was disabled; a reindex is required to search for the new mimetype(s).
-
-# Individual patch messages
-
-patch.noOpPatch.description=A placeholder patch; usually marks a superceded patch.
-patch.noOpPatch.result=No-op patch
-
-patch.marker.description=Marker patch to record installations and upgrades
-patch.marker.result=Marker patch applied
-
-patch.savedSearchesFolder.description=Ensures the existence of the 'Saved Searches' folder.
-patch.savedSearchesFolder.result.exists=The saved searches folder already exists: {0}
-patch.savedSearchesFolder.result.created=The saved searches folder was successfully created: {0}
-
-patch.savedSearchesPermission.description=Sets required permissions on 'Saved Searches' folder.
-patch.savedSearchesPermission.result.applied=Granted CONTRIBUTOR role to EVERYONE on 'Saved Searches' folder: {0}.
-patch.savedSearchesPermission.err.not_found='Saved Searches' folder could not be found.
-
-patch.updatePermissionData.description=Update permissions from 'folder' to 'cmobject' [JIRA: AR-344].
-patch.updatePermissionData.result=Changed {0} 'folder' access control entries to 'cmobject'.
-
-patch.authoritiesFolder.description=Ensures the existence of the user authorities folder [JIRA: AR-497].
-
-patch.authoritiesFolderPermission.description=Ensures group authorities are visible to everyone.
-
-patch.guestUser.description=Add the guest user, guest home space; and fix permissions on company home, guest home and guest person.
-patch.guestUser.result=Added guest user and fixed permissions.
-
-patch.fixNodeSerializableValues.description=Ensure that property values are not stored as Serializable if at all possible
-patch.fixNodeSerializableValues.result=Fixed {0} node property serialized values
-
-patch.updateGuestPermission.description=Rename guest permission from 'Guest' to 'Consumer'
-patch.updateGuestPermission.result=Changed {0} 'Guest' access control entries to 'Consumer'.
-
-patch.categoryRootPermission.description=Sets required permissions on 'Category Root' folder.
-patch.categoryRootPermission.result=Granted CONSUMER role to GUEST on 'Category Root' folder: {0}.
-patch.categoryRootPermission.err.not_found='Category Root' folder ({0}) could not be found.
-
-patch.guestPersonPermission.description=Change Guest Person permission from 'Consumer' to 'Read'
-patch.guestPersonPermission.result=Updated Guest Person permission from 'Consumer' to 'Read'
-
-patch.spacesRootPermission.description=Change Spaces store root permission from 'Consumer' to 'Read'
-patch.spacesRootPermission.result=Updated Spaces store root permission from 'Consumer' to 'Read'
-
-patch.contentPermission.description=Update permission entries from 'cm:content' to 'sys:base'.
-patch.contentPermission.result=Changed {0} 'cm:content' access control entries to 'sys:base'.
-
-patch.forumsIcons.description=Updates forums icon references
-patch.forumsIcons.result=Updated {0} icon references
-
-patch.emailTemplatesFolder.description=Ensures the existence of the 'Email Templates' folder.
-patch.emailTemplatesFolder.result.exists=The email templates folder already exists: {0}
-patch.emailTemplatesFolder.result.created=The email templates folder was successfully created: {0}
-
-patch.emailInviteAndNotifyTemplatesFolder.description=Ensures the existence of the 'Email Invite Templates' and 'Email Notify Templates' folders.
-patch.emailNotifyTemplatesFolder.result.exists=The Email Notify Templates folder already exists: {0}
-patch.emailNotifyTemplatesFolder.result.created=The Email Notify Templates folder was successfully created: {0}
-patch.emailInviteTemplatesFolder.result.exists=The Email Invite Templates folder already exists: {0}
-patch.emailInviteTemplatesFolder.result.created=The Email Invite Templates folder was successfully created: {0}
-
-patch.emailTemplatesContent.description=Loads the email templates into the Email Templates folder.
-patch.emailTemplatesContent.result=Imported the Email Templates into the default folder.
-
-patch.descriptorUpdate.description=Update Repository descriptor
-patch.descriptorUpdate.result=Repository descriptor updated
-
-patch.scriptsFolder.description=Ensures the existence of the 'Scripts' folder.
-patch.scriptsFolder.result.exists=The scripts folder already exists: {0}
-patch.scriptsFolder.result.created=The scripts folder was successfully created: {0}
-
-patch.topLevelGroupParentChildAssociationTypePatch.description=Ensure top level groups have the correct child association type.
-patch.topLevelGroupParentChildAssociationTypePatch.result=Fixed {0} top level groups child association types.
-patch.topLevelGroupParentChildAssociationTypePatch.err.sys_path_not_found=Required authority system path not found: {0}
-patch.topLevelGroupParentChildAssociationTypePatch.err.auth_path_not_found=Required authority path not found: {0}
-
-patch.actionRuleDecouplingPatch.description=Migrate existing rules to the updated model where rules are decoupled from actions.
-patch.actionRuleDecouplingPatch.result=Updated {0} rules.
-
-patch.systemWorkflowFolder.description=Ensures the existence of the system workflow container.
-patch.systemWorkflowFolder.result.created=Created system workflow container {0}.
-
-patch.rssTemplatesFolder.description=Ensures the existence of the 'RSS Templates' folder.
-patch.rssTemplatesFolder.result.exists=The RSS Templates folder already exists: {0}. Re-applying guest permissions.
-patch.rssTemplatesFolder.result.created=The RSS Templates folder was successfully created: {0}
-
-patch.rendition.rendering_actions.exists=The Rendering Actions folder already exists: {0}.
-patch.rendition.rendering_actions.created=The Rendering Actions folder was successfully created: {0}
-patch.rendition.rendering_actions.description=Creates the Rendering Actions folder.
-
-patch.replication.replication_actions.exists=The Replication Actions folder already exists: {0}.
-patch.replication.replication_actions.created=The Replication Actions folder was successfully created: {0}
-patch.replication.replication_actions.description=Creates the Replication Actions folder.
-
-patch.uifacetsAspectRemovalPatch.description=Removes the incorrectly applied uifacets aspect from presentation template files.
-patch.uifacetsAspectRemovalPatch.updated=Successfully removed the uifacets aspect from {0} presentation template files.
-
-patch.guestPersonPermission2.description=Change Guest Person permission to visible by all users as 'Consumer'.
-patch.guestPersonPermission2.result=Updated Guest Person permission to visible by all users as 'Consumer'.
-
-patch.schemaUpgradeScript.description=Ensures that the database upgrade script has been run.
-patch.schemaUpgradeScript.err.not_executed=The schema upgrade script, ''{0}'', has not been run against this database.
-
-patch.uniqueChildName.description=Checks and renames duplicate children.
-patch.uniqueChildName.copyOf=({0}-{1})
-patch.uniqueChildName.result=Checked {0} associations and fixed {1} duplicates. See file {2} for details.
-patch.uniqueChildName.err.unable_to_fix=Auto-fixing of duplicate names failed. See file {0} for details.
-
-patch.invalidNameEnding.description=Fixes names ending with a space or full stop.
-patch.invalidNameEnding.result=Fixed {0} names ending with a space or full stop. See file {1} for details.
-patch.invalidNameEnding.err.unable_to_fix=Auto-fixing of names ending with a space or full stop failed. See file {0} for details.
-patch.invalidNameEnding.rewritten=Name ''{0}'' rewritten to ''{1}''
-
-patch.systemDescriptorContent.description=Adds the version properties content to the system descriptor.
-patch.systemDescriptorContent.result=Added the version properties content to the system descriptor.
-patch.systemDescriptorContent.err.no_version_properties=The version.properties resource could not be found.
-patch.systemDescriptorContent.err.no_descriptor=The system descriptor could not be found.
-
-patch.versionHistoryPerformance.description=Improves the performance of version history lookups.
-patch.versionHistoryPerformance.result=Updated {0} version history objects to improve performance.
-
-patch.multilingualBootstrap.description=Bootstraps the node that will hold the multilingual containers.
-
-patch.siteLoadPatch.description=Loads a sample site into the repository.
-patch.siteLoadPatch.exists=The Site {0} already exists and so could not be imported
-patch.siteLoadPatch.noBootstrapViews=No bootstrap views were given for importing Site {0} - please check the bootstrap extension bean configuration
-patch.siteLoadPatch.result=Site {0} imported.
-
-patch.wcmFolders.description=Ensures the existance of the WCM specific 'Web Projects' and 'Web Forms' folders.
-patch.wcmFolders.webprojects.result.exists=The Web Projects folder already exists: {0}
-patch.wcmFolders.webprojects.result.created=The Web Projects folder was successfully created: {0}
-patch.wcmFolders.webforms.result.exists=The Web Forms folder already exists: {0}
-patch.wcmFolders.webforms.result.created=The Web Forms folder was successfully created: {0}
-
-patch.linkNodeExtension.description=Fixes link node file extensions to have a .url extension.
-patch.linkNodeExtension.result=Fixed {0} link node file extensions. See file {1} for details.
-patch.linkNodeExtension.err.unable_to_fix=Auto-fixing of link node file extensions failed. See file {0} for details.
-patch.linkNodeExtension.rewritten=Name ''{0}'' rewritten to ''{1}''
-
-patch.systemRegistryBootstrap.description=Bootstraps the node that will hold system registry metadata.
-
-patch.userAndPersonUserNamesAsIdentifiers.description=Reindex usr:user and cm:person uids as identifiers
-patch.userAndPersonUserNamesAsIdentifiers.result=Reindexed user:user and cm:person uids as identifiers
-
-patch.contentFormFolderType.description=Update WCM Content Form folder type.
-patch.contentFormFolderType.result=Updated {0} WCM Content Form objects to 'wcm:formfolder' type.
-
-patch.groupNamesAsIdentifiers.description=Reindex usr:authorityContainer gids as identifiers
-patch.groupNamesAsIdentifiers.result=Reindexed usr:authorityContainer with identifiers
-
-patch.invalidUserPersonAndGroup.description=Fix up invalid uids for people and users; and invalid gids for groups
-patch.invalidUserPersonAndGroup.result=Fixed ''{0}'' invalid user nodes, ''{1}'' invalid person nodes and ''{2}'' invalid authority nodes.
-
-patch.AVMGuidPatch.description=Set GUIDs on AVM nodes.
-patch.AVMGuidPatch.result=AVM GUIDS set.
-
-patch.webscripts.description=Adds Web Scripts to Data Dictionary.
-patch.webscripts2.description=Adds Web Scripts (second set) to Data Dictionary.
-patch.webscripts3.description=Update Web Scripts ReadMe.
-patch.webscriptsExtension.description=Adds Web Scripts Extension to Data Dictionary.
-
-patch.AVMLayeredSnapshot.description=Set indirectionVersion on Layered Nodes.
-patch.AVMLayeredSnapshot.result=Layered Node indirectionVersions set.
-
-patch.groupMembersAsIdentifiers.description=Reindex usr:authorityContainer members as identifiers
-
-patch.genericWorkflow.result.deployed=Re-deployed {0} workflows.
-
-patch.redeploySubmitProcess.description=Re-deploy WCM Submit Process Definition.
-patch.deploySubmitDirectProcess.description=Deploy WCM Direct Submit Process Definition.
-
-patch.AVMAspects.description=Changes storage of aspects on AVM Nodes.
-patch.AVMAspects.result=Aspects were moved.
-
-patch.ReadmeTemplate.description=Deployed ReadMe Template
-patch.webScriptsReadme.description=Applied ReadMe template to Web Scripts folders
-
-patch.AVMProperties.description=Changes storage of properties on AVM Nodes.
-patch.AVMProperties.result=Properties were moved.
-
-patch.customModels.description=Adds 'Models' folder to Data Dictionary
-patch.customMessages.description=Adds 'Messages' folder to Data Dictionary
-patch.customWebClientExtension.description=Adds 'Web Client Extension' folder to Data Dictionary
-
-patch.customWorkflowDefs.description=Adds 'Workflow Definitions' folder to Data Dictionary.
-
-patch.emailContributorGroup.description=Adds the 'GROUP_EMAIL_CONTRIBUTORS' group.
-
-patch.avmStoreAsIdentifier.description=Reindex wca:webfolder to make wca:avmstore an identifier
-patch.avmStoreAsIdentifier.result=Reindexed wca:webfolder to make wca:avmstore an identifier
-
-patch.avmFormPropertyIdentifier.description=Reindex wca:webform to make wca:formname an identifier
-patch.avmFormPropertyIdentifier.result=Reindexed wca:webform to make wca:formname an identifier
-
-patch.formsFolder.description=Adds 'Forms' folder to Data Dictionary.
-
-patch.tagRootCategory.description=Adds 'Tags' as new top-level category root.
-
-patch.sitesFolder.description=Adds 'Sites' folder to Company Home.
-
-patch.deploymentMigration.description=Migrates deployment data to the new model.
-patch.deploymentMigration.webProjectName=Migrating deployment data for web project ''{0}''
-patch.deploymentMigration.serverMigrated=Server ''{0}'' from web project ''{1}'' has been migrated
-patch.deploymentMigration.reportMigrated=Deployment report for ''{0}'' from web project ''{1}'' has been migrated
-patch.deploymentMigration.result=Deployment data has been migrated.
-
-patch.updateAvmPermissionData.description=Update avm permissions from 'webfolder' to 'cmobject'.
-patch.updateAvmPermissionData.result=Changed {0} 'webfolder' access control entries to 'cmobject'.
-
-patch.updateAvmPermissions.description=Update ACLs on all avm objects to the new 2.2 permission model
-patch.updateAvmPermissions.result=Updated ACLs. Created {0} defining and {1} layered ACLs.
-
-patch.wcmPermissionPatch.description=Fix ACLs so they are only set on the staging area store.
-patch.wcmPermissionPatch.result=Updated ACLs: ACLS are moved to the staging area store and removed from all other stores. They are now applied via layering.
-
-patch.avmWebProjectInheritPermissions.description=Break inheritance of permissions on wca:webfolder object to hide access by default.
-patch.avmWebProjectInheritPermissions.result=Removed inheritance of permissions on all wca:webfolder objects.
-
-patch.wcmPostPermissionSnapshotPatch.description=Snapshot stores (after fixing ACLs so they are only set on the staging area store).
-patch.wcmPostPermissionSnapshotPatch.result=Snapshot complete after WCM ACL changes.
-
-patch.updateDmPermissions.description=Update ACLs on all DM node objects to the new 3.0 permission model
-patch.updateDmPermissions.result=Updated ACLs. Created {0} defining ACLs.
-
-patch.db-V3.0-0-CreateActivitiesExtras.description=Replaced by 'patch.db-V3.0-ActivityTables', which must run first.
-
-patch.createSiteStore.description=Create the AVM store for site data structure for 3.0 web-tier clients.
-patch.createSiteStore.result=Created the AVM site data store.
-
-patch.sitePermissionRefactorPatch.description=Create permission groups for sites.
-patch.sitePermissionRefactorPatch.result=Groups have been created for all sites and user's allocated accordingly.
-
-patch.migrateVersionStore.description=Version Store migration (from lightWeightVersionStore to version2Store)
-patch.migrateVersionStore.incomplete=Version Store migration incomplete.
-patch.migrateVersionStore.done=Version Store migration completed.
-patch.migrateVersionStore.bypassingPatch=Bypass Version Store migration patch since scheduled to run as job
-
-patch.inviteEmailTemplate.description=Adds invite email template to invite space
-
-patch.calendarModelNamespacePatch.description=Update the Calendar model namespace URI and reindex all calendar objects.
-patch.calendarModelNamespacePatch.result=Updated the Calendar model namespace URI to http://www.alfresco.org/model/calendar and reindexed {0} calendar objects.
-
-patch.spacesStoreGuestPermission.description=Sets READ permissions for GUEST on root node of the SpacesStore.
-patch.spacesStoreGuestPermission.result=Granted READ permissions for GUEST on root node of the SpacesStore.
-
-patch.administratorGroup.description=Adds the 'ALFRESCO_ADMINISTRATORS' group.
-
-patch.resetWCMToGroupBasedPermissionsPatch.description=Reset WCM to group based permissions.
-patch.resetWCMToGroupBasedPermissionsPatch.result=WCM reset to group based permissions.
-
-patch.migrateVersionStoreUpdateCounter.description=Update internal version2Store counter (if needed).
-patch.migrateVersionStoreUpdateCounter.result=Update internal version2Store counter (if needed): {0}
-
-patch.invitationMigration.description=Migrate invitations from old invite service to invitation service
-patch.invitationMigration.result=Migrated {0} invitations from old invite service to invitation service.
-patch.invitationMigration.no_invites=No invitations require migrating old invite service to invitation service.
-
-patch.webSiteAddModerated.description=Changing Web Site visibility from a boolean to enum.
-patch.webSiteAddModerated.result=Changed Web Site visibility.
-
-patch.mtShareExistingTenants.description=Update existing tenants for MT Share.
-patch.mtShareExistingTenants.result=Update existing tenants for MT Share.
-patch.mtShareExistingTenants.result.not_applicable=Patch applied, although no changes made since MT is not enabled.
-
-patch.redeployInvitationProcess.description=Re-deploy Invitation Process Definitions.
-
-patch.imapFolders.description=Creates folders tree necessary for IMAP functionality
-patch.imapFolders.result.exists=The 'Imap Configs' folder already exists
-patch.imapFolders.result.created=The 'Imap Configs' folder was successfully created
-
-patch.zonedAuthorities.description=Adds the remodelled cm:authority container to the spaces store
-
-patch.authorityMigration.description=Copies any old authorities from the user store to the spaces store.
-patch.authorityMigration.process.name=Authority Migration
-patch.authorityMigration.warning.assoc=Ignoring group memberships of non-existent user {1}
-patch.authorityMigration.result=Migrated {0} groups and {1} group associations to the spaces store.
-
-patch.authorityDefaultZonesPatch.description=Adds groups and people to the appropriate zones for wcm, share and everything else.
-patch.authorityDefaultZonesPatch.result=Unzoned groups and people added to the default zones.
-patch.authorityDefaultZonesPatch.users= Adding users to zones ...
-patch.authorityDefaultZonesPatch.groups= Adding groups to zones ...
-
-patch.fixNameCrcValues.description=Fixes name and qname CRC32 values to match UTF-8 encoding.
-patch.fixNameCrcValues.result=Fixed CRC32 values for UTF-8 encoding for {0} node child associations. See file {1} for details.
-patch.fixNameCrcValues.fixed=Updated CRC32 values for association ID {0}, name ''{1}'': {2} -> {3}, qname ''{4}'': {5} -> {6}.
-patch.fixNameCrcValues.unableToChange=Failed to update the CRC32 value for association ID {0}: \n Node name: {1} \n name CRC old: {2} \n name CRC new: {3} \n qname: {4} \n qname CRC old: {5} \n qname CRC new: {6} \n Error: {7}
-patch.fixNameCrcValues.fixingLocalname=Fixing invalid localname for association ID {0}: \n Was: ''{1}'' \n Now: ''{2}''
-patch.fixNameCrcValues.associationTypeNotDefined=Association type ''{0}'' has not been defined for child association ID {1}.
-patch.fixNameCrcValues.associationTypeNotChild=Association type ''{0}'' does not represent a child association but is used as one; for child association ID {1}.
-
-patch.personUsagePatch.description=Add person 'cm:sizeCurrent' property (if missing).
-patch.personUsagePatch.result1=Added 'cm:sizeCurrent' property to {0} people that were missing this property.
-patch.personUsagePatch.result2=No people were missing the 'cm:sizeCurrent' property.
-
-patch.redeployNominatedInvitationProcessWithPropsForShare.description=Redeploy nominated invitation workflow
-patch.redeployNominatedInvitationProcessWithPropsForShare.result=Nominated invitation workflow redeployed
-
-patch.transferDefinitions.description=Add transfer definitions folder to data dictionary.
-patch.transferDefinitions.result=Transfer definitions folder added to data dictionary.
-
-patch.redeployNominatedInvitationProcessWithPropsForShare.description=Redeploy nominated invitation workflow
-patch.redeployNominatedInvitationProcessWithPropsForShare.result=Nominated invitation workflow redeployed
-
-patch.thumbnailsAssocQName.description=Update the 'cm:thumbnails' association QName to 'rn:rendition'.
-
-patch.convertContentUrls.description=Converts pre-3.2 content URLs to use the alf_content_data table. The conversion work can also be done on a schedule; please contact Alfresco Support for further details.
-patch.convertContentUrls.bypassingPatch=Content URL conversion was NOT performed by this patch. Activate the scheduled job 'contentUrlConverterTrigger'.
-patch.convertContentUrls.start=Content URL conversion progress:
-patch.convertContentUrls.error=Content URL conversion failed: {0}
-patch.convertContentUrls.inProgress=Content URL conversion increment completed. Awaiting next scheduled call...
-patch.convertContentUrls.done=Content URL conversion completed.
-patch.convertContentUrls.adm.start=\tProcessing ADM Content URLs.
-patch.convertContentUrls.adm.done=\tFinished processing ADM nodes up to ID {0}.
-patch.convertContentUrls.avm.start=\tProcessing AVM Content URLs.
-patch.convertContentUrls.avm.done=\tFinished processing AVM nodes up to ID {0}.
-patch.convertContentUrls.store.start=\tReading content URLs from store {0}.
-patch.convertContentUrls.store.readOnly=\tNo content URLs will be marked for deletion. The content store is read-only.
-patch.convertContentUrls.store.pending=\tContent URLs will be marked for deletion once the URL conversion process is complete.
-patch.convertContentUrls.store.noSupport=\tNo content URLs will be marked for deletion. The store does not support URL enumeration.
-patch.convertContentUrls.store.progress=\t\tProcessed {0} content URLs from store.
-patch.convertContentUrls.store.scheduled=\tScheduled {0} content URLs for deletion from store: {1}
-patch.convertContentUrls.store.done=This job is complete. Deactivate the scheduled job 'contentUrlConverterTrigger'.
-
-patch.fixAuthoritiesCrcValues.description=Fixes authority CRC32 values to match UTF-8 encoding.
-patch.fixAuthoritiesCrcValues.result=Fixed CRC32 values for UTF-8 encoding for {0} authorities. See file {1} for details.
-patch.fixAuthoritiesCrcValues.fixed=Updated CRC32 values for authority '{0}'.
-patch.fixAuthoritiesCrcValues.unableToChange=Failed to update the CRC32 value for authority: \n Authority: {0} \n Error: {1}
-
-patch.updateMimetypes1.description=Fix mimetypes for Excel and Powerpoint.
-patch.updateMimetypes2.description=Fix mimetypes for Excel and Powerpoint.
-
-patch.db-V3.2-AddFKIndexes.description=Fixes ALF-3189: Added missing FK indexes. Note: The script is empty for MySQL.
-
-patch.eliminateDuplicates.description=Fixes ALF-4203: Searches for AVM duplicate nodes and changes their name
-
-patch.migrateAttrTenants.description=Migrate old Tenant attributes
-patch.migrateAttrTenants.result=Processed {0} attributes
-
-patch.migrateAttrAVMLocks.description=Migrate old AVM Lock attributes
-patch.migrateAttrAVMLocks.result=Processed {0} attributes
-
-patch.migrateAttrPropBackedBeans.description=Migrate old Property-Backed Bean component attributes
-patch.migrateAttrPropBackedBeans.result=Processed {0} attributes ({1} properties)
-
-patch.migrateAttrChainingURS.description=Migrate old Chaining User Registry Synchronizer attributes
-patch.migrateAttrChainingURS.result=Processed {0} attributes
-
-patch.migrateAttrDelete.description=Delete old attributes (if any) after they have been migrated
-patch.migrateAttrDelete.result=Old attributes were deleted (if any)
-
-patch.transfer.targetrulefolder.description=Creates the transfer target rule folder for the default transfer group.
-
-patch.transfer.targetrule.description=Creates the transfer target rule for the default transfer group.
-
-patch.actions.scheduledfolder.description=Creates the scheduled actions folder in the Data Dictionary.
-
-patch.removingLinkValidationMetadata.description=Fixes ALF-5185: Removes all Link Validation reports from schema
-<<<<<<< .working
-
-patch.varcharFieldSizesQuadrupleIncreasing.description=ALF-4300: Increasing 'VARCHAR' field sizes quadruply for DB2 dialect
-
-patch.mtFixAdminExistingTenants.description=Fix bootstrapped creator/modifier
-patch.mtFixAdminExistingTenants.result=Fix bootstrapped creator/modifier
-
-patch.fixUserQNames.description=Fixes user store qnames to improve native authentication performance
-patch.fixUserQNames.result=Generated qnames for {0} users.
-
-patch.fixAclInheritance.description=Fixes any ACL inheritance issues.
-patch.fixAclInheritance.result=Fixed {0} ACLs.
diff --git a/config/alfresco/messages/patch-service_ja.properties b/config/alfresco/messages/patch-service_ja.properties
deleted file mode 100755
index fcc7939517..0000000000
--- a/config/alfresco/messages/patch-service_ja.properties
+++ /dev/null
@@ -1,395 +0,0 @@
-# PatchService messages
-patch.service.preceeded_by_alternative=Preceded by alternative patch ''{0}''.
-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} {1}% complete, estimated complete at {2}.
-patch.validation.failed=Validation of patch ''{0}'' failed. Patch is applicable to a newer schema than the schema of this build ({1}).\nfixesToSchema: {2}\ntargetSchema: {3}.\nIf this patch should always be run once on every installation, please ensure that the ''fixesToSchema'' value is set to '''${version.schema}'''.
-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=====================================
-patch.executer.executed =\n=== Applied patch === \nID: {0}\nRESULT: \n{1}\n=====================================
-patch.executer.failed =\n=== Failed to apply patch === \nID: {0}\nRESULT: \n{1}\n=====================================
-patch.noLongerSupportedPatch.err.use_incremental_upgrade = \nPatch ''{0}'' was last supported on version {1}.\n Please follow an incremental upgrade using version {2}.
-
-# General patch messages
-
-patch.genericBootstrap.result.exists=Bootstrap location already exists: {0}
-patch.genericBootstrap.result.created=Imported view into bootstrap location: {0} ({1})
-patch.genericBootstrap.err.multiple_found=Multiple nodes found: {0}
-
-patch.general.property_not_set=Patch property ''{0}'' has not been set on this patch: {1}
-
-patch.QNamePatch.result=Successfully updated the ''{0}'' QName to ''{1}''.
-
-patch.genericMimetypeUpdate.start=Updating mimetypes.
-patch.genericMimetypeUpdate.updated=\n\tUpdated {0} content references with mimetype ''{1}'' to use ''{2}''.
-patch.genericMimetypeUpdate.indexed=\n\tIndexed {0} nodes in store ''{1}''.
-patch.genericMimetypeUpdate.done=\n\tFinished updating mimetypes.
-patch.genericMimetypeUpdate.doneReindex=\n\tFinished updating mimetypes. Selective reindexing was disabled; a reindex is required to search for the new mimetype(s).
-
-# Individual patch messages
-
-patch.noOpPatch.description=A placeholder patch; usually marks a superceded patch.
-patch.noOpPatch.result=No-op patch
-
-patch.marker.description=Marker patch to record installations and upgrades
-patch.marker.result=Marker patch applied
-
-patch.savedSearchesFolder.description=Ensures the existence of the 'Saved Searches' folder.
-patch.savedSearchesFolder.result.exists=The saved searches folder already exists: {0}
-patch.savedSearchesFolder.result.created=The saved searches folder was successfully created: {0}
-
-patch.savedSearchesPermission.description=Sets required permissions on 'Saved Searches' folder.
-patch.savedSearchesPermission.result.applied=Granted CONTRIBUTOR role to EVERYONE on 'Saved Searches' folder: {0}.
-patch.savedSearchesPermission.err.not_found='Saved Searches' folder could not be found.
-
-patch.updatePermissionData.description=Update permissions from 'folder' to 'cmobject' [JIRA: AR-344].
-patch.updatePermissionData.result=Changed {0} 'folder' access control entries to 'cmobject'.
-
-patch.authoritiesFolder.description=Ensures the existence of the user authorities folder [JIRA: AR-497].
-
-patch.authoritiesFolderPermission.description=Ensures group authorities are visible to everyone.
-
-patch.guestUser.description=Add the guest user, guest home space; and fix permissions on company home, guest home and guest person.
-patch.guestUser.result=Added guest user and fixed permissions.
-
-patch.fixNodeSerializableValues.description=Ensure that property values are not stored as Serializable if at all possible
-patch.fixNodeSerializableValues.result=Fixed {0} node property serialized values
-
-patch.updateGuestPermission.description=Rename guest permission from 'Guest' to 'Consumer'
-patch.updateGuestPermission.result=Changed {0} 'Guest' access control entries to 'Consumer'.
-
-patch.categoryRootPermission.description=Sets required permissions on 'Category Root' folder.
-patch.categoryRootPermission.result=Granted CONSUMER role to GUEST on 'Category Root' folder: {0}.
-patch.categoryRootPermission.err.not_found='Category Root' folder ({0}) could not be found.
-
-patch.guestPersonPermission.description=Change Guest Person permission from 'Consumer' to 'Read'
-patch.guestPersonPermission.result=Updated Guest Person permission from 'Consumer' to 'Read'
-
-patch.spacesRootPermission.description=Change Spaces store root permission from 'Consumer' to 'Read'
-patch.spacesRootPermission.result=Updated Spaces store root permission from 'Consumer' to 'Read'
-
-patch.contentPermission.description=Update permission entries from 'cm:content' to 'sys:base'.
-patch.contentPermission.result=Changed {0} 'cm:content' access control entries to 'sys:base'.
-
-patch.forumsIcons.description=Updates forums icon references
-patch.forumsIcons.result=Updated {0} icon references
-
-patch.emailTemplatesFolder.description=Ensures the existence of the 'Email Templates' folder.
-patch.emailTemplatesFolder.result.exists=The email templates folder already exists: {0}
-patch.emailTemplatesFolder.result.created=The email templates folder was successfully created: {0}
-
-patch.emailInviteAndNotifyTemplatesFolder.description=Ensures the existence of the 'Email Invite Templates' and 'Email Notify Templates' folders.
-patch.emailNotifyTemplatesFolder.result.exists=The Email Notify Templates folder already exists: {0}
-patch.emailNotifyTemplatesFolder.result.created=The Email Notify Templates folder was successfully created: {0}
-patch.emailInviteTemplatesFolder.result.exists=The Email Invite Templates folder already exists: {0}
-patch.emailInviteTemplatesFolder.result.created=The Email Invite Templates folder was successfully created: {0}
-
-patch.emailTemplatesContent.description=Loads the email templates into the Email Templates folder.
-patch.emailTemplatesContent.result=Imported the Email Templates into the default folder.
-
-patch.descriptorUpdate.description=Update Repository descriptor
-patch.descriptorUpdate.result=Repository descriptor updated
-
-patch.scriptsFolder.description=Ensures the existence of the 'Scripts' folder.
-patch.scriptsFolder.result.exists=The scripts folder already exists: {0}
-patch.scriptsFolder.result.created=The scripts folder was successfully created: {0}
-
-patch.topLevelGroupParentChildAssociationTypePatch.description=Ensure top level groups have the correct child association type.
-patch.topLevelGroupParentChildAssociationTypePatch.result=Fixed {0} top level groups child association types.
-patch.topLevelGroupParentChildAssociationTypePatch.err.sys_path_not_found=Required authority system path not found: {0}
-patch.topLevelGroupParentChildAssociationTypePatch.err.auth_path_not_found=Required authority path not found: {0}
-
-patch.actionRuleDecouplingPatch.description=Migrate existing rules to the updated model where rules are decoupled from actions.
-patch.actionRuleDecouplingPatch.result=Updated {0} rules.
-
-patch.systemWorkflowFolder.description=Ensures the existence of the system workflow container.
-patch.systemWorkflowFolder.result.created=Created system workflow container {0}.
-
-patch.rssTemplatesFolder.description=Ensures the existence of the 'RSS Templates' folder.
-patch.rssTemplatesFolder.result.exists=The RSS Templates folder already exists: {0}. Re-applying guest permissions.
-patch.rssTemplatesFolder.result.created=The RSS Templates folder was successfully created: {0}
-
-patch.rendition.rendering_actions.exists=The Rendering Actions folder already exists: {0}.
-patch.rendition.rendering_actions.created=The Rendering Actions folder was successfully created: {0}
-patch.rendition.rendering_actions.description=Creates the Rendering Actions folder.
-
-patch.replication.replication_actions.exists=The Replication Actions folder already exists: {0}.
-patch.replication.replication_actions.created=The Replication Actions folder was successfully created: {0}
-patch.replication.replication_actions.description=Creates the Replication Actions folder.
-
-patch.uifacetsAspectRemovalPatch.description=Removes the incorrectly applied uifacets aspect from presentation template files.
-patch.uifacetsAspectRemovalPatch.updated=Successfully removed the uifacets aspect from {0} presentation template files.
-
-patch.guestPersonPermission2.description=Change Guest Person permission to visible by all users as 'Consumer'.
-patch.guestPersonPermission2.result=Updated Guest Person permission to visible by all users as 'Consumer'.
-
-patch.schemaUpgradeScript.description=Ensures that the database upgrade script has been run.
-patch.schemaUpgradeScript.err.not_executed=The schema upgrade script, ''{0}'', has not been run against this database.
-
-patch.uniqueChildName.description=Checks and renames duplicate children.
-patch.uniqueChildName.copyOf=({0}-{1})
-patch.uniqueChildName.result=Checked {0} associations and fixed {1} duplicates. See file {2} for details.
-patch.uniqueChildName.err.unable_to_fix=Auto-fixing of duplicate names failed. See file {0} for details.
-
-patch.invalidNameEnding.description=Fixes names ending with a space or full stop.
-patch.invalidNameEnding.result=Fixed {0} names ending with a space or full stop. See file {1} for details.
-patch.invalidNameEnding.err.unable_to_fix=Auto-fixing of names ending with a space or full stop failed. See file {0} for details.
-patch.invalidNameEnding.rewritten=Name ''{0}'' rewritten to ''{1}''
-
-patch.systemDescriptorContent.description=Adds the version properties content to the system descriptor.
-patch.systemDescriptorContent.result=Added the version properties content to the system descriptor.
-patch.systemDescriptorContent.err.no_version_properties=The version.properties resource could not be found.
-patch.systemDescriptorContent.err.no_descriptor=The system descriptor could not be found.
-
-patch.versionHistoryPerformance.description=Improves the performance of version history lookups.
-patch.versionHistoryPerformance.result=Updated {0} version history objects to improve performance.
-
-patch.multilingualBootstrap.description=Bootstraps the node that will hold the multilingual containers.
-
-patch.siteLoadPatch.description=Loads a sample site into the repository.
-patch.siteLoadPatch.exists=The Site {0} already exists and so could not be imported
-patch.siteLoadPatch.noBootstrapViews=No bootstrap views were given for importing Site {0} - please check the bootstrap extension bean configuration
-patch.siteLoadPatch.result=Site {0} imported.
-
-patch.wcmFolders.description=Ensures the existance of the WCM specific 'Web Projects' and 'Web Forms' folders.
-patch.wcmFolders.webprojects.result.exists=The Web Projects folder already exists: {0}
-patch.wcmFolders.webprojects.result.created=The Web Projects folder was successfully created: {0}
-patch.wcmFolders.webforms.result.exists=The Web Forms folder already exists: {0}
-patch.wcmFolders.webforms.result.created=The Web Forms folder was successfully created: {0}
-
-patch.linkNodeExtension.description=Fixes link node file extensions to have a .url extension.
-patch.linkNodeExtension.result=Fixed {0} link node file extensions. See file {1} for details.
-patch.linkNodeExtension.err.unable_to_fix=Auto-fixing of link node file extensions failed. See file {0} for details.
-patch.linkNodeExtension.rewritten=Name ''{0}'' rewritten to ''{1}''
-
-patch.systemRegistryBootstrap.description=Bootstraps the node that will hold system registry metadata.
-
-patch.userAndPersonUserNamesAsIdentifiers.description=Reindex usr:user and cm:person uids as identifiers
-patch.userAndPersonUserNamesAsIdentifiers.result=Reindexed user:user and cm:person uids as identifiers
-
-patch.contentFormFolderType.description=Update WCM Content Form folder type.
-patch.contentFormFolderType.result=Updated {0} WCM Content Form objects to 'wcm:formfolder' type.
-
-patch.groupNamesAsIdentifiers.description=Reindex usr:authorityContainer gids as identifiers
-patch.groupNamesAsIdentifiers.result=Reindexed usr:authorityContainer with identifiers
-
-patch.invalidUserPersonAndGroup.description=Fix up invalid uids for people and users; and invalid gids for groups
-patch.invalidUserPersonAndGroup.result=Fixed ''{0}'' invalid user nodes, ''{1}'' invalid person nodes and ''{2}'' invalid authority nodes.
-
-patch.AVMGuidPatch.description=Set GUIDs on AVM nodes.
-patch.AVMGuidPatch.result=AVM GUIDS set.
-
-patch.webscripts.description=Adds Web Scripts to Data Dictionary.
-patch.webscripts2.description=Adds Web Scripts (second set) to Data Dictionary.
-patch.webscripts3.description=Update Web Scripts ReadMe.
-patch.webscriptsExtension.description=Adds Web Scripts Extension to Data Dictionary.
-
-patch.AVMLayeredSnapshot.description=Set indirectionVersion on Layered Nodes.
-patch.AVMLayeredSnapshot.result=Layered Node indirectionVersions set.
-
-patch.groupMembersAsIdentifiers.description=Reindex usr:authorityContainer members as identifiers
-
-patch.genericWorkflow.result.deployed=Re-deployed {0} workflows.
-
-patch.redeploySubmitProcess.description=Re-deploy WCM Submit Process Definition.
-patch.deploySubmitDirectProcess.description=Deploy WCM Direct Submit Process Definition.
-
-patch.AVMAspects.description=Changes storage of aspects on AVM Nodes.
-patch.AVMAspects.result=Aspects were moved.
-
-patch.ReadmeTemplate.description=Deployed ReadMe Template
-patch.webScriptsReadme.description=Applied ReadMe template to Web Scripts folders
-
-patch.AVMProperties.description=Changes storage of properties on AVM Nodes.
-patch.AVMProperties.result=Properties were moved.
-
-patch.customModels.description=Adds 'Models' folder to Data Dictionary
-patch.customMessages.description=Adds 'Messages' folder to Data Dictionary
-patch.customWebClientExtension.description=Adds 'Web Client Extension' folder to Data Dictionary
-
-patch.customWorkflowDefs.description=Adds 'Workflow Definitions' folder to Data Dictionary.
-
-patch.emailContributorGroup.description=Adds the 'GROUP_EMAIL_CONTRIBUTORS' group.
-
-patch.avmStoreAsIdentifier.description=Reindex wca:webfolder to make wca:avmstore an identifier
-patch.avmStoreAsIdentifier.result=Reindexed wca:webfolder to make wca:avmstore an identifier
-
-patch.avmFormPropertyIdentifier.description=Reindex wca:webform to make wca:formname an identifier
-patch.avmFormPropertyIdentifier.result=Reindexed wca:webform to make wca:formname an identifier
-
-patch.formsFolder.description=Adds 'Forms' folder to Data Dictionary.
-
-patch.tagRootCategory.description=Adds 'Tags' as new top-level category root.
-
-patch.sitesFolder.description=Adds 'Sites' folder to Company Home.
-
-patch.deploymentMigration.description=Migrates deployment data to the new model.
-patch.deploymentMigration.webProjectName=Migrating deployment data for web project ''{0}''
-patch.deploymentMigration.serverMigrated=Server ''{0}'' from web project ''{1}'' has been migrated
-patch.deploymentMigration.reportMigrated=Deployment report for ''{0}'' from web project ''{1}'' has been migrated
-patch.deploymentMigration.result=Deployment data has been migrated.
-
-patch.updateAvmPermissionData.description=Update avm permissions from 'webfolder' to 'cmobject'.
-patch.updateAvmPermissionData.result=Changed {0} 'webfolder' access control entries to 'cmobject'.
-
-patch.updateAvmPermissions.description=Update ACLs on all avm objects to the new 2.2 permission model
-patch.updateAvmPermissions.result=Updated ACLs. Created {0} defining and {1} layered ACLs.
-
-patch.wcmPermissionPatch.description=Fix ACLs so they are only set on the staging area store.
-patch.wcmPermissionPatch.result=Updated ACLs: ACLS are moved to the staging area store and removed from all other stores. They are now applied via layering.
-
-patch.avmWebProjectInheritPermissions.description=Break inheritance of permissions on wca:webfolder object to hide access by default.
-patch.avmWebProjectInheritPermissions.result=Removed inheritance of permissions on all wca:webfolder objects.
-
-patch.wcmPostPermissionSnapshotPatch.description=Snapshot stores (after fixing ACLs so they are only set on the staging area store).
-patch.wcmPostPermissionSnapshotPatch.result=Snapshot complete after WCM ACL changes.
-
-patch.updateDmPermissions.description=Update ACLs on all DM node objects to the new 3.0 permission model
-patch.updateDmPermissions.result=Updated ACLs. Created {0} defining ACLs.
-
-patch.db-V3.0-0-CreateActivitiesExtras.description=Replaced by 'patch.db-V3.0-ActivityTables', which must run first.
-
-patch.createSiteStore.description=Create the AVM store for site data structure for 3.0 web-tier clients.
-patch.createSiteStore.result=Created the AVM site data store.
-
-patch.sitePermissionRefactorPatch.description=Create permission groups for sites.
-patch.sitePermissionRefactorPatch.result=Groups have been created for all sites and user's allocated accordingly.
-
-patch.migrateVersionStore.description=Version Store migration (from lightWeightVersionStore to version2Store)
-patch.migrateVersionStore.incomplete=Version Store migration incomplete.
-patch.migrateVersionStore.done=Version Store migration completed.
-patch.migrateVersionStore.bypassingPatch=Bypass Version Store migration patch since scheduled to run as job
-
-patch.inviteEmailTemplate.description=Adds invite email template to invite space
-
-patch.calendarModelNamespacePatch.description=Update the Calendar model namespace URI and reindex all calendar objects.
-patch.calendarModelNamespacePatch.result=Updated the Calendar model namespace URI to http://www.alfresco.org/model/calendar and reindexed {0} calendar objects.
-
-patch.spacesStoreGuestPermission.description=Sets READ permissions for GUEST on root node of the SpacesStore.
-patch.spacesStoreGuestPermission.result=Granted READ permissions for GUEST on root node of the SpacesStore.
-
-patch.administratorGroup.description=Adds the 'ALFRESCO_ADMINISTRATORS' group.
-
-patch.resetWCMToGroupBasedPermissionsPatch.description=Reset WCM to group based permissions.
-patch.resetWCMToGroupBasedPermissionsPatch.result=WCM reset to group based permissions.
-
-patch.migrateVersionStoreUpdateCounter.description=Update internal version2Store counter (if needed).
-patch.migrateVersionStoreUpdateCounter.result=Update internal version2Store counter (if needed): {0}
-
-patch.invitationMigration.description=Migrate invitations from old invite service to invitation service
-patch.invitationMigration.result=Migrated {0} invitations from old invite service to invitation service.
-patch.invitationMigration.no_invites=No invitations require migrating old invite service to invitation service.
-
-patch.webSiteAddModerated.description=Changing Web Site visibility from a boolean to enum.
-patch.webSiteAddModerated.result=Changed Web Site visibility.
-
-patch.mtShareExistingTenants.description=Update existing tenants for MT Share.
-patch.mtShareExistingTenants.result=Update existing tenants for MT Share.
-patch.mtShareExistingTenants.result.not_applicable=Patch applied, although no changes made since MT is not enabled.
-
-patch.redeployInvitationProcess.description=Re-deploy Invitation Process Definitions.
-
-patch.imapFolders.description=Creates folders tree necessary for IMAP functionality
-patch.imapFolders.result.exists=The 'Imap Configs' folder already exists
-patch.imapFolders.result.created=The 'Imap Configs' folder was successfully created
-
-patch.zonedAuthorities.description=Adds the remodelled cm:authority container to the spaces store
-
-patch.authorityMigration.description=Copies any old authorities from the user store to the spaces store.
-patch.authorityMigration.process.name=Authority Migration
-patch.authorityMigration.warning.assoc=Ignoring group memberships of non-existent user {1}
-patch.authorityMigration.result=Migrated {0} groups and {1} group associations to the spaces store.
-
-patch.authorityDefaultZonesPatch.description=Adds groups and people to the appropriate zones for wcm, share and everything else.
-patch.authorityDefaultZonesPatch.result=Unzoned groups and people added to the default zones.
-patch.authorityDefaultZonesPatch.users= Adding users to zones ...
-patch.authorityDefaultZonesPatch.groups= Adding groups to zones ...
-
-patch.fixNameCrcValues.description=Fixes name and qname CRC32 values to match UTF-8 encoding.
-patch.fixNameCrcValues.result=Fixed CRC32 values for UTF-8 encoding for {0} node child associations. See file {1} for details.
-patch.fixNameCrcValues.fixed=Updated CRC32 values for association ID {0}, name ''{1}'': {2} -> {3}, qname ''{4}'': {5} -> {6}.
-patch.fixNameCrcValues.unableToChange=Failed to update the CRC32 value for association ID {0}: \n Node name: {1} \n name CRC old: {2} \n name CRC new: {3} \n qname: {4} \n qname CRC old: {5} \n qname CRC new: {6} \n Error: {7}
-patch.fixNameCrcValues.fixingLocalname=Fixing invalid localname for association ID {0}: \n Was: ''{1}'' \n Now: ''{2}''
-patch.fixNameCrcValues.associationTypeNotDefined=Association type ''{0}'' has not been defined for child association ID {1}.
-patch.fixNameCrcValues.associationTypeNotChild=Association type ''{0}'' does not represent a child association but is used as one; for child association ID {1}.
-
-patch.personUsagePatch.description=Add person 'cm:sizeCurrent' property (if missing).
-patch.personUsagePatch.result1=Added 'cm:sizeCurrent' property to {0} people that were missing this property.
-patch.personUsagePatch.result2=No people were missing the 'cm:sizeCurrent' property.
-
-patch.redeployNominatedInvitationProcessWithPropsForShare.description=Redeploy nominated invitation workflow
-patch.redeployNominatedInvitationProcessWithPropsForShare.result=Nominated invitation workflow redeployed
-
-patch.transferDefinitions.description=Add transfer definitions folder to data dictionary.
-patch.transferDefinitions.result=Transfer definitions folder added to data dictionary.
-
-patch.redeployNominatedInvitationProcessWithPropsForShare.description=Redeploy nominated invitation workflow
-patch.redeployNominatedInvitationProcessWithPropsForShare.result=Nominated invitation workflow redeployed
-
-patch.thumbnailsAssocQName.description=Update the 'cm:thumbnails' association QName to 'rn:rendition'.
-
-patch.convertContentUrls.description=Converts pre-3.2 content URLs to use the alf_content_data table. The conversion work can also be done on a schedule; please contact Alfresco Support for further details.
-patch.convertContentUrls.bypassingPatch=Content URL conversion was NOT performed by this patch. Activate the scheduled job 'contentUrlConverterTrigger'.
-patch.convertContentUrls.start=Content URL conversion progress:
-patch.convertContentUrls.error=Content URL conversion failed: {0}
-patch.convertContentUrls.inProgress=Content URL conversion increment completed. Awaiting next scheduled call...
-patch.convertContentUrls.done=Content URL conversion completed.
-patch.convertContentUrls.adm.start=\tProcessing ADM Content URLs.
-patch.convertContentUrls.adm.done=\tFinished processing ADM nodes up to ID {0}.
-patch.convertContentUrls.avm.start=\tProcessing AVM Content URLs.
-patch.convertContentUrls.avm.done=\tFinished processing AVM nodes up to ID {0}.
-patch.convertContentUrls.store.start=\tReading content URLs from store {0}.
-patch.convertContentUrls.store.readOnly=\tNo content URLs will be marked for deletion. The content store is read-only.
-patch.convertContentUrls.store.pending=\tContent URLs will be marked for deletion once the URL conversion process is complete.
-patch.convertContentUrls.store.noSupport=\tNo content URLs will be marked for deletion. The store does not support URL enumeration.
-patch.convertContentUrls.store.progress=\t\tProcessed {0} content URLs from store.
-patch.convertContentUrls.store.scheduled=\tScheduled {0} content URLs for deletion from store: {1}
-patch.convertContentUrls.store.done=This job is complete. Deactivate the scheduled job 'contentUrlConverterTrigger'.
-
-patch.fixAuthoritiesCrcValues.description=Fixes authority CRC32 values to match UTF-8 encoding.
-patch.fixAuthoritiesCrcValues.result=Fixed CRC32 values for UTF-8 encoding for {0} authorities. See file {1} for details.
-patch.fixAuthoritiesCrcValues.fixed=Updated CRC32 values for authority '{0}'.
-patch.fixAuthoritiesCrcValues.unableToChange=Failed to update the CRC32 value for authority: \n Authority: {0} \n Error: {1}
-
-patch.updateMimetypes1.description=Fix mimetypes for Excel and Powerpoint.
-patch.updateMimetypes2.description=Fix mimetypes for Excel and Powerpoint.
-
-patch.db-V3.2-AddFKIndexes.description=Fixes ALF-3189: Added missing FK indexes. Note: The script is empty for MySQL.
-
-patch.eliminateDuplicates.description=Fixes ALF-4203: Searches for AVM duplicate nodes and changes their name
-
-patch.migrateAttrTenants.description=Migrate old Tenant attributes
-patch.migrateAttrTenants.result=Processed {0} attributes
-
-patch.migrateAttrAVMLocks.description=Migrate old AVM Lock attributes
-patch.migrateAttrAVMLocks.result=Processed {0} attributes
-
-patch.migrateAttrPropBackedBeans.description=Migrate old Property-Backed Bean component attributes
-patch.migrateAttrPropBackedBeans.result=Processed {0} attributes ({1} properties)
-
-patch.migrateAttrChainingURS.description=Migrate old Chaining User Registry Synchronizer attributes
-patch.migrateAttrChainingURS.result=Processed {0} attributes
-
-patch.migrateAttrDelete.description=Delete old attributes (if any) after they have been migrated
-patch.migrateAttrDelete.result=Old attributes were deleted (if any)
-
-patch.transfer.targetrulefolder.description=Creates the transfer target rule folder for the default transfer group.
-
-patch.transfer.targetrule.description=Creates the transfer target rule for the default transfer group.
-
-patch.actions.scheduledfolder.description=Creates the scheduled actions folder in the Data Dictionary.
-
-patch.removingLinkValidationMetadata.description=Fixes ALF-5185: Removes all Link Validation reports from schema
-
-patch.varcharFieldSizesQuadrupleIncreasing.description=ALF-4300: Increasing 'VARCHAR' field sizes quadruply for DB2 dialect
-
-patch.mtFixAdminExistingTenants.description=Fix bootstrapped creator/modifier
-patch.mtFixAdminExistingTenants.result=Fix bootstrapped creator/modifier
-
-patch.fixUserQNames.description=Fixes user store qnames to improve native authentication performance
-patch.fixUserQNames.result=Generated qnames for {0} users.
-
-patch.fixAclInheritance.description=Fixes any ACL inheritance issues.
-patch.fixAclInheritance.result=Fixed {0} ACLs.
diff --git a/config/alfresco/messages/wdr-messages_de.properties b/config/alfresco/messages/wdr-messages_de.properties
new file mode 100755
index 0000000000..150e98f0a7
--- /dev/null
+++ b/config/alfresco/messages/wdr-messages_de.properties
@@ -0,0 +1,12 @@
+# Display labels for Web Delivery Runtime
+
+wdr.err.invalid_username_or_password=Benutzername oder Passwort ung\u00fcltig.
+wdr.err.unable_create_logfile=Logdatei konnte nicht erstellt werden; Deployment kann nicht fortgesetzt werden.
+wdr.err.unable_prepare_already_commit=Deployment kann nicht vorbereitet werden: wird entweder abgebrochen oder \u00fcbertragen.
+wdr.err.unable_prepare_missing_file=Kann nicht vorbereitet werden, tempor\u00e4re Datei fehlt. {0}
+wdr.err.invalid_ticket=Deployment ist abgelaufen, oder Ticket ist ung\u00fcltig. {0}
+wdr.err.unable_commit=Kann nicht \u00fcbertragen werden.
+
+wdr.avm.snapshot_tag=Deployment von Speicher:{0}, Version:{1}
+wdr.avm.snapshot_description=Deployment von Speicher:{0}, Version:{1}
+
diff --git a/config/alfresco/messages/wdr-messages_es.properties b/config/alfresco/messages/wdr-messages_es.properties
new file mode 100755
index 0000000000..f26480d6b9
--- /dev/null
+++ b/config/alfresco/messages/wdr-messages_es.properties
@@ -0,0 +1,12 @@
+# Display labels for Web Delivery Runtime
+
+wdr.err.invalid_username_or_password=Nombre de usuario o contrase\u00f1a no v\u00e1lidos.
+wdr.err.unable_create_logfile=No se pudo crear el archivo de registro. No se puede continuar el despliegue
+wdr.err.unable_prepare_already_commit=No se puede preparar el despliegue: ya se ha anulado o confirmado.
+wdr.err.unable_prepare_missing_file=No se puede preparar, falta el archivo temporal. {0}
+wdr.err.invalid_ticket=Despliegue expirado o vale no v\u00e1lido. {0}
+wdr.err.unable_commit=No se puede confirmar
+
+wdr.avm.snapshot_tag=Despliegue desde el almac\u00e9n:{0}, versi\u00f3n:{1}
+wdr.avm.snapshot_description=Despliegue desde el almac\u00e9n:{0}, versi\u00f3n:{1}
+
diff --git a/config/alfresco/messages/wdr-messages_fr.properties b/config/alfresco/messages/wdr-messages_fr.properties
new file mode 100755
index 0000000000..f2ebdceb5d
--- /dev/null
+++ b/config/alfresco/messages/wdr-messages_fr.properties
@@ -0,0 +1,12 @@
+# Display labels for Web Delivery Runtime
+
+wdr.err.invalid_username_or_password=Nom d'utilisateur ou mot de passe non valide.
+wdr.err.unable_create_logfile=Impossible de cr\u00e9er le fichier journal. Le d\u00e9ploiement ne peut se poursuivre
+wdr.err.unable_prepare_already_commit=Le d\u00e9ploiement ne peut \u00eatre pr\u00e9par\u00e9 : il est d\u00e9j\u00e0 en cours d'abandon ou de validation.
+wdr.err.unable_prepare_missing_file=Pr\u00e9paration impossible, fichier temporaire manquant. {0}
+wdr.err.invalid_ticket=D\u00e9ploiement expir\u00e9 ou ticket non valide. {0}
+wdr.err.unable_commit=Validation impossible
+
+wdr.avm.snapshot_tag=D\u00e9ploiement depuis le magasin:{0},version:{1}
+wdr.avm.snapshot_description=D\u00e9ploiement depuis le magasin:{0},version:{1}
+
diff --git a/config/alfresco/messages/wdr-messages_it.properties b/config/alfresco/messages/wdr-messages_it.properties
new file mode 100755
index 0000000000..1cfdcde310
--- /dev/null
+++ b/config/alfresco/messages/wdr-messages_it.properties
@@ -0,0 +1,12 @@
+# Display labels for Web Delivery Runtime
+
+wdr.err.invalid_username_or_password=Nome utente o password non validi.
+wdr.err.unable_create_logfile=Impossibile creare il file di log; Impossibile continuare il dispiegamento
+wdr.err.unable_prepare_already_commit=Impossibile preparare il dispiegamento: interruzione o commit in corso.
+wdr.err.unable_prepare_missing_file=Preparazione non riuscita, file temporaneo mancante. {0}
+wdr.err.invalid_ticket=Timeout dispiegamento o ticket non valido. {0}
+wdr.err.unable_commit=Impossibile eseguire il commit
+
+wdr.avm.snapshot_tag=Dispiegamento dal deposito:{0}, versione:{1}
+wdr.avm.snapshot_description=Dispiegamento dal deposito:{0}, versione:{1}
+
diff --git a/config/alfresco/messages/wdr-messages_ja.properties b/config/alfresco/messages/wdr-messages_ja.properties
new file mode 100755
index 0000000000..a89f2c4c14
--- /dev/null
+++ b/config/alfresco/messages/wdr-messages_ja.properties
@@ -0,0 +1,12 @@
+# Display labels for Web Delivery Runtime
+
+wdr.err.invalid_username_or_password=\u30e6\u30fc\u30b6\u540d\u307e\u305f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u7121\u52b9\u3067\u3059\u3002
+wdr.err.unable_create_logfile=\u30ed\u30b0\u30d5\u30a1\u30a4\u30eb\u304c\u4f5c\u6210\u3067\u304d\u306a\u304b\u3063\u305f\u305f\u3081\u3001\u30c7\u30d7\u30ed\u30a4\u3092\u7d9a\u884c\u3067\u304d\u307e\u305b\u3093\u3002
+wdr.err.unable_prepare_already_commit=\u30c7\u30d7\u30ed\u30a4\u3092\u6e96\u5099\u3067\u304d\u307e\u305b\u3093\u3002\u3059\u3067\u306b\u4e2d\u6b62\u307e\u305f\u306f\u30b3\u30df\u30c3\u30c8\u3057\u3066\u3044\u307e\u3059\u3002
+wdr.err.unable_prepare_missing_file=\u4e00\u6642\u30d5\u30a1\u30a4\u30eb\u304c\u306a\u3044\u305f\u3081\u3001\u6e96\u5099\u3067\u304d\u307e\u305b\u3093\u3002 {0}
+wdr.err.invalid_ticket=\u30c7\u30d7\u30ed\u30a4\u304c\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u3057\u305f\u304b\u3001\u30c1\u30b1\u30c3\u30c8\u304c\u7121\u52b9\u3067\u3059\u3002 {0}
+wdr.err.unable_commit=\u30b3\u30df\u30c3\u30c8\u3067\u304d\u307e\u305b\u3093
+
+wdr.avm.snapshot_tag=\u30b9\u30c8\u30a2:{0}\u3001\u30d0\u30fc\u30b8\u30e7\u30f3:{1}\u304b\u3089\u306e\u30c7\u30d7\u30ed\u30a4
+wdr.avm.snapshot_description=\u30b9\u30c8\u30a2:{0}\u3001\u30d0\u30fc\u30b8\u30e7\u30f3:{1}\u304b\u3089\u306e\u30c7\u30d7\u30ed\u30a4
+
diff --git a/config/alfresco/replication-services-context.xml b/config/alfresco/replication-services-context.xml
index 6d31cac20b..d926f2e231 100644
--- a/config/alfresco/replication-services-context.xml
+++ b/config/alfresco/replication-services-context.xml
@@ -91,6 +91,13 @@
+
+
+ {http://www.alfresco.org/model/rule/1.0}rules
+ {http://www.alfresco.org/model/content/1.0}versionable
+ {http://www.alfresco.org/model/content/1.0}mlDocument
+
+
diff --git a/source/java/org/alfresco/repo/avm/ibatis/AVMNodeDAOIbatis.java b/source/java/org/alfresco/repo/avm/ibatis/AVMNodeDAOIbatis.java
index 8957855cae..f281f63185 100644
--- a/source/java/org/alfresco/repo/avm/ibatis/AVMNodeDAOIbatis.java
+++ b/source/java/org/alfresco/repo/avm/ibatis/AVMNodeDAOIbatis.java
@@ -50,6 +50,8 @@ import org.alfresco.repo.domain.avm.AVMNodeEntity;
import org.alfresco.repo.domain.avm.AVMVersionRootEntity;
import org.alfresco.repo.domain.permissions.Acl;
import org.alfresco.service.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* iBATIS DAO wrapper for AVMNode
@@ -59,6 +61,8 @@ import org.alfresco.service.namespace.QName;
*/
class AVMNodeDAOIbatis implements AVMNodeDAO
{
+ private static Log logger = LogFactory.getLog(AVMNodeDAO.class);
+
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMNodeDAO#save(org.alfresco.repo.avm.AVMNode)
*/
@@ -150,11 +154,19 @@ class AVMNodeDAOIbatis implements AVMNodeDAO
/* package */ AVMNode getRootNodeByID(AVMStore store, long rootNodeId)
{
- AVMNodeEntity rootNodeEntity = AVMDAOs.Instance().newAVMNodeDAO.getNode(rootNodeId);
+ AVMNodeEntity rootNodeEntity = null;
- if (rootNodeEntity == null)
+ try
{
- return null;
+ rootNodeEntity = AVMDAOs.Instance().newAVMNodeDAO.getNode(rootNodeId);
+ }
+ catch (RuntimeException re)
+ {
+ if (logger.isWarnEnabled())
+ {
+ logger.warn("Root node ("+rootNodeId+") not found for store: "+store);
+ }
+ throw re;
}
AVMNode rootNode = null;
diff --git a/source/java/org/alfresco/repo/avm/ibatis/AVMStoreDAOIbatis.java b/source/java/org/alfresco/repo/avm/ibatis/AVMStoreDAOIbatis.java
index de9c1246ee..3da2dcaeca 100644
--- a/source/java/org/alfresco/repo/avm/ibatis/AVMStoreDAOIbatis.java
+++ b/source/java/org/alfresco/repo/avm/ibatis/AVMStoreDAOIbatis.java
@@ -29,6 +29,7 @@ import org.alfresco.repo.avm.AVMStoreImpl;
import org.alfresco.repo.avm.DirectoryNode;
import org.alfresco.repo.domain.avm.AVMStoreEntity;
import org.alfresco.repo.domain.permissions.Acl;
+import org.alfresco.service.cmr.avm.AVMException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -145,17 +146,18 @@ class AVMStoreDAOIbatis implements AVMStoreDAO
{
logger.warn("Root node id is null for store: "+storeEntity);
}
- return null;
+ throw new AVMException(storeEntity.toString());
}
DirectoryNode rootNode = (DirectoryNode) ((AVMNodeDAOIbatis)AVMDAOs.Instance().fAVMNodeDAO).getRootNodeByID(store, rootNodeId);
if (rootNode == null)
{
+ // belts-and-braces
if (logger.isWarnEnabled())
{
logger.warn("Root node ("+rootNodeId+") not found for store: "+storeEntity);
}
- return null;
+ throw new AVMException(storeEntity.toString());
}
store.setRoot(rootNode);
diff --git a/source/java/org/alfresco/repo/domain/avm/AbstractAVMNodeDAOImpl.java b/source/java/org/alfresco/repo/domain/avm/AbstractAVMNodeDAOImpl.java
index 665ce1722b..9bd2dbcf75 100644
--- a/source/java/org/alfresco/repo/domain/avm/AbstractAVMNodeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/avm/AbstractAVMNodeDAOImpl.java
@@ -156,7 +156,10 @@ public abstract class AbstractAVMNodeDAOImpl implements AVMNodeDAO
Pair entityPair = avmNodeCache.getByKey(nodeId);
if (entityPair == null)
{
- return null;
+ // cache-only operation: belts-and-braces
+ avmNodeCache.removeByKey(nodeId);
+
+ throw new ConcurrencyFailureException("getNode: "+nodeId);
}
return entityPair.getSecond();
}
diff --git a/source/java/org/alfresco/repo/forms/FormServiceImplTest.java b/source/java/org/alfresco/repo/forms/FormServiceImplTest.java
index dea721bfb7..c4edd26767 100644
--- a/source/java/org/alfresco/repo/forms/FormServiceImplTest.java
+++ b/source/java/org/alfresco/repo/forms/FormServiceImplTest.java
@@ -1253,13 +1253,13 @@ public class FormServiceImplTest extends BaseAlfrescoSpringTest
assertEquals(1, assocs.size());
// request a form for a type with an underscore in it's name
- fields = new ArrayList(4);
+ fields = new ArrayList(1);
fields.add("cm:name");
form = this.formService.getForm(new Item(TYPE_FORM_ITEM_KIND, "fdk:with_underscore"), fields);
assertNotNull(form);
- // make sure there are 3 fields
+ // make sure there is 1 fields
fieldDefs = form.getFieldDefinitions();
assertNotNull(fieldDefs);
assertEquals(1, fieldDefs.size());
@@ -1271,6 +1271,34 @@ public class FormServiceImplTest extends BaseAlfrescoSpringTest
data.addFieldData(AbstractFormProcessor.DESTINATION, this.folder.toString());
NodeRef newNode = (NodeRef)this.formService.saveForm(new Item(TYPE_FORM_ITEM_KIND, "fdk:with_underscore"), data);
assertNotNull(newNode);
+
+ // get and save a form for a type and property that has a dash in the namespace prefix
+ fields = new ArrayList(2);
+ fields.add("cm:name");
+ fields.add("my-fdk:more_text");
+
+ form = this.formService.getForm(new Item(TYPE_FORM_ITEM_KIND, "my-fdk:namespace-with-dash"), fields);
+ assertNotNull(form);
+
+ // make sure there are 2 fields
+ fieldDefs = form.getFieldDefinitions();
+ assertNotNull(fieldDefs);
+ assertEquals(2, fieldDefs.size());
+
+ // save the form to ensure persistence works too
+ nodeName = GUID.generate() + ".txt";
+ data = new FormData();
+ data.addFieldData("prop_cm_name", nodeName);
+ data.addFieldData("prop_my-fdk_more_text", "This is some text");
+ data.addFieldData(TypeFormProcessor.DESTINATION, this.folder.toString());
+ newNode = (NodeRef)this.formService.saveForm(new Item(TYPE_FORM_ITEM_KIND, "my-fdk_namespace-with-dash"), data);
+ assertNotNull(newNode);
+
+ // retrieve the properties and check the values
+ Map props = nodeService.getProperties(newNode);
+ assertEquals(nodeName, (String)props.get(ContentModel.PROP_NAME));
+ assertEquals("This is some text", (String)props.get(
+ QName.createQName("http://www.alfresco.org/model/my-fdk/1.0", "more_text")));
}
public void testGetFormForJbpmTask() throws Exception
diff --git a/source/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java b/source/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java
index 3d94ebb13d..8c2878b115 100644
--- a/source/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java
+++ b/source/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java
@@ -97,7 +97,7 @@ public abstract class ContentModelFormProcessor extends
* names will look like "prop_cm_name". The pattern can also be
* used to extract the "cm" and the "name" parts.
*/
- protected Pattern propertyNamePattern = Pattern.compile(PROP_DATA_PREFIX + "([a-zA-Z0-9]+)_(.*)");
+ protected Pattern propertyNamePattern = Pattern.compile(PROP_DATA_PREFIX + "([a-zA-Z0-9-]+)_(.*)");
/**
* A regular expression which can be used to match tranisent property names.
@@ -112,7 +112,7 @@ public abstract class ContentModelFormProcessor extends
* pattern can also be used to extract the "cm", the "name" and the suffix
* parts.
*/
- protected Pattern associationNamePattern = Pattern.compile(ASSOC_DATA_PREFIX + "([a-zA-Z0-9]+)_(.*)(_[a-zA-Z]+)");
+ protected Pattern associationNamePattern = Pattern.compile(ASSOC_DATA_PREFIX + "([a-zA-Z0-9-]+)_(.*)(_[a-zA-Z]+)");
/**
* Sets the node service
diff --git a/source/java/org/alfresco/repo/imap/ImapService.java b/source/java/org/alfresco/repo/imap/ImapService.java
index 685c094a86..a3b1fc0872 100644
--- a/source/java/org/alfresco/repo/imap/ImapService.java
+++ b/source/java/org/alfresco/repo/imap/ImapService.java
@@ -54,7 +54,7 @@ public interface ImapService
}
public String getSubtype()
{
- return name().toLowerCase().substring(name().indexOf("_") + 1 + "TEXT".length());
+ return name().toLowerCase().substring(name().indexOf("_") + 2 + "TEXT".length());
}
public String getTypeSubtype()
diff --git a/source/java/org/alfresco/repo/jscript/ScriptNode.java b/source/java/org/alfresco/repo/jscript/ScriptNode.java
index 7bab6e3f4a..0eaec140f4 100644
--- a/source/java/org/alfresco/repo/jscript/ScriptNode.java
+++ b/source/java/org/alfresco/repo/jscript/ScriptNode.java
@@ -1980,7 +1980,14 @@ public class ScriptNode implements Serializable, Scopeable, NamespacePrefixResol
extractScriptableProperties((ScriptableObject)props, aspectProps);
}
QName aspectQName = createQName(type);
- this.nodeService.addAspect(this.nodeRef, aspectQName, aspectProps);
+ if (aspectQName.equals(ContentModel.ASPECT_VERSIONABLE))
+ {
+ ensureVersioningEnabled(true, true);
+ }
+ else
+ {
+ this.nodeService.addAspect(this.nodeRef, aspectQName, aspectProps);
+ }
// reset the relevant cached node members
reset();
diff --git a/source/java/org/alfresco/repo/replication/ReplicationActionExecutor.java b/source/java/org/alfresco/repo/replication/ReplicationActionExecutor.java
index 93ad64cf41..9e2b77b8c2 100644
--- a/source/java/org/alfresco/repo/replication/ReplicationActionExecutor.java
+++ b/source/java/org/alfresco/repo/replication/ReplicationActionExecutor.java
@@ -18,6 +18,7 @@
*/
package org.alfresco.repo.replication;
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -28,7 +29,6 @@ import org.alfresco.repo.action.ActionCancelledException;
import org.alfresco.repo.action.executer.ActionExecuterAbstractBase;
import org.alfresco.repo.lock.JobLockService;
import org.alfresco.repo.lock.LockAcquisitionException;
-import org.alfresco.repo.rule.RuleModel;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transfer.ChildAssociatedNodeFinder;
import org.alfresco.repo.transfer.ContentClassFilter;
@@ -51,6 +51,7 @@ import org.alfresco.service.cmr.transfer.TransferEventEnterState;
import org.alfresco.service.cmr.transfer.TransferEventError;
import org.alfresco.service.cmr.transfer.TransferFailureException;
import org.alfresco.service.cmr.transfer.TransferService2;
+import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -73,6 +74,7 @@ public class ReplicationActionExecutor extends ActionExecuterAbstractBase {
private TransactionService transactionService;
private ReplicationDefinitionPersisterImpl replicationDefinitionPersister;
private ReplicationParams replicationParams;
+ private List excludedAspects = new ArrayList();
/**
* By default, we lock for a minute, so if this server is shutdown another can take over a
@@ -159,6 +161,14 @@ public class ReplicationActionExecutor extends ActionExecuterAbstractBase {
this.replicationParams = replicationParams;
}
+ public void setExcludedAspects(String[] excludedAspects)
+ {
+ for (String aspect : excludedAspects)
+ {
+ this.excludedAspects.add(QName.createQName(aspect));
+ }
+ }
+
@Override
protected void addParameterDefinitions(List paramList) {
// Not used - our definitions hold everything on them
@@ -218,8 +228,7 @@ public class ReplicationActionExecutor extends ActionExecuterAbstractBase {
// Exclude aspects from transfer
// NOTE: this list of aspects should be synced up with the NodeCrawler in expandPayload to
// ensure a coherent set of nodes are transferred
- transferDefinition.setExcludedAspects(RuleModel.ASPECT_RULES,
- ContentModel.ASPECT_VERSIONABLE);
+ transferDefinition.setExcludedAspects(excludedAspects);
return transferDefinition;
}
diff --git a/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestWriter.java b/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestWriter.java
index f9978d2999..20806fac9c 100644
--- a/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestWriter.java
+++ b/source/java/org/alfresco/repo/transfer/manifest/XMLTransferManifestWriter.java
@@ -471,8 +471,11 @@ public class XMLTransferManifestWriter implements TransferManifestWriter
writer.startElement(TransferModel.TRANSFER_MODEL_1_0_URI,
ManifestModel.LOCALNAME_ELEMENT_MLVALUE, PREFIX + ":"
+ ManifestModel.LOCALNAME_ELEMENT_MLVALUE, attributes);
- String strValue = (String) DefaultTypeConverter.INSTANCE.convert(String.class, value);
- writer.characters(strValue.toCharArray(), 0, strValue.length());
+ if (value != null)
+ {
+ String strValue = (String) DefaultTypeConverter.INSTANCE.convert(String.class, value);
+ writer.characters(strValue.toCharArray(), 0, strValue.length());
+ }
writer.endElement(TransferModel.TRANSFER_MODEL_1_0_URI,
ManifestModel.LOCALNAME_ELEMENT_MLVALUE, PREFIX + ":"
+ ManifestModel.LOCALNAME_ELEMENT_MLVALUE);
diff --git a/source/java/org/alfresco/repo/version/VersionServiceImpl.java b/source/java/org/alfresco/repo/version/VersionServiceImpl.java
index fd3d30859c..6408cc37f1 100644
--- a/source/java/org/alfresco/repo/version/VersionServiceImpl.java
+++ b/source/java/org/alfresco/repo/version/VersionServiceImpl.java
@@ -21,6 +21,7 @@ package org.alfresco.repo.version;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -53,6 +54,7 @@ import org.alfresco.service.cmr.version.Version;
import org.alfresco.service.cmr.version.VersionHistory;
import org.alfresco.service.cmr.version.VersionService;
import org.alfresco.service.cmr.version.VersionServiceException;
+import org.alfresco.service.cmr.version.VersionType;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern;
@@ -921,10 +923,10 @@ public class VersionServiceImpl extends AbstractVersionServiceImpl implements Ve
nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, props);
}
- // Do we need to create the initial version history entry?
+ // Do we need to create the initial version history entry? By convention this is always a major version.
if(getVersionHistory(nodeRef) == null)
{
- createVersion(nodeRef, null);
+ createVersion(nodeRef, Collections.singletonMap(VersionModel.PROP_VERSION_TYPE, VersionType.MAJOR));
}
// Put Auditable back