You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2012/06/11 22:13:01 UTC
svn commit: r1348990 [2/3] - in /rave/branches/model_interfaces: ./
rave-components/rave-core/
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/
rave-c...
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java Mon Jun 11 20:12:56 2012
@@ -19,7 +19,11 @@
package org.apache.rave.portal.service.impl;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.Authority;
+import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.AuthorityImpl;
+import org.apache.rave.portal.model.impl.PageLayoutImpl;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.service.AuthorityService;
import org.apache.rave.portal.service.NewAccountService;
@@ -55,7 +59,7 @@ public class DefaultNewAccountServiceTes
private final String VALID_PASSWORD = "valid.password";
private final String VALID_LAYOUT_CODE = "valid.layout";
private final String VALID_EMAIL = "valid.email";
- private JpaPageLayout validPageLayout;
+ private PageLayoutImpl validPageLayout;
private SearchResult<Authority> validAuthoritySearchResult;
private List<Authority> validAuthorityList;
@@ -71,14 +75,13 @@ public class DefaultNewAccountServiceTes
newAccountService = new DefaultNewAccountService(userService, pageLayoutService, authorityService);
- validPageLayout = new JpaPageLayout();
- validPageLayout.setEntityId(99L);
+ validPageLayout = new PageLayoutImpl();
validPageLayout.setNumberOfRegions(4L);
validPageLayout.setCode(VALID_LAYOUT_CODE);
- Authority role1 = new JpaAuthority();
+ Authority role1 = new AuthorityImpl();
role1.setAuthority("DEFAULT_ROLE1");
- Authority role2 = new JpaAuthority();
+ Authority role2 = new AuthorityImpl();
role2.setAuthority("DEFAULT_ROLE2");
validAuthorityList = new ArrayList<Authority>();
@@ -89,14 +92,14 @@ public class DefaultNewAccountServiceTes
@Test
public void createNewAccountTest() throws Exception {
- JpaUser newUser = new JpaUser();
+ UserImpl newUser = new UserImpl();
newUser.setUsername(VALID_USER);
newUser.setPassword(VALID_PASSWORD);
newUser.setConfirmPassword(VALID_PASSWORD);
newUser.setEmail(VALID_EMAIL);
newUser.setDefaultPageLayoutCode(VALID_LAYOUT_CODE);
- User expectedUser = new JpaUser();
+ User expectedUser = new UserImpl();
expectedUser.setUsername(newUser.getUsername());
expectedUser.setPassword(newUser.getPassword());
expectedUser.setEmail(newUser.getEmail());
@@ -112,7 +115,7 @@ public class DefaultNewAccountServiceTes
expect(userService.getUserByEmail(VALID_EMAIL)).andReturn(null);
expect(pageLayoutService.getPageLayoutByCode(VALID_LAYOUT_CODE)).andReturn(validPageLayout);
expect(authorityService.getDefaultAuthorities()).andReturn(validAuthoritySearchResult);
- userService.registerNewUser(expectedUser);
+ userService.registerNewUser(isA(User.class));
expectLastCall();
replay(userDetails, passwordEncoder, userService, pageLayoutService, authorityService);
@@ -123,14 +126,14 @@ public class DefaultNewAccountServiceTes
@Test
public void createNewAccountTest_blankEmail() throws Exception {
- JpaUser newUser = new JpaUser();
+ UserImpl newUser = new UserImpl();
newUser.setUsername(VALID_USER);
newUser.setPassword(VALID_PASSWORD);
newUser.setConfirmPassword(VALID_PASSWORD);
newUser.setEmail("");
newUser.setDefaultPageLayoutCode(VALID_LAYOUT_CODE);
- User expectedUser = new JpaUser();
+ User expectedUser = new UserImpl();
expectedUser.setUsername(newUser.getUsername());
expectedUser.setPassword(newUser.getPassword());
expectedUser.setEmail(newUser.getEmail());
@@ -146,7 +149,7 @@ public class DefaultNewAccountServiceTes
//if the email is blank getUserByEmail should not be called so dont expect it
expect(pageLayoutService.getPageLayoutByCode(VALID_LAYOUT_CODE)).andReturn(validPageLayout);
expect(authorityService.getDefaultAuthorities()).andReturn(validAuthoritySearchResult);
- userService.registerNewUser(expectedUser);
+ userService.registerNewUser(isA(User.class));
expectLastCall();
replay(userDetails, passwordEncoder, userService, pageLayoutService, authorityService);
@@ -158,9 +161,9 @@ public class DefaultNewAccountServiceTes
@Test
public void failedAccountCreationTest_duplicateUsername() throws Exception {
String duplicateUserName = "duplicateUserName";
- JpaUser newUser = new JpaUser();
+ UserImpl newUser = new UserImpl();
newUser.setUsername(duplicateUserName);
- User existingUser = new JpaUser();
+ User existingUser = new UserImpl();
existingUser.setUsername(duplicateUserName);
expect(userService.getUserByUsername(duplicateUserName)).andReturn(existingUser);
@@ -177,10 +180,10 @@ public class DefaultNewAccountServiceTes
@Test
public void failedAccountCreationTest_duplicateEmail() throws Exception {
String duplicateEmail = "duplicateEmail";
- JpaUser newUser = new JpaUser();
+ UserImpl newUser = new UserImpl();
newUser.setUsername("newUser");
newUser.setEmail(duplicateEmail);
- User existingUser = new JpaUser();
+ User existingUser = new UserImpl();
existingUser.setEmail(duplicateEmail);
expect(userService.getUserByUsername("newUser")).andReturn(null);
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageLayoutServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageLayoutServiceTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageLayoutServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageLayoutServiceTest.java Mon Jun 11 20:12:56 2012
@@ -19,8 +19,8 @@
package org.apache.rave.portal.service.impl;
-import org.apache.rave.portal.model.JpaPageLayout;
import org.apache.rave.portal.model.PageLayout;
+import org.apache.rave.portal.model.impl.PageLayoutImpl;
import org.apache.rave.portal.repository.PageLayoutRepository;
import org.apache.rave.portal.service.PageLayoutService;
import org.junit.Before;
@@ -30,9 +30,7 @@ import java.util.ArrayList;
import java.util.List;
import static org.easymock.EasyMock.*;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
public class DefaultPageLayoutServiceTest {
@@ -48,7 +46,7 @@ public class DefaultPageLayoutServiceTes
pageLayoutRepository = createMock(PageLayoutRepository.class);
pageLayoutService = new DefaultPageLayoutService(pageLayoutRepository);
- validPageLayout = new JpaPageLayout();
+ validPageLayout = new PageLayoutImpl();
validPageLayout.setCode(VALID_LAYOUT_CODE);
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java Mon Jun 11 20:12:56 2012
@@ -27,9 +27,6 @@ import org.apache.rave.portal.service.Us
import org.hamcrest.CoreMatchers;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import javax.persistence.NoResultException;
import javax.persistence.NonUniqueResultException;
@@ -41,9 +38,6 @@ import static org.hamcrest.CoreMatchers.
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
-// TODO - remove the RunWith and ContextConfiguration once User has been refactored to interface
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:test-dataContext.xml", "classpath:test-applicationContext.xml"})
public class DefaultPageServiceTest {
private PageService pageService;
@@ -69,7 +63,7 @@ public class DefaultPageServiceTest {
private Region targetRegion, originalRegion, lockedRegion;
private Widget validWidget;
private RegionWidget validRegionWidget;
- private JpaUser user;
+ private UserImpl user;
private PageLayout pageLayout;
private String defaultPageName = "Main";
private Page page, page2;
@@ -128,9 +122,9 @@ public class DefaultPageServiceTest {
pageLayout.setCode(PAGE_LAYOUT_CODE);
pageLayout.setNumberOfRegions(3L);
- user = new JpaUser();
- user.setEntityId(1L);
+ user = new UserImpl();
user.setUsername("acarlucci");
+ user.setId(1L);
user.setDefaultPageLayout(pageLayout);
pageList = new ArrayList<Page>();
@@ -179,7 +173,7 @@ public class DefaultPageServiceTest {
List<Page> VALID_PAGES = new ArrayList<Page>();
Page personPage = new PageImpl();
PageTemplate pageTemplate = new PageTemplateImpl();
- JpaUser user = new JpaUser();
+ UserImpl user = new UserImpl();
expect(pageRepository.getAllPages(VALID_USER_ID, PageType.PERSON_PROFILE)).andReturn(VALID_PAGES);
expect(userService.getUserById(isA(Long.class))).andReturn(user).once();
@@ -212,7 +206,7 @@ public class DefaultPageServiceTest {
expect(pageLayoutRepository.getByPageLayoutCode(PAGE_LAYOUT_CODE)).andReturn(pageLayout);
expect(pageTemplateRepository.getDefaultPage(PageType.USER)).andReturn(pageTemplate);
expect(pageRepository.createPageForUser(user, pageTemplate)).andReturn(expectedPage);
- expect(pageRepository.getAllPages(user.getEntityId(), PageType.USER)).andReturn(new ArrayList<Page>());
+ expect(pageRepository.getAllPages(user.getId(), PageType.USER)).andReturn(new ArrayList<Page>());
replay(userService, pageLayoutRepository, pageRepository, pageTemplateRepository);
@@ -242,7 +236,7 @@ public class DefaultPageServiceTest {
expect(pageRepository.save(expectedPage)).andReturn(expectedPage);
expect(pageTemplateRepository.getDefaultPage(PageType.USER)).andThrow(new NoResultException("No Result Exception"));
- expect(pageRepository.getAllPages(user.getEntityId(), PageType.USER)).andReturn(new ArrayList<Page>());
+ expect(pageRepository.getAllPages(user.getId(), PageType.USER)).andReturn(new ArrayList<Page>());
replay(userService, pageLayoutRepository, pageRepository, pageTemplateRepository);
Page newPage = pageService.addNewUserPage(PAGE_NAME, PAGE_LAYOUT_CODE);
@@ -271,7 +265,7 @@ public class DefaultPageServiceTest {
expect(pageRepository.save(expectedPage)).andReturn(expectedPage);
expect(pageTemplateRepository.getDefaultPage(PageType.USER)).andThrow(new NonUniqueResultException("Non-Unique Result Exception"));
- expect(pageRepository.getAllPages(user.getEntityId(), PageType.USER)).andReturn(new ArrayList<Page>());
+ expect(pageRepository.getAllPages(user.getId(), PageType.USER)).andReturn(new ArrayList<Page>());
replay(userService, pageLayoutRepository, pageRepository, pageTemplateRepository);
Page newPage = pageService.addNewUserPage(PAGE_NAME, PAGE_LAYOUT_CODE);
@@ -305,7 +299,7 @@ public class DefaultPageServiceTest {
expect(userService.getAuthenticatedUser()).andReturn(user);
expect(pageLayoutRepository.getByPageLayoutCode(PAGE_LAYOUT_CODE)).andReturn(pageLayout);
- expect(pageRepository.getAllPages(user.getEntityId(), PageType.USER)).andReturn(new ArrayList<Page>());
+ expect(pageRepository.getAllPages(user.getId(), PageType.USER)).andReturn(new ArrayList<Page>());
expect(pageRepository.createPageForUser(user, pageTemplate)).andReturn(userPage);
expect(pageTemplateRepository.getDefaultPage(PageType.USER)).andReturn(pageTemplate);
replay(userService, pageLayoutRepository, pageRepository, pageTemplateRepository);
@@ -340,7 +334,7 @@ public class DefaultPageServiceTest {
expect(userService.getAuthenticatedUser()).andReturn(user);
expect(pageLayoutRepository.getByPageLayoutCode(PAGE_LAYOUT_CODE)).andReturn(pageLayout);
expect(pageRepository.save(expectedPage)).andReturn(expectedPage);
- expect(pageRepository.getAllPages(user.getEntityId(), PageType.USER)).andReturn(existingPages);
+ expect(pageRepository.getAllPages(user.getId(), PageType.USER)).andReturn(existingPages);
replay(userService, pageLayoutRepository, pageRepository);
Page newPage = pageService.addNewUserPage(PAGE_NAME, PAGE_LAYOUT_CODE);
@@ -444,14 +438,14 @@ public class DefaultPageServiceTest {
members.add(lPageUser);
expectedPage.setMembers(members);
- expect(userService.getUserById(user.getEntityId())).andReturn(user);
+ expect(userService.getUserById(user.getId())).andReturn(user);
expect(pageLayoutRepository.getByPageLayoutCode(PAGE_LAYOUT_CODE)).andReturn(pageLayout);
expect(pageTemplateRepository.getDefaultPage(PageType.USER)).andReturn(pageTemplate);
expect(pageRepository.createPageForUser(user, pageTemplate)).andReturn(expectedPage);
- expect(pageRepository.getAllPages(user.getEntityId(), PageType.USER)).andReturn(new ArrayList<Page>());
+ expect(pageRepository.getAllPages(user.getId(), PageType.USER)).andReturn(new ArrayList<Page>());
replay(userService, pageLayoutRepository, pageRepository, pageTemplateRepository);
- Page newPage = pageService.addNewDefaultUserPage(user.getEntityId());
+ Page newPage = pageService.addNewDefaultUserPage(user.getId());
assertThat(newPage.getMembers().get(0).getRenderSequence(), is(EXPECTED_RENDER_SEQUENCE));
assertThat(newPage.getName(), is(defaultPageName));
assertThat(newPage.getRegions().size(), is(pageLayout.getNumberOfRegions().intValue()));
@@ -471,7 +465,7 @@ public class DefaultPageServiceTest {
expect(userService.getAuthenticatedUser()).andReturn(user);
expect(pageRepository.get(PAGE_ID)).andReturn(page);
- expect(pageRepository.getPagesForUser(user.getEntityId(), PageType.USER)).andReturn(pageUserListAfterDelete);
+ expect(pageRepository.getPagesForUser(user.getId(), PageType.USER)).andReturn(pageUserListAfterDelete);
expect(pageRepository.save(page2)).andReturn(page2);
pageRepository.delete(page);
@@ -492,7 +486,7 @@ public class DefaultPageServiceTest {
expect(pageRepository.get(INVALID_PAGE_ID)).andReturn(page);
pageRepository.delete(page);
expectLastCall();
- expect(pageRepository.getPagesForUser(user.getEntityId(), PageType.USER)).andReturn(pageUserListAfterDelete);
+ expect(pageRepository.getPagesForUser(user.getId(), PageType.USER)).andReturn(pageUserListAfterDelete);
expect(pageRepository.save(page2)).andReturn(page2);
expect(pageRepository.save(page)).andReturn(page);
replay(userService);
@@ -879,9 +873,9 @@ public class DefaultPageServiceTest {
@Test
public void movePage() {
expect(userService.getAuthenticatedUser()).andReturn(user);
- expect(pageRepository.getSingleRecord(user.getEntityId(), PAGE_ID)).andReturn(pageUser);
- expect(pageRepository.getSingleRecord(user.getEntityId(), page2.getId())).andReturn(pageUser2);
- expect(pageRepository.getPagesForUser(user.getEntityId(), PageType.USER)).andReturn(pageUserList);
+ expect(pageRepository.getSingleRecord(user.getId(), PAGE_ID)).andReturn(pageUser);
+ expect(pageRepository.getSingleRecord(user.getId(), page2.getId())).andReturn(pageUser2);
+ expect(pageRepository.getPagesForUser(user.getId(), PageType.USER)).andReturn(pageUserList);
expect(pageRepository.save(page)).andReturn(page);
expect(pageRepository.save(page2)).andReturn(page);
@@ -900,13 +894,13 @@ public class DefaultPageServiceTest {
@Test(expected=RuntimeException.class)
public void movePage_invalidPageId() {
expect(userService.getAuthenticatedUser()).andReturn(user);
- expect(pageRepository.getSingleRecord(user.getEntityId(), INVALID_PAGE_ID)).andReturn(null);
- expect(pageRepository.getSingleRecord(user.getEntityId(), page2.getId())).andReturn(pageUser2);
- expect(pageRepository.getPagesForUser(user.getEntityId(), PageType.USER)).andReturn(pageUserList);
+ expect(pageRepository.getSingleRecord(user.getId(), INVALID_PAGE_ID)).andReturn(null);
+ expect(pageRepository.getSingleRecord(user.getId(), page2.getId())).andReturn(pageUser2);
+ expect(pageRepository.getPagesForUser(user.getId(), PageType.USER)).andReturn(pageUserList);
expect(pageRepository.get(INVALID_PAGE_ID)).andReturn(null);
expect(pageRepository.get(page2.getId())).andReturn(page2);
- expect(pageRepository.getAllPages(user.getEntityId(), PageType.USER)).andReturn(pageList);
+ expect(pageRepository.getAllPages(user.getId(), PageType.USER)).andReturn(pageList);
replay(userService);
replay(pageRepository);
@@ -919,8 +913,8 @@ public class DefaultPageServiceTest {
@Test
public void movePageToDefault() {
expect(userService.getAuthenticatedUser()).andReturn(user);
- expect(pageRepository.getSingleRecord(user.getEntityId(), page2.getId())).andReturn(pageUser2);
- expect(pageRepository.getPagesForUser(user.getEntityId(), PageType.USER)).andReturn(pageUserList);
+ expect(pageRepository.getSingleRecord(user.getId(), page2.getId())).andReturn(pageUser2);
+ expect(pageRepository.getPagesForUser(user.getId(), PageType.USER)).andReturn(pageUserList);
expect(pageRepository.save(page)).andReturn(page);
expect(pageRepository.save(page2)).andReturn(page);
replay(userService);
@@ -937,8 +931,8 @@ public class DefaultPageServiceTest {
@Test(expected=RuntimeException.class)
public void movePageToDefault_invalidPageId() {
expect(userService.getAuthenticatedUser()).andReturn(user);
- expect(pageRepository.getSingleRecord(user.getEntityId(), INVALID_PAGE_ID)).andReturn(null);
- expect(pageRepository.getPagesForUser(user.getEntityId(), PageType.USER)).andReturn(pageUserList);
+ expect(pageRepository.getSingleRecord(user.getId(), INVALID_PAGE_ID)).andReturn(null);
+ expect(pageRepository.getPagesForUser(user.getId(), PageType.USER)).andReturn(pageUserList);
replay(userService);
replay(pageRepository);
@@ -1005,16 +999,18 @@ public class DefaultPageServiceTest {
expect(curPage.getPageLayout()).andReturn(prevLayout);
expect(curPage.getRegions()).andReturn(regions);
expect(curPage.getId()).andReturn(PAGE_ID).anyTimes();
- expect(curPage.getMembers()).andReturn(new ArrayList<PageUser>());
+ /*expect(curPage.getMembers()).andReturn(new ArrayList<PageUser>());
expect(curPage.getName()).andReturn(newName);
expect(curPage.getOwner()).andReturn(user);
expect(curPage.getPageLayout()).andReturn(layout);
expect(curPage.getPageType()).andReturn(PageType.USER);
expect(curPage.getParentPage()).andReturn(null);
expect(curPage.getRegions()).andReturn(regions);
- expect(curPage.getSubPages()).andReturn(new ArrayList<Page>());
+ expect(curPage.getSubPages()).andReturn(new ArrayList<Page>()); */
curPage.setName(newName);
+ expectLastCall();
curPage.setPageLayout(layout);
+ expectLastCall();
replay(curPage);
expect(pageRepository.get(PAGE_ID)).andReturn(curPage);
@@ -1026,7 +1022,7 @@ public class DefaultPageServiceTest {
pageService.updatePage(PAGE_ID, newName, layoutName);
assertThat(regions.size(), is(3));
- assertThat(regions.get(regions.size()-1).getPage().getId(), is(PAGE_ID));
+ //assertThat(regions.get(regions.size()-1).getPage().getId(), is(PAGE_ID));
verify(curPage);
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceServiceTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceServiceTest.java Mon Jun 11 20:12:56 2012
@@ -19,8 +19,8 @@
package org.apache.rave.portal.service.impl;
-import org.apache.rave.portal.model.JpaPortalPreference;
import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.portal.model.impl.PortalPreferenceImpl;
import org.apache.rave.portal.repository.PortalPreferenceRepository;
import org.apache.rave.portal.service.PortalPreferenceService;
import org.junit.Before;
@@ -31,13 +31,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
+import static junit.framework.Assert.*;
+import static org.easymock.EasyMock.*;
/**
* Test class for {@link DefaultPortalPreferenceService}
@@ -109,9 +104,8 @@ public class DefaultPortalPreferenceServ
public void testSaveKeyValue_new() {
final String key = "foo";
final String value = "bar";
- PortalPreference fooBar = new JpaPortalPreference(key, value);
- JpaPortalPreference fooBarSaved = new JpaPortalPreference(key, value);
- fooBarSaved.setEntityId(123L);
+ PortalPreference fooBar = new PortalPreferenceImpl(key, value);
+ PortalPreferenceImpl fooBarSaved = new PortalPreferenceImpl(key, value);
expect(repository.getByKey(key)).andReturn(null).once();
expect(repository.save(fooBar)).andReturn(fooBarSaved).once();
@@ -125,11 +119,8 @@ public class DefaultPortalPreferenceServ
final String key = "foo";
final String value = "bar";
final String newValue = "baz";
- JpaPortalPreference fooBar = new JpaPortalPreference(key, value);
- fooBar.setEntityId(123L);
- JpaPortalPreference fooBarSaved = new JpaPortalPreference(key, newValue);
- fooBarSaved.setEntityId(123L);
-
+ PortalPreferenceImpl fooBar = new PortalPreferenceImpl(key, value);
+ PortalPreferenceImpl fooBarSaved = new PortalPreferenceImpl(key, newValue);
expect(repository.getByKey(key)).andReturn(fooBar).once();
expect(repository.save(fooBar)).andReturn(fooBarSaved).once();
replay(repository);
@@ -143,9 +134,8 @@ public class DefaultPortalPreferenceServ
List<String> values = new ArrayList<String>();
values.add("bar");
values.add("baz");
- PortalPreference fooBar = new JpaPortalPreference(key, values);
- JpaPortalPreference fooBarSaved = new JpaPortalPreference(key, values);
- fooBarSaved.setEntityId(123L);
+ PortalPreference fooBar = new PortalPreferenceImpl(key, values);
+ PortalPreferenceImpl fooBarSaved = new PortalPreferenceImpl(key, values);
expect(repository.getByKey(key)).andReturn(null).once();
expect(repository.save(fooBar)).andReturn(fooBarSaved).once();
@@ -163,10 +153,8 @@ public class DefaultPortalPreferenceServ
List<String> newValues = new ArrayList<String>();
values.add("bar2");
values.add("baz2");
- JpaPortalPreference fooBar = new JpaPortalPreference(key, values);
- fooBar.setEntityId(123L);
- JpaPortalPreference fooBarSaved = new JpaPortalPreference(key, newValues);
- fooBarSaved.setEntityId(123L);
+ PortalPreferenceImpl fooBar = new PortalPreferenceImpl(key, values);
+ PortalPreferenceImpl fooBarSaved = new PortalPreferenceImpl(key, newValues);
expect(repository.getByKey(key)).andReturn(fooBar).once();
expect(repository.save(fooBar)).andReturn(fooBarSaved).once();
@@ -178,8 +166,7 @@ public class DefaultPortalPreferenceServ
@Test
public void testSavePreference() {
PortalPreference title = titlePreference();
- JpaPortalPreference savedTitle = new JpaPortalPreference("title", "Rave");
- savedTitle.setEntityId(123L);
+ PortalPreferenceImpl savedTitle = new PortalPreferenceImpl("title", "Rave");
expect(repository.save(title)).andReturn(savedTitle).once();
replay(repository);
@@ -195,7 +182,7 @@ public class DefaultPortalPreferenceServ
colors.add("red");
colors.add("yellow");
colors.add("blue");
- PortalPreference colorPref = new JpaPortalPreference("colors", colors);
+ PortalPreference colorPref = new PortalPreferenceImpl("colors", colors);
List<PortalPreference> preferences = new ArrayList<PortalPreference>();
preferences.add(title);
@@ -205,6 +192,6 @@ public class DefaultPortalPreferenceServ
}
private static PortalPreference titlePreference() {
- return new JpaPortalPreference("title", "Rave");
+ return new PortalPreferenceImpl("title", "Rave");
}
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java Mon Jun 11 20:12:56 2012
@@ -20,10 +20,10 @@
package org.apache.rave.portal.service.impl;
import org.apache.commons.lang.StringUtils;
-import org.apache.rave.portal.model.JpaRegionWidget;
-import org.apache.rave.portal.model.JpaRegionWidgetPreference;
import org.apache.rave.portal.model.RegionWidget;
import org.apache.rave.portal.model.RegionWidgetPreference;
+import org.apache.rave.portal.model.impl.RegionWidgetImpl;
+import org.apache.rave.portal.model.impl.RegionWidgetPreferenceImpl;
import org.apache.rave.portal.repository.RegionWidgetRepository;
import org.apache.rave.portal.service.RegionWidgetService;
import org.junit.Before;
@@ -54,7 +54,7 @@ public class DefaultRegionWidgetServiceT
@Test
public void getRegionWidget_validId() {
- final RegionWidget VALID_REGION_WIDGET = new JpaRegionWidget(VALID_REGION_WIDGET_ID);
+ final RegionWidget VALID_REGION_WIDGET = new RegionWidgetImpl(VALID_REGION_WIDGET_ID);
expect(regionWidgetRepository.get(VALID_REGION_WIDGET_ID)).andReturn(VALID_REGION_WIDGET);
replay(regionWidgetRepository);
@@ -72,7 +72,7 @@ public class DefaultRegionWidgetServiceT
@Test
public void saveRegionWidget() {
- final RegionWidget VALID_REGION_WIDGET = new JpaRegionWidget(VALID_REGION_WIDGET_ID);
+ final RegionWidget VALID_REGION_WIDGET = new RegionWidgetImpl(VALID_REGION_WIDGET_ID);
expect(regionWidgetRepository.save(VALID_REGION_WIDGET)).andReturn(VALID_REGION_WIDGET);
replay(regionWidgetRepository);
@@ -82,7 +82,7 @@ public class DefaultRegionWidgetServiceT
@Test
public void saveRegionWidgetPreferences() {
- final RegionWidget VALID_REGION_WIDGET = new JpaRegionWidget(VALID_REGION_WIDGET_ID);
+ final RegionWidget VALID_REGION_WIDGET = new RegionWidgetImpl(VALID_REGION_WIDGET_ID);
VALID_REGION_WIDGET.setPreferences(getTestExistingRegionWidgetPreferences());
expect(regionWidgetRepository.get(VALID_REGION_WIDGET_ID)).andReturn(VALID_REGION_WIDGET);
@@ -98,7 +98,7 @@ public class DefaultRegionWidgetServiceT
@Test
public void saveRegionWidgetPreference() {
- final RegionWidget VALID_REGION_WIDGET = new JpaRegionWidget(VALID_REGION_WIDGET_ID);
+ final RegionWidget VALID_REGION_WIDGET = new RegionWidgetImpl(VALID_REGION_WIDGET_ID);
VALID_REGION_WIDGET.setPreferences(getTestExistingRegionWidgetPreferences());
expect(regionWidgetRepository.get(VALID_REGION_WIDGET_ID)).andReturn(VALID_REGION_WIDGET).anyTimes();
@@ -106,9 +106,9 @@ public class DefaultRegionWidgetServiceT
replay(regionWidgetRepository);
//Add and update a preference.
- RegionWidgetPreference newPreference = new JpaRegionWidgetPreference(null, null, "age", "30");
+ RegionWidgetPreference newPreference = new RegionWidgetPreferenceImpl(null, "age", "30");
RegionWidgetPreference savedNewPreference = regionWidgetService.saveRegionWidgetPreference(VALID_REGION_WIDGET_ID, newPreference);
- RegionWidgetPreference updatedPreference = new JpaRegionWidgetPreference(null, null, "color", "purple");
+ RegionWidgetPreference updatedPreference = new RegionWidgetPreferenceImpl(null, "color", "purple");
RegionWidgetPreference savedUpdatedPreference = regionWidgetService.saveRegionWidgetPreference(VALID_REGION_WIDGET_ID, updatedPreference);
//Make sure the new and updated preference got mixed in properly with the existing preferences.
@@ -122,7 +122,7 @@ public class DefaultRegionWidgetServiceT
@Test
public void saveRegionWidgetCollapsedState() {
final boolean COLLAPSED = true;
- RegionWidget regionWidget = new JpaRegionWidget(VALID_REGION_WIDGET_ID);
+ RegionWidget regionWidget = new RegionWidgetImpl(VALID_REGION_WIDGET_ID);
expect(regionWidgetRepository.get(VALID_REGION_WIDGET_ID)).andReturn(regionWidget);
regionWidget.setCollapsed(COLLAPSED);
@@ -180,8 +180,8 @@ public class DefaultRegionWidgetServiceT
private List<RegionWidgetPreference> getTestExistingRegionWidgetPreferences() {
ArrayList<RegionWidgetPreference> regionWidgetPreferences = new ArrayList<RegionWidgetPreference>();
- regionWidgetPreferences.add(new JpaRegionWidgetPreference(1L, VALID_REGION_WIDGET_ID, "color", "blue"));
- regionWidgetPreferences.add(new JpaRegionWidgetPreference(2L, VALID_REGION_WIDGET_ID, "speed", "fast"));
+ regionWidgetPreferences.add(new RegionWidgetPreferenceImpl(VALID_REGION_WIDGET_ID, "color", "blue"));
+ regionWidgetPreferences.add(new RegionWidgetPreferenceImpl(VALID_REGION_WIDGET_ID, "speed", "fast"));
return regionWidgetPreferences;
}
@@ -189,7 +189,7 @@ public class DefaultRegionWidgetServiceT
List<RegionWidgetPreference> regionWidgetPreferences = getTestExistingRegionWidgetPreferences();
regionWidgetPreferences.remove(0);
regionWidgetPreferences.get(0).setValue("slow");
- regionWidgetPreferences.add(new JpaRegionWidgetPreference(null, VALID_REGION_WIDGET_ID, "size", "small"));
+ regionWidgetPreferences.add(new RegionWidgetPreferenceImpl(VALID_REGION_WIDGET_ID, "size", "small"));
return regionWidgetPreferences;
}
}
\ No newline at end of file
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java Mon Jun 11 20:12:56 2012
@@ -20,8 +20,10 @@
package org.apache.rave.portal.service.impl;
import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.AuthorityImpl;
import org.apache.rave.portal.model.impl.PageImpl;
import org.apache.rave.portal.model.impl.PageTemplateImpl;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.repository.*;
import org.apache.rave.portal.service.UserService;
@@ -79,7 +81,7 @@ public class DefaultUserServiceTest {
@Test
public void getAuthenticatedUser_validUser() {
- final User authUser = new JpaUser(USER_ID);
+ final User authUser = new UserImpl(USER_ID);
AbstractAuthenticationToken auth = createNiceMock(AbstractAuthenticationToken.class);
expect(auth.getPrincipal()).andReturn(authUser).anyTimes();
replay(auth);
@@ -118,7 +120,7 @@ public class DefaultUserServiceTest {
@Test
public void setAuthenticatedUser_valid() {
- final User authUser = new JpaUser(USER_ID);
+ final User authUser = new UserImpl(USER_ID);
expect(userRepository.get(USER_ID)).andReturn(authUser).anyTimes();
replay(userRepository);
@@ -130,8 +132,8 @@ public class DefaultUserServiceTest {
@Test
public void setAuthenticatedUser_validRole() {
- final User authUser = new JpaUser(USER_ID);
- final Authority userRole = new JpaAuthority();
+ final User authUser = new UserImpl(USER_ID);
+ final Authority userRole = new AuthorityImpl();
userRole.setAuthority("admin");
authUser.addAuthority(userRole);
expect(userRepository.get(USER_ID)).andReturn(authUser).anyTimes();
@@ -158,7 +160,7 @@ public class DefaultUserServiceTest {
@Test
public void loadByUsername_valid() {
- final User authUser = new JpaUser(USER_ID, USER_NAME);
+ final User authUser = new UserImpl(USER_ID, USER_NAME);
expect(userRepository.getByUsername(USER_NAME)).andReturn(authUser).anyTimes();
replay(userRepository);
@@ -186,7 +188,7 @@ public class DefaultUserServiceTest {
@Test
public void getUserByEmail_valid() {
- final User authUser=new JpaUser(USER_ID,USER_NAME);
+ final User authUser=new UserImpl(USER_ID,USER_NAME);
authUser.setEmail(USER_EMAIL);
expect(userRepository.getByUserEmail(USER_EMAIL)).andReturn(authUser).anyTimes();
replay(userRepository);
@@ -207,8 +209,8 @@ public class DefaultUserServiceTest {
@Test
public void getLimitedListOfUsers() {
- User user1 = new JpaUser(123L, "john.doe.sr");
- User user2 = new JpaUser(456L, "john.doe.jr");
+ User user1 = new UserImpl(123L, "john.doe.sr");
+ User user2 = new UserImpl(456L, "john.doe.jr");
List<User> users = new ArrayList<User>();
users.add(user1);
users.add(user2);
@@ -228,8 +230,8 @@ public class DefaultUserServiceTest {
@Test
public void getUsersByFreeTextSearch() {
final String searchTerm = "Doe";
- User user1 = new JpaUser(123L, "john.doe.sr");
- User user2 = new JpaUser(456L, "john.doe.jr");
+ User user1 = new UserImpl(123L, "john.doe.sr");
+ User user2 = new UserImpl(456L, "john.doe.jr");
List<User> users = new ArrayList<User>();
users.add(user1);
users.add(user2);
@@ -248,7 +250,7 @@ public class DefaultUserServiceTest {
@Test
public void updateUserProfile() {
- User user = new JpaUser(USER_ID, USER_NAME);
+ User user = new UserImpl(USER_ID, USER_NAME);
expect(userRepository.save(user)).andReturn(user).once();
replay(userRepository);
@@ -262,7 +264,7 @@ public class DefaultUserServiceTest {
final int NUM_COMMENTS = 33;
final int NUM_RATINGS = 99;
final int NUM_WIDGETS_OWNED = 4;
- JpaUser user = new JpaUser(USER_ID, USER_NAME);
+ UserImpl user = new UserImpl(USER_ID, USER_NAME);
Page page = new PageImpl(1L, user);
List<Page> pages = new ArrayList<Page>();
pages.add(page);
@@ -295,8 +297,8 @@ public class DefaultUserServiceTest {
@Test
public void getAllByAddedWidget() {
List<User> userList = new ArrayList<User>();
- userList.add(new JpaUser());
- userList.add(new JpaUser());
+ userList.add(new UserImpl());
+ userList.add(new UserImpl());
List<Person> personList = new ArrayList<Person>();
personList.add(userList.get(0).toPerson());
@@ -313,10 +315,10 @@ public class DefaultUserServiceTest {
@Test
public void registerNewUser_valid(){
- User user = new JpaUser();
+ User user = new UserImpl();
expect(userRepository.save(user)).andReturn(user).once();
expect(pageTemplateRepository.getDefaultPage(PageType.PERSON_PROFILE)).andReturn(new PageTemplateImpl()).once();
- expect(pageRepository.createPageForUser(isA(JpaUser.class), isA(PageTemplate.class))).andReturn(new PageImpl());
+ expect(pageRepository.createPageForUser(isA(UserImpl.class), isA(PageTemplate.class))).andReturn(new PageImpl());
replay(userRepository, pageTemplateRepository, pageRepository);
service.registerNewUser(user);
verify(userRepository, pageTemplateRepository, pageRepository);
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingServiceTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingServiceTest.java Mon Jun 11 20:12:56 2012
@@ -19,7 +19,7 @@
package org.apache.rave.portal.service.impl;
-import org.apache.rave.portal.model.JpaWidgetRating;
+import org.apache.rave.portal.model.impl.WidgetRatingImpl;
import org.apache.rave.portal.model.WidgetRating;
import org.apache.rave.portal.repository.WidgetRatingRepository;
import org.apache.rave.portal.service.WidgetRatingService;
@@ -46,7 +46,7 @@ public class DefaultWidgetRatingServiceT
@Test
public void testGetByWidgetIdAndUserId() {
- WidgetRating widgetRating = new JpaWidgetRating(1L, 2L, 3L, 5);
+ WidgetRating widgetRating = new WidgetRatingImpl(1L, 2L, 3L, 5);
expect(repository.getByWidgetIdAndUserId(2L, 3L)).andReturn(widgetRating);
replay(repository);
final WidgetRating rating = service.getByWidgetIdAndUserId(2L, 3L);
@@ -56,7 +56,7 @@ public class DefaultWidgetRatingServiceT
@Test
public void updateScore() {
- WidgetRating widgetRating = createMock(JpaWidgetRating.class);
+ WidgetRating widgetRating = createMock(WidgetRatingImpl.class);
widgetRating.setScore(10);
expectLastCall().once();
@@ -69,7 +69,7 @@ public class DefaultWidgetRatingServiceT
@Test
public void saveWidgetRating_new() {
- WidgetRating newRating = new JpaWidgetRating();
+ WidgetRating newRating = new WidgetRatingImpl();
newRating.setWidgetId(2L);
newRating.setUserId(1L);
newRating.setScore(10);
@@ -84,8 +84,8 @@ public class DefaultWidgetRatingServiceT
@Test
public void saveWidgetRating_existing() {
- WidgetRating existingRating = new JpaWidgetRating(1L, 1L, 1L, 5);
- WidgetRating newRating = new JpaWidgetRating();
+ WidgetRating existingRating = new WidgetRatingImpl(1L, 1L, 1L, 5);
+ WidgetRating newRating = new WidgetRatingImpl();
newRating.setWidgetId(1L);
newRating.setUserId(1L);
newRating.setScore(10);
@@ -102,7 +102,7 @@ public class DefaultWidgetRatingServiceT
@Test
public void removeWidgetRating_existingRating() {
- final WidgetRating widgetRating = new JpaWidgetRating(1L, 1L, 1L, 5);
+ final WidgetRating widgetRating = new WidgetRatingImpl(1L, 1L, 1L, 5);
expect(repository.getByWidgetIdAndUserId(1L, 1L)).andReturn(widgetRating);
repository.delete(widgetRating);
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java Mon Jun 11 20:12:56 2012
@@ -20,8 +20,11 @@
package org.apache.rave.portal.service.impl;
import org.apache.rave.exception.DuplicateItemException;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.Category;
+import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.model.WidgetStatus;
import org.apache.rave.portal.model.impl.CategoryImpl;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.model.util.WidgetStatistics;
@@ -31,9 +34,6 @@ import org.apache.rave.portal.repository
import org.apache.rave.portal.service.WidgetService;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import java.util.ArrayList;
import java.util.HashMap;
@@ -46,8 +46,6 @@ import static org.junit.Assert.*;
/**
* Test for {@link DefaultWidgetService}
*/
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath:test-dataContext.xml", "classpath:test-applicationContext.xml"})
public class DefaultWidgetServiceTest {
private WidgetService widgetService;
@@ -206,8 +204,8 @@ public class DefaultWidgetServiceTest {
public void getWidgetsByOwner() {
final int offset = 0;
final int pageSize = 10;
- final JpaUser user = new JpaUser(5L);
- expect(userRepository.get(user.getEntityId())).andReturn(user);
+ final UserImpl user = new UserImpl(5L);
+ expect(userRepository.get(user.getId())).andReturn(user);
replay(userRepository);
final List<Widget> widgets = new ArrayList<Widget>();
@@ -218,7 +216,7 @@ public class DefaultWidgetServiceTest {
expect(widgetRepository.getByOwner(user, offset, pageSize)).andReturn(widgets);
replay(widgetRepository);
- SearchResult<Widget> result = widgetService.getWidgetsByOwner(user.getEntityId(), offset, pageSize);
+ SearchResult<Widget> result = widgetService.getWidgetsByOwner(user.getId(), offset, pageSize);
assertNotNull(result);
assertEquals(offset, result.getOffset());
assertEquals(pageSize, result.getPageSize());
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java Mon Jun 11 20:12:56 2012
@@ -20,10 +20,9 @@
package org.apache.rave.portal.web.renderer;
import org.apache.rave.exception.NotSupportedException;
-import org.apache.rave.portal.model.JpaRegion;
-import org.apache.rave.portal.model.JpaRegionWidget;
-import org.apache.rave.portal.model.JpaWidget;
import org.apache.rave.portal.model.RegionWidget;
+import org.apache.rave.portal.model.impl.RegionWidgetImpl;
+import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.web.renderer.impl.DefaultRenderService;
import org.apache.rave.portal.web.renderer.model.RenderContext;
import org.junit.Before;
@@ -85,10 +84,10 @@ public class RenderServiceTest {
@Test
public void render_supported_foo() {
- JpaWidget w = new JpaWidget();
+ WidgetImpl w = new WidgetImpl();
w.setType(SUPPORTED_TYPE_1);
- RegionWidget rw = new JpaRegionWidget();
+ RegionWidget rw = new RegionWidgetImpl();
rw.setWidget(w);
expect(widgetRenderer1.render(rw, context)).andReturn(RENDERED_TYPE_1);
@@ -100,9 +99,9 @@ public class RenderServiceTest {
@Test
public void render_supported_bar() {
- JpaWidget w = new JpaWidget();
+ WidgetImpl w = new WidgetImpl();
w.setType(SUPPORTED_TYPE_2);
- RegionWidget rw = new JpaRegionWidget();
+ RegionWidget rw = new RegionWidgetImpl();
rw.setWidget(w);
expect(widgetRenderer2.render(rw, context)).andReturn(RENDERED_TYPE_2);
@@ -114,10 +113,10 @@ public class RenderServiceTest {
@Test(expected = NotSupportedException.class)
public void render_invalid() {
- JpaWidget w = new JpaWidget();
+ WidgetImpl w = new WidgetImpl();
w.setType("NONE");
- RegionWidget rw = new JpaRegionWidget();
+ RegionWidget rw = new RegionWidgetImpl();
rw.setWidget(w);
replayMocks();
Modified: rave/branches/model_interfaces/rave-components/rave-jpa/pom.xml
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/pom.xml?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/pom.xml (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/pom.xml Mon Jun 11 20:12:56 2012
@@ -39,18 +39,41 @@
<groupId>org.apache.rave</groupId>
<artifactId>rave-commons</artifactId>
<exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-core</artifactId>
+ </dependency>
+
+ <!-- Shindig -->
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-common</artifactId>
+ <type>jar</type>
+ <scope>compile</scope>
+ <version>${apache.shindig.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper-el</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -63,6 +86,24 @@
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ </dependency>
+
+ <!-- Jackson JSON Mapper -->
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+
+ <!-- JSON Support -->
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20090211</version>
+ </dependency>
<!--Persistence-->
<dependency>
@@ -101,6 +142,27 @@
<artifactId>icu4j</artifactId>
</dependency>
+ <!-- Captcha -->
+ <dependency>
+ <groupId>net.tanesha.recaptcha4j</groupId>
+ <artifactId>recaptcha4j</artifactId>
+ </dependency>
+
+ <!-- mail -->
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ </dependency>
+
+
<!-- Test -->
<dependency>
<groupId>junit</groupId>
@@ -118,7 +180,7 @@
<build>
<defaultGoal>install</defaultGoal>
- <plugins><!-- COMMENT OUT UNTIL THERE IS A PERSISTENCE XML & CODE IN RESOURCES
+ <plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
@@ -151,7 +213,7 @@
<version>${openjpa.version}</version>
</dependency>
</dependencies>
- </plugin>-->
+ </plugin>
</plugins>
</build>
</project>
Modified: rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java?rev=1348990&r1=1348807&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java Mon Jun 11 20:12:56 2012
@@ -19,10 +19,8 @@
package org.apache.rave.portal.repository.impl;
-import org.apache.rave.persistence.jpa.AbstractJpaRepository;
import org.apache.rave.portal.model.JpaRegion;
import org.apache.rave.portal.model.Region;
-import org.apache.rave.portal.model.conversion.JpaCategoryConverter;
import org.apache.rave.portal.model.conversion.JpaRegionConverter;
import org.apache.rave.portal.repository.RegionRepository;
import org.springframework.beans.factory.annotation.Autowired;
Modified: rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java?rev=1348990&r1=1348807&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java Mon Jun 11 20:12:56 2012
@@ -19,7 +19,6 @@
package org.apache.rave.portal.repository.impl;
-import org.apache.rave.persistence.jpa.AbstractJpaRepository;
import org.apache.rave.portal.model.JpaWidgetRating;
import org.apache.rave.portal.model.WidgetRating;
import org.apache.rave.portal.model.conversion.JpaWidgetRatingConverter;
Added: rave/branches/model_interfaces/rave-components/rave-jpa/src/main/resources/org/apache/rave/jpa-applicationContext.xml
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/main/resources/org/apache/rave/jpa-applicationContext.xml?rev=1348990&view=auto
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-jpa/src/main/resources/org/apache/rave/jpa-applicationContext.xml (added)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/main/resources/org/apache/rave/jpa-applicationContext.xml Mon Jun 11 20:12:56 2012
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+ $Id$
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:tx="http://www.springframework.org/schema/tx"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
+
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd">
+
+ <!-- make the the portal.properties props available to autowire injectors, location of the properties can
+ be overridden by setting a system property "portal.override.properties" -->
+ <bean id="portalPropertyPlaceholder" class="org.apache.rave.util.OverridablePropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ <property name="systemPropertyName" value="portal.override.properties"/>
+ <property name="location" value="classpath:portal.properties"/>
+ </bean>
+
+ <!-- bean post-processor for JPA annotations -->
+ <context:annotation-config/>
+
+ <!-- enable the use of the @AspectJ style of Spring AOP -->
+ <aop:aspectj-autoproxy/>
+
+ <!-- rave-common component base-package scan (maybe move to a separate common-applicationContext.xml?) -->
+ <context:component-scan base-package="org.apache.rave.service"/>
+ <context:component-scan base-package="org.apache.rave.synchronization"/>
+
+ <!-- rave-core component base-package scan -->
+ <context:component-scan base-package="org.apache.rave.portal.model"/>
+ <context:component-scan base-package="org.apache.rave.portal.repository"/>
+ <context:component-scan base-package="org.apache.rave.portal.service"/>
+ <context:component-scan base-package="org.apache.rave.portal.security"/>
+
+ <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+ <property name="entityManagerFactory" ref="entityManagerFactory"/>
+ </bean>
+
+ <tx:annotation-driven transaction-manager="transactionManager"/>
+
+ <bean id="entityManagerFactory"
+ class="org.apache.rave.persistence.jpa.PopulatedLocalContainerEntityManagerFactory">
+ <property name="populator" ref="dataSourcePopulator"/>
+ <property name="loadTimeWeaver">
+ <bean class="org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver"/>
+ </property>
+ <property name="persistenceUnitName" value="ravePersistenceUnit"/>
+ <property name="dataSource" ref="dataSource"/>
+ <property name="jpaVendorAdapter">
+ <bean class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter"
+ p:databasePlatform="${portal.jpaVendorAdapter.databasePlatform}"
+ p:database="${portal.jpaVendorAdapter.database}"
+ p:showSql="${portal.jpaVendorAdapter.showSql}"/>
+ </property>
+ <property name="jpaDialect">
+ <bean class="${portal.jpaDialect}"/>
+ </property>
+ <property name="jpaPropertyMap">
+ <map>
+ <entry key="openjpa.Log" value="${portal.openjpa.Log}"/>
+ <entry key="openjpa.RuntimeUnenhancedClasses" value="${portal.openjpa.RuntimeUnenhancedClasses}"/>
+ <entry key="openjpa.jdbc.SynchronizeMappings" value="${portal.openjpa.jdbc.SynchronizeMappings}"/>
+ </map>
+ </property>
+ </bean>
+
+ <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+ <property name="url" value="${portal.dataSource.url}"/>
+ <property name="driverClassName" value="${portal.dataSource.driver}"/>
+ <property name="username" value="${portal.dataSource.username}"/>
+ <property name="password" value="${portal.dataSource.password}"/>
+ </bean>
+
+ <!-- Password encoding -->
+ <bean class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder" id="passwordEncoder">
+ <!--<constructor-arg index="0" value="10"/>-->
+ </bean>
+
+ <!-- email settings -->
+ <bean id="emailServiceMailMessage" class="org.springframework.mail.SimpleMailMessage">
+ <property name="from" value="${portal.mail.sender}"/>
+ <property name="replyTo" value="${portal.mail.replyto}"/>
+ </bean>
+
+ <bean id="freemarkerMailConfiguration" class="org.springframework.ui.freemarker.FreeMarkerConfigurationFactoryBean">
+ <property name="templateLoaderPath" value="/WEB-INF/mailtemplates"/>
+ </bean>
+ <bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
+ <property name="host" value="${portal.mail.host}"/>
+ <property name="password" value="${portal.mail.password}"/>
+ <property name="username" value="${portal.mail.username}"/>
+ <property name="port" value="${portal.mail.port}"/>
+ <property name="protocol" value="${portal.mail.protocol}"/>
+ <!-- NOTE: if using Gmail, you'll need following properties-->
+ <!--<property name="javaMailProperties">
+ <props>
+ <prop key="mail.smtp.auth">true</prop>
+ <prop key="mail.smtp.starttls.enable">true</prop>
+ <prop key="mail.smtp.timeout">8500</prop>
+ </props>
+ </property>-->
+ </bean>
+ <!--
+ NOTE: to use mail session you'll need to configure following within catalina_home/conf/context.xml
+ <Resource name="mail/Session" auth="Container" type="javax.mail.Session" mail.smtp.host="my.mail.host"/>
+
+ Further, activation & mail jars needs to be placed within catalina_home/lib folder
+ -->
+ <!--
+ <bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
+ <property name="session" ref="mailSession"/>
+ </bean>
+ <bean id="mailSession" class="org.springframework.jndi.JndiObjectFactoryBean">
+ <property name="jndiName" value="java:comp/env/mail/Session"/>
+ </bean>
+ -->
+
+ <bean id="restTemplate" class="org.springframework.web.client.RestTemplate" />
+
+ <bean id="staticContentCache" class="org.apache.rave.service.impl.DefaultStaticContentFetcherService">
+ <constructor-arg ref="restTemplate"/>
+ <constructor-arg>
+ <list>
+ <!-- example of a Static Content source that doesn't have any string token placeholders in its content body
+ <bean class="org.apache.rave.model.StaticContent">
+ <constructor-arg index="0" value="standardCompanyHeader"/>
+ <constructor-arg index="1" value="${company.header.host}/content/standard_header.html"/>
+ <constructor-arg index="2">
+ <null/>
+ </constructor-arg>
+ </bean>
+ -->
+ <!-- example of a Static Content source that has string token placeholders
+ <bean class="org.apache.rave.model.StaticContent">
+ <constructor-arg index="0" value="environmentSpecificContent"/>
+ <constructor-arg index="1" value="${company.header.host}/content/footer.html"/>
+ <constructor-arg index="2">
+ <map>
+ <entry key="\{supportEmail\}" value="${raveproperty.supportemail}"/>
+ <entry key="\{productVersion\}" value="${raveproperty.version}"/>
+ </map>
+ </constructor-arg>
+ </bean>
+ -->
+ </list>
+ </constructor-arg>
+ </bean>
+
+ <!-- example on how to setup a Spring Timer to refresh the Static Content cache at a fixed interval
+ <bean id="refreshStaticContentCacheScheduledTask" class="org.springframework.scheduling.timer.ScheduledTimerTask">
+ <property name="delay" value="5000"/>
+ <property name="period" value="300000"/>
+ <property name="timerTask">
+ <bean class="org.springframework.scheduling.timer.MethodInvokingTimerTaskFactoryBean"
+ p:targetObject-ref="staticContentCache" p:targetMethod="refreshAll"/>
+ </property>
+ </bean>
+ <bean id="timerFactory" class="org.springframework.scheduling.timer.TimerFactoryBean">
+ <property name="daemon" value="true"/>
+ <property name="scheduledTimerTasks">
+ <list>
+ <ref local="refreshStaticContentCacheScheduledTask"/>
+ </list>
+ </property>
+ </bean>
+ -->
+</beans>
\ No newline at end of file
Propchange: rave/branches/model_interfaces/rave-components/rave-jpa/src/main/resources/org/apache/rave/jpa-applicationContext.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/branches/model_interfaces/rave-components/rave-jpa/src/main/resources/org/apache/rave/jpa-applicationContext.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: rave/branches/model_interfaces/rave-components/rave-jpa/src/main/resources/org/apache/rave/jpa-applicationContext.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: rave/branches/model_interfaces/rave-components/rave-jpa/src/test/resources/test-applicationContext.xml (from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/test/resources/test-applicationContext.xml)
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-jpa/src/test/resources/test-applicationContext.xml?p2=rave/branches/model_interfaces/rave-components/rave-jpa/src/test/resources/test-applicationContext.xml&p1=rave/branches/model_interfaces/rave-components/rave-core/src/test/resources/test-applicationContext.xml&r1=1348807&r2=1348990&rev=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/resources/test-applicationContext.xml (original)
+++ rave/branches/model_interfaces/rave-components/rave-jpa/src/test/resources/test-applicationContext.xml Mon Jun 11 20:12:56 2012
@@ -21,6 +21,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
- <import resource="classpath:org/apache/rave/core-applicationContext.xml"/>
+ <import resource="classpath:org/apache/rave/jpa-applicationContext.xml"/>
</beans>
\ No newline at end of file
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java Mon Jun 11 20:12:56 2012
@@ -22,6 +22,7 @@ package org.apache.rave.portal.web.api.r
import org.apache.rave.portal.model.*;
import org.apache.rave.portal.model.impl.TagImpl;
import org.apache.rave.portal.model.impl.WidgetCommentImpl;
+import org.apache.rave.portal.model.impl.WidgetRatingImpl;
import org.apache.rave.portal.model.impl.WidgetTagImpl;
import org.apache.rave.portal.service.*;
import org.slf4j.Logger;
@@ -135,7 +136,7 @@ public class WidgetApi extends AbstractR
HttpServletResponse response) {
logger.debug("POST WidgetRating received for /api/rest/widgets/{} score: {}", widgetId, score);
- WidgetRating widgetRating = new JpaWidgetRating();
+ WidgetRating widgetRating = new WidgetRatingImpl();
widgetRating.setScore(score);
widgetRating.setUserId(userService.getAuthenticatedUser().getId());
widgetRating.setWidgetId(widgetId);
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=1348990&r1=1348989&r2=1348990&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 Mon Jun 11 20:12:56 2012
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.controller;
-import org.apache.rave.portal.model.JpaUser;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.web.util.ModelKeys;
@@ -43,7 +43,7 @@ import org.springframework.web.servlet.m
* Only requests that have a valid (matched) forgotPasswordHash will be honored
*
* @version "$Id$"
- * @see org.apache.rave.portal.model.JpaUser#forgotPasswordHash
+ * @see org.apache.rave.portal.model.User#getForgotPasswordHash()
*/
@Controller
public class ChangePasswordController {
@@ -66,7 +66,7 @@ public class ChangePasswordController {
@RequestMapping(value = {"/changepassword/{passwordHash:.*}"}, method = RequestMethod.GET)
public String initialize(Model model, @PathVariable("passwordHash") String passwordHash) {
log.debug("Requesting user for hash: {}", passwordHash);
- User user = new JpaUser();
+ User user = new UserImpl();
model.addAttribute(ModelKeys.USER, user);
user.setForgotPasswordHash(passwordHash);
return ViewNames.PASSWORD_CHANGE;
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=1348990&r1=1348989&r2=1348990&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 Mon Jun 11 20:12:56 2012
@@ -19,9 +19,8 @@
package org.apache.rave.portal.web.controller;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.rave.portal.model.JpaUser;
+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;
import org.apache.rave.portal.web.util.ModelKeys;
@@ -40,6 +39,8 @@ import org.springframework.web.bind.anno
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import javax.servlet.http.HttpServletRequest;
+
@Controller
public class NewAccountController {
private final Logger logger = LoggerFactory.getLogger(getClass());
@@ -63,11 +64,11 @@ public class NewAccountController {
public void setUpForm(ModelMap model, HttpServletRequest request) {
logger.debug("Initializing form");
model.addAttribute(ModelKeys.CAPTCHA_HTML, captchaService.createHtml(request));
- model.addAttribute(ModelKeys.NEW_USER, new JpaUser());
+ model.addAttribute(ModelKeys.NEW_USER, new UserImpl());
}
@RequestMapping(value = {"/newaccount", "/newaccount/*"}, method = RequestMethod.POST)
- public String create(@ModelAttribute(value = "newUser") JpaUser newUser, BindingResult results, Model model, HttpServletRequest request, RedirectAttributes redirectAttributes) {
+ public String create(@ModelAttribute(value = "newUser") User 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/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=1348990&r1=1348989&r2=1348990&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 Mon Jun 11 20:12:56 2012
@@ -19,10 +19,8 @@
package org.apache.rave.portal.web.controller;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.rave.portal.model.JpaUser;
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;
import org.apache.rave.portal.web.util.ModelKeys;
@@ -40,6 +38,8 @@ import org.springframework.web.bind.anno
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import javax.servlet.http.HttpServletRequest;
+
/**
* Handles password ans username reminder requests
*
@@ -66,7 +66,7 @@ public class ReminderController {
@RequestMapping(value = {"/retrieveusername", "/newpassword"})
public void initialize(ModelMap model, HttpServletRequest request) {
model.addAttribute(ModelKeys.CAPTCHA_HTML, captchaService.createHtml(request));
- model.addAttribute(ModelKeys.USER, new JpaUser());
+ model.addAttribute(ModelKeys.USER, new UserImpl());
}
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java Mon Jun 11 20:12:56 2012
@@ -19,8 +19,8 @@
package org.apache.rave.portal.web.model;
-import org.apache.rave.portal.model.JpaPortalPreference;
import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.portal.model.impl.PortalPreferenceImpl;
import java.util.Map;
@@ -46,13 +46,13 @@ public class PortalPreferenceForm {
private void populateMissingPreferences() {
if (getPageSize() == null) {
- preferenceMap.put(PAGE_SIZE, new JpaPortalPreference(PAGE_SIZE, DEFAULT_PAGE_SIZE));
+ preferenceMap.put(PAGE_SIZE, new PortalPreferenceImpl(PAGE_SIZE, DEFAULT_PAGE_SIZE));
}
if (getTitleSuffix() == null) {
- preferenceMap.put(TITLE_SUFFIX, new JpaPortalPreference(TITLE_SUFFIX, DEFAULT_TITLE_SUFFIX));
+ preferenceMap.put(TITLE_SUFFIX, new PortalPreferenceImpl(TITLE_SUFFIX, DEFAULT_TITLE_SUFFIX));
}
if (getJavaScriptDebugMode() == null) {
- preferenceMap.put(JAVASCRIPT_DEBUG_MODE, new JpaPortalPreference(JAVASCRIPT_DEBUG_MODE, DEFAULT_JAVASCRIPT_DEBUG_MODE));
+ preferenceMap.put(JAVASCRIPT_DEBUG_MODE, new PortalPreferenceImpl(JAVASCRIPT_DEBUG_MODE, DEFAULT_JAVASCRIPT_DEBUG_MODE));
}
}
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java Mon Jun 11 20:12:56 2012
@@ -19,12 +19,10 @@
package org.apache.rave.portal.web.security;
-import java.util.Collection;
-
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.NewAccountService;
import org.apache.rave.portal.service.UserService;
import org.springframework.ldap.core.DirContextAdapter;
@@ -33,6 +31,8 @@ import org.springframework.security.core
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.ldap.userdetails.UserDetailsContextMapper;
+import java.util.Collection;
+
/**
* Mapping class between a Rave User and LDAP user
*/
@@ -87,7 +87,7 @@ public class LdapUserDetailsContextMappe
}
private void createRaveUserFromLdapInfo(DirContextOperations ctx, String username) {
- JpaUser newUser = new JpaUser();
+ User newUser = new UserImpl();
newUser.setUsername(username);
if (!ctx.attributeExists(mailAttributeName) || StringUtils.isBlank(ctx.getStringAttribute(mailAttributeName))) {
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java Mon Jun 11 20:12:56 2012
@@ -18,11 +18,8 @@
*/
package org.apache.rave.portal.web.validator;
-import java.util.regex.Pattern;
-
import org.apache.commons.lang.StringUtils;
import org.apache.commons.validator.routines.EmailValidator;
-import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.UserService;
import org.slf4j.Logger;
@@ -33,6 +30,8 @@ import org.springframework.validation.Er
import org.springframework.validation.ObjectError;
import org.springframework.validation.Validator;
+import java.util.regex.Pattern;
+
@Component
public class NewAccountValidator implements Validator {
@@ -53,7 +52,7 @@ public class NewAccountValidator impleme
}
public boolean supports(Class<?> aClass) {
- return JpaUser.class.isAssignableFrom(aClass);
+ return User.class.isAssignableFrom(aClass);
}
public void validate(Object obj, Errors errors) {
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java Mon Jun 11 20:12:56 2012
@@ -20,7 +20,6 @@ package org.apache.rave.portal.web.valid
import org.apache.commons.lang.StringUtils;
import org.apache.commons.validator.routines.EmailValidator;
-import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.UserService;
import org.slf4j.Logger;
@@ -45,7 +44,7 @@ public class UserProfileValidator implem
}
public boolean supports(Class<?> aClass) {
- return JpaUser.class.isAssignableFrom(aClass);
+ return User.class.isAssignableFrom(aClass);
}
public void validate(Object obj, Errors errors) {
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java Mon Jun 11 20:12:56 2012
@@ -64,12 +64,12 @@ public class PageApiTest {
public void getPage_validId_export() {
Page p = new PageImpl();
p.setRegions(new ArrayList<Region>());
- p.setOwner(new JpaUser());
+ p.setOwner(new UserImpl());
Region region = new RegionImpl();
region.setRegionWidgets(new ArrayList<RegionWidget>());
RegionWidget w = new RegionWidgetImpl();
w.setPreferences(new ArrayList<RegionWidgetPreference>());
- w.getPreferences().add(new JpaRegionWidgetPreference());
+ w.getPreferences().add(new RegionWidgetPreferenceImpl());
region.getRegionWidgets().add(w);
p.getRegions().add(region);
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java Mon Jun 11 20:12:56 2012
@@ -20,9 +20,7 @@
package org.apache.rave.portal.web.api.rest;
import org.apache.rave.portal.model.*;
-import org.apache.rave.portal.model.impl.TagImpl;
-import org.apache.rave.portal.model.impl.WidgetCommentImpl;
-import org.apache.rave.portal.model.impl.WidgetTagImpl;
+import org.apache.rave.portal.model.impl.*;
import org.apache.rave.portal.service.*;
import org.junit.Before;
import org.junit.Test;
@@ -34,8 +32,10 @@ import java.util.ArrayList;
import java.util.List;
import static org.easymock.EasyMock.*;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
public class WidgetApiTest {
private WidgetApi widgetApi;
@@ -49,7 +49,7 @@ public class WidgetApiTest {
private final Long VALID_USER_ID = 5L;
private final Long VALID_WIDGET_ID = 10L;
- private JpaUser user;
+ private UserImpl user;
private List<Tag> tagList;
@Before
@@ -60,8 +60,8 @@ public class WidgetApiTest {
tagService = createMock(TagService.class);
widgetTagService = createMock(WidgetTagService.class);
- user = new JpaUser();
- user.setEntityId(VALID_USER_ID);
+ user = new UserImpl();
+ user.setId(VALID_USER_ID);
tagList = new ArrayList<Tag>();
tagList.add(new TagImpl("tag1"));
@@ -80,8 +80,8 @@ public class WidgetApiTest {
public void createWidgetComment() {
String comment = "new comment";
- JpaWidget widget = new JpaWidget();
- widget.setEntityId(1L);
+ WidgetImpl widget = new WidgetImpl();
+ widget.setId(1L);
widget.setComments(new ArrayList<WidgetComment>());
HttpServletResponse httpServletResponse = createMock(HttpServletResponse.class);
@@ -113,7 +113,7 @@ public class WidgetApiTest {
WidgetComment widgetComment = new WidgetCommentImpl();
widgetComment.setWidgetId(2L);
widgetComment.setText(message);
- widgetComment.setUser(new JpaUser(VALID_USER_ID, "John.Doe"));
+ widgetComment.setUser(new UserImpl(VALID_USER_ID, "John.Doe"));
expect(userService.getAuthenticatedUser()).andReturn(user);
expect(widgetCommentService.getWidgetComment(3L)).andReturn(null);
@@ -178,17 +178,17 @@ public class WidgetApiTest {
@Test
public void updateWidgetRating() {
- WidgetRating widgetRating = new JpaWidgetRating();
+ WidgetRating widgetRating = new WidgetRatingImpl();
widgetRating.setScore(5);
- widgetRating.setUserId(2L);
+ widgetRating.setUserId(5L);
widgetRating.setWidgetId(1L);
expect(userService.getAuthenticatedUser()).andReturn(user);
- widgetRatingService.saveWidgetRating(widgetRating);
+ widgetRatingService.saveWidgetRating(eq(widgetRating));
expectLastCall();
response.setStatus(HttpStatus.NO_CONTENT.value());
replay(userService, widgetRatingService, response);
- User user = new JpaUser(2L);
+ User user = new UserImpl(2L);
widgetApi.setWidgetRating(1L, 5, response);
verify(widgetRatingService, userService, response);
@@ -197,8 +197,8 @@ public class WidgetApiTest {
@Test
public void getAllUsers() {
List<Person> persons = new ArrayList<Person>();
- persons.add(new JpaPerson());
- persons.add(new JpaPerson());
+ persons.add(new PersonImpl());
+ persons.add(new PersonImpl());
expect(userService.getAllByAddedWidget(VALID_WIDGET_ID)).andReturn(persons);
replay(userService);