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 2012/06/05 14:45:52 UTC
svn commit: r1346372 [2/2] - in /rave/branches/model_interfaces:
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/
rave-components/rave-core/src/main/j...
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java Tue Jun 5 12:45:50 2012
@@ -20,6 +20,7 @@
package org.apache.rave.portal.service.impl;
import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.repository.*;
import org.apache.rave.portal.service.PageService;
import org.apache.rave.portal.service.UserService;
@@ -73,6 +74,7 @@ public class DefaultPageServiceTest {
@Before
public void setup() {
+
pageRepository = createMock(PageRepository.class);
pageTemplateRepository = createMock(PageTemplateRepository.class);
regionRepository = createMock(RegionRepository.class);
@@ -84,7 +86,7 @@ public class DefaultPageServiceTest {
pageService = new DefaultPageService(pageRepository, pageTemplateRepository, regionRepository, widgetRepository, regionWidgetRepository,
pageLayoutRepository, userService, defaultPageName);
- validWidget = new Widget(1L, "http://dummy.apache.org/widgets/widget.xml");
+ validWidget = new WidgetImpl(1L, "http://dummy.apache.org/widgets/widget.xml");
page = new Page(PAGE_ID, user);
pageUser = new PageUser(user, page, 1L);
@@ -665,7 +667,7 @@ public class DefaultPageServiceTest {
value.setRegions(new ArrayList<Region>());
value.getRegions().add(originalRegion);
value.getRegions().add(targetRegion);
- Widget widget = new Widget();
+ Widget widget = new WidgetImpl();
expect(pageRepository.get(PAGE_ID)).andReturn(value);
expect(widgetRepository.get(WIDGET_ID)).andReturn(widget);
@@ -682,7 +684,7 @@ public class DefaultPageServiceTest {
verifyPositions(0, instance, true);
assertThat(originalRegion.getRegionWidgets().get(0), is(sameInstance(instance)));
- assertThat(instance.getWidget(), is(sameInstance(widget)));
+ assertThat(instance.getWidget().getId(), is(equalTo(widget.getId())));
}
@@ -695,7 +697,7 @@ public class DefaultPageServiceTest {
value.setRegions(new ArrayList<Region>());
value.getRegions().add(originalRegion);
value.getRegions().add(targetRegion);
- Widget widget = new Widget();
+ Widget widget = new WidgetImpl();
expect(pageRepository.get(PAGE_ID)).andReturn(value);
expect(widgetRepository.get(WIDGET_ID)).andReturn(widget);
@@ -725,7 +727,7 @@ public class DefaultPageServiceTest {
value.setRegions(new ArrayList<Region>());
value.getRegions().add(originalRegion);
value.getRegions().add(targetRegion);
- Widget widget = new Widget();
+ Widget widget = new WidgetImpl();
expect(pageRepository.get(PAGE_ID)).andReturn(value);
expect(widgetRepository.get(WIDGET_ID)).andReturn(widget);
@@ -762,7 +764,7 @@ public class DefaultPageServiceTest {
public void addWidgetToPage_invalidPage() {
long WIDGET_ID = -1L;
expect(pageRepository.get(PAGE_ID)).andReturn(null);
- expect(widgetRepository.get(WIDGET_ID)).andReturn(new Widget());
+ expect(widgetRepository.get(WIDGET_ID)).andReturn(new WidgetImpl());
replay(pageRepository);
replay(regionRepository);
replay(widgetRepository);
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java Tue Jun 5 12:45:50 2012
@@ -22,6 +22,7 @@ package org.apache.rave.portal.service.i
import org.apache.rave.exception.DuplicateItemException;
import org.apache.rave.portal.model.*;
import org.apache.rave.portal.model.impl.CategoryImpl;
+import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.model.util.WidgetStatistics;
import org.apache.rave.portal.repository.CategoryRepository;
@@ -77,8 +78,8 @@ public class DefaultWidgetServiceTest {
@Test
public void getLimitedListOfWidgets() {
- Widget widget1 = new Widget(1L, "http://example.com/widget1.xml");
- Widget widget2 = new Widget(2L, "http://example.com/widget2.xml");
+ Widget widget1 = new WidgetImpl(1L, "http://example.com/widget1.xml");
+ Widget widget2 = new WidgetImpl(2L, "http://example.com/widget2.xml");
List<Widget> widgets = new ArrayList<Widget>();
widgets.add(widget1);
widgets.add(widget2);
@@ -95,9 +96,9 @@ public class DefaultWidgetServiceTest {
@Test
public void getPublishedWidgets() {
- Widget widget1 = new Widget(1L, "http://example.com/widget1.xml");
+ Widget widget1 = new WidgetImpl(1L, "http://example.com/widget1.xml");
widget1.setWidgetStatus(WidgetStatus.PUBLISHED);
- Widget widget2 = new Widget(2L, "http://example.com/widget2.xml");
+ Widget widget2 = new WidgetImpl(2L, "http://example.com/widget2.xml");
widget2.setWidgetStatus(WidgetStatus.PUBLISHED);
List<Widget> widgets = new ArrayList<Widget>();
widgets.add(widget1);
@@ -115,7 +116,7 @@ public class DefaultWidgetServiceTest {
@Test
public void getWidget() {
- Widget w = new Widget();
+ Widget w = new WidgetImpl();
expect(widgetRepository.get(1L)).andReturn(w);
replay(widgetRepository);
@@ -130,8 +131,8 @@ public class DefaultWidgetServiceTest {
int offset = 0;
int pageSize = 10;
int totalResults = 2;
- Widget widget = new Widget();
- widget.setEntityId(1L);
+ WidgetImpl widget = new WidgetImpl();
+ widget.setId(1L);
List<Widget> widgets = new ArrayList<Widget>();
widgets.add(widget);
@@ -153,9 +154,9 @@ public class DefaultWidgetServiceTest {
int offset = 0;
int pageSize = 10;
int totalResults = 2;
- Widget widget = new Widget();
+ WidgetImpl widget = new WidgetImpl();
widget.setWidgetStatus(WidgetStatus.PUBLISHED);
- widget.setEntityId(1L);
+ widget.setId(1L);
List<Widget> widgets = new ArrayList<Widget>();
widgets.add(widget);
@@ -179,11 +180,11 @@ public class DefaultWidgetServiceTest {
int offset = 0;
int pageSize = 10;
int totalResults = 2;
- Widget widget = new Widget();
+ WidgetImpl widget = new WidgetImpl();
widget.setWidgetStatus(WidgetStatus.PUBLISHED);
final String type = "OpenSocial";
widget.setType(type);
- widget.setEntityId(1L);
+ widget.setId(1L);
List<Widget> widgets = new ArrayList<Widget>();
widgets.add(widget);
@@ -210,7 +211,7 @@ public class DefaultWidgetServiceTest {
replay(userRepository);
final List<Widget> widgets = new ArrayList<Widget>();
- final Widget widget = new Widget(3L, "http://www.widgetsRus.com/");
+ final Widget widget = new WidgetImpl(3L, "http://www.widgetsRus.com/");
widgets.add(widget);
expect(widgetRepository.getCountByOwner(user, offset, pageSize)).andReturn(widgets.size());
@@ -241,7 +242,7 @@ public class DefaultWidgetServiceTest {
public void getWidgetByUrl() {
final String widgetUrl =
"http://hosting.gmodules.com/ig/gadgets/file/112581010116074801021/hamster.xml";
- Widget widget = new Widget();
+ Widget widget = new WidgetImpl();
widget.setUrl(widgetUrl);
expect(widgetRepository.getByUrl(widgetUrl)).andReturn(widget);
replay(widgetRepository);
@@ -256,7 +257,7 @@ public class DefaultWidgetServiceTest {
public void isRegisteredWidget() {
final String widgetUrl =
"http://hosting.gmodules.com/ig/gadgets/file/112581010116074801021/hamster.xml";
- Widget widget = new Widget();
+ Widget widget = new WidgetImpl();
widget.setUrl(widgetUrl);
expect(widgetRepository.getByUrl(widgetUrl)).andReturn(widget);
replay(widgetRepository);
@@ -270,7 +271,7 @@ public class DefaultWidgetServiceTest {
public void isNotRegisteredWidget_() {
final String widgetUrl =
"http://example.com/doesnotexistinrepository.xml";
- Widget widget = new Widget();
+ Widget widget = new WidgetImpl();
widget.setUrl(widgetUrl);
expect(widgetRepository.getByUrl(widgetUrl)).andReturn(null);
replay(widgetRepository);
@@ -283,7 +284,7 @@ public class DefaultWidgetServiceTest {
@Test
public void registerNewWidget() {
final String widgetUrl = "http://example.com/newwidget.xml";
- Widget widget = new Widget();
+ WidgetImpl widget = new WidgetImpl();
widget.setUrl(widgetUrl);
expect(widgetRepository.getByUrl(widgetUrl)).andReturn(null);
expect(widgetRepository.save(widget)).andReturn(widget);
@@ -291,7 +292,7 @@ public class DefaultWidgetServiceTest {
Widget savedWidget = widgetService.registerNewWidget(widget);
assertNotNull(savedWidget);
- assertEquals(widget.getEntityId(), savedWidget.getEntityId());
+ assertEquals(widget.getId(), savedWidget.getId());
verify(widgetRepository);
}
@@ -300,7 +301,7 @@ public class DefaultWidgetServiceTest {
public void registerExistingWidgetAsNew() {
final String widgetUrl =
"http://hosting.gmodules.com/ig/gadgets/file/112581010116074801021/hamster.xml";
- Widget widget = new Widget();
+ WidgetImpl widget = new WidgetImpl();
widget.setUrl(widgetUrl);
expect(widgetRepository.getByUrl(widgetUrl)).andReturn(widget);
replay(widgetRepository);
@@ -314,7 +315,7 @@ public class DefaultWidgetServiceTest {
public void updateWidget() {
final String widgetUrl =
"http://hosting.gmodules.com/ig/gadgets/file/112581010116074801021/hamster.xml";
- Widget widget = new Widget();
+ Widget widget = new WidgetImpl();
widget.setUrl(widgetUrl);
expect(widgetRepository.save(widget)).andReturn(widget).once();
replay(widgetRepository);
@@ -344,14 +345,13 @@ public class DefaultWidgetServiceTest {
verify(widgetRepository);
}
- // TODO - remove the IllegalArgumentException expectation once the JpaWidgetConverter class is created
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void getWidgetsByCategory_valid(){
long id = 1L;
int offset = 0;
int pageSize = 10;
String categoryText = "Social";
- Widget w = new Widget();
+ Widget w = new WidgetImpl();
List<Category> categories = new ArrayList<Category>();
Category c = new CategoryImpl();
List<Widget> widgets = new ArrayList<Widget>();
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java Tue Jun 5 12:45:50 2012
@@ -20,8 +20,8 @@
package org.apache.rave.portal.web.renderer;
import org.apache.rave.exception.NotSupportedException;
+import org.apache.rave.portal.model.JpaWidget;
import org.apache.rave.portal.model.RegionWidget;
-import org.apache.rave.portal.model.Widget;
import org.apache.rave.portal.web.renderer.impl.DefaultRenderService;
import org.apache.rave.portal.web.renderer.model.RenderContext;
import org.junit.Before;
@@ -83,7 +83,7 @@ public class RenderServiceTest {
@Test
public void render_supported_foo() {
- Widget w = new Widget();
+ JpaWidget w = new JpaWidget();
w.setType(SUPPORTED_TYPE_1);
RegionWidget rw = new RegionWidget();
@@ -98,7 +98,7 @@ public class RenderServiceTest {
@Test
public void render_supported_bar() {
- Widget w = new Widget();
+ JpaWidget w = new JpaWidget();
w.setType(SUPPORTED_TYPE_2);
RegionWidget rw = new RegionWidget();
rw.setWidget(w);
@@ -112,7 +112,7 @@ public class RenderServiceTest {
@Test(expected = NotSupportedException.class)
public void render_invalid() {
- Widget w = new Widget();
+ JpaWidget w = new JpaWidget();
w.setType("NONE");
RegionWidget rw = new RegionWidget();
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PageApi.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PageApi.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PageApi.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PageApi.java Tue Jun 5 12:45:50 2012
@@ -49,7 +49,7 @@ public class PageApi {
* the ID of the {@link org.apache.rave.portal.model.Page} to add
* the widget to
* @param widgetId
- * the ID of the {@link org.apache.rave.portal.model.Widget} to
+ * the ID of the {@link org.apache.rave.portal.model.JpaWidget} to
* add do the page
* @return a {@link RpcOperation} containing the new widget instance (
* {@link org.apache.rave.portal.model.RegionWidget }) or any errors
@@ -110,7 +110,7 @@ public class PageApi {
* Deletes a widget
*
* @param regionWidgetId
- * the ID of the {@link org.apache.rave.portal.model.Widget} to
+ * the ID of the {@link org.apache.rave.portal.model.JpaWidget} to
* delete
* @return an {@link RpcOperation} containing the updated region or any
* errors encountered.
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java Tue Jun 5 12:45:50 2012
@@ -22,8 +22,6 @@ package org.apache.rave.portal.web.contr
import org.apache.rave.portal.model.*;
import org.apache.rave.portal.service.*;
import org.apache.rave.portal.web.controller.util.ControllerUtils;
-import org.apache.rave.portal.web.model.NavigationItem;
-import org.apache.rave.portal.web.model.NavigationMenu;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.PortalPreferenceKeys;
import org.apache.rave.portal.web.util.ViewNames;
@@ -101,7 +99,7 @@ public class WidgetStoreController {
* @param model
* model map
* @param widgetId
- * ID of the {@link org.apache.rave.portal.model.Widget } to view
+ * ID of the {@link org.apache.rave.portal.model.JpaWidget } to view
* @param referringPageId
* the source {@link org.apache.rave.portal.model.Page } ID
* @return the view name of the widget detail page
@@ -196,7 +194,7 @@ public class WidgetStoreController {
*/
@RequestMapping(method = RequestMethod.GET, value = "widget/add")
public String viewAddWidgetForm(Model model, @RequestParam long referringPageId) {
- final Widget widget = new Widget();
+ final Widget widget = new JpaWidget();
final String view = ViewNames.ADD_WIDGET_FORM;
model.addAttribute(ModelKeys.WIDGET, widget);
model.addAttribute(ModelKeys.REFERRING_PAGE_ID, referringPageId);
@@ -208,7 +206,7 @@ public class WidgetStoreController {
* Validates the form input, if valid, tries to store the Widget data
*
* @param widget
- * {@link Widget} as submitted by the user
+ * {@link org.apache.rave.portal.model.JpaWidget} as submitted by the user
* @param results
* {@link BindingResult}
* @param model
@@ -233,7 +231,7 @@ public class WidgetStoreController {
widget.setOwner(user);
final Widget storedWidget = widgetService.registerNewWidget(widget);
- return "redirect:/app/store/widget/" + storedWidget.getEntityId() + "?referringPageId=" + referringPageId;
+ return "redirect:/app/store/widget/" + storedWidget.getId() + "?referringPageId=" + referringPageId;
}
/**
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java Tue Jun 5 12:45:50 2012
@@ -38,23 +38,11 @@ import org.springframework.ui.Model;
import org.springframework.ui.ModelMap;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.SessionAttributes;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.support.SessionStatus;
-import java.beans.PropertyEditorSupport;
-import java.util.ArrayList;
-
import static org.apache.rave.portal.model.WidgetStatus.values;
-import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.DEFAULT_PAGE_SIZE;
-import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.addNavigationMenusToModel;
-import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.checkTokens;
-import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.isDeleteOrUpdate;
+import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.*;
/**
* Admin controller to manipulate Widget data
@@ -120,7 +108,7 @@ public class WidgetController {
@RequestMapping(value = "/admin/widgetdetail/{widgetid}", method = RequestMethod.GET)
public String viewWidgetDetail(@PathVariable("widgetid") Long widgetid, Model model) {
addNavigationMenusToModel(SELECTED_ITEM, model);
- model.addAttribute(widgetService.getWidget(widgetid));
+ model.addAttribute(ModelKeys.WIDGET, widgetService.getWidget(widgetid));
model.addAttribute(ModelKeys.TOKENCHECK, AdminControllerUtil.generateSessionToken());
model.addAttribute(ModelKeys.CATEGORIES, categoryService.getAll());
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java Tue Jun 5 12:45:50 2012
@@ -71,7 +71,7 @@ public class RegionWidgetTag extends Abs
regionWidget.getEntityId(),
StringEscapeUtils.escapeJavaScript(regionWidget.getWidget().getDisableRenderingMessage()),
regionWidget.isCollapsed(),
- regionWidget.getWidget().getEntityId());
+ regionWidget.getWidget().getId());
scriptManager.registerScriptBlock(widgetScript, ScriptLocation.AFTER_RAVE, RenderScope.CURRENT_REQUEST, getContext());
} else {
writeString(getBean().render(regionWidget, getContext()));
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewWidgetValidator.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewWidgetValidator.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewWidgetValidator.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewWidgetValidator.java Tue Jun 5 12:45:50 2012
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Co
import org.springframework.validation.Errors;
/**
- * Validator for adding a new {@link Widget}
+ * Validator for adding a new {@link org.apache.rave.portal.model.JpaWidget}
*/
@Component
public class NewWidgetValidator extends WidgetValidator {
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UpdateWidgetValidator.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UpdateWidgetValidator.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UpdateWidgetValidator.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UpdateWidgetValidator.java Tue Jun 5 12:45:50 2012
@@ -42,7 +42,7 @@ public class UpdateWidgetValidator exten
@Override
protected final void validateIfWidgetAlreadyExists(Widget widget, Errors errors) {
Widget existing = widgetService.getWidgetByUrl(widget.getUrl());
- if (existing == null || existing.getEntityId().equals(widget.getEntityId())) {
+ if (existing == null || existing.getId().equals(widget.getId())) {
return;
}
errors.rejectValue(FIELD_URL, "widget.url.exists");
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/WidgetValidator.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/WidgetValidator.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/WidgetValidator.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/WidgetValidator.java Tue Jun 5 12:45:50 2012
@@ -28,7 +28,7 @@ import org.springframework.validation.Va
import org.springframework.validation.Validator;
/**
-Abstract {@link Validator} for {@link Widget}'s
+Abstract {@link Validator} for {@link org.apache.rave.portal.model.Widget}'s
*/
public abstract class WidgetValidator implements Validator {
protected static final String FIELD_URL = "url";
@@ -65,7 +65,7 @@ public abstract class WidgetValidator im
/**
* Checks if a Widget already exists for this URL.
- * @param widget {@link Widget} to validate
+ * @param widget {@link org.apache.rave.portal.model.Widget} to validate
* @param errors {@link Errors}
*/
protected abstract void validateIfWidgetAlreadyExists(Widget widget, Errors errors);
@@ -86,7 +86,7 @@ public abstract class WidgetValidator im
/**
* Validates fields that may contain a URL
*
- * @param widget {@link Widget} to validate
+ * @param widget {@link org.apache.rave.portal.model.Widget} to validate
* @param errors {@link org.springframework.validation.Errors}
*/
private void validateUrlFields(Widget widget, Errors errors) {
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java Tue Jun 5 12:45:50 2012
@@ -80,7 +80,7 @@ public class WidgetApiTest {
public void createWidgetComment() {
String comment = "new comment";
- Widget widget = new Widget();
+ JpaWidget widget = new JpaWidget();
widget.setEntityId(1L);
widget.setComments(new ArrayList<WidgetComment>());
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java Tue Jun 5 12:45:50 2012
@@ -20,10 +20,7 @@
package org.apache.rave.portal.web.controller;
-import org.apache.rave.portal.model.Category;
-import org.apache.rave.portal.model.Tag;
-import org.apache.rave.portal.model.User;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.model.*;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.model.util.WidgetStatistics;
import org.apache.rave.portal.service.PortalPreferenceService;
@@ -153,7 +150,7 @@ public class WidgetStoreControllerTest {
@Test
public void viewWidget() {
Model model = new ExtendedModelMap();
- Widget w = new Widget(1L, "http://example.com/widget.xml");
+ Widget w = new JpaWidget(1L, "http://example.com/widget.xml");
expect(widgetService.getAllWidgetStatistics(validUser.getEntityId())).andReturn(allWidgetStatisticsMap);
expect(tagService.getAllTags()).andReturn(new ArrayList<Tag>());
@@ -212,7 +209,7 @@ public class WidgetStoreControllerTest {
int offset = 0;
int pagesize = 10;
int totalResults = 2;
- Widget widget = new Widget();
+ JpaWidget widget = new JpaWidget();
widget.setEntityId(1L);
List<Widget> widgets = new ArrayList<Widget>();
widgets.add(widget);
@@ -251,7 +248,7 @@ public class WidgetStoreControllerTest {
public void doAddWidget() {
final String widgetUrl = "http://example.com/newwidget.xml";
final Model model = new ExtendedModelMap();
- final Widget widget = new Widget();
+ final JpaWidget widget = new JpaWidget();
widget.setEntityId(1L);
widget.setTitle("Widget title");
widget.setUrl(widgetUrl);
@@ -274,13 +271,13 @@ public class WidgetStoreControllerTest {
final String widgetUrl = "http://example.com/existingwidget.xml";
final Model model = new ExtendedModelMap();
- final Widget existingWidget = new Widget();
+ final JpaWidget existingWidget = new JpaWidget();
existingWidget.setEntityId(123L);
existingWidget.setTitle("Widget title");
existingWidget.setUrl(widgetUrl);
existingWidget.setType("OpenSocial");
- final Widget widget = new Widget();
+ final Widget widget = new JpaWidget();
widget.setTitle("Widget title");
widget.setUrl(widgetUrl);
widget.setType("OpenSocial");
@@ -298,7 +295,7 @@ public class WidgetStoreControllerTest {
@Test
public void doAddWidget_invalid() {
- final Widget widget = new Widget();
+ final Widget widget = new JpaWidget();
widget.setTitle("Not enough data");
final Model model = new ExtendedModelMap();
final BindingResult errors = new BeanPropertyBindingResult(widget, "widget");
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java Tue Jun 5 12:45:50 2012
@@ -20,8 +20,10 @@
package org.apache.rave.portal.web.controller.admin;
import org.apache.rave.portal.model.Category;
+import org.apache.rave.portal.model.JpaWidget;
import org.apache.rave.portal.model.Widget;
import org.apache.rave.portal.model.impl.CategoryImpl;
+import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.service.CategoryService;
import org.apache.rave.portal.service.PortalPreferenceService;
@@ -136,9 +138,9 @@ public class WidgetControllerTest {
@Test
public void viewAdminWidgetDetail() throws Exception {
Model model = new ExtendedModelMap();
- Widget widget = new Widget();
+ WidgetImpl widget = new WidgetImpl();
final long entityId = 123L;
- widget.setEntityId(entityId);
+ widget.setId(entityId);
widget.setTitle("My widget");
expect(service.getWidget(entityId)).andReturn(widget);
@@ -157,7 +159,7 @@ public class WidgetControllerTest {
@Test
public void updateWidget_valid() {
final String widgetUrl = "http://example.com/widget";
- Widget widget = new Widget(123L, widgetUrl);
+ Widget widget = new JpaWidget(123L, widgetUrl);
widget.setTitle("Widget title");
widget.setType("OpenSocial");
widget.setDescription("Lorem ipsum");
@@ -180,7 +182,7 @@ public class WidgetControllerTest {
@Test(expected = SecurityException.class)
public void updateWidget_wrongToken() {
- Widget widget = new Widget();
+ Widget widget = new JpaWidget();
BindingResult errors = new BeanPropertyBindingResult(widget, "widget");
SessionStatus sessionStatus = createMock(SessionStatus.class);
ModelMap modelMap = new ExtendedModelMap();
@@ -199,7 +201,7 @@ public class WidgetControllerTest {
@Test
public void updateWidget_invalid() {
- Widget widget = new Widget(123L, "http://broken/url");
+ Widget widget = new JpaWidget(123L, "http://broken/url");
BindingResult errors = new BeanPropertyBindingResult(widget, "widget");
SessionStatus sessionStatus = createMock(SessionStatus.class);
ModelMap modelMap = new ExtendedModelMap();
@@ -226,7 +228,7 @@ public class WidgetControllerTest {
private static SearchResult<Widget> populateWidgetSearchResult() {
List<Widget> widgetList = new ArrayList<Widget>();
for (int i = 0; i < DEFAULT_PAGESIZE; i++) {
- Widget widget = new Widget();
+ Widget widget = new JpaWidget();
widget.setTitle("Widget " + i);
widgetList.add(widget);
}
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java Tue Jun 5 12:45:50 2012
@@ -19,10 +19,12 @@
package org.apache.rave.portal.web.tag;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.rave.model.ModelConverter;
+import org.apache.rave.portal.model.JpaWidget;
import org.apache.rave.portal.model.Region;
import org.apache.rave.portal.model.RegionWidget;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.model.conversion.JpaConverter;
+import org.apache.rave.portal.model.conversion.JpaWidgetConverter;
import org.apache.rave.portal.web.renderer.RenderScope;
import org.apache.rave.portal.web.renderer.RenderService;
import org.apache.rave.portal.web.renderer.ScriptLocation;
@@ -39,7 +41,9 @@ import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import static org.easymock.EasyMock.*;
@@ -61,6 +65,12 @@ public class RegionWidgetTagTest {
@Before
public void setup() throws JspException {
+ //TODO:REMOVE WHEN REGION_WIDGET REFACTOR IS COMPLETE
+ JpaWidgetConverter converter = new JpaWidgetConverter();
+ List<ModelConverter> converters = new ArrayList<ModelConverter>();
+ converters.add(converter);
+ new JpaConverter(converters);
+
context = new RenderContext();
service = createNiceMock(RenderService.class);
scriptManager = createMock(ScriptManager.class);
@@ -83,7 +93,7 @@ public class RegionWidgetTagTest {
@Test
public void doStartTag_valid() throws IOException, JspException {
RegionWidget regionWidget = new RegionWidget();
- Widget widget = new Widget();
+ JpaWidget widget = new JpaWidget();
regionWidget.setWidget(widget);
widget.setType(WIDGET_TYPE);
@@ -119,7 +129,7 @@ public class RegionWidgetTagTest {
public void doStartTag_IOException() throws JspException, IOException {
RegionWidget regionWidget = new RegionWidget();
- Widget widget = new Widget();
+ JpaWidget widget = new JpaWidget();
regionWidget.setWidget(widget);
widget.setType("INVALID");
@@ -146,7 +156,7 @@ public class RegionWidgetTagTest {
RegionWidget regionWidget = new RegionWidget();
Region region = new Region(25L);
- Widget widget = new Widget();
+ JpaWidget widget = new JpaWidget();
regionWidget.setWidget(widget);
regionWidget.setRegion(region);
widget.setType("INVALID");
@@ -165,7 +175,7 @@ public class RegionWidgetTagTest {
public void doStartTag_disabledWidget() throws IOException, JspException {
final String DISABLED_WIDGET_MESSAGE = "THIS IS DISABLED";
- Widget widget = new Widget();
+ JpaWidget widget = new JpaWidget();
widget.setEntityId(8L);
widget.setType(WIDGET_TYPE);
widget.setDisableRendering(true);
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewWidgetValidatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewWidgetValidatorTest.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewWidgetValidatorTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewWidgetValidatorTest.java Tue Jun 5 12:45:50 2012
@@ -19,6 +19,7 @@
package org.apache.rave.portal.web.validator;
+import org.apache.rave.portal.model.JpaWidget;
import org.apache.rave.portal.model.Widget;
import org.apache.rave.portal.service.WidgetService;
import org.junit.Before;
@@ -50,7 +51,7 @@ public class NewWidgetValidatorTest {
@Test
public void testValidateValidFormData() throws Exception {
- Widget widget = new Widget();
+ Widget widget = new JpaWidget();
widget.setTitle(VALID_TITLE);
widget.setUrl(VALID_URL);
widget.setType(VALID_TYPE);
@@ -67,7 +68,7 @@ public class NewWidgetValidatorTest {
@Test
public void testValidationFailsOnEmptyValues() {
- Widget widget = new Widget();
+ Widget widget = new JpaWidget();
Errors errors = new BindException(widget, WIDGET);
widgetValidator.validate(widget, errors);
@@ -79,14 +80,14 @@ public class NewWidgetValidatorTest {
public void testValidationFailsOnDuplicateUrl() {
final String existingUrl = "http://example.com/existing_widget.xml";
- Widget widget = new Widget();
+ JpaWidget widget = new JpaWidget();
widget.setEntityId(123L);
widget.setTitle(VALID_TITLE);
widget.setType(VALID_TYPE);
widget.setDescription(VALID_DESCRIPTION);
widget.setUrl(existingUrl);
- Widget newWidget = new Widget();
+ Widget newWidget = new JpaWidget();
newWidget.setTitle(VALID_TITLE);
newWidget.setType(VALID_TYPE);
newWidget.setDescription(VALID_DESCRIPTION);
@@ -104,7 +105,7 @@ public class NewWidgetValidatorTest {
@Test
public void testValidationFailsOnInvalidUrl() {
- Widget widget = new Widget();
+ Widget widget = new JpaWidget();
widget.setTitle(VALID_TITLE);
widget.setType(VALID_TYPE);
widget.setUrl("http:/this.is/invalid?url=true&reject=true");
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UpdateWidgetValidatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UpdateWidgetValidatorTest.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UpdateWidgetValidatorTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UpdateWidgetValidatorTest.java Tue Jun 5 12:45:50 2012
@@ -19,6 +19,7 @@
package org.apache.rave.portal.web.validator;
+import org.apache.rave.portal.model.JpaWidget;
import org.apache.rave.portal.model.Widget;
import org.apache.rave.portal.service.WidgetService;
import org.junit.Before;
@@ -50,7 +51,7 @@ public class UpdateWidgetValidatorTest {
@Test
public void testValidateValidFormData() throws Exception {
- Widget widget = new Widget();
+ JpaWidget widget = new JpaWidget();
widget.setEntityId(123L);
widget.setTitle(VALID_TITLE);
widget.setUrl(VALID_URL);
@@ -68,7 +69,7 @@ public class UpdateWidgetValidatorTest {
@Test
public void testValidationFailsOnEmptyValues() {
- Widget widget = new Widget();
+ Widget widget = new JpaWidget();
Errors errors = new BindException(widget, WIDGET);
widgetValidator.validate(widget, errors);
@@ -80,14 +81,14 @@ public class UpdateWidgetValidatorTest {
public void testValidationFailsOnDuplicateUrl() {
final String existingUrl = "http://example.com/existing_widget.xml";
- Widget widget = new Widget();
+ JpaWidget widget = new JpaWidget();
widget.setEntityId(123L);
widget.setTitle(VALID_TITLE);
widget.setType(VALID_TYPE);
widget.setDescription(VALID_DESCRIPTION);
widget.setUrl(existingUrl);
- Widget newWidget = new Widget();
+ Widget newWidget = new JpaWidget();
newWidget.setTitle(VALID_TITLE);
newWidget.setType(VALID_TYPE);
newWidget.setDescription(VALID_DESCRIPTION);
@@ -105,7 +106,7 @@ public class UpdateWidgetValidatorTest {
@Test
public void testValidationFailsOnInvalidUrl() {
- Widget widget = new Widget();
+ Widget widget = new JpaWidget();
widget.setTitle(VALID_TITLE);
widget.setType(VALID_TYPE);
widget.setDescription(VALID_DESCRIPTION);
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/WidgetValidatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/WidgetValidatorTest.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/WidgetValidatorTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/WidgetValidatorTest.java Tue Jun 5 12:45:50 2012
@@ -19,16 +19,17 @@
package org.apache.rave.portal.web.validator;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-
import org.apache.commons.validator.routines.RegexValidator;
import org.apache.commons.validator.routines.UrlValidator;
+import org.apache.rave.portal.model.JpaWidget;
import org.apache.rave.portal.model.Widget;
import org.junit.Before;
import org.junit.Test;
import org.springframework.validation.Errors;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
/**
* Test for {@link WidgetValidator}
*/
@@ -43,7 +44,7 @@ public class WidgetValidatorTest {
@Test
public void testSupports() throws Exception {
- assertTrue("Supports org.apache.rave.portal.model.Widget", widgetValidator.supports(Widget.class));
+ assertTrue("Supports org.apache.rave.portal.model.Widget", widgetValidator.supports(JpaWidget.class));
}
/*
Modified: rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml (original)
+++ rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml Tue Jun 5 12:45:50 2012
@@ -61,11 +61,13 @@
<property name="suffix" value=".jsp"/>
</bean>
- <oxm:jaxb2-marshaller id="marshaller">
+ <!-- TODO: Fix HttpMessage Converter-->
+
+<!-- <oxm:jaxb2-marshaller id="marshaller">
<oxm:class-to-be-bound name="org.apache.rave.portal.model.Page"/>
<oxm:class-to-be-bound name="org.apache.rave.portal.model.RegionWidgetPreference"/>
<oxm:class-to-be-bound name="org.apache.rave.portal.web.model.RegionWidgetPreferenceListWrapper"/>
- </oxm:jaxb2-marshaller>
+ </oxm:jaxb2-marshaller>-->
<bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter">
<property name="messageConverters">
@@ -86,8 +88,8 @@
</list>
</property>
</bean>
- <bean class="org.springframework.http.converter.xml.MarshallingHttpMessageConverter"
- p:marshaller-ref="marshaller" p:unmarshaller-ref="marshaller"/>
+ <!-- <bean class="org.springframework.http.converter.xml.MarshallingHttpMessageConverter"
+ p:marshaller-ref="marshaller" p:unmarshaller-ref="marshaller"/>-->
</list>
</property>
</bean>
Modified: rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp (original)
+++ rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp Tue Jun 5 12:45:50 2012
@@ -19,7 +19,7 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<%--@elvariable id="searchResult" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.Widget>"--%>
+<%--@elvariable id="searchResult" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.JpaWidget>"--%>
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
<rave:navbar pageTitle="${pagetitle}"/>
<div class="container-fluid">
Modified: rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp (original)
+++ rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp Tue Jun 5 12:45:50 2012
@@ -77,7 +77,7 @@
</c:if>
<ul class="storeItems">
- <%--@elvariable id="widget" type="org.apache.rave.portal.model.Widget"--%>
+ <%--@elvariable id="widget" type="org.apache.rave.portal.model.JpaWidget"--%>
<c:forEach var="widget" items="${widgets.resultSet}">
<%--@elvariable id="widgetsStatistics" type="org.apache.rave.portal.model.util.WidgetStatistics"--%>
<c:set var="widgetStatistics" value="${widgetsStatistics[widget.entityId]}"/>
Modified: rave/branches/model_interfaces/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java (original)
+++ rave/branches/model_interfaces/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java Tue Jun 5 12:45:50 2012
@@ -24,7 +24,7 @@ import org.apache.rave.portal.model.Page
import org.apache.rave.portal.model.Region;
import org.apache.rave.portal.model.RegionWidget;
import org.apache.rave.portal.model.User;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.web.renderer.RenderService;
import org.apache.rave.portal.web.renderer.ScriptLocation;
import org.apache.rave.portal.web.renderer.ScriptManager;
@@ -47,9 +47,7 @@ import org.springframework.web.client.Re
import java.util.Arrays;
import java.util.HashMap;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
@RunWith(SpringJUnit4ClassRunner.class)
@@ -109,9 +107,9 @@ public class RenderServiceIntegrationTes
Region region = new Region(1L, page, 1);
page.setRegions(Arrays.asList(region));
- Widget w = new Widget();
+ WidgetImpl w = new WidgetImpl();
w.setType("OpenSocial");
- w.setEntityId(1L);
+ w.setId(1L);
w.setTitle("Gadget Title");
w.setUrl("http://www.example.com/gadget.xml");
Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/EncryptedBlobSecurityTokenService.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/EncryptedBlobSecurityTokenService.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/EncryptedBlobSecurityTokenService.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/EncryptedBlobSecurityTokenService.java Tue Jun 5 12:45:50 2012
@@ -20,7 +20,11 @@
package org.apache.rave.provider.opensocial.service.impl;
import org.apache.commons.io.FileUtils;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.Page;
+import org.apache.rave.portal.model.Region;
+import org.apache.rave.portal.model.RegionWidget;
+import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.provider.opensocial.exception.SecurityTokenException;
import org.apache.rave.provider.opensocial.service.SecurityTokenService;
@@ -138,7 +142,7 @@ public class EncryptedBlobSecurityTokenS
//Create a new RegionWidget instance from it so we can use it to generate a new encrypted token
RegionWidget regionWidget = new RegionWidget(securityToken.getModuleId(),
- new Widget(-1L, securityToken.getAppUrl()),
+ new WidgetImpl(-1L, securityToken.getAppUrl()),
new Region(-1L, new Page(-1L, new User(Long.valueOf(securityToken.getOwnerId()))), -1));
//Create and return the newly encrypted token
Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/OpenSocialWidgetMetadataResolver.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/OpenSocialWidgetMetadataResolver.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/OpenSocialWidgetMetadataResolver.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/OpenSocialWidgetMetadataResolver.java Tue Jun 5 12:45:50 2012
@@ -20,6 +20,7 @@
package org.apache.rave.provider.opensocial.service.impl;
import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.service.WidgetMetadataResolver;
import org.apache.rave.provider.opensocial.Constants;
import org.apache.rave.provider.opensocial.repository.GadgetMetadataRepository;
@@ -52,7 +53,7 @@ public class OpenSocialWidgetMetadataRes
* @return
*/
public Widget getMetadata(String url) {
- Widget widget = new Widget();
+ Widget widget = new WidgetImpl();
JSONObject jsonGadget = null;
try {
jsonGadget = (JSONObject) new JSONTokener(gadgetMetadataRepository.getGadgetMetadata(url)).nextValue();
Modified: rave/branches/model_interfaces/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/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java Tue Jun 5 12:45:50 2012
@@ -122,7 +122,7 @@ public class OpenSocialWidgetRenderer im
openSocialService.getGadgetMetadata(item.getWidget().getUrl()),
userPrefs.toString(),
item.isCollapsed(),
- item.getWidget().getEntityId(),
+ item.getWidget().getId(),
item.isLocked(),
item.isHideChrome());
}
Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/SecurityTokenServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/SecurityTokenServiceTest.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/SecurityTokenServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/SecurityTokenServiceTest.java Tue Jun 5 12:45:50 2012
@@ -19,7 +19,10 @@
package org.apache.rave.provider.opensocial.service;
+import org.apache.rave.model.ModelConverter;
import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.conversion.JpaConverter;
+import org.apache.rave.portal.model.conversion.JpaWidgetConverter;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.provider.opensocial.service.impl.EncryptedBlobSecurityTokenService;
import org.apache.shindig.auth.SecurityToken;
@@ -32,8 +35,10 @@ import org.springframework.core.io.Class
import java.io.IOException;
import java.net.MalformedURLException;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.List;
import static org.easymock.EasyMock.*;
import static org.junit.Assert.assertEquals;
@@ -49,7 +54,7 @@ public class SecurityTokenServiceTest {
private Page validPage;
private Region validRegion;
private RegionWidget validRegionWidget;
- private Widget validWidget;
+ private JpaWidget validWidget;
private final Long VALID_REGION_WIDGET_ID = 1L;
private final Long VALID_USER_ID = 1L;
@@ -76,6 +81,13 @@ public class SecurityTokenServiceTest {
@Before
public void setup() throws MalformedURLException {
+
+ //TODO:REMOVE WHEN REGION_WIDGET REFACTOR IS COMPLETE
+ JpaWidgetConverter converter = new JpaWidgetConverter();
+ List<ModelConverter> converters = new ArrayList<ModelConverter>();
+ converters.add(converter);
+ new JpaConverter(converters);
+
userService = createMock(UserService.class);
securityTokenService = new EncryptedBlobSecurityTokenService(userService, "default", "default",
encryptionKey);
@@ -86,7 +98,7 @@ public class SecurityTokenServiceTest {
validRegion = new Region(1L, validPage, 1);
validPage.setRegions(Arrays.asList(validRegion));
- validWidget = new Widget(1L, VALID_URL);
+ validWidget = new JpaWidget(1L, VALID_URL);
validWidget.setType("OpenSocial");
validWidget.setTitle("Widget Title");
Modified: rave/branches/model_interfaces/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/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java Tue Jun 5 12:45:50 2012
@@ -20,10 +20,7 @@
package org.apache.rave.provider.opensocial.web.renderer;
import org.apache.rave.exception.NotSupportedException;
-import org.apache.rave.portal.model.Region;
-import org.apache.rave.portal.model.RegionWidget;
-import org.apache.rave.portal.model.RegionWidgetPreference;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.model.*;
import org.apache.rave.portal.web.renderer.RenderScope;
import org.apache.rave.portal.web.renderer.Renderer;
import org.apache.rave.portal.web.renderer.ScriptLocation;
@@ -76,7 +73,7 @@ public class OpenSocialWidgetRendererTes
expect(openSocialService.getGadgetMetadata(VALID_GADGET_URL)).andReturn(VALID_METADATA);
replay(openSocialService);
- Widget w = new Widget();
+ JpaWidget w = new JpaWidget();
w.setEntityId(1L);
w.setType(Constants.WIDGET_TYPE);
w.setUrl(VALID_GADGET_URL);
@@ -120,7 +117,7 @@ public class OpenSocialWidgetRendererTes
@Test
public void render_null() {
- Widget w = new Widget();
+ JpaWidget w = new JpaWidget();
w.setType(Constants.WIDGET_TYPE);
Region region = new Region(1L);
RegionWidget rw = new RegionWidget();
@@ -147,7 +144,7 @@ public class OpenSocialWidgetRendererTes
@Test(expected = NotSupportedException.class)
public void render_invalid() {
- Widget w = new Widget();
+ JpaWidget w = new JpaWidget();
w.setType("NONE");
w.setUrl("http://www.example.com/gadget.xml");
RegionWidget rw = new RegionWidget();
Modified: rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/W3CWidget.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/W3CWidget.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/W3CWidget.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/W3CWidget.java Tue Jun 5 12:45:50 2012
@@ -19,7 +19,7 @@
package org.apache.rave.provider.w3c.service.impl;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.model.impl.WidgetImpl;
/**
* Extended version of Widget with some additional W3C metadata.
@@ -28,7 +28,7 @@ import org.apache.rave.portal.model.Widg
* Rave data model classes.
*
*/
-public class W3CWidget extends Widget{
+public class W3CWidget extends WidgetImpl {
private static final long serialVersionUID = 6211520730435963518L;
Modified: rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java Tue Jun 5 12:45:50 2012
@@ -66,12 +66,12 @@ public class WookieWidgetService impleme
Collection<org.apache.wookie.connector.framework.Widget> widgets = connectorService.getAvailableWidgets().values();
ArrayList<Widget> raveWidgets = new ArrayList<Widget>();
for (org.apache.wookie.connector.framework.Widget wookieWidget: widgets){
- Widget widget = new Widget();
+ Widget widget = new W3CWidget();
widget.setUrl(wookieWidget.getIdentifier());
widget.setDescription(wookieWidget.getDescription());
- widget.setTitle(wookieWidget.getName());
+ widget.setTitle(wookieWidget.getTitle());
widget.setThumbnailUrl(wookieWidget.getIcon().toString());
- widget.setAuthor(wookieWidget.getAuthor());
+ //widget.setAuthor(wookieWidget.getAuthor());
raveWidgets.add(widget);
}
return raveWidgets.toArray(new Widget[raveWidgets.size()]);
Modified: rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java Tue Jun 5 12:45:50 2012
@@ -157,7 +157,7 @@ public class W3cWidgetRenderer implement
height,
width,
item.isCollapsed(),
- item.getWidget().getEntityId(),
+ item.getWidget().getId(),
item.isLocked(),
item.isHideChrome());
}
Modified: rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetMetadataResolverTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetMetadataResolverTest.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetMetadataResolverTest.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetMetadataResolverTest.java Tue Jun 5 12:45:50 2012
@@ -20,6 +20,7 @@
package org.apache.rave.provider.w3c.service.impl;
import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.service.WidgetMetadataResolver;
import org.apache.rave.provider.w3c.repository.W3CWidgetMetadataRepository;
import org.apache.wookie.connector.framework.WookieConnectorException;
@@ -28,12 +29,8 @@ import org.junit.Test;
import java.io.IOException;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
public class WookieWidgetMetadataResolverTest {
private W3CWidgetMetadataRepository wookieWidgetMetadataRepository;
@@ -52,7 +49,7 @@ public class WookieWidgetMetadataResolve
wookieWidgetMetadataRepository = createNiceMock(W3CWidgetMetadataRepository.class);
widgetMetadataResolver = new WookieWidgetMetadataResolver(widgetService);
- TEST_WIDGET = new Widget();
+ TEST_WIDGET = new WidgetImpl();
TEST_WIDGET.setTitle("freeder");
TEST_WIDGET.setUrl("http://wookie.apache.org/widgets/freeder");
TEST_WIDGET.setDescription("An RSS reader widget optimised for small screens or desktop widgets.");
Modified: rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java?rev=1346372&r1=1346371&r2=1346372&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java Tue Jun 5 12:45:50 2012
@@ -19,19 +19,15 @@
package org.apache.rave.provider.w3c.web.renderer;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
import org.apache.rave.exception.NotSupportedException;
+import org.apache.rave.model.ModelConverter;
import org.apache.rave.portal.model.Region;
import org.apache.rave.portal.model.RegionWidget;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.model.conversion.JpaConverter;
+import org.apache.rave.portal.model.conversion.JpaWidgetConverter;
+import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.service.WidgetProviderService;
import org.apache.rave.portal.web.renderer.Renderer;
@@ -42,6 +38,15 @@ import org.apache.rave.provider.w3c.serv
import org.junit.Before;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.easymock.EasyMock.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
/*
*/
public class W3cWidgetRendererTest {
@@ -56,6 +61,12 @@ public class W3cWidgetRendererTest {
@Before
public void setup() {
+ //TODO:REMOVE WHEN REGION_WIDGET REFACTOR IS COMPLETE
+ JpaWidgetConverter converter = new JpaWidgetConverter();
+ List<ModelConverter> converters = new ArrayList<ModelConverter>();
+ converters.add(converter);
+ new JpaConverter(converters);
+
renderContext = new RenderContext();
wookieService = createNiceMock(WidgetProviderService.class);
userService = createNiceMock(UserService.class);
@@ -86,7 +97,7 @@ public class W3cWidgetRendererTest {
W3CWidget wookieWidget = new W3CWidget();
wookieWidget.setUrl(VALID_WIDGET_INSTANCE_URL);
- expect(wookieService.getWidget(user, rw.getEntityId().toString(), w)).andReturn(wookieWidget);
+ expect(wookieService.getWidget(eq(user), eq(rw.getEntityId().toString()), isA(Widget.class))).andReturn(wookieWidget);
replay(wookieService);
String placeholder = renderer.render(rw, renderContext);
@@ -95,7 +106,7 @@ public class W3cWidgetRendererTest {
@Test(expected = NotSupportedException.class)
public void render_invalid() {
- Widget w = new Widget();
+ Widget w = new WidgetImpl();
w.setType("NONE");
w.setUrl(VALID_WIDGET_URL);
RegionWidget rw = new RegionWidget();