You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ca...@apache.org on 2011/10/26 23:06:57 UTC
svn commit: r1189460 - in /incubator/rave/trunk:
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
rave-components/rave-core/src/main/java/org/apache/rave/portal/service/
rave-components/rave-core/src/main/java/org/apache/rave/porta...
Author: carlucci
Date: Wed Oct 26 21:06:55 2011
New Revision: 1189460
URL: http://svn.apache.org/viewvc?rev=1189460&view=rev
Log:
RAVE-303: refactor usage of PageService.addNewDefaultPage for security reasons. New Behavior - when a new user is registered a default page is no longer created at registration time. Now, anytime the PageController is hit and the user has zero existing pages, a new default page will be created for the user. I also moved the service tests into the impl package since they were incorrectly located.
Added:
incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/
incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java
- copied, changed from r1189333, incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/DefaultAuthorityServiceTest.java
incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java
- copied, changed from r1189333, incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/NewAccountServiceTest.java
incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
- copied, changed from r1189333, incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/PageServiceTest.java
incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java
- copied, changed from r1189333, incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/RegionWidgetServiceTest.java
incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java
- copied, changed from r1189333, incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/UserServiceTest.java
incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingServiceTest.java
- copied, changed from r1189333, incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/DefaultWidgetRatingServiceTest.java
incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java
- copied, changed from r1189333, incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/DefaultWidgetServiceTest.java
Removed:
incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/DefaultAuthorityServiceTest.java
incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/DefaultWidgetRatingServiceTest.java
incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/DefaultWidgetServiceTest.java
incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/NewAccountServiceTest.java
incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/PageServiceTest.java
incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/RegionWidgetServiceTest.java
incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/UserServiceTest.java
Modified:
incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java
incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
incubator/rave/trunk/rave-components/rave-core/src/test/resources/test_data.sql
incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java
incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java
incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
incubator/rave/trunk/rave-portal/src/test/resources/test-data.sql
Modified: incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java?rev=1189460&r1=1189459&r2=1189460&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java Wed Oct 26 21:06:55 2011
@@ -41,6 +41,7 @@ import javax.persistence.Transient;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
+import javax.persistence.ManyToOne;
/**
* {@inheritDoc}
@@ -108,7 +109,11 @@ public class User implements UserDetails
@Basic
@Column(name = "openid")
- private String openId;
+ private String openId;
+
+ @ManyToOne
+ @JoinColumn(name="default_page_layout_id")
+ private PageLayout defaultPageLayout;
@Transient
private String confirmPassword;
@@ -264,6 +269,14 @@ public class User implements UserDetails
public void setOpenId(String openId) {
this.openId = openId;
}
+
+ public PageLayout getDefaultPageLayout() {
+ return defaultPageLayout;
+ }
+
+ public void setDefaultPageLayout(PageLayout defaultPageLayout) {
+ this.defaultPageLayout = defaultPageLayout;
+ }
public String getConfirmPassword() {
//confirmPassword is not stored persistently, so if the value is not set,
Modified: incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java?rev=1189460&r1=1189459&r2=1189460&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java Wed Oct 26 21:06:55 2011
@@ -21,24 +21,12 @@ package org.apache.rave.portal.service;
import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.Region;
import org.apache.rave.portal.model.RegionWidget;
-import org.apache.rave.portal.model.User;
import java.util.List;
import org.springframework.security.access.prepost.PostAuthorize;
import org.springframework.security.access.prepost.PreAuthorize;
/**
- * TODO:
- * 1) RAVE-303: Protect addNewDefaultPage once the code has been re-factored to call
- * this method from PageController when there are 0 pages for a user instead
- * of calling it from DefaultNewAccountService (the user is not authenticated
- * at that point)
- *
- * 2) Protect the rest of the non Page object related methods here after writing
- * the associated Default<Model>PermissionEvaluator classes. Also,
- * determine if those functions should be re-factored into more appropriate
- * service classes
- *
* @author carlucci
*/
public interface PageService {
@@ -70,6 +58,14 @@ public interface PageService {
Page getPageFromList(long pageId, List<Page> pages);
/**
+ * Given a List of Page objects, return the default one
+ *
+ * @param pages the List of Page objects
+ * @return the default Page in the list
+ */
+ Page getDefaultPageFromList(List<Page> pages);
+
+ /**
* Creates a new page with the supplied pageName and pageLayoutCode
*
* @param pageName the name of the new page
@@ -80,20 +76,15 @@ public interface PageService {
Page addNewPage(String pageName, String pageLayoutCode);
/**
- * Creates a new default page for the supplied user using the
- * supplied pageLayoutCode. This method should be used for new users
- * who just registered and need to create the default page
- *
- * @param user
- * @param pageLayoutCode
- * @return
- */
- // TODO: RAVE-303: addNewDefaultPage is currently not security protected because
- // the DefaultPagePermissionEvaluator requires an authenticated user.
- // This function should be called in PageController if the user has
- // 0 pages instead of calling it in DefaultNewAccountService. Once
- // refactored there we can protect this method
- Page addNewDefaultPage(User user, String pageLayoutCode);
+ * Creates a new default page for the supplied user, and uses the
+ * defaultPageLayout attribute of the User to determine the layout of the
+ * new page.
+ *
+ * @param userId the entityId of the user to create a default page for
+ * @return the new default Page object for the user
+ */
+ @PreAuthorize("hasPermission(new org.apache.rave.portal.security.impl.RaveSecurityContext(#userId, 'org.apache.rave.portal.model.User'), 'org.apache.rave.portal.model.Page', 'create')")
+ Page addNewDefaultPage(long userId);
/**
* Get the default page name used by Rave
Modified: incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java?rev=1189460&r1=1189459&r2=1189460&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java Wed Oct 26 21:06:55 2011
@@ -62,7 +62,7 @@ public class DefaultNewAccountService im
public void createNewAccount(NewUser newUser) throws Exception {
final String userName = newUser.getUsername();
final String password = newUser.getPassword();
- final String userPageLayout = newUser.getPageLayout();
+ final String defaultPageLayoutCode = newUser.getPageLayout();
final String email = newUser.getEmail();
throwExceptionIfUserExists(userName, email);
@@ -72,17 +72,16 @@ public class DefaultNewAccountService im
user.setEmail(email);
//This assumes we use the username for the salt. If not, the code below will need to change.
//See also applicationContext-security.xml
- String saltedHashedPassword=passwordEncoder.encodePassword(password,saltSource.getSalt(user));
- logger.debug("Salt Source: {}", saltSource.getSalt(user));
+ Object salt = saltSource.getSalt(user);
+ String saltedHashedPassword=passwordEncoder.encodePassword(password, salt);
+ logger.debug("Salt Source: {}", salt);
user.setPassword(saltedHashedPassword);
user.setExpired(false);
user.setLocked(false);
user.setEnabled(true);
- userService.registerNewUser(user);
-
- // Return the newly registered user and create a new default page for them
- pageService.addNewDefaultPage(userService.getUserByUsername(user.getUsername()), userPageLayout);
+ user.setDefaultPageLayout(pageLayoutService.getPageLayoutByCode(defaultPageLayoutCode));
+ userService.registerNewUser(user);
}
private void throwExceptionIfUserExists(String userName, String email) {
Modified: incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java?rev=1189460&r1=1189459&r2=1189460&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java Wed Oct 26 21:06:55 2011
@@ -88,6 +88,12 @@ public class DefaultPageService implemen
}
@Override
+ public Page getDefaultPageFromList(List<Page> pages) {
+ // the first sequenced ordered page is considered the user's default page
+ return (pages == null || pages.isEmpty()) ? null : pages.get(0);
+ }
+
+ @Override
@Transactional
public Page addNewPage(String pageName, String pageLayoutCode) {
return addNewPage(userService.getAuthenticatedUser(), pageName, pageLayoutCode);
@@ -95,8 +101,9 @@ public class DefaultPageService implemen
@Override
@Transactional
- public Page addNewDefaultPage(User user, String pageLayoutCode) {
- return addNewPage(user, defaultPageName, pageLayoutCode);
+ public Page addNewDefaultPage(long userId) {
+ User user = userService.getUserById(userId);
+ return addNewPage(user, defaultPageName, user.getDefaultPageLayout().getCode());
}
@Override
Copied: incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java (from r1189333, incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/DefaultAuthorityServiceTest.java)
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java?p2=incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java&p1=incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/DefaultAuthorityServiceTest.java&r1=1189333&r2=1189460&rev=1189460&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/DefaultAuthorityServiceTest.java (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java Wed Oct 26 21:06:55 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.service;
+package org.apache.rave.portal.service.impl;
import org.apache.rave.portal.model.Authority;
import org.apache.rave.portal.model.util.SearchResult;
@@ -29,6 +29,7 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
+import org.apache.rave.portal.service.AuthorityService;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNull;
import static org.easymock.EasyMock.createMock;
Copied: incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java (from r1189333, incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/NewAccountServiceTest.java)
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java?p2=incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java&p1=incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/NewAccountServiceTest.java&r1=1189333&r2=1189460&rev=1189460&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/NewAccountServiceTest.java (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java Wed Oct 26 21:06:55 2011
@@ -17,12 +17,16 @@
* under the License.
*/
-package org.apache.rave.portal.service;
+package org.apache.rave.portal.service.impl;
import org.apache.rave.portal.model.NewUser;
import org.apache.rave.portal.model.PageLayout;
import org.apache.rave.portal.model.User;
-import org.apache.rave.portal.service.impl.DefaultNewAccountService;
+import org.apache.rave.portal.service.NewAccountService;
+import org.apache.rave.portal.service.PageLayoutService;
+import org.apache.rave.portal.service.PageService;
+import org.apache.rave.portal.service.RegionService;
+import org.apache.rave.portal.service.UserService;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
@@ -33,54 +37,80 @@ import org.springframework.security.core
import org.springframework.test.util.ReflectionTestUtils;
import static junit.framework.Assert.fail;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.*;
/**
* Test class for {@link org.apache.rave.portal.service.impl.DefaultNewAccountService}
*/
-public class NewAccountServiceTest {
+public class DefaultNewAccountServiceTest {
private UserService userService;
private PageLayoutService pageLayoutService;
-
+ private PageService pageService;
+ private RegionService regionService;
private NewAccountService newAccountService;
+ private SaltSource saltSource;
+ private UserDetails userDetails;
+ private PasswordEncoder passwordEncoder;
+
+ private final String VALID_USER = "valid.user";
+ private final String VALID_PASSWORD = "valid.password";
+ private final String VALID_LAYOUT_CODE = "valid.layout";
+ private final String VALID_EMAIL = "valid.email";
+ private PageLayout validPageLayout;
+
+ private final Logger logger = LoggerFactory.getLogger(DefaultNewAccountServiceTest.class);
- private final Logger logger = LoggerFactory.getLogger(NewAccountServiceTest.class);
+ @Before
+ public void setup() {
+ userService = createMock(UserService.class);
+ pageService = createMock(PageService.class);
+ pageLayoutService = createMock(PageLayoutService.class);
+ regionService = createMock(RegionService.class);
+ saltSource = createMock(SaltSource.class);
+ userDetails = createMock(UserDetails.class);
+ passwordEncoder = createMock(PasswordEncoder.class);
+ newAccountService = new DefaultNewAccountService(userService, pageService, pageLayoutService, regionService);
+
+ validPageLayout = new PageLayout();
+ validPageLayout.setEntityId(99L);
+ validPageLayout.setNumberOfRegions(4L);
+ validPageLayout.setCode(VALID_LAYOUT_CODE);
+ }
+
@Test
public void createNewAccountTest() throws Exception {
- String validUser = "valid.user";
- String validPass = "valid.password";
- String validLayout = "valid.layout";
- String validEmail = "valid.email";
-
NewUser newUser = new NewUser();
- newUser.setUsername(validUser);
- newUser.setPassword(validPass);
- newUser.setConfirmPassword(validPass);
- newUser.setEmail(validEmail);
-
-
- SaltSource saltSource = createNiceMock(SaltSource.class);
- UserDetails userDetails = createNiceMock(UserDetails.class);
- expect(userDetails.getUsername()).andReturn("valid.user");
- expect(userDetails.getPassword()).andReturn("valid.password");
- expect(saltSource.getSalt(userDetails)).andReturn("salt");
- PasswordEncoder passwordEncoder = createNiceMock(PasswordEncoder.class);
- expect(passwordEncoder.encodePassword("valid.password", "salt")).andReturn("valid.password");
- replay(saltSource, userDetails, passwordEncoder);
-
+ newUser.setUsername(VALID_USER);
+ newUser.setPassword(VALID_PASSWORD);
+ newUser.setConfirmPassword(VALID_PASSWORD);
+ newUser.setEmail(VALID_EMAIL);
+ newUser.setPageLayout(VALID_LAYOUT_CODE);
+
+ User expectedUser = new User();
+ expectedUser.setUsername(newUser.getUsername());
+ expectedUser.setPassword(newUser.getPassword());
+ expectedUser.setEmail(newUser.getEmail());
+ expectedUser.setDefaultPageLayout(validPageLayout);
+ expectedUser.setExpired(false);
+ expectedUser.setLocked(false);
+ expectedUser.setEnabled(true);
+
ReflectionTestUtils.setField(newAccountService, "saltSource", saltSource);
ReflectionTestUtils.setField(newAccountService, "passwordEncoder", passwordEncoder);
-
- expect(userService.getUserByUsername(validUser)).andReturn(null);
- PageLayout pageLayout = new PageLayout();
- pageLayout.setNumberOfRegions(4L);
- expect(pageLayoutService.getPageLayoutByCode(validLayout)).andReturn(pageLayout);
- replay(userService, pageLayoutService);
-
+
+ expect(saltSource.getSalt(anyObject(UserDetails.class))).andReturn("salt");
+ expect(passwordEncoder.encodePassword("valid.password", "salt")).andReturn("valid.password");
+ expect(userService.getUserByUsername(VALID_USER)).andReturn(null);
+ expect(userService.getUserByEmail(VALID_EMAIL)).andReturn(null);
+ expect(pageLayoutService.getPageLayoutByCode(VALID_LAYOUT_CODE)).andReturn(validPageLayout);
+ userService.registerNewUser(expectedUser);
+ expectLastCall();
+ replay(saltSource, userDetails, passwordEncoder, userService, pageLayoutService);
+
newAccountService.createNewAccount(newUser);
+
+ verify(saltSource, userDetails, passwordEncoder, userService, pageLayoutService);
}
@Test
@@ -124,14 +154,4 @@ public class NewAccountServiceTest {
}
- @Before
- public void setup() {
- userService = createNiceMock(UserService.class);
- PageService pageService = createNiceMock(PageService.class);
- pageLayoutService = createNiceMock(PageLayoutService.class);
- RegionService regionService = createNiceMock(RegionService.class);
-
- newAccountService = new DefaultNewAccountService(userService, pageService, pageLayoutService, regionService);
-
- }
}
\ No newline at end of file
Copied: incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java (from r1189333, incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/PageServiceTest.java)
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java?p2=incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java&p1=incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/PageServiceTest.java&r1=1189333&r2=1189460&rev=1189460&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/PageServiceTest.java (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java Wed Oct 26 21:06:55 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.service;
+package org.apache.rave.portal.service.impl;
import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.PageLayout;
@@ -38,11 +38,13 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
+import org.apache.rave.portal.service.PageService;
+import org.apache.rave.portal.service.UserService;
import static org.easymock.EasyMock.*;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
-public class PageServiceTest {
+public class DefaultPageServiceTest {
private PageService pageService;
private PageRepository pageRepository;
@@ -98,15 +100,16 @@ public class PageServiceTest {
originalRegion.getRegionWidgets().add(new RegionWidget(5L, validWidget, targetRegion, 1));
originalRegion.getRegionWidgets().add(new RegionWidget(6L, validWidget, targetRegion, 2));
- user = new User();
- user.setEntityId(1L);
- user.setUsername("acarlucci");
-
pageLayout = new PageLayout();
pageLayout.setEntityId(1L);
pageLayout.setCode(PAGE_LAYOUT_CODE);
pageLayout.setNumberOfRegions(3L);
+ user = new User();
+ user.setEntityId(1L);
+ user.setUsername("acarlucci");
+ user.setDefaultPageLayout(pageLayout);
+
page = new Page(PAGE_ID, user);
page.setRenderSequence(1L);
page2 = new Page(99L, user);
@@ -201,19 +204,18 @@ public class PageServiceTest {
expectedPage.setRenderSequence(EXPECTED_RENDER_SEQUENCE);
expectedPage.setRegions(createEmptyRegionList(pageLayout.getNumberOfRegions()));
+ expect(userService.getUserById(user.getEntityId())).andReturn(user);
expect(pageLayoutRepository.getByPageLayoutCode(PAGE_LAYOUT_CODE)).andReturn(pageLayout);
expect(pageRepository.save(expectedPage)).andReturn(expectedPage);
expect(pageRepository.getAllPages(user.getEntityId())).andReturn(new ArrayList<Page>());
- replay(pageLayoutRepository);
- replay(pageRepository);
+ replay(userService, pageLayoutRepository, pageRepository);
- Page newPage = pageService.addNewDefaultPage(user, PAGE_LAYOUT_CODE);
+ Page newPage = pageService.addNewDefaultPage(user.getEntityId());
assertThat(newPage.getRenderSequence(), is(EXPECTED_RENDER_SEQUENCE));
assertThat(newPage.getName(), is(defaultPageName));
assertThat(newPage.getRegions().size(), is(pageLayout.getNumberOfRegions().intValue()));
- verify(pageLayoutRepository);
- verify(pageRepository);
+ verify(pageLayoutRepository, pageRepository);
}
@Test
@@ -448,7 +450,22 @@ public class PageServiceTest {
public void getPageFromList_invalidId() {
assertThat(pageService.getPageFromList(INVALID_PAGE_ID, pageList), is(nullValue(Page.class)));
}
-
+
+ @Test
+ public void getDefaultPageFromList_validList() {
+ assertThat(pageService.getDefaultPageFromList(pageList), is(page2));
+ }
+
+ @Test
+ public void getDefaultPageFromList_emptyList() {
+ assertThat(pageService.getDefaultPageFromList(new ArrayList<Page>()), is(nullValue(Page.class)));
+ }
+
+ @Test
+ public void getDefaultPageFromList_nullList() {
+ assertThat(pageService.getDefaultPageFromList(null), is(nullValue(Page.class)));
+ }
+
@Test
public void movePage() {
expect(userService.getAuthenticatedUser()).andReturn(user);
Copied: incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java (from r1189333, incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/RegionWidgetServiceTest.java)
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java?p2=incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java&p1=incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/RegionWidgetServiceTest.java&r1=1189333&r2=1189460&rev=1189460&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/RegionWidgetServiceTest.java (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java Wed Oct 26 21:06:55 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.service;
+package org.apache.rave.portal.service.impl;
import org.apache.commons.lang.StringUtils;
import org.apache.rave.portal.model.RegionWidget;
@@ -33,11 +33,12 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.rave.portal.service.RegionWidgetService;
import static org.easymock.EasyMock.*;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
-public class RegionWidgetServiceTest {
+public class DefaultRegionWidgetServiceTest {
private RegionWidgetRepository regionWidgetRepository;
private RegionWidgetService regionWidgetService;
Copied: incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java (from r1189333, incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/UserServiceTest.java)
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java?p2=incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java&p1=incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/UserServiceTest.java&r1=1189333&r2=1189460&rev=1189460&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/UserServiceTest.java (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java Wed Oct 26 21:06:55 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.service;
+package org.apache.rave.portal.service.impl;
import org.apache.rave.portal.model.Authority;
import org.apache.rave.portal.model.User;
@@ -39,6 +39,7 @@ import org.springframework.security.core
import java.util.ArrayList;
import java.util.List;
+import org.apache.rave.portal.service.UserService;
import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
@@ -49,7 +50,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
-public class UserServiceTest {
+public class DefaultUserServiceTest {
private static final Long USER_ID = 1234L;
private UserService service;
Copied: incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingServiceTest.java (from r1189333, incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/DefaultWidgetRatingServiceTest.java)
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingServiceTest.java?p2=incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingServiceTest.java&p1=incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/DefaultWidgetRatingServiceTest.java&r1=1189333&r2=1189460&rev=1189460&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/DefaultWidgetRatingServiceTest.java (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingServiceTest.java Wed Oct 26 21:06:55 2011
@@ -17,10 +17,11 @@
* under the License.
*/
-package org.apache.rave.portal.service;
+package org.apache.rave.portal.service.impl;
import org.apache.rave.portal.model.WidgetRating;
import org.apache.rave.portal.repository.WidgetRatingRepository;
+import org.apache.rave.portal.service.WidgetRatingService;
import org.apache.rave.portal.service.impl.DefaultWidgetRatingService;
import org.junit.Before;
import org.junit.Test;
Copied: incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java (from r1189333, incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/DefaultWidgetServiceTest.java)
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java?p2=incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java&p1=incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/DefaultWidgetServiceTest.java&r1=1189333&r2=1189460&rev=1189460&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/DefaultWidgetServiceTest.java (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java Wed Oct 26 21:06:55 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.rave.portal.service;
+package org.apache.rave.portal.service.impl;
import org.apache.rave.portal.model.Widget;
import org.apache.rave.portal.model.WidgetRating;
@@ -31,6 +31,8 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
+import org.apache.rave.portal.service.WidgetRatingService;
+import org.apache.rave.portal.service.WidgetService;
import static junit.framework.Assert.assertTrue;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.createNiceMock;
Modified: incubator/rave/trunk/rave-components/rave-core/src/test/resources/test_data.sql
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/test/resources/test_data.sql?rev=1189460&r1=1189459&r2=1189460&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/test/resources/test_data.sql (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/test/resources/test_data.sql Wed Oct 26 21:06:55 2011
@@ -85,69 +85,69 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
-- ***********************************************************************************
--- start user data ---
set @user_id_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_1, 'canonical', 'b97fd0fa25ba8a504309be2b6651ac6dee167ded', FALSE, FALSE, TRUE,'canonical@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_1, 'canonical', 'b97fd0fa25ba8a504309be2b6651ac6dee167ded', FALSE, FALSE, TRUE,'canonical@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_2 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_2, 'john.doe', '49e5f5c7c7ae8372af9b3063c493f080d16411f5', FALSE, FALSE, TRUE,'john.doe@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_2, 'john.doe', '49e5f5c7c7ae8372af9b3063c493f080d16411f5', FALSE, FALSE, TRUE,'john.doe@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_3 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_3, 'jane.doe', '30dd37e81704bbbd4e235c22990802ae25b187da', FALSE, FALSE, TRUE,'jane.doe@example.net');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_3, 'jane.doe', '30dd37e81704bbbd4e235c22990802ae25b187da', FALSE, FALSE, TRUE,'jane.doe@example.net', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_4 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_4, 'george.doe', '452802e3f2ff8b7b28785f50dfaaaaf80fc1430f', FALSE, FALSE, TRUE,'george.doe@example.org');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_4, 'george.doe', '452802e3f2ff8b7b28785f50dfaaaaf80fc1430f', FALSE, FALSE, TRUE,'george.doe@example.org', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_5 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_5,'mario.rossi', '8aadae9f6e73a479cb8a565bcfa6e8de2b074e89', FALSE, FALSE, TRUE,'mario.rossi@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_5,'mario.rossi', '8aadae9f6e73a479cb8a565bcfa6e8de2b074e89', FALSE, FALSE, TRUE,'mario.rossi@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_6 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_6, 'maija.m', '18550acca1b36af6cfa41c82e1caab12073475a1', FALSE, FALSE, TRUE,'maijam@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_6, 'maija.m', '18550acca1b36af6cfa41c82e1caab12073475a1', FALSE, FALSE, TRUE,'maijam@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_7 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_7, 'one.col', '07acee6193e84ba9ae2f7b2bf26538f2d6e4b0a1', FALSE, FALSE, TRUE,'one.col@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_7, 'one.col', '07acee6193e84ba9ae2f7b2bf26538f2d6e4b0a1', FALSE, FALSE, TRUE,'one.col@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_8 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_8, 'twown.col', '24159ea43cbcecb50021cd14a1d41a8079fd9714', FALSE, FALSE, TRUE,'twown.col@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_8, 'twown.col', '24159ea43cbcecb50021cd14a1d41a8079fd9714', FALSE, FALSE, TRUE,'twown.col@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_9 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_9, 'three.col', 'c736434430af90772bfd4351bffa3da04cec0403', FALSE, FALSE, TRUE,'three.col@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_9, 'three.col', 'c736434430af90772bfd4351bffa3da04cec0403', FALSE, FALSE, TRUE,'three.col@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_10 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_10, 'threewn.col', 'ad67065a5bc25f86036508971a09a58e9c9131e8', FALSE, FALSE, TRUE,'threewn.col@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_10, 'threewn.col', 'ad67065a5bc25f86036508971a09a58e9c9131e8', FALSE, FALSE, TRUE,'threewn.col@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_11 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_11, 'four.col', 'c875ce4416fc56cd34c01bd366a3af5468137155', FALSE, FALSE, TRUE,'four.col@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_11, 'four.col', 'c875ce4416fc56cd34c01bd366a3af5468137155', FALSE, FALSE, TRUE,'four.col@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_12 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_12, 'fourwn.col', 'eb0b450eff79a33027a41a05051f5609a83667e8', FALSE, FALSE, TRUE,'fourwn.col@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_12, 'fourwn.col', 'eb0b450eff79a33027a41a05051f5609a83667e8', FALSE, FALSE, TRUE,'fourwn.col@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
-- duplicate user id!!
set @user_id_13 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_13, 'http://rave2011.myopenid.com/', 'cdf15c184b7d2539b0cfc29ee9f10bad62793d50', FALSE, FALSE, TRUE,'rave2011_openid@example.org');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_13, 'http://rave2011.myopenid.com/', 'cdf15c184b7d2539b0cfc29ee9f10bad62793d50', FALSE, FALSE, TRUE,'rave2011_openid@example.org', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
--- end user data ---
Modified: incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java?rev=1189460&r1=1189459&r2=1189460&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java (original)
+++ incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java Wed Oct 26 21:06:55 2011
@@ -18,6 +18,7 @@
*/
package org.apache.rave.portal.web.controller;
+import java.util.ArrayList;
import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.PageService;
@@ -41,7 +42,6 @@ import java.util.List;
* @author carlucci
*/
@Controller
-//@RequestMapping(value={"/page/*","/index.html"})
public class PageController {
protected final Logger logger = LoggerFactory.getLogger(getClass());
@@ -56,9 +56,8 @@ public class PageController {
@RequestMapping(value = {"/page/view", "/index.html"}, method = RequestMethod.GET)
public String viewDefault(Model model) {
- User user = userService.getAuthenticatedUser();
- List<Page> pages = pageService.getAllPages(user.getEntityId());
- model.addAttribute(ModelKeys.PAGE, pages.get(0));
+ List<Page> pages = getAllPagesForAuthenticatedUser();
+ model.addAttribute(ModelKeys.PAGE, pageService.getDefaultPageFromList(pages));
model.addAttribute(ModelKeys.PAGES, pages);
return ViewNames.HOME;
}
@@ -68,11 +67,25 @@ public class PageController {
User user = userService.getAuthenticatedUser();
logger.debug("attempting to get pageId " + pageId + " for " + user);
- List<Page> pages = pageService.getAllPages(user.getEntityId());
+ List<Page> pages = getAllPagesForAuthenticatedUser();
Page page = pageService.getPageFromList(pageId, pages);
model.addAttribute(ModelKeys.PAGE, page);
model.addAttribute(ModelKeys.PAGES, pages);
return ViewNames.HOME;
}
-}
\ No newline at end of file
+
+ private List<Page> getAllPagesForAuthenticatedUser() {
+ User user = userService.getAuthenticatedUser();
+ long userId = user.getEntityId();
+ List<Page> pages = pageService.getAllPages(userId);
+ if (pages.isEmpty()) {
+ // create a new default page for the user
+ logger.info("user " + user.getUsername() + " does not have any pages - creating default page");
+ pageService.addNewDefaultPage(userId);
+ // refresh the pages list which will now have the new page
+ pages = pageService.getAllPages(userId);
+ }
+ return pages;
+ }
+}
Modified: incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java?rev=1189460&r1=1189459&r2=1189460&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java (original)
+++ incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java Wed Oct 26 21:06:55 2011
@@ -19,12 +19,12 @@
package org.apache.rave.portal.web.controller;
+import org.apache.rave.portal.model.PageLayout;
import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.PageService;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.web.util.ModelKeys;
-import org.hamcrest.CoreMatchers;
import org.junit.Before;
import org.junit.Test;
import org.springframework.ui.ExtendedModelMap;
@@ -33,6 +33,7 @@ import org.springframework.ui.Model;
import java.util.ArrayList;
import java.util.List;
+import static org.hamcrest.CoreMatchers.*;
import static org.easymock.EasyMock.*;
import static org.junit.Assert.assertThat;
@@ -49,6 +50,9 @@ public class PageControllerTest {
private final Long OTHER_PAGE_ID = 22L;
private final Long USER_ID = 1L;
private final String HOME_VIEW = "home";
+ private final String VALID_PAGE_LAYOUT_CODE = "layout98";
+ private User validUser;
+ private PageLayout validPageLayout;
@Before
public void setup() {
@@ -63,40 +67,84 @@ public class PageControllerTest {
allPages = new ArrayList<Page>();
allPages.add(defaultPage);
allPages.add(otherPage);
+
+ validPageLayout = new PageLayout();
+ validPageLayout.setEntityId(33L);
+ validPageLayout.setCode(VALID_PAGE_LAYOUT_CODE);
+
+ validUser = new User(USER_ID);
+ validUser.setDefaultPageLayout(validPageLayout);
}
@Test
public void view_pageId() {
- expect(userService.getAuthenticatedUser()).andReturn(new User(USER_ID));
+ expect(userService.getAuthenticatedUser()).andReturn(validUser).anyTimes();
expect(pageService.getAllPages(USER_ID)).andReturn(allPages);
expect(pageService.getPageFromList(OTHER_PAGE_ID, allPages)).andReturn(otherPage);
- replay(userService);
- replay(pageService);
+ replay(userService, pageService);
String results = pageController.view(OTHER_PAGE_ID, model);
- assertThat(results, CoreMatchers.equalTo(HOME_VIEW));
- assertThat((Page) model.asMap().get(ModelKeys.PAGE), CoreMatchers.sameInstance(otherPage));
- assertThat((List<Page>) model.asMap().get(ModelKeys.PAGES), CoreMatchers.sameInstance(allPages));
+ assertThat(results, equalTo(HOME_VIEW));
+ assertThat((Page) model.asMap().get(ModelKeys.PAGE), sameInstance(otherPage));
+ assertThat((List<Page>) model.asMap().get(ModelKeys.PAGES), sameInstance(allPages));
- verify(userService);
- verify(pageService);
+ verify(userService, pageService);
}
@Test
+ public void view_pageId_zeroExistingPages() {
+ List<Page> pages = new ArrayList<Page>();
+
+ assertThat(pages.isEmpty(), is(true));
+ expect(userService.getAuthenticatedUser()).andReturn(validUser).anyTimes();
+ expect(pageService.getAllPages(USER_ID)).andReturn(pages).times(2);
+ expect(pageService.addNewDefaultPage(validUser.getEntityId())).andReturn(defaultPage);
+ expect(pageService.getPageFromList(OTHER_PAGE_ID, pages)).andReturn(defaultPage);
+ replay(userService, pageService);
+
+ String results = pageController.view(OTHER_PAGE_ID, model);
+
+ assertThat(results, equalTo(HOME_VIEW));
+ assertThat((Page) model.asMap().get(ModelKeys.PAGE), sameInstance(defaultPage));
+ assertThat((List<Page>) model.asMap().get(ModelKeys.PAGES), sameInstance(pages));
+
+ verify(userService, pageService);
+ }
+
+ @Test
public void viewDefault_pageId() {
- expect(userService.getAuthenticatedUser()).andReturn(new User(USER_ID));
+ expect(userService.getAuthenticatedUser()).andReturn(validUser).anyTimes();
expect(pageService.getAllPages(USER_ID)).andReturn(allPages);
- replay(userService);
- replay(pageService);
+ expect(pageService.getDefaultPageFromList(allPages)).andReturn(defaultPage);
+ replay(userService, pageService);
String results = pageController.viewDefault(model);
- assertThat(results, CoreMatchers.equalTo(HOME_VIEW));
- assertThat((Page) model.asMap().get(ModelKeys.PAGE), CoreMatchers.sameInstance(defaultPage));
- assertThat((List<Page>) model.asMap().get(ModelKeys.PAGES), CoreMatchers.sameInstance(allPages));
+ assertThat(results, equalTo(HOME_VIEW));
+ assertThat((Page) model.asMap().get(ModelKeys.PAGE), sameInstance(defaultPage));
+ assertThat((List<Page>) model.asMap().get(ModelKeys.PAGES), sameInstance(allPages));
- verify(userService);
- verify(pageService);
+ verify(userService, pageService);
}
+
+ @Test
+ public void viewDefault_pageId_zeroExistingPages() {
+ List<Page> pages = new ArrayList<Page>();
+
+ assertThat(pages.isEmpty(), is(true));
+ expect(userService.getAuthenticatedUser()).andReturn(validUser).anyTimes();
+ expect(pageService.getAllPages(USER_ID)).andReturn(pages).times(2);
+ expect(pageService.addNewDefaultPage(validUser.getEntityId())).andReturn(defaultPage);
+ expect(pageService.getDefaultPageFromList(pages)).andReturn(defaultPage);
+ replay(userService, pageService);
+
+ String results = pageController.viewDefault(model);
+
+ assertThat(results, equalTo(HOME_VIEW));
+ assertThat((Page) model.asMap().get(ModelKeys.PAGE), sameInstance(defaultPage));
+ assertThat((List<Page>) model.asMap().get(ModelKeys.PAGES), sameInstance(pages));
+
+ verify(userService, pageService);
+ }
}
\ No newline at end of file
Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql?rev=1189460&r1=1189459&r2=1189460&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql Wed Oct 26 21:06:55 2011
@@ -82,69 +82,69 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
-- ***********************************************************************************
--- start user data ---
set @user_id_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_1, 'canonical', 'b97fd0fa25ba8a504309be2b6651ac6dee167ded', FALSE, FALSE, TRUE,'canonical@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_1, 'canonical', 'b97fd0fa25ba8a504309be2b6651ac6dee167ded', FALSE, FALSE, TRUE,'canonical@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_2 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_2, 'john.doe', '49e5f5c7c7ae8372af9b3063c493f080d16411f5', FALSE, FALSE, TRUE,'john.doe@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_2, 'john.doe', '49e5f5c7c7ae8372af9b3063c493f080d16411f5', FALSE, FALSE, TRUE,'john.doe@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_3 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_3, 'jane.doe', '30dd37e81704bbbd4e235c22990802ae25b187da', FALSE, FALSE, TRUE,'jane.doe@example.net');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_3, 'jane.doe', '30dd37e81704bbbd4e235c22990802ae25b187da', FALSE, FALSE, TRUE,'jane.doe@example.net', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_4 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_4, 'george.doe', '452802e3f2ff8b7b28785f50dfaaaaf80fc1430f', FALSE, FALSE, TRUE,'george.doe@example.org');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_4, 'george.doe', '452802e3f2ff8b7b28785f50dfaaaaf80fc1430f', FALSE, FALSE, TRUE,'george.doe@example.org', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_5 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_5,'mario.rossi', '8aadae9f6e73a479cb8a565bcfa6e8de2b074e89', FALSE, FALSE, TRUE,'mario.rossi@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_5,'mario.rossi', '8aadae9f6e73a479cb8a565bcfa6e8de2b074e89', FALSE, FALSE, TRUE,'mario.rossi@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_6 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_6, 'maija.m', '18550acca1b36af6cfa41c82e1caab12073475a1', FALSE, FALSE, TRUE,'maijam@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_6, 'maija.m', '18550acca1b36af6cfa41c82e1caab12073475a1', FALSE, FALSE, TRUE,'maijam@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_7 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_7, 'one.col', '07acee6193e84ba9ae2f7b2bf26538f2d6e4b0a1', FALSE, FALSE, TRUE,'one.col@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_7, 'one.col', '07acee6193e84ba9ae2f7b2bf26538f2d6e4b0a1', FALSE, FALSE, TRUE,'one.col@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_8 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_8, 'twown.col', '24159ea43cbcecb50021cd14a1d41a8079fd9714', FALSE, FALSE, TRUE,'twown.col@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_8, 'twown.col', '24159ea43cbcecb50021cd14a1d41a8079fd9714', FALSE, FALSE, TRUE,'twown.col@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_9 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_9, 'three.col', 'c736434430af90772bfd4351bffa3da04cec0403', FALSE, FALSE, TRUE,'three.col@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_9, 'three.col', 'c736434430af90772bfd4351bffa3da04cec0403', FALSE, FALSE, TRUE,'three.col@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_10 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_10, 'threewn.col', 'ad67065a5bc25f86036508971a09a58e9c9131e8', FALSE, FALSE, TRUE,'threewn.col@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_10, 'threewn.col', 'ad67065a5bc25f86036508971a09a58e9c9131e8', FALSE, FALSE, TRUE,'threewn.col@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_11 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_11, 'four.col', 'c875ce4416fc56cd34c01bd366a3af5468137155', FALSE, FALSE, TRUE,'four.col@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_11, 'four.col', 'c875ce4416fc56cd34c01bd366a3af5468137155', FALSE, FALSE, TRUE,'four.col@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_12 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_12, 'fourwn.col', 'eb0b450eff79a33027a41a05051f5609a83667e8', FALSE, FALSE, TRUE,'fourwn.col@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_12, 'fourwn.col', 'eb0b450eff79a33027a41a05051f5609a83667e8', FALSE, FALSE, TRUE,'fourwn.col@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
-- duplicate user id!!
set @user_id_13 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_13, 'http://rave2011.myopenid.com/', 'cdf15c184b7d2539b0cfc29ee9f10bad62793d50', FALSE, FALSE, TRUE,'rave2011_openid@example.org');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_13, 'http://rave2011.myopenid.com/', 'cdf15c184b7d2539b0cfc29ee9f10bad62793d50', FALSE, FALSE, TRUE,'rave2011_openid@example.org', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
--- end user data ---
Modified: incubator/rave/trunk/rave-portal/src/test/resources/test-data.sql
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/resources/test-data.sql?rev=1189460&r1=1189459&r2=1189460&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/resources/test-data.sql (original)
+++ incubator/rave/trunk/rave-portal/src/test/resources/test-data.sql Wed Oct 26 21:06:55 2011
@@ -81,69 +81,69 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
-- ***********************************************************************************
--- start user data ---
set @user_id_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_1, 'canonical', 'b97fd0fa25ba8a504309be2b6651ac6dee167ded', FALSE, FALSE, TRUE,'canonical@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_1, 'canonical', 'b97fd0fa25ba8a504309be2b6651ac6dee167ded', FALSE, FALSE, TRUE,'canonical@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_2 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_2, 'john.doe', '49e5f5c7c7ae8372af9b3063c493f080d16411f5', FALSE, FALSE, TRUE,'john.doe@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_2, 'john.doe', '49e5f5c7c7ae8372af9b3063c493f080d16411f5', FALSE, FALSE, TRUE,'john.doe@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_3 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_3, 'jane.doe', '30dd37e81704bbbd4e235c22990802ae25b187da', FALSE, FALSE, TRUE,'jane.doe@example.net');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_3, 'jane.doe', '30dd37e81704bbbd4e235c22990802ae25b187da', FALSE, FALSE, TRUE,'jane.doe@example.net', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_4 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_4, 'george.doe', '452802e3f2ff8b7b28785f50dfaaaaf80fc1430f', FALSE, FALSE, TRUE,'george.doe@example.org');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_4, 'george.doe', '452802e3f2ff8b7b28785f50dfaaaaf80fc1430f', FALSE, FALSE, TRUE,'george.doe@example.org', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_5 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_5,'mario.rossi', '8aadae9f6e73a479cb8a565bcfa6e8de2b074e89', FALSE, FALSE, TRUE,'mario.rossi@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_5,'mario.rossi', '8aadae9f6e73a479cb8a565bcfa6e8de2b074e89', FALSE, FALSE, TRUE,'mario.rossi@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_6 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_6, 'maija.m', '18550acca1b36af6cfa41c82e1caab12073475a1', FALSE, FALSE, TRUE,'maijam@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_6, 'maija.m', '18550acca1b36af6cfa41c82e1caab12073475a1', FALSE, FALSE, TRUE,'maijam@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_7 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_7, 'one.col', '07acee6193e84ba9ae2f7b2bf26538f2d6e4b0a1', FALSE, FALSE, TRUE,'one.col@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_7, 'one.col', '07acee6193e84ba9ae2f7b2bf26538f2d6e4b0a1', FALSE, FALSE, TRUE,'one.col@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_8 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_8, 'twown.col', '24159ea43cbcecb50021cd14a1d41a8079fd9714', FALSE, FALSE, TRUE,'twown.col@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_8, 'twown.col', '24159ea43cbcecb50021cd14a1d41a8079fd9714', FALSE, FALSE, TRUE,'twown.col@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_9 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_9, 'three.col', 'c736434430af90772bfd4351bffa3da04cec0403', FALSE, FALSE, TRUE,'three.col@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_9, 'three.col', 'c736434430af90772bfd4351bffa3da04cec0403', FALSE, FALSE, TRUE,'three.col@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_10 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_10, 'threewn.col', 'ad67065a5bc25f86036508971a09a58e9c9131e8', FALSE, FALSE, TRUE,'threewn.col@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_10, 'threewn.col', 'ad67065a5bc25f86036508971a09a58e9c9131e8', FALSE, FALSE, TRUE,'threewn.col@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_11 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_11, 'four.col', 'c875ce4416fc56cd34c01bd366a3af5468137155', FALSE, FALSE, TRUE,'four.col@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_11, 'four.col', 'c875ce4416fc56cd34c01bd366a3af5468137155', FALSE, FALSE, TRUE,'four.col@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_12 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_12, 'fourwn.col', 'eb0b450eff79a33027a41a05051f5609a83667e8', FALSE, FALSE, TRUE,'fourwn.col@example.com');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_12, 'fourwn.col', 'eb0b450eff79a33027a41a05051f5609a83667e8', FALSE, FALSE, TRUE,'fourwn.col@example.com', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
-- duplicate user id!!
set @user_id_13 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into raveuser (entity_id, username, password, expired, locked, enabled, email)
-values (@user_id_13, 'http://rave2011.myopenid.com/', 'cdf15c184b7d2539b0cfc29ee9f10bad62793d50', FALSE, FALSE, TRUE,'rave2011_openid@example.org');
+insert into raveuser (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id)
+values (@user_id_13, 'http://rave2011.myopenid.com/', 'cdf15c184b7d2539b0cfc29ee9f10bad62793d50', FALSE, FALSE, TRUE,'rave2011_openid@example.org', @three_col_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
--- end user data ---