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/05/31 17:22:15 UTC
svn commit: r1344770 -
/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
Author: mfranklin
Date: Thu May 31 15:22:14 2012
New Revision: 1344770
URL: http://svn.apache.org/viewvc?rev=1344770&view=rev
Log:
Explicitly requiring field access type on all entities (Supports RAVE-625)
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Authority.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Category.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaAddress.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaGroup.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaOrganization.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageLayout.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonAssociation.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PortalPreference.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Tag.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetTag.java
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Authority.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Authority.java?rev=1344770&r1=1344769&r2=1344770&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Authority.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Authority.java Thu May 31 15:22:14 2012
@@ -22,19 +22,7 @@ package org.apache.rave.portal.model;
import org.apache.rave.persistence.BasicEntity;
import org.springframework.security.core.GrantedAuthority;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.PreRemove;
-import javax.persistence.Table;
-import javax.persistence.TableGenerator;
+import javax.persistence.*;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
@@ -44,6 +32,7 @@ import java.util.Collection;
*/
@Entity
@Table(name = "granted_authority")
+@Access(AccessType.FIELD)
@NamedQueries({
@NamedQuery(name = Authority.GET_BY_AUTHORITY_NAME, query = "SELECT a FROM Authority a WHERE a.authority = :authority"),
@NamedQuery(name = Authority.GET_ALL, query = "SELECT a FROM Authority a"),
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Category.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Category.java?rev=1344770&r1=1344769&r2=1344770&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Category.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Category.java Thu May 31 15:22:14 2012
@@ -28,6 +28,7 @@ import java.util.List;
* A category for a widget.
*/
@Entity
+@Access(AccessType.FIELD)
@Table(name = "category")
@XmlRootElement
@NamedQueries({
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaAddress.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaAddress.java?rev=1344770&r1=1344769&r2=1344770&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaAddress.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaAddress.java Thu May 31 15:22:14 2012
@@ -23,6 +23,7 @@ import javax.persistence.*;
/**
*/
@Entity
+@Access(AccessType.FIELD)
@NamedQueries(value = {
@NamedQuery(name = JpaAddress.FIND_BY_STREET_CITY_COUNTRY, query = "select a from JpaAddress a where a.streetAddress=:street and a.locality=:city and a.country=:country")
})
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaGroup.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaGroup.java?rev=1344770&r1=1344769&r2=1344770&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaGroup.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaGroup.java Thu May 31 15:22:14 2012
@@ -33,6 +33,7 @@ import java.util.List;
* associated with individuals and are used by those individuals to manage people.
*/
@Entity
+@Access(AccessType.FIELD)
@Table(name = "groups")
@NamedQueries(
@NamedQuery(name = JpaGroup.FIND_BY_TITLE, query="select g from JpaGroup g where g.title = :groupId")
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaOrganization.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaOrganization.java?rev=1344770&r1=1344769&r2=1344770&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaOrganization.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaOrganization.java Thu May 31 15:22:14 2012
@@ -27,6 +27,7 @@ import java.util.Date;
/**
*/
@Entity
+@Access(AccessType.FIELD)
@NamedQueries(value = {
@NamedQuery(name = JpaOrganization.FIND_BY_NAME, query = "select o from JpaOrganization o where o.name like :name")
})
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.java?rev=1344770&r1=1344769&r2=1344770&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.java Thu May 31 15:22:14 2012
@@ -27,6 +27,7 @@ import javax.persistence.*;
* add fields to the Person not initially envisioned
*/
@Entity
+@Access(AccessType.FIELD)
@NamedQueries(value = {
@NamedQuery(name = JpaPersonProperty.FIND_BY_TYPE_AND_VALUE, query = "select p from JpaPersonProperty p where p.type=:type and p.value=:value")
})
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageLayout.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageLayout.java?rev=1344770&r1=1344769&r2=1344770&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageLayout.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageLayout.java Thu May 31 15:22:14 2012
@@ -21,22 +21,14 @@ package org.apache.rave.portal.model;
import org.apache.rave.persistence.BasicEntity;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.TableGenerator;
+import javax.persistence.*;
import java.io.Serializable;
/**
* Represents an organization of regions within a page that is supported by the rendering engine
*/
@Entity
+@Access(AccessType.FIELD)
@Table(name="page_layout")
@NamedQueries({
@NamedQuery(name=PageLayout.PAGELAYOUT_GET_BY_LAYOUT_CODE, query = "select pl from PageLayout pl where pl.code = :code"),
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java?rev=1344770&r1=1344769&r2=1344770&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java Thu May 31 15:22:14 2012
@@ -20,26 +20,12 @@ package org.apache.rave.portal.model;
import java.io.Serializable;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.TableGenerator;
-import javax.persistence.UniqueConstraint;
+import javax.persistence.*;
import org.apache.rave.persistence.BasicEntity;
import org.codehaus.jackson.annotate.JsonBackReference;
@Entity
+@Access(AccessType.FIELD)
@Table(name = "page_user", uniqueConstraints={@UniqueConstraint(columnNames={"page_id","user_id"})})
@NamedQueries({
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonAssociation.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonAssociation.java?rev=1344770&r1=1344769&r2=1344770&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonAssociation.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonAssociation.java Thu May 31 15:22:14 2012
@@ -26,6 +26,7 @@ import javax.persistence.*;
* Represents an association between people
*/
@Entity
+@Access(AccessType.FIELD)
@Table(name = "person_association",
uniqueConstraints = @UniqueConstraint(columnNames = {"follower_id", "followed_id"})
)
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PortalPreference.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PortalPreference.java?rev=1344770&r1=1344769&r2=1344770&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PortalPreference.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PortalPreference.java Thu May 31 15:22:14 2012
@@ -22,18 +22,7 @@ package org.apache.rave.portal.model;
import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.persistence.BasicEntity;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.TableGenerator;
+import javax.persistence.*;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.LinkedList;
@@ -43,6 +32,7 @@ import java.util.List;
* Bean to manage portal preferences like title suffix, logo, number of items per page etc
*/
@Entity
+@Access(AccessType.FIELD)
@Table(name = "portal_preference")
@NamedQueries({
@NamedQuery(name = PortalPreference.GET_ALL, query = "SELECT pp FROM PortalPreference pp"),
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java?rev=1344770&r1=1344769&r2=1344770&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java Thu May 31 15:22:14 2012
@@ -29,6 +29,7 @@ import java.util.List;
* A widget within a region
*/
@Entity
+@Access(AccessType.FIELD)
@Table(name = "region_widget")
@NamedQueries({
@NamedQuery(name = RegionWidget.REGION_WIDGET_GET_DISTINCT_USER_COUNT_ALL_WIDGETS,
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java?rev=1344770&r1=1344769&r2=1344770&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java Thu May 31 15:22:14 2012
@@ -21,14 +21,7 @@ package org.apache.rave.portal.model;
import org.apache.rave.persistence.BasicEntity;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.TableGenerator;
+import javax.persistence.*;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
@@ -36,6 +29,7 @@ import java.io.Serializable;
* A preference for a region widget.
*/
@Entity
+@Access(AccessType.FIELD)
@Table(name = "region_widget_preference")
@XmlRootElement
public class RegionWidgetPreference implements BasicEntity, Serializable {
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Tag.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Tag.java?rev=1344770&r1=1344769&r2=1344770&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Tag.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Tag.java Thu May 31 15:22:14 2012
@@ -30,6 +30,7 @@ import java.util.List;
* associated with individuals and are used by those individuals to manage people.
*/
@Entity
+@Access(AccessType.FIELD)
@Table(name = "tag")
@NamedQueries({
@NamedQuery(name = Tag.GET_ALL, query = "select t from Tag t order by t.keyword asc"),
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java?rev=1344770&r1=1344769&r2=1344770&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java Thu May 31 15:22:14 2012
@@ -35,6 +35,7 @@ import java.util.Date;
* A user of the system
*/
@Entity
+@Access(AccessType.FIELD)
@NamedQueries({
@NamedQuery(name = User.USER_GET_BY_USERNAME, query = "select u from User u where u.username = :"+User.PARAM_USERNAME),
@NamedQuery(name = User.USER_GET_BY_USER_EMAIL, query = "select u from User u where u.email = :"+User.PARAM_EMAIL),
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java?rev=1344770&r1=1344769&r2=1344770&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java Thu May 31 15:22:14 2012
@@ -32,6 +32,7 @@ import java.util.List;
*/
@XmlAccessorType(XmlAccessType.NONE)
@Entity
+@Access(AccessType.FIELD)
@Table(name = "widget")
@NamedQueries({
@NamedQuery(name = Widget.WIDGET_GET_ALL, query = Widget.SELECT_W_FROM_WIDGET_W + Widget.ORDER_BY_TITLE_ASC),
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java?rev=1344770&r1=1344769&r2=1344770&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java Thu May 31 15:22:14 2012
@@ -26,6 +26,7 @@ import java.util.Date;
* A comment for a widget.
*/
@Entity
+@Access(AccessType.FIELD)
@Table(name = "widget_comment")
@NamedQueries({
@NamedQuery(name = WidgetComment.DELETE_ALL_BY_USER,
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java?rev=1344770&r1=1344769&r2=1344770&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java Thu May 31 15:22:14 2012
@@ -20,16 +20,7 @@ package org.apache.rave.portal.model;
import org.apache.rave.persistence.BasicEntity;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.TableGenerator;
+import javax.persistence.*;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
@@ -37,6 +28,7 @@ import java.io.Serializable;
* A Rating for a Widget
*/
@Entity
+@Access(AccessType.FIELD)
@Table(name = "widget_rating")
@NamedQueries ({
@NamedQuery(name = WidgetRating.WIDGET_ALL_TOTAL_LIKES,
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetTag.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetTag.java?rev=1344770&r1=1344769&r2=1344770&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetTag.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetTag.java Thu May 31 15:22:14 2012
@@ -26,6 +26,7 @@ import java.util.Date;
* A tag for a widget.
*/
@Entity
+@Access(AccessType.FIELD)
@Table(name = "widget_tag")
@XmlRootElement
@NamedQueries({