Author: mfranklin
Date: Tue Jun 19 01:44:11 2012
New Revision: 1351554
URL: http://svn.apache.org/viewvc?rev=1351554&view=rev
Log:
Updated binding for form objects RAVE-667
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ChangePasswordController.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ReminderController.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/UserProfileController.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/CategoryController.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ChangePasswordControllerTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ReminderControllerTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ChangePasswordController.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ChangePasswordController.java?rev=1351554&r1=1351553&r2=1351554&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ChangePasswordController.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ChangePasswordController.java
Tue Jun 19 01:44:11 2012
@@ -74,7 +74,7 @@ public class ChangePasswordController {
@RequestMapping(value = {"/changepassword", "/changepassword/**"}, method
= RequestMethod.POST)
- public String update(@ModelAttribute User user, BindingResult results,
Model model, RedirectAttributes redirectAttributes) {
+ public String update(@ModelAttribute UserImpl user, BindingResult results,
Model model, RedirectAttributes redirectAttributes) {
log.debug("updating user password for hash {}",
user.getForgotPasswordHash());
model.addAttribute(ModelKeys.USER, user);
passwordValidator.validate(user, results);
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java?rev=1351554&r1=1351553&r2=1351554&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java
Tue Jun 19 01:44:11 2012
@@ -19,7 +19,6 @@
package org.apache.rave.portal.web.controller;
-import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.CaptchaService;
import org.apache.rave.portal.service.NewAccountService;
@@ -68,7 +67,7 @@ public class NewAccountController {
}
@RequestMapping(value = {"/newaccount", "/newaccount/*"}, method =
RequestMethod.POST)
- public String create(@ModelAttribute(value = "newUser") User newUser,
BindingResult results, Model model, HttpServletRequest request,
RedirectAttributes redirectAttributes) {
+ public String create(@ModelAttribute(value = "newUser") UserImpl newUser,
BindingResult results, Model model, HttpServletRequest request,
RedirectAttributes redirectAttributes) {
logger.debug("Creating a new user account");
model.addAttribute(ModelKeys.NEW_USER, newUser);
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java?rev=1351554&r1=1351553&r2=1351554&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java
Tue Jun 19 01:44:11 2012
@@ -21,6 +21,7 @@ package org.apache.rave.portal.web.contr
import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.PageService;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.web.controller.util.ControllerUtils;
@@ -81,7 +82,7 @@ public class ProfileController {
@RequestMapping(method = RequestMethod.POST)
public String updateProfile(ModelMap model,
@RequestParam(required = false) Long
referringPageId,
- @ModelAttribute("updatedUser") User
updatedUser) {
+ @ModelAttribute("updatedUser") UserImpl
updatedUser) {
logger.info("Updating " + updatedUser.getUsername() + " profile
information");
User user = userService.getAuthenticatedUser();
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ReminderController.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ReminderController.java?rev=1351554&r1=1351553&r2=1351554&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ReminderController.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ReminderController.java
Tue Jun 19 01:44:11 2012
@@ -74,7 +74,7 @@ public class ReminderController {
* Processes username requests
*/
@RequestMapping(value = {"/retrieveusername"}, method = RequestMethod.POST)
- public String requestUsername(@ModelAttribute User user, BindingResult
results, Model model,
+ public String requestUsername(@ModelAttribute UserImpl user, BindingResult
results, Model model,
HttpServletRequest request,
RedirectAttributes redirectAttributes) {
log.debug("Requesting username reminder");
if (!validateEmail(user, results, model, request)) {
@@ -98,7 +98,7 @@ public class ReminderController {
* Processes new password requests
*/
@RequestMapping(value = {"/newpassword"}, method = RequestMethod.POST)
- public String requestPassword(@ModelAttribute User user, BindingResult
results, Model model,
+ public String requestPassword(@ModelAttribute UserImpl user, BindingResult
results, Model model,
HttpServletRequest request,
RedirectAttributes redirectAttributes) {
log.debug("Requesting password reminder");
if (!validateEmail(user, results, model, request)) {
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/UserProfileController.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/UserProfileController.java?rev=1351554&r1=1351553&r2=1351554&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/UserProfileController.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/UserProfileController.java
Tue Jun 19 01:44:11 2012
@@ -20,6 +20,7 @@
package org.apache.rave.portal.web.controller;
import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
@@ -66,7 +67,7 @@ public class UserProfileController {
}
@RequestMapping(value = {"/updateUserProfile", "/updateUserProfile/*"},
method = RequestMethod.POST)
- public String create(@ModelAttribute User user, BindingResult results,
Model model, @RequestParam String username, @RequestParam String password,
RedirectAttributes redirectAttributes) {
+ public String create(@ModelAttribute UserImpl user, BindingResult results,
Model model, @RequestParam String username, @RequestParam String password,
RedirectAttributes redirectAttributes) {
logger.debug("Updating user profile.");
model.addAttribute(ModelKeys.USER_PROFILE, user);
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=1351554&r1=1351553&r2=1351554&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 19 01:44:11 2012
@@ -217,7 +217,7 @@ public class WidgetStoreController {
* @return if successful the view name of the widget, otherwise the form
*/
@RequestMapping(method = RequestMethod.POST, value = "widget/add")
- public String viewAddWidgetResult(@ModelAttribute Widget widget,
BindingResult results, Model model,
+ public String viewAddWidgetResult(@ModelAttribute WidgetImpl widget,
BindingResult results, Model model,
@RequestParam long referringPageId) {
User user = userService.getAuthenticatedUser();
widgetValidator.validate(widget, results);
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/CategoryController.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/CategoryController.java?rev=1351554&r1=1351553&r2=1351554&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/CategoryController.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/CategoryController.java
Tue Jun 19 01:44:11 2012
@@ -64,7 +64,7 @@ public class CategoryController {
}
@RequestMapping(value = {"/admin/category/create"}, method =
RequestMethod.POST)
- public String createCategory(@ModelAttribute Category category,
+ public String createCategory(@ModelAttribute CategoryImpl category,
@ModelAttribute(ModelKeys.TOKENCHECK) String
sessionToken,
@RequestParam String token,
Model model,
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=1351554&r1=1351553&r2=1351554&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
Tue Jun 19 01:44:11 2012
@@ -125,7 +125,7 @@ public class UserController {
}
@RequestMapping(value = "/admin/userdetail/update", method =
RequestMethod.POST)
- public String updateUserDetail(@ModelAttribute User user, BindingResult
result,
+ public String updateUserDetail(@ModelAttribute UserImpl user,
BindingResult result,
@ModelAttribute(ModelKeys.TOKENCHECK)
String sessionToken,
@RequestParam() String token,
ModelMap modelMap,
@@ -144,7 +144,7 @@ public class UserController {
}
@RequestMapping(value = "/admin/userdetail/delete", method =
RequestMethod.POST)
- public String deleteUserDetail(@ModelAttribute User user,
+ public String deleteUserDetail(@ModelAttribute UserImpl user,
@ModelAttribute(ModelKeys.TOKENCHECK)
String sessionToken,
@RequestParam String token,
@RequestParam(required = false) String
confirmdelete,
@@ -172,7 +172,7 @@ public class UserController {
}
@RequestMapping(value = {"/admin/newaccount", "/admin/newaccount/*"},
method = RequestMethod.POST)
- public String create(@ModelAttribute(value = "newUser") User newUser,
BindingResult results, Model model,
+ public String create(@ModelAttribute(value = "newUser") UserImpl newUser,
BindingResult results, Model model,
RedirectAttributes redirectAttributes) {
logger.debug("Creating a new user account");
model.addAttribute(ModelKeys.NEW_USER, newUser);
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=1351554&r1=1351553&r2=1351554&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
Tue Jun 19 01:44:11 2012
@@ -95,7 +95,7 @@ public class UserProfileValidator implem
private boolean isExistingEmailAddress(User user, String email) {
final User userByEmail = userService.getUserByEmail(email);
- return userByEmail != null && !userByEmail.equals(user);
+ return userByEmail != null &&
!userByEmail.getId().equals(user.getId());
}
private void writeResultToLog(Errors errors) {
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=1351554&r1=1351553&r2=1351554&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
Tue Jun 19 01:44:11 2012
@@ -19,7 +19,6 @@
package org.apache.rave.portal.web.controller;
-import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.web.util.ModelKeys;
@@ -70,7 +69,7 @@ public class ChangePasswordControllerTes
public void testUpdate() throws Exception {
final Model model = createNiceMock(Model.class);
RedirectAttributes redirectAttributes =
createNiceMock(RedirectAttributes.class);
- User newUser = new UserImpl();
+ UserImpl newUser = new UserImpl();
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/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=1351554&r1=1351553&r2=1351554&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
Tue Jun 19 01:44:11 2012
@@ -155,7 +155,7 @@ public class ProfileControllerTest {
String userProfile = new String(ModelKeys.USER_PROFILE);
//creating a mock authenticated user
- final User authUser = new UserImpl();
+ final UserImpl authUser = new UserImpl();
authUser.setUsername(USERNAME);
//set existing status
authUser.setStatus("Single");
@@ -166,7 +166,7 @@ public class ProfileControllerTest {
authUser.setEmail("[email protected]");
//creating a mock updated user
- final User updatedUser = new UserImpl();
+ final UserImpl updatedUser = new UserImpl();
//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=1351554&r1=1351553&r2=1351554&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
Tue Jun 19 01:44:11 2012
@@ -19,7 +19,6 @@
package org.apache.rave.portal.web.controller;
-import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.CaptchaService;
import org.apache.rave.portal.service.UserService;
@@ -84,7 +83,7 @@ public class ReminderControllerTest {
@Test
public void testCreate() throws Exception {
Model model = createNiceMock(Model.class);
- User User = new UserImpl();
+ UserImpl User = new UserImpl();
BindingResult results = new DirectFieldBindingResult(User,
ModelKeys.USER);
RedirectAttributes 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=1351554&r1=1351553&r2=1351554&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 19 01:44:11 2012
@@ -268,7 +268,7 @@ public class WidgetStoreControllerTest {
existingWidget.setUrl(widgetUrl);
existingWidget.setType("OpenSocial");
- final Widget widget = new WidgetImpl();
+ final WidgetImpl widget = new WidgetImpl();
widget.setTitle("Widget title");
widget.setUrl(widgetUrl);
widget.setType("OpenSocial");
@@ -286,7 +286,7 @@ public class WidgetStoreControllerTest {
@Test
public void doAddWidget_invalid() {
- final Widget widget = new WidgetImpl();
+ final WidgetImpl 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=1351554&r1=1351553&r2=1351554&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
Tue Jun 19 01:44:11 2012
@@ -149,7 +149,7 @@ public class CategoryControllerTest {
Model model = new ExtendedModelMap();
User user = new UserImpl();
String categoryText = "Social";
- Category category = new CategoryImpl();
+ CategoryImpl category = new CategoryImpl();
category.setText(categoryText);
SessionStatus sessionStatus = createMock(SessionStatus.class);
expect(userService.getAuthenticatedUser()).andReturn(user).once();
@@ -169,7 +169,7 @@ public class CategoryControllerTest {
String invalidToken = AdminControllerUtil.generateSessionToken();
User user = new UserImpl();
String categoryText = "Social";
- Category category = new CategoryImpl();
+ CategoryImpl category = new CategoryImpl();
category.setText(categoryText);
SessionStatus sessionStatus = createMock(SessionStatus.class);
expect(userService.getAuthenticatedUser()).andReturn(user).once();
@@ -186,7 +186,7 @@ public class CategoryControllerTest {
Model model = new ExtendedModelMap();
User user = new UserImpl();
String categoryText = "";
- Category category = new CategoryImpl();
+ CategoryImpl category = new CategoryImpl();
category.setText(categoryText);
SessionStatus sessionStatus = createMock(SessionStatus.class);
expect(userService.getAuthenticatedUser()).andReturn(user).once();
@@ -203,7 +203,7 @@ public class CategoryControllerTest {
User user = new UserImpl();
long id = 1L;
String categoryText = "Social";
- Category category = new CategoryImpl();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
category.setId(id);
@@ -227,7 +227,7 @@ public class CategoryControllerTest {
long id = 1L;
String categoryText = "Social";
String invalidToken = AdminControllerUtil.generateSessionToken();
- Category category = new CategoryImpl();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
category.setId(id);
@@ -249,7 +249,7 @@ public class CategoryControllerTest {
long id = 1L;
String categoryText = "";
- Category category = new CategoryImpl();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
category.setId(id);
@@ -268,7 +268,7 @@ public class CategoryControllerTest {
long id = 1L;
User user = new UserImpl();
String categoryText = "Social";
- Category category = new CategoryImpl();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
category.setId(id);
@@ -287,7 +287,7 @@ public class CategoryControllerTest {
User user = new UserImpl();
long id = 1L;
String categoryText = "Social";
- Category category = new CategoryImpl();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
category.setId(id);
@@ -307,7 +307,7 @@ public class CategoryControllerTest {
User user = new UserImpl();
long id = 1L;
String categoryText = "Social";
- Category category = new CategoryImpl();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
category.setId(id);
@@ -332,7 +332,7 @@ public class CategoryControllerTest {
long id = 1L;
String categoryText = "Social";
String invalidToken = AdminControllerUtil.generateSessionToken();
- Category category = new CategoryImpl();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
category.setId(id);
@@ -355,7 +355,7 @@ public class CategoryControllerTest {
long id = 1L;
String categoryText = "";
- Category category = new CategoryImpl();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
category.setId(id);
@@ -374,7 +374,7 @@ public class CategoryControllerTest {
long id = 1L;
User user = new UserImpl();
String categoryText = "Social";
- Category category = new CategoryImpl();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
category.setId(id);
@@ -393,7 +393,7 @@ public class CategoryControllerTest {
User user = new UserImpl();
long id = 1L;
String categoryText = "Social";
- Category category = new CategoryImpl();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
category.setId(id);
@@ -413,7 +413,7 @@ public class CategoryControllerTest {
User user = new UserImpl();
long id = 1L;
String categoryText = "Social";
- Category category = new CategoryImpl();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
category.setId(id);
@@ -432,7 +432,7 @@ public class CategoryControllerTest {
long id = 1L;
String categoryText = "Social";
Model model = new ExtendedModelMap();
- Category category = new CategoryImpl();
+ CategoryImpl category = new CategoryImpl();
category.setCreatedUser(user);
category.setText(categoryText);
category.setId(id);
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=1351554&r1=1351553&r2=1351554&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
Tue Jun 19 01:44:11 2012
@@ -122,7 +122,7 @@ public class UserControllerTest {
ModelMap modelMap = new ExtendedModelMap();
final Long userid = 123L;
final String email = "[email protected]";
- User user = new UserImpl(userid, "john.doe.sr");
+ UserImpl user = new UserImpl(userid, "john.doe.sr");
user.setPassword("secrect");
user.setConfirmPassword("secrect");
user.setEmail(email);
@@ -147,7 +147,7 @@ public class UserControllerTest {
public void updateUserDetail_withErrors() {
ModelMap modelMap = new ExtendedModelMap();
Long userid = 123L;
- User user = new UserImpl(userid, "john.doe.sr");
+ UserImpl user = new UserImpl(userid, "john.doe.sr");
final BindingResult errors = new BeanPropertyBindingResult(user,
"user");
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -162,7 +162,7 @@ public class UserControllerTest {
@Test(expected = SecurityException.class)
public void updateUserDetail_wrongToken() {
ModelMap modelMap = new ExtendedModelMap();
- User user = new UserImpl(123L, "john.doe.sr");
+ UserImpl user = new UserImpl(123L, "john.doe.sr");
final BindingResult errors = new BeanPropertyBindingResult(user,
"user");
SessionStatus sessionStatus = createMock(SessionStatus.class);
sessionStatus.setComplete();
@@ -336,8 +336,8 @@ public class UserControllerTest {
private static SearchResult<User> createSearchResultWithTwoUsers() {
- User user1 = new UserImpl(123L, "john.doe.sr");
- User user2 = new UserImpl(456L, "john.doe.jr");
+ UserImpl user1 = new UserImpl(123L, "john.doe.sr");
+ UserImpl 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/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=1351554&r1=1351553&r2=1351554&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 19 01:44:11 2012
@@ -158,8 +158,8 @@ public class WidgetControllerTest {
@Test
public void updateWidget_valid() {
final String widgetUrl = "http://example.com/widget";;
- Widget widget = new WidgetImpl(123L, widgetUrl);
- widget.setTitle("Widget title");
+ WidgetImpl widget = new WidgetImpl(123L, widgetUrl);
+ widget.setTitle("WidgetImpl title");
widget.setType("OpenSocial");
widget.setDescription("Lorem ipsum");
BindingResult errors = new BeanPropertyBindingResult(widget, "widget");
@@ -181,7 +181,7 @@ public class WidgetControllerTest {
@Test(expected = SecurityException.class)
public void updateWidget_wrongToken() {
- Widget widget = new WidgetImpl();
+ WidgetImpl widget = new WidgetImpl();
BindingResult errors = new BeanPropertyBindingResult(widget, "widget");
SessionStatus sessionStatus = createMock(SessionStatus.class);
ModelMap modelMap = new ExtendedModelMap();
@@ -200,7 +200,7 @@ public class WidgetControllerTest {
@Test
public void updateWidget_invalid() {
- Widget widget = new WidgetImpl(123L, "http://broken/url";);
+ WidgetImpl widget = new WidgetImpl(123L, "http://broken/url";);
BindingResult errors = new BeanPropertyBindingResult(widget, "widget");
SessionStatus sessionStatus = createMock(SessionStatus.class);
ModelMap modelMap = new ExtendedModelMap();
@@ -227,8 +227,8 @@ 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 WidgetImpl();
- widget.setTitle("Widget " + i);
+ WidgetImpl widget = new WidgetImpl();
+ widget.setTitle("WidgetImpl " + i);
widgetList.add(widget);
}
return new SearchResult<Widget>(widgetList, 25);
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=1351554&r1=1351553&r2=1351554&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 19 01:44:11 2012
@@ -83,7 +83,6 @@
<oxm:class-to-be-bound
name="org.apache.rave.portal.web.model.RegionWidgetPreferenceListWrapper"/>
</oxm:jaxb2-marshaller>
-
<bean id="tilesConfigurer"
class="org.springframework.web.servlet.view.tiles2.TilesConfigurer">
<property name="definitions">
<list>
