You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mp...@apache.org on 2011/08/03 03:39:58 UTC
svn commit: r1153319 - in /incubator/rave/trunk/rave-portal/src:
main/java/org/apache/rave/portal/model/
main/java/org/apache/rave/portal/service/
main/java/org/apache/rave/portal/service/impl/
main/java/org/apache/rave/portal/web/controller/ main/weba...
Author: mpierce
Date: Wed Aug 3 01:39:57 2011
New Revision: 1153319
URL: http://svn.apache.org/viewvc?rev=1153319&view=rev
Log:
(RAVE-148) New accounts now specify the layout to use from a drop down menu.
Modified:
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/NewUser.java
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/NewAccountService.java
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java
incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java
incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/newaccount.jsp
incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/NewUser.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/NewUser.java?rev=1153319&r1=1153318&r2=1153319&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/NewUser.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/NewUser.java Wed Aug 3 01:39:57 2011
@@ -30,6 +30,8 @@ public class NewUser {
private String password;
private String confirmPassword;
+
+ private String pageLayout;
public NewUser(){
}
@@ -57,5 +59,13 @@ public class NewUser {
public void setConfirmPassword(String confirmPassword) {
this.confirmPassword = confirmPassword;
}
+
+ public String getPageLayout() {
+ return pageLayout;
+ }
+
+ public void setPageLayout(String pageLayout) {
+ this.pageLayout = pageLayout;
+ }
}
\ No newline at end of file
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/NewAccountService.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/NewAccountService.java?rev=1153319&r1=1153318&r2=1153319&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/NewAccountService.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/NewAccountService.java Wed Aug 3 01:39:57 2011
@@ -18,6 +18,7 @@
*/
package org.apache.rave.portal.service;
+
public interface NewAccountService {
/**
@@ -25,5 +26,5 @@ public interface NewAccountService {
* @param userName is the user name of the new account.
* @param password is the account's password.
*/
- public void createNewAccount(String userName, String password) throws Exception;
+ public void createNewAccount(String userName, String password, String pageLayout) throws Exception;
}
\ No newline at end of file
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java?rev=1153319&r1=1153318&r2=1153319&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java Wed Aug 3 01:39:57 2011
@@ -44,14 +44,14 @@ public class DefaultNewAccountService im
@Autowired
public DefaultNewAccountService(UserService userService, PageService pageService, PageLayoutService pageLayoutService, RegionService regionService) {
- this.userService = userService;
+ this.userService = userService;
this.pageService = pageService;
this.pageLayoutService = pageLayoutService;
this.regionService = regionService;
}
@Override
- public void createNewAccount(String userName, String password) throws Exception {
+ public void createNewAccount(String userName, String password, String userPageLayout) throws Exception {
User user=new User();
user.setUsername(userName);
user.setPassword(password);
@@ -64,16 +64,16 @@ public class DefaultNewAccountService im
//Return the newly registered user
User registeredUser=userService.getUserByUsername(user.getUsername());
- //Create a PageLayout object. We will default to
- //the two-column layout
- PageLayout pageLayout=pageLayoutService.getPageLayoutByCode("columns_2");
+ //Create a PageLayout object.
+ PageLayout pageLayout=pageLayoutService.getPageLayoutByCode(userPageLayout);
//Create regions
List<Region> regions=new ArrayList<Region>();
- Region region1=new Region();
- Region region2=new Region();
- regions.add(region1);
- regions.add(region2);
+ int regionCount;
+ for (regionCount = 0; regionCount < pageLayout.getNumberOfRegions(); regionCount++) {
+ Region region = new Region();
+ regions.add(region);
+ }
//Create a Page object and register it.
Page page=new Page();
Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java?rev=1153319&r1=1153318&r2=1153319&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java (original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java Wed Aug 3 01:39:57 2011
@@ -19,8 +19,6 @@
package org.apache.rave.portal.web.controller;
-import java.util.List;
-
import org.apache.rave.portal.model.NewUser;
import org.apache.rave.portal.service.NewAccountService;
import org.apache.rave.portal.web.util.ModelKeys;
@@ -33,11 +31,9 @@ import org.springframework.stereotype.Co
import org.springframework.ui.Model;
import org.springframework.ui.ModelMap;
import org.springframework.validation.BindingResult;
-import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
@Controller
@@ -63,7 +59,7 @@ public class NewAccountController {
}
@RequestMapping(value = { "/newaccount","/newacount/*"}, method = RequestMethod.POST)
- public String create(@ModelAttribute NewUser newUser, BindingResult results, Model model,@RequestParam String username, @RequestParam String password){
+ public String create(@ModelAttribute NewUser newUser, BindingResult results, Model model){
logger.debug("Creating a new user account");
model.addAttribute(ModelKeys.NEW_USER,newUser);
@@ -77,8 +73,7 @@ public class NewAccountController {
//Now attempt to create the account.
try {
logger.debug("newaccount.jsp: passed form validation");
-
- newAccountService.createNewAccount(username,password);
+ newAccountService.createNewAccount(newUser.getUsername(),newUser.getPassword(),newUser.getPageLayout());
//TODO: change this to a viewname (done)
return ViewNames.REDIRECT;
}
Modified: incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/newaccount.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/newaccount.jsp?rev=1153319&r1=1153318&r2=1153319&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/newaccount.jsp (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/newaccount.jsp Wed Aug 3 01:39:57 2011
@@ -1,4 +1,4 @@
-<%--
+<sele%--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -43,6 +43,18 @@
<form:input id="passwordConfirmField" type="password" path="confirmPassword" required="required"/>
<form:errors path="confirmPassword" cssClass="error" />
</p>
+ <p>
+ <label for="pageLayoutField">Select Page Layout:</label>
+ <form:select path="pageLayout">
+ <form:option value="columns_1" id="columns_1_id">One Column</form:option>
+ <form:option value="columns_2" id="columns_2_id" selected="selected" xmlns="default namespace">Two Columns</form:option>
+ <form:option value="columns_2wn" id="columns_2wn_id">Two Columns (wide/narrow)</form:option>
+ <form:option value="columns_3" id="columns_3_id">Three Columns</form:option>
+ <form:option value="columns_3nwn" id="columns_3nwn_id">Three Columns (narrow/wide/narrow)</form:option>
+ <form:option value="columns_4" id="columns_4_id">Four Columns</form:option>
+ <form:option value="columns_3nwn_1_bottom" id="columns_3nwn_1_bottom">Four Columns (narrow/wide/narrow/bottom)</form:option>
+ </form:select>
+ </p>
</fieldset>
<fieldset>
<input type="submit" value="Create Account" />
Modified: incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java?rev=1153319&r1=1153318&r2=1153319&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java (original)
+++ incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java Wed Aug 3 01:39:57 2011
@@ -102,7 +102,7 @@ public class NewAccountControllerTest {
expect(errors.getAllErrors()).andReturn(errorList).anyTimes();
replay(errors);
- String result = new String(newAccountController.create(newUser, errors, model, username, password));
+ String result = new String(newAccountController.create(newUser, errors, model));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(1));
@@ -138,7 +138,7 @@ public class NewAccountControllerTest {
expect(userService.getUserByUsername(username)).andReturn(existingUser).anyTimes();
replay(userService);
- String result = new String(newAccountController.create(newUser, errors, model, username, password));
+ String result = new String(newAccountController.create(newUser, errors, model));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(1));
@@ -167,7 +167,7 @@ public class NewAccountControllerTest {
expect(errors.getAllErrors()).andReturn(errorList).anyTimes();
replay(errors);
- String result = new String(newAccountController.create(newUser, errors, model, username, password));
+ String result = new String(newAccountController.create(newUser, errors, model));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(1));
@@ -196,7 +196,7 @@ public class NewAccountControllerTest {
expect(errors.getAllErrors()).andReturn(errorList).anyTimes();
replay(errors);
- String result = new String(newAccountController.create(newUser, errors, model, username, password));
+ String result = new String(newAccountController.create(newUser, errors, model));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(2));
@@ -225,7 +225,7 @@ public class NewAccountControllerTest {
expect(errors.getAllErrors()).andReturn(errorList).anyTimes();
replay(errors);
- String result = new String(newAccountController.create(newUser, errors, model, username, password));
+ String result = new String(newAccountController.create(newUser, errors, model));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(1));
@@ -253,7 +253,7 @@ public class NewAccountControllerTest {
expect(errors.getAllErrors()).andReturn(errorList).anyTimes();
replay(errors);
- String result = new String(newAccountController.create(newUser, errors, model, username, password));
+ String result = new String(newAccountController.create(newUser, errors, model));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(1));
@@ -281,7 +281,7 @@ public class NewAccountControllerTest {
expect(errors.getAllErrors()).andReturn(errorList).anyTimes();
replay(errors);
- String result = new String(newAccountController.create(newUser, errors, model, username, password));
+ String result = new String(newAccountController.create(newUser, errors, model));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(1));
@@ -309,7 +309,7 @@ public class NewAccountControllerTest {
expect(errors.getAllErrors()).andReturn(errorList).anyTimes();
replay(errors);
- String result = new String(newAccountController.create(newUser, errors, model, username, password));
+ String result = new String(newAccountController.create(newUser, errors, model));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(1));
@@ -339,7 +339,7 @@ public class NewAccountControllerTest {
expect(errors.getAllErrors()).andReturn(errorList).anyTimes();
replay(errors);
- String result = new String(newAccountController.create(newUser, errors, model, username, password));
+ String result = new String(newAccountController.create(newUser, errors, model));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(3));
@@ -367,7 +367,7 @@ public class NewAccountControllerTest {
expect(errors.getAllErrors()).andReturn(errorList).anyTimes();
replay(errors);
- String result = new String(newAccountController.create(newUser, errors, model, username, password));
+ String result = new String(newAccountController.create(newUser, errors, model));
errorList = errors.getAllErrors();
assertThat(errorList.size(), CoreMatchers.equalTo(0));