Author: mfranklin
Date: Fri Aug 24 17:37:54 2012
New Revision: 1377002
URL: http://svn.apache.org/viewvc?rev=1377002&view=rev
Log:
Refactored reference to UserId in PageUser (RAVE-729)
Modified:
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluator.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluator.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPage.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageUser.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageUserConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PageTest.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
Modified:
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java
URL:
http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java?rev=1377002&r1=1377001&r2=1377002&view=diff
==============================================================================
---
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java
(original)
+++
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java
Fri Aug 24 17:37:54 2012
@@ -27,8 +27,8 @@ public interface PageUser {
boolean isEditor();
void setEditor(boolean editor);
- User getUser();
- void setUser(User user);
+ String getUserId();
+ void setUserId(String user);
Page getPage();
void setPage(Page page);
Modified:
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java
URL:
http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java?rev=1377002&r1=1377001&r2=1377002&view=diff
==============================================================================
---
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java
(original)
+++
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java
Fri Aug 24 17:37:54 2012
@@ -22,7 +22,7 @@ import org.apache.rave.portal.model.*;
public class PageUserImpl implements PageUser {
private String id;
- private User user;
+ private String userId;
private Page page;
private boolean editor;
private Long renderSequence;
@@ -34,13 +34,13 @@ public class PageUserImpl implements Pag
this.id = id;
}
- public PageUserImpl(User user, Page page){
- this.user = user;
+ public PageUserImpl(String userId, Page page){
+ this.userId = userId;
this.page = page;
}
- public PageUserImpl(User user, Page page, long sequence){
- this.user = user;
+ public PageUserImpl(String userId, Page page, long sequence){
+ this.userId = userId;
this.page = page;
this.renderSequence = sequence;
}
@@ -56,13 +56,13 @@ public class PageUserImpl implements Pag
}
@Override
- public User getUser() {
- return user;
+ public String getUserId() {
+ return userId;
}
@Override
- public void setUser(User user) {
- this.user = user;
+ public void setUserId(String user) {
+ this.userId = user;
}
@Override
Modified:
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java
URL:
http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java?rev=1377002&r1=1377001&r2=1377002&view=diff
==============================================================================
---
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java
(original)
+++
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java
Fri Aug 24 17:37:54 2012
@@ -20,6 +20,7 @@ package org.apache.rave.portal.security.
import org.apache.rave.portal.model.*;
import org.apache.rave.portal.repository.PageRepository;
+import org.apache.rave.portal.repository.UserRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,10 +40,12 @@ import java.util.List;
public class DefaultPagePermissionEvaluator extends
AbstractModelPermissionEvaluator<Page> {
private Logger log = LoggerFactory.getLogger(getClass());
private PageRepository pageRepository;
+ private UserRepository userRepository;
@Autowired
- public DefaultPagePermissionEvaluator(PageRepository pageRepository) {
+ public DefaultPagePermissionEvaluator(PageRepository pageRepository,
UserRepository userRepository) {
this.pageRepository = pageRepository;
+ this.userRepository = userRepository;
}
@Override
@@ -217,7 +220,7 @@ public class DefaultPagePermissionEvalua
List<PageUser> members = trustedPage.getMembers();
if (members != null) {
for (PageUser pageUser : members){
- if (pageUser.getUser().getUsername().equals(viewer)){
+ if
(userRepository.get(pageUser.getUserId()).getUsername().equals(viewer)){
log.info("User "+viewer+" is a member of page
"+trustedPage.getId());
if(checkEditorStatus){
log.info("checking
editor:"+trustedPage.getId()+"@"+viewer+"@"+pageUser.isEditor());
Modified:
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluator.java
URL:
http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluator.java?rev=1377002&r1=1377001&r2=1377002&view=diff
==============================================================================
---
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluator.java
(original)
+++
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluator.java
Fri Aug 24 17:37:54 2012
@@ -20,6 +20,7 @@ package org.apache.rave.portal.security.
import org.apache.rave.portal.model.*;
import org.apache.rave.portal.repository.RegionRepository;
+import org.apache.rave.portal.repository.UserRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,10 +35,12 @@ import java.util.List;
public class DefaultRegionPermissionEvaluator extends
AbstractModelPermissionEvaluator<Region>{
private Logger log = LoggerFactory.getLogger(getClass());
private RegionRepository regionRepository;
+ private UserRepository userRepository;
@Autowired
- public DefaultRegionPermissionEvaluator(RegionRepository regionRepository)
{
+ public DefaultRegionPermissionEvaluator(RegionRepository regionRepository,
UserRepository userRepository) {
this.regionRepository = regionRepository;
+ this.userRepository = userRepository;
}
@Override
@@ -193,7 +196,7 @@ public class DefaultRegionPermissionEval
//
String viewer = ((User)authentication.getPrincipal()).getUsername();
for (PageUser pageUser:containerPage.getMembers()){
- if (pageUser.getUser().getUsername().equals(viewer)){
+ if
(userRepository.get(pageUser.getUserId()).getUsername().equals(viewer)){
log.info("User "+viewer+" is a member of page
"+containerPage.getId());
if(checkEditorStatus){
return pageUser.isEditor();
Modified:
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluator.java
URL:
http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluator.java?rev=1377002&r1=1377001&r2=1377002&view=diff
==============================================================================
---
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluator.java
(original)
+++
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluator.java
Fri Aug 24 17:37:54 2012
@@ -20,6 +20,7 @@ package org.apache.rave.portal.security.
import org.apache.rave.portal.model.*;
import org.apache.rave.portal.repository.RegionWidgetRepository;
+import org.apache.rave.portal.repository.UserRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,10 +35,12 @@ import java.util.List;
public class DefaultRegionWidgetPermissionEvaluator extends
AbstractModelPermissionEvaluator<RegionWidget> {
private Logger log = LoggerFactory.getLogger(getClass());
private RegionWidgetRepository regionWidgetRepository;
+ private UserRepository userRepository;
@Autowired
- public DefaultRegionWidgetPermissionEvaluator(RegionWidgetRepository
regionWidgetRepository) {
+ public DefaultRegionWidgetPermissionEvaluator(RegionWidgetRepository
regionWidgetRepository, UserRepository userRepository) {
this.regionWidgetRepository = regionWidgetRepository;
+ this.userRepository = userRepository;
}
@Override
@@ -198,7 +201,7 @@ public class DefaultRegionWidgetPermissi
//
String viewer = ((User)authentication.getPrincipal()).getUsername();
for (PageUser pageUser:containerPage.getMembers()){
- if (pageUser.getUser().getUsername().equals(viewer)){
+ if
(userRepository.get(pageUser.getUserId()).getUsername().equals(viewer)){
log.info("User "+viewer+" is a member of page
"+containerPage.getId());
if(checkEditorStatus){
return pageUser.isEditor();
Modified:
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
URL:
http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java?rev=1377002&r1=1377001&r2=1377002&view=diff
==============================================================================
---
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
(original)
+++
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
Fri Aug 24 17:37:54 2012
@@ -155,7 +155,7 @@ public class DefaultPageService implemen
// set this as a "sub-page" page type
page.setPageType(PageType.SUB_PAGE);
- PageUser pageUser = new PageUserImpl(page.getOwner(), page,
renderSequence);
+ PageUser pageUser = new PageUserImpl(page.getOwner().getId(), page,
renderSequence);
pageUser.setPageStatus(PageInvitationStatus.OWNER);
List<PageUser> members = new ArrayList<PageUser>();
members.add(pageUser);
@@ -305,7 +305,7 @@ public class DefaultPageService implemen
public Boolean addMemberToPage(String pageId, String userId){
Page page = getPage(pageId);
PageUser pageUser = new PageUserImpl();
- pageUser.setUser(userService.getUserById(userId));
+ pageUser.setUserId(userService.getUserById(userId).getId());
pageUser.setPage(page);
pageUser.setPageStatus(PageInvitationStatus.PENDING);
List<PageUser> thisUsersPages =
pageRepository.getPagesForUser(userService.getUserById(userId).getId(),
PageType.USER);
@@ -323,7 +323,7 @@ public class DefaultPageService implemen
Page page = this.getPage(pageId);
PageUser pageUserToRemove = null;
for(PageUser pageUser : page.getMembers()){
- if(pageUser.getUser().getId().equals(userId)){
+ if(pageUser.getUserId().equals(userId)){
pageUserToRemove = pageUser;
break;
}
@@ -344,7 +344,7 @@ public class DefaultPageService implemen
public Boolean updateSharedPageStatus(String pageId, String shareStatus) {
Page page = this.getPage(pageId);
for(PageUser pageUser : page.getMembers()){
- if(pageUser.getUser().equals(userService.getAuthenticatedUser())){
+
if(pageUser.getUserId().equals(userService.getAuthenticatedUser())){
pageUser.setPageStatus(PageInvitationStatus.get(shareStatus));
}
}
@@ -360,7 +360,7 @@ public class DefaultPageService implemen
public Boolean updatePageEditingStatus(String pageId, String userId,
boolean isEditor) {
Page page = this.getPage(pageId);
for(PageUser pageUser : page.getMembers()){
- if(pageUser.getUser().equals(userService.getUserById(userId))){
+ if(pageUser.getUserId().equals(userService.getUserById(userId))){
pageUser.setEditor(isEditor);
}
}
@@ -512,7 +512,7 @@ public class DefaultPageService implemen
page.setName(pageName);
page.setOwner(user);
page.setPageLayout(pageLayout);
- PageUser pageUser = new PageUserImpl(page.getOwner(), page,
renderSequence);
+ PageUser pageUser = new PageUserImpl(page.getOwner().getId(), page,
renderSequence);
pageUser.setPageStatus(PageInvitationStatus.OWNER);
pageUser.setEditor(true);
Modified:
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java?rev=1377002&r1=1377001&r2=1377002&view=diff
==============================================================================
---
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java
(original)
+++
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java
Fri Aug 24 17:37:54 2012
@@ -66,7 +66,7 @@ public class DefaultPagePermissionEvalua
mockPageRepository = createMock(PageRepository.class);
mockAuthentication = createMock(Authentication.class);
- defaultPagePermissionEvaluator = new
DefaultPagePermissionEvaluator(mockPageRepository);
+ defaultPagePermissionEvaluator = new
DefaultPagePermissionEvaluator(mockPageRepository, null);
user = new UserImpl();
user.setUsername(VALID_USERNAME);
Modified:
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java?rev=1377002&r1=1377001&r2=1377002&view=diff
==============================================================================
---
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java
(original)
+++
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java
Fri Aug 24 17:37:54 2012
@@ -59,7 +59,7 @@ public class DefaultRegionPermissionEval
@Before
public void setUp() {
mockRegionRepository = createMock(RegionRepository.class);
- defaultRegionPermissionEvaluator = new
DefaultRegionPermissionEvaluator(mockRegionRepository);
+ defaultRegionPermissionEvaluator = new
DefaultRegionPermissionEvaluator(mockRegionRepository, null);
mockAuthentication = createMock(Authentication.class);
user = new UserImpl();
Modified:
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java?rev=1377002&r1=1377001&r2=1377002&view=diff
==============================================================================
---
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java
(original)
+++
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java
Fri Aug 24 17:37:54 2012
@@ -63,7 +63,7 @@ public class DefaultRegionWidgetPermissi
@Before
public void setUp() {
mockRegionWidgetRepository = createMock(RegionWidgetRepository.class);
- defaultRegionWidgetPermissionEvaluator = new
DefaultRegionWidgetPermissionEvaluator(mockRegionWidgetRepository);
+ defaultRegionWidgetPermissionEvaluator = new
DefaultRegionWidgetPermissionEvaluator(mockRegionWidgetRepository, null);
mockAuthentication = createMock(Authentication.class);
user = new UserImpl();
Modified:
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java?rev=1377002&r1=1377001&r2=1377002&view=diff
==============================================================================
---
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
(original)
+++
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
Fri Aug 24 17:37:54 2012
@@ -77,6 +77,15 @@ public class DefaultPageServiceTest {
@Before
public void setup() {
+ pageLayout = new PageLayoutImpl();
+ pageLayout.setCode(PAGE_LAYOUT_CODE);
+ pageLayout.setNumberOfRegions(3L);
+
+ user = new UserImpl();
+ user.setUsername("acarlucci");
+ user.setId("1");
+ user.setDefaultPageLayout(pageLayout);
+
pageRepository = createMock(PageRepository.class);
pageTemplateRepository = createMock(PageTemplateRepository.class);
regionRepository = createMock(RegionRepository.class);
@@ -91,12 +100,12 @@ public class DefaultPageServiceTest {
validWidget = new WidgetImpl("1",
"http://dummy.apache.org/widgets/widget.xml";);
page = new PageImpl(PAGE_ID, user);
- pageUser = new PageUserImpl(user, page, 1L);
+ pageUser = new PageUserImpl(user.getId(), page, 1L);
page.setMembers(new ArrayList<PageUser>());
page.getMembers().add(pageUser);
page2 = new PageImpl(PAGE_ID2, user);
- pageUser2 = new PageUserImpl(user, page2, 2L);
+ pageUser2 = new PageUserImpl(user.getId(), page2, 2L);
page2.setMembers(new ArrayList<PageUser>());
page2.getMembers().add(pageUser2);
@@ -119,15 +128,6 @@ public class DefaultPageServiceTest {
lockedRegion.setLocked(true);
lockedRegion.setPage(page);
- pageLayout = new PageLayoutImpl();
- pageLayout.setCode(PAGE_LAYOUT_CODE);
- pageLayout.setNumberOfRegions(3L);
-
- user = new UserImpl();
- user.setUsername("acarlucci");
- user.setId("1");
- user.setDefaultPageLayout(pageLayout);
-
pageList = new ArrayList<Page>();
pageList.add(page2);
pageList.add(page);
@@ -197,7 +197,7 @@ public class DefaultPageServiceTest {
expectedPage.setPageLayout(pageLayout);
expectedPage.setRegions(createEmptyRegionList(pageLayout.getNumberOfRegions()));
expectedPage.setPageType(PageType.USER);
- PageUser lPageUser = new PageUserImpl(user, expectedPage,
EXPECTED_RENDER_SEQUENCE);
+ PageUser lPageUser = new PageUserImpl(user.getId(), expectedPage,
EXPECTED_RENDER_SEQUENCE);
List<PageUser> members = new ArrayList<PageUser>();
members.add(lPageUser);
expectedPage.setMembers(members);
@@ -302,7 +302,7 @@ public class DefaultPageServiceTest {
expectedPage.setPageLayout(pageLayout);
expectedPage.setRegions(createEmptyRegionList(pageLayout.getNumberOfRegions()));
expectedPage.setPageType(PageType.USER);
- PageUser lPageUser = new PageUserImpl(user, expectedPage,
EXPECTED_RENDER_SEQUENCE);
+ PageUser lPageUser = new PageUserImpl(user.getId(), expectedPage,
EXPECTED_RENDER_SEQUENCE);
List<PageUser> members = new ArrayList<PageUser>();
members.add(lPageUser);
userPage.setMembers(members);
@@ -336,7 +336,7 @@ public class DefaultPageServiceTest {
expectedPage.setOwner(user);
expectedPage.setPageLayout(pageLayout);
expectedPage.setRegions(createEmptyRegionList(pageLayout.getNumberOfRegions()));
- PageUser lPageUser = new PageUserImpl(user, expectedPage,
EXPECTED_RENDER_SEQUENCE);
+ PageUser lPageUser = new PageUserImpl(user.getId(), expectedPage,
EXPECTED_RENDER_SEQUENCE);
List<PageUser> members = new ArrayList<PageUser>();
members.add(lPageUser);
expectedPage.setMembers(members);
@@ -448,7 +448,7 @@ public class DefaultPageServiceTest {
expectedPage.setOwner(user);
expectedPage.setPageLayout(pageLayout);
expectedPage.setRegions(createEmptyRegionList(pageLayout.getNumberOfRegions()));
- PageUser lPageUser = new PageUserImpl(user, expectedPage,
EXPECTED_RENDER_SEQUENCE);
+ PageUser lPageUser = new PageUserImpl(user.getId(), expectedPage,
EXPECTED_RENDER_SEQUENCE);
List<PageUser> members = new ArrayList<PageUser>();
members.add(lPageUser);
expectedPage.setMembers(members);
Modified:
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPage.java
URL:
http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPage.java?rev=1377002&r1=1377001&r2=1377002&view=diff
==============================================================================
---
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPage.java
(original)
+++
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPage.java
Fri Aug 24 17:37:54 2012
@@ -309,7 +309,7 @@ public class JpaPage implements BasicEnt
// find the PageUser object representing the sub page owned by the
user
for (PageUser pageUser : o1.getMembers()) {
- if (pageUser.getUser().equals(o1.getOwner())) {
+ if (pageUser.getUserId().equals(o1.getOwner().getId())) {
o1RenderSequence = pageUser.getRenderSequence();
break;
}
@@ -317,7 +317,7 @@ public class JpaPage implements BasicEnt
// find the PageUser object representing the sub page owned by the
user
for (PageUser pageUser : o2.getMembers()) {
- if (pageUser.getUser().equals(o2.getOwner())) {
+ if (pageUser.getUserId().equals(o2.getOwner().getId())) {
o2RenderSequence = pageUser.getRenderSequence();
break;
}
Modified:
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageUser.java
URL:
http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageUser.java?rev=1377002&r1=1377001&r2=1377002&view=diff
==============================================================================
---
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageUser.java
(original)
+++
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageUser.java
Fri Aug 24 17:37:54 2012
@@ -29,9 +29,9 @@ import org.codehaus.jackson.annotate.Jso
@Access(AccessType.FIELD)
@Table(name = "page_user",
uniqueConstraints={@UniqueConstraint(columnNames={"page_id","user_id"})})
@NamedQueries({
- @NamedQuery(name = JpaPageUser.GET_BY_USER_ID_AND_PAGE_TYPE,
query="SELECT p.page FROM JpaPageUser p, JpaPage q WHERE p.page.entityId =
q.entityId and p.user.entityId = :userId and q.pageType = :pageType ORDER BY
p.renderSequence"),
- @NamedQuery(name = JpaPageUser.GET_PAGES_FOR_USER, query="SELECT p
FROM JpaPageUser p, JpaPage q WHERE p.page.entityId = q.entityId and
p.user.entityId = :userId and q.pageType = :pageType ORDER BY
p.renderSequence"),
- @NamedQuery(name = JpaPageUser.GET_SINGLE_RECORD, query="SELECT p FROM
JpaPageUser p WHERE p.user.entityId = :userId and p.page.entityId = :pageId")
+ @NamedQuery(name = JpaPageUser.GET_BY_USER_ID_AND_PAGE_TYPE,
query="SELECT p.page FROM JpaPageUser p, JpaPage q WHERE p.page.entityId =
q.entityId and p.userId = :userId and q.pageType = :pageType ORDER BY
p.renderSequence"),
+ @NamedQuery(name = JpaPageUser.GET_PAGES_FOR_USER, query="SELECT p
FROM JpaPageUser p, JpaPage q WHERE p.page.entityId = q.entityId and p.userId =
:userId and q.pageType = :pageType ORDER BY p.renderSequence"),
+ @NamedQuery(name = JpaPageUser.GET_SINGLE_RECORD, query="SELECT p FROM
JpaPageUser p WHERE p.userId = :userId and p.page.entityId = :pageId")
})
public class JpaPageUser implements BasicEntity, Serializable, PageUser {
private static final long serialVersionUID = 1L;
@@ -44,12 +44,11 @@ public class JpaPageUser implements Basi
@GeneratedValue(strategy = GenerationType.TABLE, generator =
"pageUserIdGenerator")
@TableGenerator(name = "pageUserIdGenerator", table =
"RAVE_PORTAL_SEQUENCES", pkColumnName = "SEQ_NAME",
valueColumnName = "SEQ_COUNT", pkColumnValue = "page_user",
allocationSize = 1, initialValue = 1)
-
private Long entityId;
- @ManyToOne
+ @Basic
@JoinColumn(name = "user_id")
- private JpaUser user;
+ private String userId;
@ManyToOne(fetch=FetchType.EAGER)
@JoinColumn(name = "page_id")
@@ -69,12 +68,12 @@ public class JpaPageUser implements Basi
public JpaPageUser(){}
public JpaPageUser(User user, Page page){
- this.setUser(user);
+ this.setUserId(user.getId());
setPage(page);
}
public JpaPageUser(JpaUser user, Page page, long sequence){
- this.user = user;
+ this.userId = user.getId();
setPage(page);
this.renderSequence = sequence;
}
@@ -109,19 +108,19 @@ public class JpaPageUser implements Basi
}
/**
- * @return the user
+ * @return the userId
*/
@Override
- public JpaUser getUser() {
- return user;
+ public String getUserId() {
+ return userId;
}
/**
- * @param user the user to set
- */
+ * @param userId the userId to set
+ */
@Override
- public void setUser(User user) {
- this.user = JpaConverter.getInstance().convert(user, User.class);
+ public void setUserId(String userId) {
+ this.userId = userId;
}
/**
Modified:
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageUserConverter.java
URL:
http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageUserConverter.java?rev=1377002&r1=1377001&r2=1377002&view=diff
==============================================================================
---
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageUserConverter.java
(original)
+++
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageUserConverter.java
Fri Aug 24 17:37:54 2012
@@ -62,7 +62,7 @@ public class JpaPageUserConverter implem
converted.setPage(source.getPage());
converted.setPageStatus(source.getPageStatus());
converted.setRenderSequence(source.getRenderSequence());
- converted.setUser(source.getUser());
+ converted.setUserId(source.getUserId());
converted.setEditor(source.isEditor());
}
}
Modified:
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java?rev=1377002&r1=1377001&r2=1377002&view=diff
==============================================================================
---
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
(original)
+++
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
Fri Aug 24 17:37:54 2012
@@ -76,7 +76,7 @@ public class JpaPageRepository implement
@Override
public List<Page> getAllPages(String userId, PageType pageType) {
TypedQuery<JpaPage> query =
manager.createNamedQuery(JpaPageUser.GET_BY_USER_ID_AND_PAGE_TYPE,
JpaPage.class);
- query.setParameter("userId", userId == null ? null :
Long.parseLong(userId));
+ query.setParameter("userId", userId);
query.setParameter("pageType", pageType);
return CollectionUtils.<Page>toBaseTypedList(query.getResultList());
}
@@ -102,7 +102,7 @@ public class JpaPageRepository implement
@Override
public List<PageUser> getPagesForUser(String userId, PageType pageType) {
TypedQuery<JpaPageUser> query =
manager.createNamedQuery(JpaPageUser.GET_PAGES_FOR_USER, JpaPageUser.class);
- query.setParameter("userId", userId == null ? null :
Long.parseLong(userId));
+ query.setParameter("userId", userId);
query.setParameter("pageType", pageType);
return
CollectionUtils.<PageUser>toBaseTypedList(query.getResultList());
}
@@ -110,7 +110,7 @@ public class JpaPageRepository implement
@Override
public PageUser getSingleRecord(String userId, String pageId){
TypedQuery<JpaPageUser> query =
manager.createNamedQuery(JpaPageUser.GET_SINGLE_RECORD, JpaPageUser.class);
- query.setParameter("userId", userId == null ? null :
Long.parseLong(userId));
+ query.setParameter("userId", userId);
query.setParameter("pageId", pageId == null ? null :
Long.parseLong(pageId));
return query.getSingleResult();
}
@@ -123,7 +123,7 @@ public class JpaPageRepository implement
private void removePageUsers(JpaPage item) {
for(PageUser user : item.getMembers()) {
user.setPage(null);
- user.setUser(null);
+ user.setUserId(null);
manager.flush();
manager.remove(user);
}
Modified:
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PageTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PageTest.java?rev=1377002&r1=1377001&r2=1377002&view=diff
==============================================================================
---
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PageTest.java
(original)
+++
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PageTest.java
Fri Aug 24 17:37:54 2012
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertTru
@Ignore
public class PageTest {
private Page page;
- private long id;
+ private String id;
private String parentId;
private String testName;
private JpaUser testOwner;
@@ -57,11 +57,12 @@ public class PageTest {
@Before
public void setup(){
- id=19191991L;
- page=new PageImpl(Long.toBinaryString(id));
+ long longId = 19191991L;
+ id=Long.toBinaryString(longId);
+ page=new PageImpl(id);
parentId = "12345";
testName="testName";
- testOwner=new JpaUser(id);
+ testOwner=new JpaUser(longId);
parentPage = new PageImpl(parentId);
subPages = new ArrayList<Page>();
@@ -74,7 +75,7 @@ public class PageTest {
List<PageUser> pageUsers1 = new ArrayList<PageUser>();
PageUser pageUser1 = new PageUserImpl();
- pageUser1.setUser(testOwner);
+ pageUser1.setUserId(id);
pageUser1.setPage(subPage1);
pageUser1.setRenderSequence(2L);
pageUsers1.add(pageUser1);
@@ -82,13 +83,13 @@ public class PageTest {
List<PageUser> pageUsers2 = new ArrayList<PageUser>();
PageUser pageUser2 = new PageUserImpl();
- pageUser2.setUser(new JpaUser());
+ pageUser2.setUserId("");
pageUser2.setPage(subPage2);
pageUser2.setRenderSequence(19L);
pageUsers2.add(pageUser2);
PageUser pageUser3 = new PageUserImpl();
- pageUser3.setUser(testOwner);
+ pageUser3.setUserId(testOwner.getId());
pageUser3.setPage(subPage2);
pageUser3.setRenderSequence(1L);
pageUsers2.add(pageUser3);
@@ -112,7 +113,7 @@ public class PageTest {
pageUser = new PageUserImpl();
pageUser.setPage(page);
- pageUser.setUser(testOwner);
+ pageUser.setUserId(id);
pageUser.setRenderSequence(renderSequence);
}
@@ -123,7 +124,7 @@ public class PageTest {
@Test
public void testAccessorMethods() {
- assertTrue(page.getId()==Long.toString(id));
+ assertTrue(page.getId().equals(id));
assertTrue(page.getName().equals(testName));
assertTrue(page.getOwner().equals(testOwner));
assertTrue(page.getParentPage().equals(parentPage));
Modified:
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java
URL:
http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java?rev=1377002&r1=1377001&r2=1377002&view=diff
==============================================================================
---
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java
(original)
+++
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java
Fri Aug 24 17:37:54 2012
@@ -71,7 +71,7 @@ public class PageController {
PageUser currentPageUser = null;
User thisUser = userService.getAuthenticatedUser();
for(PageUser pageUser : page.getMembers()){
- if(pageUser.getUser().equals(thisUser)){
+ if(pageUser.getUserId().equals(thisUser.getId())){
currentPageUser = pageUser;
}
}
@@ -90,7 +90,7 @@ public class PageController {
PageUser currentPageUser = null;
User thisUser = userService.getAuthenticatedUser();
for(PageUser pageUser : page.getMembers()){
- if(pageUser.getUser().equals(thisUser)){
+ if(pageUser.getUserId().equals(thisUser.getId())){
currentPageUser = pageUser;
}
}
@@ -114,7 +114,7 @@ public class PageController {
List<Page> viewablePages = new ArrayList<Page>();
for(Page page : pages){
for(PageUser pageUser : page.getMembers()){
- if(pageUser != null && pageUser.getUser().equals(user) &&
!pageUser.getPageStatus().equals(PageInvitationStatus.REFUSED)){
+ if(pageUser != null &&
pageUser.getUserId().equals(user.getId()) &&
!pageUser.getPageStatus().equals(PageInvitationStatus.REFUSED)){
viewablePages.add(page);
}
}
Modified:
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java?rev=1377002&r1=1377001&r2=1377002&view=diff
==============================================================================
---
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java
(original)
+++
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java
Fri Aug 24 17:37:54 2012
@@ -79,7 +79,7 @@ public class PageControllerTest {
validUser = new UserImpl(USER_ID);
validPageLayout = new PageLayoutImpl();
validPageLayout.setCode(VALID_PAGE_LAYOUT_CODE);
- defaultPageUser = new PageUserImpl(validUser, defaultPage, 1L);
+ defaultPageUser = new PageUserImpl(USER_ID, defaultPage, 1L);
defaultPageUser.setPageStatus(PageInvitationStatus.OWNER);
validUser.setDefaultPageLayout(validPageLayout);
@@ -93,7 +93,7 @@ public class PageControllerTest {
otherPage = new PageImpl(OTHER_PAGE_ID, validUser);
otherPage.setPageLayout(validPageLayout);
- otherPageUser = new PageUserImpl(validUser, otherPage, 2L);
+ otherPageUser = new PageUserImpl(USER_ID, otherPage, 2L);
otherPageUser.setPageStatus(PageInvitationStatus.OWNER);
List<PageUser> members2 = new ArrayList<PageUser>();
Modified:
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp?rev=1377002&r1=1377001&r2=1377002&view=diff
==============================================================================
---
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
(original)
+++
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
Fri Aug 24 17:37:54 2012
@@ -24,6 +24,7 @@
<jsp:useBean id="pageUser" type="org.apache.rave.portal.model.PageUser"
scope="request"/>
<jsp:useBean id="pageLayouts"
type="java.util.List<org.apache.rave.portal.model.JpaPageLayout>"
scope="request"/>
<%--@elvariable id="page" type="org.apache.rave.portal.model.Page"--%>
+<sec:authentication property="principal.id" var="principalId" scope="request"/>
<sec:authentication property="principal.username" var="principleUsername"
scope="request"/>
<sec:authentication property="principal.displayName" var="displayName"
scope="request"/>
@@ -118,7 +119,7 @@
</c:otherwise>
</c:choose>
<c:forEach var="members" items="${userPage.members}">
- <c:if test="${members.user.username == principleUsername
and members.editor and userPage.id != page.id}">
+ <c:if test="${members.userId == principalId and
members.editor and userPage.id != page.id}">
<c:set var="canMoveWidgetsToEditablePage"
scope="request" value="true"/>
</c:if>
</c:forEach>
@@ -236,7 +237,7 @@
<select id="moveToPageId">
<c:forEach var="userPage" items="${pages}">
<c:forEach var="members"
items="${userPage.members}">
- <c:if test="${members.user.username ==
principleUsername and members.editor and userPage.id != page.id}">
+ <c:if test="${members.userId ==
principalId and members.editor and userPage.id != page.id}">
<option value="${userPage.id}">
<c:out
value="${userPage.name}"/>
</option>
@@ -309,6 +310,7 @@
});
</script>
<c:forEach var="members" items="${page.members}">
-
<script>rave.layout.searchHandler.addExistingMember("${members.user.username}",${members.editor});</script>
+ <%--TODO: This MUST change before RAVE-729 is complete --%>
+
<script>rave.layout.searchHandler.addExistingMember("${members.userId}",${members.editor});</script>
</c:forEach>
</portal:register-init-script>
