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/11 16:39:31 UTC
svn commit: r1348873 [3/3] - 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-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=1348873&r1=1348872&r2=1348873&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 Mon Jun 11 14:39:27 2012
@@ -20,6 +20,7 @@
package org.apache.rave.portal.web.controller;
import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.service.*;
import org.apache.rave.portal.web.controller.util.ControllerUtils;
import org.apache.rave.portal.web.util.ModelKeys;
@@ -89,7 +90,7 @@ public class WidgetStoreController {
User user = userService.getAuthenticatedUser();
widgetStoreModelHelper(model, referringPageId, user, view);
model.addAttribute(ModelKeys.WIDGETS,
- widgetService.getWidgetsByOwner(user.getEntityId(), offset, getPageSize()));
+ widgetService.getWidgetsByOwner(user.getId(), offset, getPageSize()));
return view;
}
@@ -99,7 +100,7 @@ public class WidgetStoreController {
* @param model
* model map
* @param widgetId
- * ID of the {@link org.apache.rave.portal.model.JpaWidget } to view
+ * ID of the {@link org.apache.rave.portal.model.Widget } to view
* @param referringPageId
* the source {@link org.apache.rave.portal.model.Page } ID
* @return the view name of the widget detail page
@@ -110,7 +111,7 @@ public class WidgetStoreController {
final User user = userService.getAuthenticatedUser();
widgetStoreModelHelper(model, referringPageId, user, view);
model.addAttribute(ModelKeys.WIDGET, widgetService.getWidget(widgetId));
- model.addAttribute(ModelKeys.WIDGET_STATISTICS, widgetService.getWidgetStatistics(widgetId, user.getEntityId()));
+ model.addAttribute(ModelKeys.WIDGET_STATISTICS, widgetService.getWidgetStatistics(widgetId, user.getId()));
model.addAttribute(ModelKeys.USER_PROFILE, user);
return view;
}
@@ -194,7 +195,7 @@ public class WidgetStoreController {
*/
@RequestMapping(method = RequestMethod.GET, value = "widget/add")
public String viewAddWidgetForm(Model model, @RequestParam long referringPageId) {
- final Widget widget = new JpaWidget();
+ final Widget widget = new WidgetImpl();
final String view = ViewNames.ADD_WIDGET_FORM;
model.addAttribute(ModelKeys.WIDGET, widget);
model.addAttribute(ModelKeys.REFERRING_PAGE_ID, referringPageId);
@@ -206,7 +207,7 @@ public class WidgetStoreController {
* Validates the form input, if valid, tries to store the Widget data
*
* @param widget
- * {@link org.apache.rave.portal.model.JpaWidget} as submitted by the user
+ * {@link org.apache.rave.portal.model.Widget} as submitted by the user
* @param results
* {@link BindingResult}
* @param model
@@ -246,7 +247,7 @@ public class WidgetStoreController {
*/
private void widgetStoreModelHelper(Model model, long referringPageId, User user, String view) {
model.addAttribute(ModelKeys.REFERRING_PAGE_ID, referringPageId);
- model.addAttribute(ModelKeys.WIDGETS_STATISTICS, widgetService.getAllWidgetStatistics(user.getEntityId()));
+ model.addAttribute(ModelKeys.WIDGETS_STATISTICS, widgetService.getAllWidgetStatistics(user.getId()));
model.addAttribute(ModelKeys.TAGS, tagService.getAllTags());
model.addAttribute(ModelKeys.CATEGORIES, categoryService.getAll());
ControllerUtils.addNavItemsToModel(view, model, referringPageId, user);
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.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/UserController.java?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java Mon Jun 11 14:39:27 2012
@@ -19,17 +19,8 @@
package org.apache.rave.portal.web.controller.admin;
-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 java.beans.PropertyEditorSupport;
-
-import org.apache.rave.portal.model.Authority;
-import org.apache.rave.portal.model.JpaAuthority;
-import org.apache.rave.portal.model.PortalPreference;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.service.AuthorityService;
import org.apache.rave.portal.service.NewAccountService;
@@ -50,16 +41,14 @@ 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 org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import java.beans.PropertyEditorSupport;
+
+import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.*;
+
/**
* Admin controller to manipulate User data
*/
@@ -96,7 +85,7 @@ public class UserController {
@InitBinder(value = {"user"})
public void initBinder(WebDataBinder dataBinder) {
dataBinder.registerCustomEditor(GrantedAuthority.class, new AuthorityEditor());
- dataBinder.registerCustomEditor(JpaAuthority.class, new AuthorityEditor());
+ dataBinder.registerCustomEditor(Authority.class, new AuthorityEditor());
dataBinder.setDisallowedFields("entityId", "username", "password", "confirmPassword");
}
@@ -130,7 +119,7 @@ public class UserController {
@RequestMapping(value = "/admin/userdetail/{userid}", method = RequestMethod.GET)
public String viewUserDetail(@PathVariable("userid") Long userid, Model model) {
addNavigationMenusToModel(SELECTED_ITEM, model);
- model.addAttribute(userService.getUserById(userid));
+ model.addAttribute(ModelKeys.USER, userService.getUserById(userid));
model.addAttribute(ModelKeys.TOKENCHECK, AdminControllerUtil.generateSessionToken());
return ViewNames.ADMIN_USERDETAIL;
}
@@ -167,7 +156,7 @@ public class UserController {
modelMap.addAttribute("missingConfirm", true);
return ViewNames.ADMIN_USERDETAIL;
}
- userService.deleteUser(user.getEntityId());
+ userService.deleteUser(user.getId());
modelMap.clear();
status.setComplete();
return "redirect:/app/admin/users?action=delete";
@@ -177,7 +166,7 @@ public class UserController {
public String setUpForm(ModelMap model) {
logger.debug("Initializing new account form");
AdminControllerUtil.addNavigationMenusToModel(SELECTED_ITEM, (Model) model);
- model.addAttribute(ModelKeys.NEW_USER, new User());
+ model.addAttribute(ModelKeys.NEW_USER, new UserImpl());
return ViewNames.ADMIN_NEW_ACCOUNT;
}
@@ -255,7 +244,7 @@ public class UserController {
/**
- * Mapping between the submitted form value and an {@link org.apache.rave.portal.model.JpaAuthority}
+ * Mapping between the submitted form value and an {@link org.apache.rave.portal.model.Authority}
*/
private class AuthorityEditor extends PropertyEditorSupport {
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java Mon Jun 11 14:39:27 2012
@@ -23,6 +23,7 @@ import java.util.Collection;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.NewAccountService;
import org.apache.rave.portal.service.UserService;
@@ -86,7 +87,7 @@ public class LdapUserDetailsContextMappe
}
private void createRaveUserFromLdapInfo(DirContextOperations ctx, String username) {
- User newUser = new User();
+ JpaUser newUser = new JpaUser();
newUser.setUsername(username);
if (!ctx.attributeExists(mailAttributeName) || StringUtils.isBlank(ctx.getStringAttribute(mailAttributeName))) {
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java Mon Jun 11 14:39:27 2012
@@ -22,6 +22,7 @@ import java.util.regex.Pattern;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.validator.routines.EmailValidator;
+import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.UserService;
import org.slf4j.Logger;
@@ -52,7 +53,7 @@ public class NewAccountValidator impleme
}
public boolean supports(Class<?> aClass) {
- return User.class.isAssignableFrom(aClass);
+ return JpaUser.class.isAssignableFrom(aClass);
}
public void validate(Object obj, Errors errors) {
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java Mon Jun 11 14:39:27 2012
@@ -20,6 +20,7 @@ package org.apache.rave.portal.web.valid
import org.apache.commons.lang.StringUtils;
import org.apache.commons.validator.routines.EmailValidator;
+import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.UserService;
import org.slf4j.Logger;
@@ -44,7 +45,7 @@ public class UserProfileValidator implem
}
public boolean supports(Class<?> aClass) {
- return User.class.isAssignableFrom(aClass);
+ return JpaUser.class.isAssignableFrom(aClass);
}
public void validate(Object obj, Errors errors) {
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.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/PageApiTest.java?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java Mon Jun 11 14:39:27 2012
@@ -64,7 +64,7 @@ public class PageApiTest {
public void getPage_validId_export() {
Page p = new PageImpl();
p.setRegions(new ArrayList<Region>());
- p.setOwner(new User());
+ p.setOwner(new JpaUser());
Region region = new RegionImpl();
region.setRegionWidgets(new ArrayList<RegionWidget>());
RegionWidget w = new RegionWidgetImpl();
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=1348873&r1=1348872&r2=1348873&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 Mon Jun 11 14:39:27 2012
@@ -49,7 +49,7 @@ public class WidgetApiTest {
private final Long VALID_USER_ID = 5L;
private final Long VALID_WIDGET_ID = 10L;
- private User user;
+ private JpaUser user;
private List<Tag> tagList;
@Before
@@ -60,7 +60,7 @@ public class WidgetApiTest {
tagService = createMock(TagService.class);
widgetTagService = createMock(WidgetTagService.class);
- user = new User();
+ user = new JpaUser();
user.setEntityId(VALID_USER_ID);
tagList = new ArrayList<Tag>();
@@ -113,7 +113,7 @@ public class WidgetApiTest {
WidgetComment widgetComment = new WidgetCommentImpl();
widgetComment.setWidgetId(2L);
widgetComment.setText(message);
- widgetComment.setUser(new User(VALID_USER_ID, "John.Doe"));
+ widgetComment.setUser(new JpaUser(VALID_USER_ID, "John.Doe"));
expect(userService.getAuthenticatedUser()).andReturn(user);
expect(widgetCommentService.getWidgetComment(3L)).andReturn(null);
@@ -188,7 +188,7 @@ public class WidgetApiTest {
response.setStatus(HttpStatus.NO_CONTENT.value());
replay(userService, widgetRatingService, response);
- User user = new User(2L);
+ User user = new JpaUser(2L);
widgetApi.setWidgetRating(1L, 5, response);
verify(widgetRatingService, userService, response);
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ChangePasswordControllerTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ChangePasswordControllerTest.java?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ChangePasswordControllerTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ChangePasswordControllerTest.java Mon Jun 11 14:39:27 2012
@@ -25,6 +25,7 @@ import static org.easymock.EasyMock.repl
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
+import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.web.util.ModelKeys;
@@ -71,7 +72,7 @@ public class ChangePasswordControllerTes
public void testUpdate() throws Exception {
final Model model = createNiceMock(Model.class);
RedirectAttributes redirectAttributes = createNiceMock(RedirectAttributes.class);
- User newUser = new User();
+ User newUser = new JpaUser();
replay(redirectAttributes);
replay(model);
BindingResult results = new DirectFieldBindingResult(newUser, ModelKeys.USER);
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java Mon Jun 11 14:39:27 2012
@@ -27,6 +27,7 @@ import static org.junit.Assert.assertTha
import java.util.ArrayList;
import java.util.List;
+import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.CaptchaService;
import org.apache.rave.portal.service.NewAccountService;
@@ -93,7 +94,7 @@ public class NewAccountControllerTest {
@Test
public void create_UsernameNotSpecified() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final JpaUser User = new JpaUser();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = ""; //no username specified
final String password = "password";
@@ -123,12 +124,12 @@ public class NewAccountControllerTest {
@Test
public void create_UsernameAlreadyExists() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final JpaUser User = new JpaUser();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = "canonical"; //specified username already exists in database
final String password = "password";
final String confirmPassword = password;
- final User existingUser = new User();
+ final User existingUser = new JpaUser();
List<ObjectError> errorList = new ArrayList<ObjectError>();
final ObjectError error = new ObjectError("username.exists", "Username already exists");
@@ -160,7 +161,7 @@ public class NewAccountControllerTest {
@Test
public void create_InvalidUsernameLength() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final JpaUser User = new JpaUser();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = "u"; //username length less than 2 characters
final String password = "password";
@@ -190,7 +191,7 @@ public class NewAccountControllerTest {
@Test
public void create_PasswordNotSpecified() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final JpaUser User = new JpaUser();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = "username";
final String password = ""; //password not specified
@@ -220,7 +221,7 @@ public class NewAccountControllerTest {
@Test
public void create_ConfirmPasswordNotSpecified() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final JpaUser User = new JpaUser();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = "usename";
final String password = "pasword";
@@ -249,7 +250,7 @@ public class NewAccountControllerTest {
@Test
public void create_InvalidPasswordLength() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final JpaUser User = new JpaUser();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = "usename";
final String password = "pas"; //invalid length password
@@ -277,7 +278,7 @@ public class NewAccountControllerTest {
@Test
public void create_PasswordMismatchCaseOne() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final JpaUser User = new JpaUser();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = "username";
final String password = "password";
@@ -305,7 +306,7 @@ public class NewAccountControllerTest {
@Test
public void create_PasswordMismatchCaseTwo() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final JpaUser User = new JpaUser();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = "username";
final String password = "password";
@@ -333,7 +334,7 @@ public class NewAccountControllerTest {
@Test
public void create_BlankFormSubmitted() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final JpaUser User = new JpaUser();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = ""; //Username not specified
final String password = ""; //Password not specified
@@ -366,7 +367,7 @@ public class NewAccountControllerTest {
@Test
public void create_ValidFormSubmitted() {
final Model model = createNiceMock(Model.class);
- final User User = new User();
+ final JpaUser User = new JpaUser();
final BindingResult errors = createNiceMock(BindingResult.class);
final String username = "username"; //Username not specified
final String password = "password"; //Password not specified
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java Mon Jun 11 14:39:27 2012
@@ -60,7 +60,7 @@ public class PageControllerTest {
private final Long OTHER_PAGE_ID = 22L;
private final Long USER_ID = 1L;
private final String VALID_PAGE_LAYOUT_CODE = "layout98";
- private User validUser;
+ private JpaUser validUser;
private PageLayout validPageLayout;
@Before
@@ -73,7 +73,7 @@ public class PageControllerTest {
model = new ExtendedModelMap();
request = new MockHttpServletRequest();
- validUser = new User(USER_ID);
+ validUser = new JpaUser(USER_ID);
validPageLayout = new JpaPageLayout();
validPageLayout.setCode(VALID_PAGE_LAYOUT_CODE);
defaultPageUser = new PageUserImpl(validUser, defaultPage, 1L);
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java Mon Jun 11 14:39:27 2012
@@ -85,7 +85,7 @@ public class ProfileControllerTest {
@Test
public void viewPerson_ShouldAddAttributeForUser() {
//creating a mock user
- final User user = new User();
+ final JpaUser user = new JpaUser();
final ModelMap model = new ModelMap();
final int modelSize = 4;
final String username="Canonical";
@@ -152,7 +152,7 @@ public class ProfileControllerTest {
String userProfile = new String(ModelKeys.USER_PROFILE);
//creating a mock authenticated user
- final User authUser = new User();
+ final User authUser = new JpaUser();
authUser.setUsername(USERNAME);
//set existing status
authUser.setStatus("Single");
@@ -163,7 +163,7 @@ public class ProfileControllerTest {
authUser.setEmail("testuser@rave.com");
//creating a mock updated user
- final User updatedUser = new User();
+ final User updatedUser = new JpaUser();
//set the updated status
updatedUser.setStatus("Married");
updatedUser.setGivenName("Test");
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ReminderControllerTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ReminderControllerTest.java?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ReminderControllerTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ReminderControllerTest.java Mon Jun 11 14:39:27 2012
@@ -19,6 +19,7 @@
package org.apache.rave.portal.web.controller;
+import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.CaptchaService;
import org.apache.rave.portal.service.UserService;
@@ -83,7 +84,7 @@ public class ReminderControllerTest {
@Test
public void testCreate() throws Exception {
Model model = createNiceMock(Model.class);
- User User = new User();
+ User User = new JpaUser();
BindingResult results = new DirectFieldBindingResult(User, ModelKeys.USER);
RedirectAttributes redirectAttributes = createNiceMock(RedirectAttributes.class);
replay(redirectAttributes);
@@ -109,7 +110,7 @@ public class ReminderControllerTest {
assertThat(viewResult, CoreMatchers.equalTo(ViewNames.USERNAME_REQUEST));
// password part:
model = createNiceMock(Model.class);
- User = new User();
+ User = new JpaUser();
results = new DirectFieldBindingResult(User, ModelKeys.USER);
redirectAttributes = createNiceMock(RedirectAttributes.class);
replay(redirectAttributes);
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=1348873&r1=1348872&r2=1348873&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 Mon Jun 11 14:39:27 2012
@@ -20,7 +20,11 @@
package org.apache.rave.portal.web.controller;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.Category;
+import org.apache.rave.portal.model.Tag;
+import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.model.impl.UserImpl;
+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.service.*;
@@ -57,14 +61,14 @@ public class WidgetStoreControllerTest {
private WidgetService widgetService;
private TagService tagService;
private CategoryService categoryService;
- private User validUser;
+ private UserImpl validUser;
private WidgetStatistics widgetStatistics;
private Map<Long, WidgetStatistics> allWidgetStatisticsMap;
@Before
public void setup() {
- validUser = new User();
- validUser.setEntityId(1L);
+ validUser = new UserImpl();
+ validUser.setId(1L);
widgetStatistics = new WidgetStatistics();
allWidgetStatisticsMap = new HashMap<Long, WidgetStatistics>();
@@ -95,7 +99,7 @@ public class WidgetStoreControllerTest {
SearchResult<Widget> emptyResult = new SearchResult<Widget>(widgets, 0);
expect(widgetService.getPublishedWidgets(0, 10)).andReturn(emptyResult);
- expect(widgetService.getAllWidgetStatistics(validUser.getEntityId())).andReturn(allWidgetStatisticsMap);
+ expect(widgetService.getAllWidgetStatistics(validUser.getId())).andReturn(allWidgetStatisticsMap);
replay(widgetService);
String view = controller.view(model, REFERRER_ID, 0);
@@ -117,8 +121,8 @@ public class WidgetStoreControllerTest {
List<Widget> widgets = new ArrayList<Widget>();
SearchResult<Widget> emptyResult = new SearchResult<Widget>(widgets, 0);
- expect(widgetService.getWidgetsByOwner(validUser.getEntityId(), 0, 10)).andReturn(emptyResult);
- expect(widgetService.getAllWidgetStatistics(validUser.getEntityId())).andReturn(allWidgetStatisticsMap);
+ expect(widgetService.getWidgetsByOwner(validUser.getId(), 0, 10)).andReturn(emptyResult);
+ expect(widgetService.getAllWidgetStatistics(validUser.getId())).andReturn(allWidgetStatisticsMap);
replay(widgetService);
String view = controller.viewMine(model, REFERRER_ID, 0);
@@ -137,13 +141,13 @@ public class WidgetStoreControllerTest {
@Test
public void viewWidget() {
Model model = new ExtendedModelMap();
- Widget w = new JpaWidget(1L, "http://example.com/widget.xml");
+ Widget w = new WidgetImpl(1L, "http://example.com/widget.xml");
- expect(widgetService.getAllWidgetStatistics(validUser.getEntityId())).andReturn(allWidgetStatisticsMap);
+ expect(widgetService.getAllWidgetStatistics(validUser.getId())).andReturn(allWidgetStatisticsMap);
expect(tagService.getAllTags()).andReturn(new ArrayList<Tag>());
expect(categoryService.getAll()).andReturn(new ArrayList<Category>());
expect(widgetService.getWidget(WIDGET_ID)).andReturn(w);
- expect(widgetService.getWidgetStatistics(WIDGET_ID, validUser.getEntityId())).andReturn(widgetStatistics);
+ expect(widgetService.getWidgetStatistics(WIDGET_ID, validUser.getId())).andReturn(widgetStatistics);
replay(widgetService);
String view = controller.viewWidget(model, WIDGET_ID, REFERRER_ID);
@@ -167,7 +171,7 @@ public class WidgetStoreControllerTest {
int offset = 0;
int pageSize = 10;
SearchResult<Widget> searchResults = new SearchResult<Widget>(new ArrayList<Widget>(),0);
- expect(widgetService.getAllWidgetStatistics(validUser.getEntityId())).andReturn(allWidgetStatisticsMap);
+ expect(widgetService.getAllWidgetStatistics(validUser.getId())).andReturn(allWidgetStatisticsMap);
expect(tagService.getAllTags()).andReturn(new ArrayList<Tag>());
expect(categoryService.getAll()).andReturn(new ArrayList<Category>());
expect(widgetService.getWidgetsByCategory(categoryId, offset, pageSize)).andReturn(searchResults);
@@ -196,15 +200,15 @@ public class WidgetStoreControllerTest {
int offset = 0;
int pagesize = 10;
int totalResults = 2;
- JpaWidget widget = new JpaWidget();
- widget.setEntityId(1L);
+ WidgetImpl widget = new WidgetImpl();
+ widget.setId(1L);
List<Widget> widgets = new ArrayList<Widget>();
widgets.add(widget);
SearchResult<Widget> result = new SearchResult<Widget>(widgets, totalResults);
result.setPageSize(pagesize);
expect(widgetService.getPublishedWidgetsByFreeTextSearch(searchTerm, offset, pagesize)).andReturn(result);
- expect(widgetService.getAllWidgetStatistics(validUser.getEntityId())).andReturn(allWidgetStatisticsMap);
+ expect(widgetService.getAllWidgetStatistics(validUser.getId())).andReturn(allWidgetStatisticsMap);
replay(widgetService);
String view = controller.viewSearchResult(model, REFERRER_ID, searchTerm, offset);
@@ -235,8 +239,8 @@ public class WidgetStoreControllerTest {
public void doAddWidget() {
final String widgetUrl = "http://example.com/newwidget.xml";
final Model model = new ExtendedModelMap();
- final JpaWidget widget = new JpaWidget();
- widget.setEntityId(1L);
+ final WidgetImpl widget = new WidgetImpl();
+ widget.setId(1L);
widget.setTitle("Widget title");
widget.setUrl(widgetUrl);
widget.setType("OpenSocial");
@@ -249,7 +253,7 @@ public class WidgetStoreControllerTest {
String view = controller.viewAddWidgetResult(widget, errors, model,REFERRER_ID);
verify(widgetService);
- assertEquals("redirect:/app/store/widget/" + widget.getEntityId() + "?referringPageId=" + REFERRER_ID, view);
+ assertEquals("redirect:/app/store/widget/" + widget.getId() + "?referringPageId=" + REFERRER_ID, view);
assertFalse("Valid widget data", errors.hasErrors());
}
@@ -258,13 +262,13 @@ public class WidgetStoreControllerTest {
final String widgetUrl = "http://example.com/existingwidget.xml";
final Model model = new ExtendedModelMap();
- final JpaWidget existingWidget = new JpaWidget();
- existingWidget.setEntityId(123L);
+ final WidgetImpl existingWidget = new WidgetImpl();
+ existingWidget.setId(123L);
existingWidget.setTitle("Widget title");
existingWidget.setUrl(widgetUrl);
existingWidget.setType("OpenSocial");
- final Widget widget = new JpaWidget();
+ final Widget widget = new WidgetImpl();
widget.setTitle("Widget title");
widget.setUrl(widgetUrl);
widget.setType("OpenSocial");
@@ -282,7 +286,7 @@ public class WidgetStoreControllerTest {
@Test
public void doAddWidget_invalid() {
- final Widget widget = new JpaWidget();
+ final Widget widget = new WidgetImpl();
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/CategoryControllerTest.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/CategoryControllerTest.java?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java Mon Jun 11 14:39:27 2012
@@ -17,6 +17,7 @@
package org.apache.rave.portal.web.controller.admin;
import org.apache.rave.portal.model.Category;
+import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.impl.CategoryImpl;
import org.apache.rave.portal.service.CategoryService;
@@ -146,7 +147,7 @@ public class CategoryControllerTest {
@Test
public void createCategory_valid(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new JpaUser();
String categoryText = "Social";
Category category = new CategoryImpl();
category.setText(categoryText);
@@ -166,7 +167,7 @@ public class CategoryControllerTest {
public void createCategory_invalidToken(){
Model model = new ExtendedModelMap();
String invalidToken = AdminControllerUtil.generateSessionToken();
- User user = new User();
+ User user = new JpaUser();
String categoryText = "Social";
Category category = new CategoryImpl();
category.setText(categoryText);
@@ -183,7 +184,7 @@ public class CategoryControllerTest {
@Test
public void createCategory_invalidValidRequest_emptyText(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new JpaUser();
String categoryText = "";
Category category = new CategoryImpl();
category.setText(categoryText);
@@ -199,7 +200,7 @@ public class CategoryControllerTest {
@Test
public void updateCategory_valid(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new JpaUser();
long id = 1L;
String categoryText = "Social";
Category category = new CategoryImpl();
@@ -222,7 +223,7 @@ public class CategoryControllerTest {
@Test(expected = SecurityException.class)
public void updateCategory_invalidToken(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new JpaUser();
long id = 1L;
String categoryText = "Social";
String invalidToken = AdminControllerUtil.generateSessionToken();
@@ -244,7 +245,7 @@ public class CategoryControllerTest {
@Test
public void updateCategory_invalidValidRequest_emptyText(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new JpaUser();
long id = 1L;
String categoryText = "";
@@ -265,7 +266,7 @@ public class CategoryControllerTest {
public void updateCategory_invalidValidRequest_nullUser(){
Model model = new ExtendedModelMap();
long id = 1L;
- User user = new User();
+ User user = new JpaUser();
String categoryText = "Social";
Category category = new CategoryImpl();
category.setCreatedUser(user);
@@ -283,7 +284,7 @@ public class CategoryControllerTest {
@Test
public void updateCategory_invalidValidRequest_nullWidgetToUpdate(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new JpaUser();
long id = 1L;
String categoryText = "Social";
Category category = new CategoryImpl();
@@ -303,7 +304,7 @@ public class CategoryControllerTest {
@Test
public void deleteCategory_valid(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new JpaUser();
long id = 1L;
String categoryText = "Social";
Category category = new CategoryImpl();
@@ -327,7 +328,7 @@ public class CategoryControllerTest {
@Test(expected = SecurityException.class)
public void deleteCategory_invalidToken(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new JpaUser();
long id = 1L;
String categoryText = "Social";
String invalidToken = AdminControllerUtil.generateSessionToken();
@@ -350,7 +351,7 @@ public class CategoryControllerTest {
@Test
public void deleteCategory_invalidValidRequest_emptyText(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new JpaUser();
long id = 1L;
String categoryText = "";
@@ -371,7 +372,7 @@ public class CategoryControllerTest {
public void deleteCategory_invalidValidRequest_nullUser(){
Model model = new ExtendedModelMap();
long id = 1L;
- User user = new User();
+ User user = new JpaUser();
String categoryText = "Social";
Category category = new CategoryImpl();
category.setCreatedUser(user);
@@ -389,7 +390,7 @@ public class CategoryControllerTest {
@Test
public void deleteCategory_invalidValidRequest_nullWidgetToDelete(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new JpaUser();
long id = 1L;
String categoryText = "Social";
Category category = new CategoryImpl();
@@ -409,7 +410,7 @@ public class CategoryControllerTest {
@Test
public void deleteCategory_invalidValidRequest_falseConfirmation(){
Model model = new ExtendedModelMap();
- User user = new User();
+ User user = new JpaUser();
long id = 1L;
String categoryText = "Social";
Category category = new CategoryImpl();
@@ -427,7 +428,7 @@ public class CategoryControllerTest {
@Test
public void editCategory_valid () {
- User user = new User();
+ User user = new JpaUser();
long id = 1L;
String categoryText = "Social";
Model model = new ExtendedModelMap();
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.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/UserControllerTest.java?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java Mon Jun 11 14:39:27 2012
@@ -21,6 +21,7 @@ package org.apache.rave.portal.web.contr
import org.apache.rave.portal.model.Authority;
import org.apache.rave.portal.model.JpaAuthority;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.service.AuthorityService;
@@ -102,7 +103,7 @@ public class UserControllerTest {
public void viewAdminUserDetail() throws Exception {
Model model = new ExtendedModelMap();
Long userid = 123L;
- User user = new User(userid, "john.doe.sr");
+ User user = new UserImpl(userid, "john.doe.sr");
expect(userService.getUserById(userid)).andReturn(user);
replay(userService);
@@ -121,7 +122,7 @@ public class UserControllerTest {
ModelMap modelMap = new ExtendedModelMap();
final Long userid = 123L;
final String email = "john.doe.sr@example.net";
- User user = new User(userid, "john.doe.sr");
+ User user = new UserImpl(userid, "john.doe.sr");
user.setPassword("secrect");
user.setConfirmPassword("secrect");
user.setEmail(email);
@@ -146,7 +147,7 @@ public class UserControllerTest {
public void updateUserDetail_withErrors() {
ModelMap modelMap = new ExtendedModelMap();
Long userid = 123L;
- User user = new User(userid, "john.doe.sr");
+ User user = new UserImpl(userid, "john.doe.sr");
final BindingResult errors = new BeanPropertyBindingResult(user, "user");
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -161,7 +162,7 @@ public class UserControllerTest {
@Test(expected = SecurityException.class)
public void updateUserDetail_wrongToken() {
ModelMap modelMap = new ExtendedModelMap();
- User user = new User(123L, "john.doe.sr");
+ User user = new UserImpl(123L, "john.doe.sr");
final BindingResult errors = new BeanPropertyBindingResult(user, "user");
SessionStatus sessionStatus = createMock(SessionStatus.class);
sessionStatus.setComplete();
@@ -182,14 +183,14 @@ public class UserControllerTest {
ModelMap modelMap = new ExtendedModelMap();
final Long userid = 123L;
final String email = "john.doe.sr@example.net";
- User user = new User(userid, "john.doe.sr");
+ UserImpl user = new UserImpl(userid, "john.doe.sr");
user.setPassword("secrect");
user.setConfirmPassword(user.getConfirmPassword());
user.setEmail(email);
SessionStatus sessionStatus = createMock(SessionStatus.class);
- userService.deleteUser(user.getEntityId());
+ userService.deleteUser(user.getId());
sessionStatus.setComplete();
expectLastCall();
replay(userService, sessionStatus);
@@ -204,7 +205,7 @@ public class UserControllerTest {
public void deleteUserDetail_noConfirmChecked() {
ModelMap modelMap = new ExtendedModelMap();
Long userid = 123L;
- User user = new User(userid, "john.doe.sr");
+ UserImpl user = new UserImpl(userid, "john.doe.sr");
SessionStatus sessionStatus = createMock(SessionStatus.class);
replay(sessionStatus);
@@ -217,7 +218,7 @@ public class UserControllerTest {
@Test(expected = SecurityException.class)
public void deleteUserDetail_wrongToken() {
ModelMap modelMap = new ExtendedModelMap();
- User user = new User(123L, "john.doe.sr");
+ UserImpl user = new UserImpl(123L, "john.doe.sr");
SessionStatus sessionStatus = createMock(SessionStatus.class);
sessionStatus.setComplete();
@@ -239,14 +240,14 @@ public class UserControllerTest {
final String viewName = controller.setUpForm(modelMap);
assertEquals(ViewNames.ADMIN_NEW_ACCOUNT, viewName);
assertTrue(modelMap.containsAttribute(TABS));
- assertTrue(modelMap.get(ModelKeys.NEW_USER) instanceof User);
+ assertTrue(modelMap.get(ModelKeys.NEW_USER) instanceof UserImpl);
}
@Test
public void create_ValidFormSubmitted() throws Exception {
final Model model = createNiceMock(Model.class);
final RedirectAttributes redirectAttributes = createNiceMock(RedirectAttributes.class);
- final User User = new User();
+ final UserImpl User = new UserImpl();
final BindingResult errors = new BeanPropertyBindingResult(User, ModelKeys.NEW_USER);
final String username = "username";
final String password = "password";
@@ -276,7 +277,7 @@ public class UserControllerTest {
public void create_EmptyForm() throws Exception {
final Model model = createNiceMock(Model.class);
final RedirectAttributes redirectAttributes = createNiceMock(RedirectAttributes.class);
- final User User = new User();
+ final UserImpl User = new UserImpl();
final BindingResult errors = new BeanPropertyBindingResult(User, ModelKeys.NEW_USER);
final String username = "";
final String password = "";
@@ -335,8 +336,8 @@ public class UserControllerTest {
private static SearchResult<User> createSearchResultWithTwoUsers() {
- User user1 = new User(123L, "john.doe.sr");
- User user2 = new User(456L, "john.doe.jr");
+ User user1 = new UserImpl(123L, "john.doe.sr");
+ User user2 = new UserImpl(456L, "john.doe.jr");
List<User> users = new ArrayList<User>();
users.add(user1);
users.add(user2);
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapperTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapperTest.java?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapperTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapperTest.java Mon Jun 11 14:39:27 2012
@@ -19,6 +19,7 @@
package org.apache.rave.portal.web.security;
+import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.NewAccountService;
import org.apache.rave.portal.service.UserService;
@@ -64,7 +65,7 @@ public class LdapUserDetailsContextMappe
DirContextOperations ctx = createMock(DirContextOperations.class);
final String username = "johnldap";
- User user = new User(123L, username);
+ User user = new JpaUser(123L, username);
expect(userService.getUserByUsername(username)).andReturn(null).once();
expect(ctx.attributeExists(MAIL_ATTRIBUTE_NAME)).andReturn(true);
@@ -88,7 +89,7 @@ public class LdapUserDetailsContextMappe
DirContextOperations ctx = createMock(DirContextOperations.class);
final String username = "johnldap";
- User user = new User(123L, username);
+ User user = new JpaUser(123L, username);
expect(userService.getUserByUsername(username)).andReturn(null).once();
expect(ctx.attributeExists(MAIL_ATTRIBUTE_NAME)).andReturn(true);
@@ -157,7 +158,7 @@ public class LdapUserDetailsContextMappe
DirContextOperations ctx = createMock(DirContextOperations.class);
final String username = "johnldap";
- User user = new User(123L, username);
+ User user = new JpaUser(123L, username);
expect(userService.getUserByUsername(username)).andReturn(user);
expectLastCall();
@@ -173,7 +174,7 @@ public class LdapUserDetailsContextMappe
@Test
public void testMapUserToContext() throws Exception {
- User user = new User();
+ User user = new JpaUser();
DirContextAdapter adapter = new DirContextAdapter();
contextMapper.mapUserToContext(user, adapter);
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewAccountValidatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewAccountValidatorTest.java?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewAccountValidatorTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewAccountValidatorTest.java Mon Jun 11 14:39:27 2012
@@ -27,6 +27,7 @@ import static org.easymock.EasyMock.crea
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
+import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.UserService;
import org.junit.Before;
@@ -54,12 +55,12 @@ public class NewAccountValidatorTest {
@Test
public void testSupports() throws Exception {
assertTrue("Can validate org.apache.rave.portal.model.User",
- newAccountValidator.supports(User.class));
+ newAccountValidator.supports(JpaUser.class));
}
@Test
public void testValidate() throws Exception {
- User user = new User();
+ JpaUser user = new JpaUser();
user.setUsername(VALID_NAME);
user.setPassword(VALID_PASSWORD);
user.setConfirmPassword(VALID_PASSWORD);
@@ -78,7 +79,7 @@ public class NewAccountValidatorTest {
@Test
public void testValidationFailsOnEmptyUser() throws Exception {
- User user = new User();
+ User user = new JpaUser();
Errors errors = new BindException(user, NEW_USER);
expect(mockUserService.getUserByUsername("")).andReturn(null);
replay(mockUserService);
@@ -96,7 +97,7 @@ public class NewAccountValidatorTest {
@Test
public void testValidationFailsOnExistingUser() throws Exception {
- User user = new User();
+ JpaUser user = new JpaUser();
user.setUsername("ExistingUser");
user.setPassword(VALID_PASSWORD);
user.setConfirmPassword(VALID_PASSWORD);
@@ -104,7 +105,7 @@ public class NewAccountValidatorTest {
user.setEmail(VALID_EMAIL);
Errors errors = new BindException(user, NEW_USER);
- User user1 = createMock(User.class);
+ User user1 = createMock(JpaUser.class);
expect(mockUserService.getUserByUsername("ExistingUser")).andReturn(user1);
expect(mockUserService.getUserByEmail(VALID_EMAIL)).andReturn(null);
replay(mockUserService);
@@ -117,7 +118,7 @@ public class NewAccountValidatorTest {
@Test
public void testValidationFailsOnExistingEmail() throws Exception {
- User user = new User();
+ JpaUser user = new JpaUser();
user.setUsername(VALID_NAME);
user.setPassword(VALID_PASSWORD);
user.setConfirmPassword(VALID_PASSWORD);
@@ -125,7 +126,7 @@ public class NewAccountValidatorTest {
user.setEmail("existing@localhost");
Errors errors = new BindException(user, NEW_USER);
- User user1 = createMock(User.class);
+ User user1 = createMock(JpaUser.class);
expect(mockUserService.getUserByUsername(VALID_NAME)).andReturn(null);
expect(mockUserService.getUserByEmail("existing@localhost")).andReturn(user1);
replay(mockUserService);
@@ -139,7 +140,7 @@ public class NewAccountValidatorTest {
@Test
public void testValidationFailsOnShortUserName() throws Exception {
- User user = new User();
+ JpaUser user = new JpaUser();
user.setUsername("A");
user.setPassword(VALID_PASSWORD);
user.setConfirmPassword(VALID_PASSWORD);
@@ -158,7 +159,7 @@ public class NewAccountValidatorTest {
@Test
public void testValidationFailsOnIllegalUsername() throws Exception {
- User user = new User();
+ JpaUser user = new JpaUser();
final String badUsername = "x'; DROP TABLE members; --";
user.setUsername(badUsername);
user.setPassword(VALID_PASSWORD);
@@ -178,7 +179,7 @@ public class NewAccountValidatorTest {
@Test
public void testValidationFailsOnShortPassword() throws Exception {
- User user = new User();
+ JpaUser user = new JpaUser();
user.setUsername(VALID_NAME);
user.setPassword("123");
user.setConfirmPassword("123");
@@ -197,7 +198,7 @@ public class NewAccountValidatorTest {
@Test
public void testValidationFailsOnNonMatchingPassword() throws Exception {
- User user = new User();
+ JpaUser user = new JpaUser();
user.setUsername(VALID_NAME);
user.setPassword(VALID_PASSWORD);
user.setConfirmPassword("doesnotmatch");
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UserProfileValidatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UserProfileValidatorTest.java?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UserProfileValidatorTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UserProfileValidatorTest.java Mon Jun 11 14:39:27 2012
@@ -19,6 +19,7 @@
package org.apache.rave.portal.web.validator;
+import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.UserService;
import org.junit.Before;
@@ -46,12 +47,12 @@ public class UserProfileValidatorTest {
@Test
public void testSupports() throws Exception {
- assertTrue("Can validate org.apache.rave.portal.model.User", validator.supports(User.class));
+ assertTrue("Can validate org.apache.rave.portal.model.User", validator.supports(JpaUser.class));
}
@Test
public void testValidate() throws Exception {
- User user = new User();
+ User user = new JpaUser();
user.setUsername(VALID_NAME);
user.setPassword(VALID_PASSWORD);
user.setConfirmPassword(VALID_PASSWORD);
@@ -65,7 +66,7 @@ public class UserProfileValidatorTest {
@Test
public void testValidateFailsOnEmptyPassword() throws Exception {
- User user = new User();
+ User user = new JpaUser();
user.setUsername(VALID_NAME);
user.setEmail(VALID_EMAIL);
@@ -79,7 +80,7 @@ public class UserProfileValidatorTest {
@Test
public void testValidateFailsOnShortPassword() throws Exception {
- User user = new User();
+ User user = new JpaUser();
user.setUsername(VALID_NAME);
user.setPassword("123");
user.setPassword("123");
@@ -94,7 +95,7 @@ public class UserProfileValidatorTest {
@Test
public void testValidateFailsOnPasswordMismatch() throws Exception {
- User user = new User();
+ User user = new JpaUser();
user.setUsername(VALID_NAME);
user.setPassword(VALID_PASSWORD);
user.setConfirmPassword("DoesNotMatch");
Modified: rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp (original)
+++ rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp Mon Jun 11 14:39:27 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.User>"--%>
+<%--@elvariable id="searchResult" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.JpaUser>"--%>
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
<rave:navbar pageTitle="${pagetitle}"/>
Modified: rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp (original)
+++ rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp Mon Jun 11 14:39:27 2012
@@ -24,7 +24,7 @@
<%@ page errorPage="/WEB-INF/jsp/views/error.jsp" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<jsp:useBean id="userProfile" type="org.apache.rave.portal.model.User" scope="request"/>
+<jsp:useBean id="userProfile" type="org.apache.rave.portal.model.JpaUser" scope="request"/>
<!-- get the display name of user -->
<fmt:message key="page.personProfile.title" var="pageTitle">
Modified: rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp (original)
+++ rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp Mon Jun 11 14:39:27 2012
@@ -19,7 +19,7 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<jsp:useBean id="userProfile" type="org.apache.rave.portal.model.User" scope="request"/>
+<jsp:useBean id="userProfile" type="org.apache.rave.portal.model.JpaUser" scope="request"/>
<div id="content">
<h1>${pagetitle}</h1>
<form:form id="userProfileForm" commandName="userProfile" action="updateUserProfile" method="POST">
Modified: rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/admin_approval.ftl
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/admin_approval.ftl?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/admin_approval.ftl (original)
+++ rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/admin_approval.ftl Mon Jun 11 14:39:27 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<#-- @ftlvariable name="user" type="org.apache.rave.portal.model.User" -->
+<#-- @ftlvariable name="user" type="org.apache.rave.portal.model.JpaUser" -->
<#-- @ftlvariable name="portalUrl" type="java.lang.String" -->
Dear Admin,
Modified: rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/password_reminder.ftl
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/password_reminder.ftl?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/password_reminder.ftl (original)
+++ rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/password_reminder.ftl Mon Jun 11 14:39:27 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<#-- @ftlvariable name="user" type="org.apache.rave.portal.model.User" -->
+<#-- @ftlvariable name="user" type="org.apache.rave.portal.model.JpaUser" -->
<#-- @ftlvariable name="reminderUrl" type="java.lang.String" -->
Dear ${user.getUsername()},
Modified: rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/username_reminder.ftl
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/username_reminder.ftl?rev=1348873&r1=1348872&r2=1348873&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/username_reminder.ftl (original)
+++ rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/username_reminder.ftl Mon Jun 11 14:39:27 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<#-- @ftlvariable name="user" type="org.apache.rave.portal.model.User" -->
+<#-- @ftlvariable name="user" type="org.apache.rave.portal.model.JpaUser" -->
<#-- @ftlvariable name="reminderUrl" type="java.lang.String" -->
Dear ${user.getUsername()},
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=1348873&r1=1348872&r2=1348873&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 Mon Jun 11 14:39:27 2012
@@ -32,7 +32,6 @@ import org.apache.rave.portal.web.render
import org.apache.rave.provider.opensocial.repository.impl.ShindigGadgetMetadataRepository;
import org.easymock.EasyMock;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -86,7 +85,7 @@ public class RenderServiceIntegrationTes
ReflectionTestUtils.setField(metadataRepository, "restOperations", restOperations);
//Setup a mock authenticated user
- final User authUser = new User(VALID_USER_ID, VALID_USER_NAME);
+ final User authUser = new JpaUser(VALID_USER_ID, VALID_USER_NAME);
AbstractAuthenticationToken auth = EasyMock.createNiceMock(AbstractAuthenticationToken.class);
EasyMock.expect(auth.getPrincipal()).andReturn(authUser).anyTimes();
EasyMock.replay(auth);
@@ -104,7 +103,7 @@ public class RenderServiceIntegrationTes
@Test
public void renderOpenSocial() {
- Page page = new PageImpl(1L, new User(VALID_USER_ID, VALID_USER_NAME));
+ Page page = new PageImpl(1L, new JpaUser(VALID_USER_ID, VALID_USER_NAME));
Region region = new RegionImpl(1L, page, 1);
page.setRegions(Arrays.asList(region));
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=1348873&r1=1348872&r2=1348873&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 Mon Jun 11 14:39:27 2012
@@ -22,10 +22,7 @@ package org.apache.rave.provider.opensoc
import org.apache.commons.io.FileUtils;
import org.apache.rave.portal.model.RegionWidget;
import org.apache.rave.portal.model.User;
-import org.apache.rave.portal.model.impl.PageImpl;
-import org.apache.rave.portal.model.impl.RegionImpl;
-import org.apache.rave.portal.model.impl.RegionWidgetImpl;
-import org.apache.rave.portal.model.impl.WidgetImpl;
+import org.apache.rave.portal.model.impl.*;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.provider.opensocial.exception.SecurityTokenException;
import org.apache.rave.provider.opensocial.service.SecurityTokenService;
@@ -135,7 +132,7 @@ public class EncryptedBlobSecurityTokenS
SecurityToken securityToken = this.decryptSecurityToken(encryptedSecurityToken);
//Make sure the person is authorized to refresh this token
- String userId = String.valueOf(userService.getAuthenticatedUser().getEntityId());
+ String userId = String.valueOf(userService.getAuthenticatedUser().getId());
if (!securityToken.getViewerId().equalsIgnoreCase(userId)) {
throw new SecurityTokenException("Illegal attempt by user " + userId +
" to refresh security token with a viewerId of " + securityToken.getViewerId());
@@ -144,7 +141,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 RegionWidgetImpl(securityToken.getModuleId(),
new WidgetImpl(-1L, securityToken.getAppUrl()),
- new RegionImpl(-1L, new PageImpl(-1L, new User(Long.valueOf(securityToken.getOwnerId()))), -1));
+ new RegionImpl(-1L, new PageImpl(-1L, new UserImpl(Long.valueOf(securityToken.getOwnerId()))), -1));
//Create and return the newly encrypted token
return getEncryptedSecurityToken(regionWidget);
@@ -158,8 +155,8 @@ public class EncryptedBlobSecurityTokenS
values.put(AbstractSecurityToken.Keys.APP_URL.getKey(), regionWidget.getWidget().getUrl());
values.put(AbstractSecurityToken.Keys.MODULE_ID.getKey(), String.valueOf(regionWidget.getId()));
values.put(AbstractSecurityToken.Keys.OWNER.getKey(),
- String.valueOf(regionWidget.getRegion().getPage().getOwner().getEntityId()));
- values.put(AbstractSecurityToken.Keys.VIEWER.getKey(), String.valueOf(user.getEntityId()));
+ String.valueOf(regionWidget.getRegion().getPage().getOwner().getId()));
+ values.put(AbstractSecurityToken.Keys.VIEWER.getKey(), String.valueOf(user.getId()));
values.put(AbstractSecurityToken.Keys.TRUSTED_JSON.getKey(), "");
BlobCrypterSecurityToken securityToken = new BlobCrypterSecurityToken(container, domain, null, values);
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=1348873&r1=1348872&r2=1348873&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 Mon Jun 11 14:39:27 2012
@@ -53,7 +53,7 @@ public class SecurityTokenServiceTest {
private SecurityTokenService securityTokenService;
private String encryptionKey;
- private User validPerson;
+ private JpaUser validPerson;
private Page validPage;
private Region validRegion;
private RegionWidget validRegionWidget;
@@ -99,7 +99,7 @@ public class SecurityTokenServiceTest {
securityTokenService = new EncryptedBlobSecurityTokenService(userService, "default", "default",
encryptionKey);
- validPerson = new User(VALID_USER_ID, VALID_USER_NAME);
+ validPerson = new JpaUser(VALID_USER_ID, VALID_USER_NAME);
validPage = new PageImpl(1L, validPerson);
validRegion = new RegionImpl(1L, validPage, 1);
@@ -125,7 +125,7 @@ public class SecurityTokenServiceTest {
@Test
public void getSecurityToken_validWidget_ownerIsNotViewer() throws SecurityTokenException {
Long expectedOwnerId = 99999L;
- validPage.setOwner(new User(expectedOwnerId));
+ validPage.setOwner(new JpaUser(expectedOwnerId));
expect(userService.getAuthenticatedUser()).andReturn(validPerson).anyTimes();
replay(userService);
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=1348873&r1=1348872&r2=1348873&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 Mon Jun 11 14:39:27 2012
@@ -21,10 +21,7 @@ package org.apache.rave.provider.w3c.web
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.*;
import org.apache.rave.portal.model.conversion.JpaConverter;
import org.apache.rave.portal.model.conversion.JpaWidgetConverter;
import org.apache.rave.portal.model.impl.RegionImpl;
@@ -83,7 +80,7 @@ public class W3cWidgetRendererTest {
@Test
public void render_valid() {
- User user = new User(9999L, "testUser");
+ User user = new JpaUser(9999L, "testUser");
expect(userService.getAuthenticatedUser()).andReturn(user);
replay(userService);