Author: mfranklin
Date: Mon Sep 16 17:24:32 2013
New Revision: 1523733
URL: http://svn.apache.org/r1523733
Log:
Moved siteByWidgetId to the container for easier override RAVE-1056
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/DefaultOpenSocialService.java
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js?rev=1523733&r1=1523732&r2=1523733&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js
Mon Sep 16 17:24:32 2013
@@ -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_ma
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_ma
_.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_ma
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();
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/DefaultOpenSocialService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/DefaultOpenSocialService.java?rev=1523733&r1=1523732&r2=1523733&view=diff
==============================================================================
---
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/DefaultOpenSocialService.java
(original)
+++
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/DefaultOpenSocialService.java
Mon Sep 16 17:24:32 2013
@@ -36,10 +36,10 @@ import org.springframework.stereotype.Se
@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 im
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)) {
