From 8f4b6474172e1ef87d9109ac6d13ff2ac018613a Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Fri, 10 Aug 2012 11:20:15 +0000 Subject: [PATCH] Merged V4.1-BUG-FIX to HEAD 40292: FRENCH: Translation update based on EN 40202 40293: ITALIAN: Translation update based on EN 40202 40295: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 40294: ALF-9540: Fix potential NPE 40296: Merged V4.1 to V4.1-BUG-FIX 40169: CloudSync: fix ALF-15380 - source file is deleted (or unsync with delete) but an unpulled target update causes target to remain synced (and/or not deleted) - fixed as per PM expected behaviour + unit tests 40176: CloudSync: add simple rename test (file + folder sync) 40182: ALF-15424: Merged PATCHES/V4.0.2 to V4.1 40181: Merged PATCHES/V4.0.1 to PATCHES/V4.0.2 40180: ALF15009: QNames that do not exist yet cause a "java.sql.SQLException: Invalid column type" - getQNameId will now return a -1 instead of null. This will allow the SQL to execute and return no rows. 40276: ALF-15472: Updates help links to 4.1 & also fixes ALF-11929 - the video tutorial link now points to a video tutorial. 40282: CloudSync: ALF-15468 - Can't create cloud sync connection from Enterprise 4.1 to Alfresco "in the cloud" ! - fix the RemoteAlfrescoTicketService (to set the remote system request headers) 40285: ALF-15474: alfresco-opencmis-extension jar is missing from the share war (error in build.properties) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40298 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/messages/patch-service_fr.properties | 11 +++++++++++ config/alfresco/messages/patch-service_it.properties | 8 +++++++- .../query/AbstractQNameAwareCannedQueryFactory.java | 2 +- .../remoteticket/RemoteAlfrescoTicketServiceImpl.java | 11 ++++++++++- .../authentication/RepositoryAuthenticationDao.java | 5 ++++- 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/config/alfresco/messages/patch-service_fr.properties b/config/alfresco/messages/patch-service_fr.properties index 231ff48423..6754bd86f3 100755 --- a/config/alfresco/messages/patch-service_fr.properties +++ b/config/alfresco/messages/patch-service_fr.properties @@ -472,3 +472,14 @@ patch.migrateTenantsFromAttrsToTable.result=Processed {0} tenants patch.remoteCredentialsContainer.description=Patch to add the root folder for Shared Remote Credentials patch.syncSetDefinitionsContainer.description=Patch to add the root folder for SyncSet Definitions + +patch.swsdpPatch.description=Patch to fix up the Sample: Web Site Design Project. +patch.swsdpPatch.success=Successfully patched the Sample: Web Site Design Project. +patch.swsdpPatch.skipped=Skipped, not required. +patch.swsdpPatch.missingSurfConfig=surf-config folder is not present in Sample: Web Site Design Project. + +patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both parallel activiti workflows, completion-condition now takes into account if minimum approval percentage can still be achived. + +patch.show.audit.success=show_audit.ftl was updated successfully + +patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti \ No newline at end of file diff --git a/config/alfresco/messages/patch-service_it.properties b/config/alfresco/messages/patch-service_it.properties index b328dd8a15..6754bd86f3 100755 --- a/config/alfresco/messages/patch-service_it.properties +++ b/config/alfresco/messages/patch-service_it.properties @@ -476,4 +476,10 @@ patch.syncSetDefinitionsContainer.description=Patch to add the root folder for S patch.swsdpPatch.description=Patch to fix up the Sample: Web Site Design Project. patch.swsdpPatch.success=Successfully patched the Sample: Web Site Design Project. patch.swsdpPatch.skipped=Skipped, not required. -patch.swsdpPatch.missingSurfConfig=surf-config folder is not present in Sample: Web Site Design Project. \ No newline at end of file +patch.swsdpPatch.missingSurfConfig=surf-config folder is not present in Sample: Web Site Design Project. + +patch.redeployParallelActivitiWorkflows.description=Patch that redeploys both parallel activiti workflows, completion-condition now takes into account if minimum approval percentage can still be achived. + +patch.show.audit.success=show_audit.ftl was updated successfully + +patch.increaseColumnSizeActiviti.description=ALF-14983 : Upgrade scripts to increase column sizes for Activiti \ No newline at end of file diff --git a/source/java/org/alfresco/repo/query/AbstractQNameAwareCannedQueryFactory.java b/source/java/org/alfresco/repo/query/AbstractQNameAwareCannedQueryFactory.java index 463ad81d16..e375a1f887 100644 --- a/source/java/org/alfresco/repo/query/AbstractQNameAwareCannedQueryFactory.java +++ b/source/java/org/alfresco/repo/query/AbstractQNameAwareCannedQueryFactory.java @@ -140,7 +140,7 @@ public abstract class AbstractQNameAwareCannedQueryFactory extends AbstractCa { logger.trace("QName does not exist: " + qname); // possible ... eg. blg:blogPost if a blog has never been posted externally } - return null; + return -1L; } return qnamePair.getFirst(); } diff --git a/source/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceImpl.java b/source/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceImpl.java index 7b6a8c0a73..836b336e68 100644 --- a/source/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceImpl.java +++ b/source/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceImpl.java @@ -326,7 +326,16 @@ public class RemoteAlfrescoTicketServiceImpl implements RemoteAlfrescoTicketServ // Turn this into a remote request RemoteConnectorRequest request = remoteConnectorService.buildRequest(url, "POST"); request.setRequestBody(json.toJSONString()); - + + Map reqHeaders = remoteSystemsReqHeaders.get(remoteSystemId); + if (reqHeaders != null) + { + for (Map.Entry reqHeader : reqHeaders.entrySet()) + { + request.addRequestHeader(reqHeader.getKey(), reqHeader.getValue()); + } + } + // Work out what key we'll use to cache on String cacheKey = toCacheKey(remoteSystemId, credentials); diff --git a/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java b/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java index 327f7375e8..f80cbcd668 100644 --- a/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java +++ b/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java @@ -709,7 +709,10 @@ public class RepositoryAuthenticationDao implements MutableAuthenticationDao, In public void onUpdateUserProperties(NodeRef nodeRef, Map before, Map after) { String uidBefore = DefaultTypeConverter.INSTANCE.convert(String.class, before.get(ContentModel.PROP_USER_USERNAME)); - authenticationCache.remove(uidBefore); + if (uidBefore != null) + { + authenticationCache.remove(uidBefore); + } } @Override