Repository: rave Updated Branches: refs/heads/angular 60e6ed5b7 -> 5344cc711
Moved siteByWidgetId to the container for easier override RAVE-1056 git-svn-id: https://svn.apache.org/repos/asf/rave/trunk@1523733 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/rave/repo Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/3a4d70be Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/3a4d70be Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/3a4d70be Branch: refs/heads/angular Commit: 3a4d70be71213372a76d23786916d57ad83b4a7f Parents: 01bc3cb Author: Matthew B. Franklin <[email protected]> Authored: Mon Sep 16 17:24:32 2013 +0000 Committer: Matthew B. Franklin <[email protected]> Committed: Mon Sep 16 17:24:32 2013 +0000 ---------------------------------------------------------------------- .../src/main/webapp/static/script/core/rave_opensocial.js | 9 +++++---- .../opensocial/service/impl/DefaultOpenSocialService.java | 10 +++++----- 2 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/rave/blob/3a4d70be/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js ---------------------------------------------------------------------- diff --git a/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js b/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js index 351ed25..7dea976 100644 --- a/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js +++ b/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js @@ -28,8 +28,7 @@ */ define(['underscore', 'core/rave_view_manager', 'core/rave_api', 'core/rave_openajax_hub', 'core/rave_log', 'core/rave_state_manager', 'core/rave_action_manager', 'osapi'], function (_, viewManager, api, managedHub, log, stateManager, actionManager) { - //Due to the shindig bug in container actions, we have to keep a map of sites by widgetId - var exports = {}, siteByWidgetId = {}; + var exports = {}; var container; @@ -37,6 +36,8 @@ define(['underscore', 'core/rave_view_manager', 'core/rave_api', 'core/rave_open containerConfig[osapi.container.ServiceConfig.API_PATH] = "/rpc"; containerConfig[osapi.container.ContainerConfig.RENDER_DEBUG] = stateManager.getDebugMode(); container = new osapi.container.Container(containerConfig); + //Due to the shindig bug in container actions, we have to keep a map of sites by widgetId + container._siteByWidgetId = {}; gadgets.pubsub2router.init({ hub: managedHub @@ -124,7 +125,7 @@ define(['underscore', 'core/rave_view_manager', 'core/rave_api', 'core/rave_open _.each(actions, function(action){ //TODO: There is a bug in the shindig code where the action is assumed to launch a new gadget. This works around the issue actionManager.createAction(action.id, action.label, action.path.replace("gadget", "widget"), action.moduleId, action.icon, action.tooltip, function() { - var site = siteByWidgetId[action.moduleId]; + var site = container._siteByWidgetId[action.moduleId]; var holder = site.getActiveSiteHolder(); if (holder) { gadgets.rpc.call(holder.getIframeId(), 'actions.runAction', null, action.id, null); @@ -224,7 +225,7 @@ define(['underscore', 'core/rave_view_manager', 'core/rave_api', 'core/rave_open site._widget = widget; site.moduleId_ = widget.regionWidgetId; widget._site = site; - siteByWidgetId[widget.regionWidgetId] = site; + container._siteByWidgetId[widget.regionWidgetId] = site; var renderParams = {}; renderParams[osapi.container.RenderParam.VIEW] = opts.view || stateManager.getDefaultView(); http://git-wip-us.apache.org/repos/asf/rave/blob/3a4d70be/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/DefaultOpenSocialService.java ---------------------------------------------------------------------- diff --git a/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/DefaultOpenSocialService.java b/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/DefaultOpenSocialService.java index 068150a..bd10fef 100644 --- a/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/DefaultOpenSocialService.java +++ b/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/DefaultOpenSocialService.java @@ -36,10 +36,10 @@ import org.springframework.stereotype.Service; @Service public class DefaultOpenSocialService implements OpenSocialService { - private GadgetMetadataRepository gadgetMetadataRepository; - private final WidgetService widgetService; - private final PageService pageService; - private final SecurityTokenService tokenService; + protected final GadgetMetadataRepository gadgetMetadataRepository; + protected final WidgetService widgetService; + protected final PageService pageService; + protected final SecurityTokenService tokenService; @Autowired public DefaultOpenSocialService(GadgetMetadataRepository gadgetMetadataRepository, WidgetService widgetService, PageService pageService, SecurityTokenService tokenService) { @@ -71,7 +71,7 @@ public class DefaultOpenSocialService implements OpenSocialService { return tokenService.getEncryptedSecurityToken(item.getId(), item.getWidgetUrl(), item.getOwnerId()); } - private void validate(Widget widget) { + protected void validate(Widget widget) { if(widget == null) { throw new ResourceNotFoundException("The requested gadget does not exist in the gadget store."); } else if(widget.getWidgetStatus().equals(WidgetStatus.PREVIEW)) {
