You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2013/03/28 17:32:56 UTC
svn commit: r1462207 - in /rave/trunk: rave-components/rave-core-api/
rave-components/rave-core-api/src/test/
rave-components/rave-core-api/src/test/java/
rave-components/rave-core-api/src/test/java/org.apache.rave.rest.model/
rave-components/rave-core...
Author: mfranklin
Date: Thu Mar 28 16:32:55 2013
New Revision: 1462207
URL: http://svn.apache.org/r1462207
Log:
Initial refactoring of Rendering framework to support new API-based delivery of render-ready data (RAVE-924)
Added:
rave/trunk/rave-components/rave-core-api/src/test/
rave/trunk/rave-components/rave-core-api/src/test/java/
rave/trunk/rave-components/rave-core-api/src/test/java/org.apache.rave.rest.model/
rave/trunk/rave-components/rave-core-api/src/test/java/org.apache.rave.rest.model/ModelTest.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RegionWidgetWrapperRenderer.java
- copied, changed from r1461913, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RegionWidgetRenderer.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetWrapperRenderer.java
- copied, changed from r1461913, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java
rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetWrapperRenderer.java
- copied, changed from r1461913, rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java
Removed:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RegionWidgetRenderer.java
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java
rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java
Modified:
rave/trunk/rave-components/rave-core-api/pom.xml
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RenderService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/Renderer.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultRenderService.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java
rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java
Modified: rave/trunk/rave-components/rave-core-api/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/pom.xml?rev=1462207&r1=1462206&r2=1462207&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core-api/pom.xml (original)
+++ rave/trunk/rave-components/rave-core-api/pom.xml Thu Mar 28 16:32:55 2013
@@ -45,6 +45,13 @@
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</dependency>
+
+ <!-- TEST -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Added: rave/trunk/rave-components/rave-core-api/src/test/java/org.apache.rave.rest.model/ModelTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/test/java/org.apache.rave.rest.model/ModelTest.java?rev=1462207&view=auto
==============================================================================
--- rave/trunk/rave-components/rave-core-api/src/test/java/org.apache.rave.rest.model/ModelTest.java (added)
+++ rave/trunk/rave-components/rave-core-api/src/test/java/org.apache.rave.rest.model/ModelTest.java Thu Mar 28 16:32:55 2013
@@ -0,0 +1,34 @@
+package org.apache.rave.rest.model;
+
+import org.junit.Test;
+
+public class ModelTest {
+
+ public static final String USER_ID = "USER";
+ public static final String PAGE_ID = "ID";
+ public static final String PAGE_NAME = "NAME";
+ public static final String LAYOUT_CODE = "LAYOUT";
+
+ @Test
+ public void testConversion() {
+ /* org.apache.rave.model.Page toConvert = new PageImpl(PAGE_ID, USER_ID);
+ toConvert.setName(PAGE_NAME);
+ toConvert.setPageLayout(new PageLayoutImpl(LAYOUT_CODE));
+ toConvert.setPageType(PageType.PERSON_PROFILE);
+ toConvert.setRegions(Arrays.<org.apache.rave.model.Region>asList(new RegionImpl(PAGE_ID)));
+ toConvert.setMembers(Arrays.<org.apache.rave.model.PageUser>asList(new PageUserImpl(USER_ID)));
+ toConvert.setSubPages(Arrays.<org.apache.rave.model.Page>asList(new PageImpl(PAGE_NAME)));
+
+ Page page = new Page(toConvert);
+ assertThat(page.getId(), equalTo(toConvert.getId()));
+ assertThat(page.getName(), equalTo(toConvert.getName()));
+ assertThat(page.getOwnerId(), equalTo(toConvert.getOwnerId()));
+ assertThat(page.getPageLayoutCode(), equalTo(LAYOUT_CODE));
+ assertThat(page.getPageType(), equalTo(PageType.PERSON_PROFILE.toString()));
+ assertThat(page.getMembers().size(), equalTo(1));
+ assertThat(page.getRegions().size(), equalTo(1));
+ assertThat(page.getSubPages().size(), equalTo(1));
+ assertThat(page.getSubPages().get(0).getId(), equalTo(PAGE_NAME));*/
+ }
+
+}
Copied: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RegionWidgetWrapperRenderer.java (from r1461913, rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RegionWidgetRenderer.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RegionWidgetWrapperRenderer.java?p2=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RegionWidgetWrapperRenderer.java&p1=rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RegionWidgetRenderer.java&r1=1461913&r2=1462207&rev=1462207&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RegionWidgetRenderer.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RegionWidgetWrapperRenderer.java Thu Mar 28 16:32:55 2013
@@ -24,4 +24,4 @@ import org.apache.rave.portal.web.render
/**
* Scoped renderer that provides additional RegionWidget related rendering operations
*/
-public interface RegionWidgetRenderer extends Renderer<RegionWidgetWrapper> {}
+public interface RegionWidgetWrapperRenderer extends Renderer<RegionWidgetWrapper> {}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RenderService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RenderService.java?rev=1462207&r1=1462206&r2=1462207&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RenderService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RenderService.java Thu Mar 28 16:32:55 2013
@@ -21,6 +21,8 @@ package org.apache.rave.portal.web.rende
import org.apache.rave.portal.web.renderer.model.RegionWidgetWrapper;
import org.apache.rave.portal.web.renderer.model.RenderContext;
+import org.apache.rave.rest.model.Page;
+import org.apache.rave.rest.model.RegionWidget;
import java.util.Collection;
@@ -41,6 +43,21 @@ public interface RenderService {
* @param context the cotnext under which to render the widget
* @return a String representing the rendered widget
*/
+ @Deprecated
String render(RegionWidgetWrapper regionWidgetWrapper, RenderContext context);
+ /**
+ * Assigns all necessary properties for rendering to the RegionWidget
+ * @param source widget to update
+ * @return the updated instance of the RegionWidget.
+ */
+ RegionWidget prepareForRender(RegionWidget source);
+
+ /**
+ * Assigns all necessary properties for rendering to the Page
+ * @param source page to update
+ * @return the updated instance of the Page.
+ */
+ Page prepareForRender(Page source);
+
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/Renderer.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/Renderer.java?rev=1462207&r1=1462206&r2=1462207&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/Renderer.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/Renderer.java Thu Mar 28 16:32:55 2013
@@ -38,5 +38,13 @@ public interface Renderer<T> {
* @param context
* @return String representing the rendered item
*/
+ @Deprecated
String render(T item, RenderContext context);
+
+ /**
+ * Prepares the item for rendering
+ * @param item the item to prepare
+ * @return an instance of a prepared item
+ */
+ T prepareForRender(T item);
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultRenderService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultRenderService.java?rev=1462207&r1=1462206&r2=1462207&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultRenderService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultRenderService.java Thu Mar 28 16:32:55 2013
@@ -24,6 +24,8 @@ import org.apache.rave.portal.repository
import org.apache.rave.portal.web.renderer.model.RegionWidgetWrapper;
import org.apache.rave.portal.web.renderer.model.RenderContext;
import org.apache.rave.portal.web.renderer.*;
+import org.apache.rave.rest.model.Page;
+import org.apache.rave.rest.model.RegionWidget;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -40,11 +42,11 @@ public class DefaultRenderService implem
public static final String WIDGET_CONTEXT_KEY = "widget";
- private final Map<String, RegionWidgetRenderer> supportedWidgets;
+ private final Map<String, RegionWidgetWrapperRenderer> supportedWidgets;
@Autowired
- public DefaultRenderService(List<RegionWidgetRenderer> widgetRenderers, WidgetRepository widgetRepository) {
- this.supportedWidgets = new HashMap<String, RegionWidgetRenderer>();
+ public DefaultRenderService(List<RegionWidgetWrapperRenderer> widgetRenderers, WidgetRepository widgetRepository) {
+ this.supportedWidgets = new HashMap<String, RegionWidgetWrapperRenderer>();
mapRenderersByType(this.supportedWidgets, widgetRenderers);
}
@@ -54,7 +56,7 @@ public class DefaultRenderService implem
}
/**
- * Renders the given rw iff there is a {@link org.apache.rave.portal.web.renderer.RegionWidgetRenderer } for the
+ * Renders the given rw iff there is a {@link org.apache.rave.portal.web.renderer.RegionWidgetWrapperRenderer } for the
* rw type
*
* @param rw RegionWidget to renderer
@@ -64,13 +66,23 @@ public class DefaultRenderService implem
*/
@Override
public String render(RegionWidgetWrapper rw, RenderContext context) {
- RegionWidgetRenderer renderer = supportedWidgets.get(rw.getWidget().getType());
+ RegionWidgetWrapperRenderer renderer = supportedWidgets.get(rw.getWidget().getType());
if(renderer == null) {
throw new NotSupportedException(rw.getWidget().getType() + " is not supported");
}
return renderer.render(rw, context);
}
+ @Override
+ public RegionWidget prepareForRender(RegionWidget source) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Page prepareForRender(Page source) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
private static <T extends Renderer> void mapRenderersByType(Map<String, T> map, List<T> renderers) {
for(T renderer : renderers) {
map.put(renderer.getSupportedContext(), renderer);
Added: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java?rev=1462207&view=auto
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java (added)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java Thu Mar 28 16:32:55 2013
@@ -0,0 +1,137 @@
+package org.apache.rave.rest.impl;
+
+
+import org.apache.cxf.jaxrs.ext.multipart.Multipart;
+import org.apache.rave.portal.service.PageService;
+import org.apache.rave.portal.web.renderer.RenderService;
+import org.apache.rave.rest.PageResource;
+import org.apache.rave.rest.model.Page;
+import org.apache.rave.rest.model.RegionWidget;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Response;
+import java.io.File;
+
+public class DefaultPageResource implements PageResource {
+
+ private Logger logger = LoggerFactory.getLogger(getClass());
+ private PageService pageService;
+ private RenderService renderService;
+
+ @Override
+ public Response deletePage(String id) {
+ logger.debug("Deleting page " + id);
+ pageService.deletePage(id);
+ return Response.noContent().build();
+ }
+
+ @Override
+ public Response getPage(String id) {
+ logger.debug("Retrieving page for export: " + id);
+ return Response.ok(pageService.getPage(id)).build();
+ }
+
+ @Override
+ public Response updatePage(String id, Page page) {
+ return Response.ok(pageService.updatePage(id, page.getName(), page.getPageLayoutCode())).build();
+ }
+
+ @Override
+ public Response getPageOmdl(@PathParam("id") String id) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response getPagesForRender(@PathParam("context") String context, @PathParam("identifier") String identifier) {
+ return null;
+ }
+
+ @Override
+ public Response getPageForRender(@PathParam("context") String context, @PathParam("identifier") String identifier, @PathParam("id") String id) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response clonePage(@PathParam("context") String context, @PathParam("identifier") String identifier, @PathParam("id") String id) {
+ return null;
+ }
+
+ @Override
+ public Response importOmdlPage(@PathParam("context") String context, @PathParam("identifier") String identifier, @Multipart(value = "root", type = "application/octet-stream") File page) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response createPage(@PathParam("context") String context, @PathParam("identifier") String identifier, Page page) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response deletePageInContext(@PathParam("id") String id) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response updatePageInContext(@PathParam("id") String id, Page page) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response movePage(@PathParam("id") String id, @QueryParam("moveAfterPageId") String moveAfterPageId) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response addWidgetToPage(@PathParam("id") String id, RegionWidget widget) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response removeWidgetFromPage(@PathParam("id") String id, @PathParam("regionWidgetId") String regionWidgetId) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response addWidgetToRegion(@PathParam("id") String id, @PathParam("regionId") String regionId, RegionWidget widget) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response moveWidgetOnPage(@PathParam("id") String id, @PathParam("toRegionId") String toRegionId, @PathParam("regionWidgetId") String regionWidgetId, @QueryParam("position") int position) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response moveWidgetToPage(@PathParam("targetPageId") String targetPageId, @PathParam("regionWidgetId") String regionWidgetId) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response addMemberToPage(@PathParam("id") String id) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response removeMemberFromPage(@PathParam("id") String id, @PathParam("userId") String userId) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response updateSharedPageStatus(@PathParam("id") String id, @PathParam("userId") String userId, String status) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response updatePageEditingStatus(@PathParam("id") String id, @PathParam("userId") String userId, boolean editor) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Inject
+ public void setPageService(PageService pageService) {
+ this.pageService = pageService;
+ }
+}
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java?rev=1462207&r1=1462206&r2=1462207&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java Thu Mar 28 16:32:55 2013
@@ -46,17 +46,17 @@ public class RenderServiceTest {
private static final String RENDERED_TYPE_2 = "BAR_RENDERED";
private RenderService service;
- private List<RegionWidgetRenderer> widgetRenderers;
- private RegionWidgetRenderer widgetRenderer2;
- private RegionWidgetRenderer widgetRenderer1;
+ private List<RegionWidgetWrapperRenderer> widgetRenderers;
+ private RegionWidgetWrapperRenderer widgetRenderer2;
+ private RegionWidgetWrapperRenderer widgetRenderer1;
private RenderContext context;
private WidgetRepository widgetRepository;
@Before
public void setup() {
- widgetRenderers = new ArrayList<RegionWidgetRenderer>();
- widgetRenderer2 = createStrictMock(RegionWidgetRenderer.class);
- widgetRenderer1 = createStrictMock(RegionWidgetRenderer.class);
+ widgetRenderers = new ArrayList<RegionWidgetWrapperRenderer>();
+ widgetRenderer2 = createStrictMock(RegionWidgetWrapperRenderer.class);
+ widgetRenderer1 = createStrictMock(RegionWidgetWrapperRenderer.class);
widgetRepository = createMock(WidgetRepository.class);
expect(widgetRenderer1.getSupportedContext()).andReturn(SUPPORTED_TYPE_1);
Copied: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetWrapperRenderer.java (from r1461913, rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.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/web/renderer/OpenSocialWidgetWrapperRenderer.java?p2=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetWrapperRenderer.java&p1=rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java&r1=1461913&r2=1462207&rev=1462207&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetWrapperRenderer.java Thu Mar 28 16:32:55 2013
@@ -21,7 +21,7 @@ package org.apache.rave.provider.opensoc
import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.model.*;
-import org.apache.rave.portal.web.renderer.RegionWidgetRenderer;
+import org.apache.rave.portal.web.renderer.RegionWidgetWrapperRenderer;
import org.apache.rave.portal.web.renderer.RenderScope;
import org.apache.rave.portal.web.renderer.ScriptLocation;
import org.apache.rave.portal.web.renderer.ScriptManager;
@@ -43,8 +43,8 @@ import org.springframework.stereotype.Co
* //TODO RAVE-29: Create infrastructure for rendering inline gadgets via Caja
*/
@Component
-public class OpenSocialWidgetRenderer implements RegionWidgetRenderer {
- private static Logger logger = LoggerFactory.getLogger(OpenSocialWidgetRenderer.class);
+public class OpenSocialWidgetWrapperRenderer implements RegionWidgetWrapperRenderer {
+ private static Logger logger = LoggerFactory.getLogger(OpenSocialWidgetWrapperRenderer.class);
public static final String REGISTER_WIDGET_KEY = "openSocialRegisterWidget";
@@ -53,9 +53,9 @@ public class OpenSocialWidgetRenderer im
private ScriptManager scriptManager;
@Autowired
- public OpenSocialWidgetRenderer(OpenSocialService openSocialService,
- SecurityTokenService securityTokenService,
- ScriptManager scriptManager) {
+ public OpenSocialWidgetWrapperRenderer(OpenSocialService openSocialService,
+ SecurityTokenService securityTokenService,
+ ScriptManager scriptManager) {
this.openSocialService = openSocialService;
this.securityTokenService = securityTokenService;
this.scriptManager = scriptManager;
@@ -104,11 +104,16 @@ public class OpenSocialWidgetRenderer im
// the key is based off the RegionWidget.id to ensure uniqueness
String key = REGISTER_WIDGET_KEY + (regionWidget.getId() == null ? "" : "-" + regionWidget.getId());
scriptManager.registerScriptBlock(key, widgetScript, ScriptLocation.AFTER_RAVE, RenderScope.CURRENT_REQUEST, context);
- logger.debug("Gadget Script Data from OpenSocialWidgetRenderer: " + widgetScript);
+ logger.debug("Gadget Script Data from OpenSocialWidgetWrapperRenderer: " + widgetScript);
return String.format(MARKUP, regionWidget.getId());
}
+ @Override
+ public RegionWidgetWrapper prepareForRender(RegionWidgetWrapper item) {
+ throw new UnsupportedOperationException();
+ }
+
private String getWidgetScript(RegionWidget item, Widget widget) {
JSONObject userPrefs = new JSONObject();
if (item.getPreferences() != null) {
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java?rev=1462207&r1=1462206&r2=1462207&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java Thu Mar 28 16:32:55 2013
@@ -63,7 +63,7 @@ public class OpenSocialWidgetRendererTes
scriptManager = createStrictMock(ScriptManager.class);
openSocialService = createNiceMock(OpenSocialService.class);
securityTokenService = createNiceMock(SecurityTokenService.class);
- renderer = new OpenSocialWidgetRenderer(openSocialService, securityTokenService, scriptManager);
+ renderer = new OpenSocialWidgetWrapperRenderer(openSocialService, securityTokenService, scriptManager);
}
@Test
@@ -126,7 +126,7 @@ public class OpenSocialWidgetRendererTes
expect(securityTokenService.getEncryptedSecurityToken(rw, w)).andReturn(VALID_SECURITY_TOKEN);
replay(securityTokenService);
- String key = OpenSocialWidgetRenderer.REGISTER_WIDGET_KEY+"-"+rw.getId();
+ String key = OpenSocialWidgetWrapperRenderer.REGISTER_WIDGET_KEY+"-"+rw.getId();
scriptManager.registerScriptBlock(key, markup, ScriptLocation.AFTER_RAVE, RenderScope.CURRENT_REQUEST, renderContext);
expectLastCall();
replay(scriptManager);
@@ -171,7 +171,7 @@ public class OpenSocialWidgetRendererTes
" subPage: {id: null, name: '', isDefault: false}" +
"});</script>";
- scriptManager.registerScriptBlock(OpenSocialWidgetRenderer.REGISTER_WIDGET_KEY, markup, ScriptLocation.AFTER_RAVE, RenderScope.CURRENT_REQUEST, null);
+ scriptManager.registerScriptBlock(OpenSocialWidgetWrapperRenderer.REGISTER_WIDGET_KEY, markup, ScriptLocation.AFTER_RAVE, RenderScope.CURRENT_REQUEST, null);
expectLastCall();
replay(scriptManager);
Copied: rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetWrapperRenderer.java (from r1461913, rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetWrapperRenderer.java?p2=rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetWrapperRenderer.java&p1=rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java&r1=1461913&r2=1462207&rev=1462207&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java (original)
+++ rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetWrapperRenderer.java Thu Mar 28 16:32:55 2013
@@ -23,7 +23,7 @@ import org.apache.rave.exception.NotSupp
import org.apache.rave.model.*;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.service.WidgetProviderService;
-import org.apache.rave.portal.web.renderer.RegionWidgetRenderer;
+import org.apache.rave.portal.web.renderer.RegionWidgetWrapperRenderer;
import org.apache.rave.portal.web.renderer.RenderScope;
import org.apache.rave.portal.web.renderer.ScriptLocation;
import org.apache.rave.portal.web.renderer.ScriptManager;
@@ -44,8 +44,8 @@ import static org.apache.rave.provider.w
* Creates the appropriate markup to represent a W3C widget
*/
@Component
-public class W3cWidgetRenderer implements RegionWidgetRenderer {
- private static Logger logger = LoggerFactory.getLogger(W3cWidgetRenderer.class);
+public class W3cWidgetWrapperRenderer implements RegionWidgetWrapperRenderer {
+ private static Logger logger = LoggerFactory.getLogger(W3cWidgetWrapperRenderer.class);
private static final String REGISTER_WIDGET_KEY = "wookieRegisterWidget";
@@ -54,8 +54,8 @@ public class W3cWidgetRenderer implement
private ScriptManager scriptManager;
@Autowired
- public W3cWidgetRenderer(@Qualifier("wookieWidgetService") WidgetProviderService widgetService,
- UserService userService, ScriptManager scriptManager) {
+ public W3cWidgetWrapperRenderer(@Qualifier("wookieWidgetService") WidgetProviderService widgetService,
+ UserService userService, ScriptManager scriptManager) {
this.widgetService = widgetService;
this.userService = userService;
this.scriptManager = scriptManager;
@@ -108,6 +108,11 @@ public class W3cWidgetRenderer implement
return String.format(MARKUP, item.getId());
}
+ @Override
+ public RegionWidgetWrapper prepareForRender(RegionWidgetWrapper item) {
+ throw new UnsupportedOperationException();
+ }
+
/**
* Create a widget script block
*
Modified: rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java?rev=1462207&r1=1462206&r2=1462207&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java (original)
+++ rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java Thu Mar 28 16:32:55 2013
@@ -60,7 +60,7 @@ public class W3cWidgetRendererTest {
wookieService = createNiceMock(WidgetProviderService.class);
userService = createNiceMock(UserService.class);
scriptManager = createNiceMock(ScriptManager.class);
- renderer = new W3cWidgetRenderer(wookieService, userService, scriptManager);
+ renderer = new W3cWidgetWrapperRenderer(wookieService, userService, scriptManager);
}
@Test