Author: mfranklin
Date: Mon Sep 9 23:19:04 2013
New Revision: 1521314
URL: http://svn.apache.org/r1521314
Log:
Added contextId property to model (RAVE-1054)
Modified:
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Page.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageImpl.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPage.java
Modified:
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Page.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Page.java?rev=1521314&r1=1521313&r2=1521314&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Page.java
(original)
+++
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/Page.java
Mon Sep 9 23:19:04 2013
@@ -23,15 +23,29 @@ import java.util.List;
@XmlTransient
public interface Page {
+
String getId();
void setId(String id);
String getName();
void setName(String name);
+ /**
+ * Represents the individual who is responsible for the page
+ *
+ * NOTE: This should be eventually deprecated in favor of context id
+ * @return the {@link Person}'s ID who owns the page
+ */
String getOwnerId();
void setOwnerId(String owner);
+ /**
+ * Represents the context identifier for the page. This *MAY* be a Person
ID depending on the context's needs
+ * @return a string representing the logical context for which the page is
to be rendered (portal user's ID, profile owner ID, etc)
+ */
+ String getContextId();
+ void setContextId(String owner);
+
PageLayout getPageLayout();
void setPageLayout(PageLayout pageLayout);
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageImpl.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageImpl.java?rev=1521314&r1=1521313&r2=1521314&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageImpl.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageImpl.java
Mon Sep 9 23:19:04 2013
@@ -26,6 +26,7 @@ public class PageImpl implements Page {
private String id;
private String name;
private String ownerId;
+ private String contextId;
private Page parentPage;
private List<Page> subPages;
private PageLayout pageLayout;
@@ -75,6 +76,16 @@ public class PageImpl implements Page {
}
@Override
+ public String getContextId() {
+ return contextId;
+ }
+
+ @Override
+ public void setContextId(String contextId) {
+ this.contextId = contextId;
+ }
+
+ @Override
public Page getParentPage() {
return parentPage;
}
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java?rev=1521314&r1=1521313&r2=1521314&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
Mon Sep 9 23:19:04 2013
@@ -87,11 +87,18 @@ public interface PageService {
*
* @since 0.22
* @param context the context for the pages ex: "portal", "profile", etc.
- * @param userId the user to retrieve the page for
+ * @param contextId the identifier of the item in the context that matches
the page.
+ * examples:
+ * context: "person_profile", contextId: "profile
owner's id"
+ * context: "group", contextId: "group id"
+ * context: "project", contextId: "project number"
+ * context: "dashboard", contextId: "subject"
+ * context: "portal", contextId: "owner's id"
+ *
* @return A non-null, possibly empty list of page for the given user.
*/
- @PreAuthorize("hasPermission(new
org.apache.rave.portal.security.impl.RaveSecurityContext(#userId,
'org.apache.rave.model.User'), 'org.apache.rave.model.Page', 'read')")
- List<Page> getPages(String context, String userId);
+ @PreAuthorize("hasPermission(new
org.apache.rave.portal.security.impl.RaveSecurityContext(#contextId,
'org.apache.rave.model.User'), 'org.apache.rave.model.Page', 'read')")
+ List<Page> getPages(String context, String contextId);
/**
* Return the page object from a list of pages given the pageId
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java?rev=1521314&r1=1521313&r2=1521314&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
Mon Sep 9 23:19:04 2013
@@ -115,7 +115,7 @@ public class DefaultPageService implemen
}
@Override
- public List<Page> getPages(String context, String userId) {
+ public List<Page> getPages(String context, String contextId) {
return null;
}
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPage.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPage.java?rev=1521314&r1=1521313&r2=1521314&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPage.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPage.java
Mon Sep 9 23:19:04 2013
@@ -75,6 +75,10 @@ public class JpaPage implements BasicEnt
@Column(name = "owner_id")
private String ownerId;
+ @Basic
+ @Column(name = "context_id")
+ private String contextId;
+
@ManyToOne(cascade=CascadeType.ALL, optional = true)
@JoinColumn(name="parent_page_id")
private JpaPage parentPage;
@@ -168,6 +172,21 @@ public class JpaPage implements BasicEnt
}
/**
+ * Gets the {@link User} that owns the page
+ *
+ * @return Valid {@link org.apache.rave.model.User}
+ */
+ @Override
+ public String getContextId() {
+ return contextId;
+ }
+
+ @Override
+ public void setContextId(String contextId) {
+ this.contextId = contextId;
+ }
+
+ /**
* Gets the {@link JpaPageLayout}
*
* @return Valid {@link JpaPageLayout}
