From a8aac980302394961ae6f81e1c350140376d99f4 Mon Sep 17 00:00:00 2001 From: Erik Winlof Date: Thu, 4 Sep 2014 06:50:19 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 82373: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 76479: Supporting Client class from alfresco-events git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83217 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/opencmis/ActivityPosterImpl.java | 5 +++-- source/java/org/alfresco/opencmis/CMISConnector.java | 9 +++++---- .../repo/activities/ActivityPostServiceImpl.java | 2 +- .../alfresco/repo/activities/ActivityServiceImpl.java | 4 ++-- .../org/alfresco/repo/activities/script/Activity.java | 5 +++-- .../alfresco/repo/quickshare/QuickShareServiceImpl.java | 5 +++-- .../service/cmr/activities/ActivityPostService.java | 2 +- 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/source/java/org/alfresco/opencmis/ActivityPosterImpl.java b/source/java/org/alfresco/opencmis/ActivityPosterImpl.java index 4f2644169e..4376fc19f6 100644 --- a/source/java/org/alfresco/opencmis/ActivityPosterImpl.java +++ b/source/java/org/alfresco/opencmis/ActivityPosterImpl.java @@ -22,6 +22,8 @@ import java.util.List; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; +import org.alfresco.repo.Client; +import org.alfresco.repo.Client.ClientType; import org.alfresco.repo.activities.ActivityType; import org.alfresco.repo.model.filefolder.HiddenAspect; import org.alfresco.repo.tenant.TenantService; @@ -35,7 +37,6 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.FileFilterMode.Client; import org.alfresco.util.PropertyCheck; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -300,7 +301,7 @@ public class ActivityPosterImpl implements ActivityPoster, InitializingBean siteId, APP_TOOL, json.toString(), - Client.cmis, + Client.asType(ClientType.cmis), fileInfo); } diff --git a/source/java/org/alfresco/opencmis/CMISConnector.java b/source/java/org/alfresco/opencmis/CMISConnector.java index 39134a404e..b9a635ffb4 100644 --- a/source/java/org/alfresco/opencmis/CMISConnector.java +++ b/source/java/org/alfresco/opencmis/CMISConnector.java @@ -72,6 +72,8 @@ import org.alfresco.opencmis.search.CMISQueryService; import org.alfresco.opencmis.search.CMISResultSet; import org.alfresco.opencmis.search.CMISResultSetColumn; import org.alfresco.opencmis.search.CMISResultSetRow; +import org.alfresco.repo.Client; +import org.alfresco.repo.Client.ClientType; import org.alfresco.repo.action.executer.ContentMetadataExtracter; import org.alfresco.repo.cache.SimpleCache; import org.alfresco.repo.events.EventPreparator; @@ -143,7 +145,6 @@ import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.FileFilterMode; -import org.alfresco.util.FileFilterMode.Client; import org.alfresco.util.Pair; import org.alfresco.util.TempFileProvider; import org.apache.chemistry.opencmis.commons.BasicPermissions; @@ -392,7 +393,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen public boolean isHidden(NodeRef nodeRef) { - final Client client = FileFilterMode.getClient(); + final FileFilterMode.Client client = FileFilterMode.getClient(); return (hiddenAspect.getVisibility(client, nodeRef) == Visibility.NotVisible); } @@ -1742,12 +1743,12 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen if (StringUtils.hasText(range)) { return new ContentReadRangeEvent(user, networkId, transactionId, - nodeRef.getId(), null, nodeType.toString(), Client.cmis, name, mimeType, contentSize, encoding, range); + nodeRef.getId(), null, nodeType.toString(), Client.asType(ClientType.cmis), name, mimeType, contentSize, encoding, range); } else { return new ContentEventImpl(ContentEvent.DOWNLOAD, user, networkId, transactionId, - nodeRef.getId(), null, nodeType.toString(), Client.cmis, name, mimeType, contentSize, encoding); + nodeRef.getId(), null, nodeType.toString(), Client.asType(ClientType.cmis), name, mimeType, contentSize, encoding); } } }); diff --git a/source/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java b/source/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java index f7e1fd7222..3a5aa4a091 100644 --- a/source/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java +++ b/source/java/org/alfresco/repo/activities/ActivityPostServiceImpl.java @@ -24,6 +24,7 @@ import java.util.Date; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.events.types.ActivityEvent; import org.alfresco.events.types.Event; +import org.alfresco.repo.Client; import org.alfresco.repo.activities.post.lookup.PostLookup; import org.alfresco.repo.domain.activities.ActivityPostDAO; import org.alfresco.repo.domain.activities.ActivityPostEntity; @@ -36,7 +37,6 @@ import org.alfresco.service.cmr.model.FileInfo; import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; -import org.alfresco.util.FileFilterMode.Client; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONException; diff --git a/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java b/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java index ba4ef421c1..ace6cd6af4 100644 --- a/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java +++ b/source/java/org/alfresco/repo/activities/ActivityServiceImpl.java @@ -29,6 +29,7 @@ import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; import org.alfresco.query.PagingRequest; import org.alfresco.query.PagingResults; +import org.alfresco.repo.Client; import org.alfresco.repo.activities.feed.cleanup.FeedCleaner; import org.alfresco.repo.domain.activities.ActivityFeedDAO; import org.alfresco.repo.domain.activities.ActivityFeedEntity; @@ -50,11 +51,10 @@ import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.namespace.QName; -import org.alfresco.util.FileFilterMode.Client; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.json.JSONObject; import org.json.JSONException; +import org.json.JSONObject; import org.springframework.beans.factory.InitializingBean; import org.springframework.extensions.surf.util.ParameterCheck; diff --git a/source/java/org/alfresco/repo/activities/script/Activity.java b/source/java/org/alfresco/repo/activities/script/Activity.java index 7ab2178aff..18d7447db3 100644 --- a/source/java/org/alfresco/repo/activities/script/Activity.java +++ b/source/java/org/alfresco/repo/activities/script/Activity.java @@ -20,13 +20,14 @@ package org.alfresco.repo.activities.script; import java.util.List; +import org.alfresco.repo.Client; +import org.alfresco.repo.Client.ClientType; import org.alfresco.repo.jscript.BaseScopableProcessorExtension; import org.alfresco.repo.tenant.TenantService; import org.alfresco.service.cmr.activities.ActivityService; import org.alfresco.service.cmr.activities.FeedControl; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; -import org.alfresco.util.FileFilterMode.Client; import org.mozilla.javascript.Context; import org.mozilla.javascript.Scriptable; @@ -73,7 +74,7 @@ public final class Activity extends BaseScopableProcessorExtension */ public void postActivity(String activityType, String siteId, String appTool, String jsonActivityData) { - activityService.postActivity(activityType, siteId, appTool, jsonActivityData, Client.webclient); + activityService.postActivity(activityType, siteId, appTool, jsonActivityData, Client.asType(ClientType.webclient)); } /** diff --git a/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java b/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java index 8fc59b4c00..8867dc407c 100644 --- a/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java +++ b/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java @@ -28,6 +28,8 @@ import org.alfresco.events.types.ActivityEvent; import org.alfresco.events.types.Event; import org.alfresco.model.ContentModel; import org.alfresco.model.QuickShareModel; +import org.alfresco.repo.Client; +import org.alfresco.repo.Client.ClientType; import org.alfresco.repo.copy.CopyBehaviourCallback; import org.alfresco.repo.copy.CopyDetails; import org.alfresco.repo.copy.CopyServicePolicies; @@ -63,7 +65,6 @@ import org.alfresco.service.cmr.thumbnail.ThumbnailService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.util.EqualsHelper; -import org.alfresco.util.FileFilterMode.Client; import org.alfresco.util.Pair; import org.apache.commons.codec.binary.Base64; import org.apache.commons.logging.Log; @@ -274,7 +275,7 @@ public class QuickShareServiceImpl implements QuickShareService, NodeServicePoli public Event prepareEvent(String user, String networkId, String transactionId) { return new ActivityEvent("quickshare", transactionId, networkId, user, nodeRef.getId(), - null, typeQName.toString(), Client.webclient, sb.toString(), + null, typeQName.toString(), Client.asType(ClientType.webclient), sb.toString(), null, null, 0l, null); } }); diff --git a/source/java/org/alfresco/service/cmr/activities/ActivityPostService.java b/source/java/org/alfresco/service/cmr/activities/ActivityPostService.java index 2e93f9413f..7407517de6 100644 --- a/source/java/org/alfresco/service/cmr/activities/ActivityPostService.java +++ b/source/java/org/alfresco/service/cmr/activities/ActivityPostService.java @@ -18,10 +18,10 @@ */ package org.alfresco.service.cmr.activities; +import org.alfresco.repo.Client; import org.alfresco.service.cmr.model.FileInfo; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; -import org.alfresco.util.FileFilterMode.Client; public interface ActivityPostService {