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 2013/02/28 21:11:23 UTC
svn commit: r1451324 - in
/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model:
JpaActivityStreamsItem.java JpaActivityStreamsMediaLink.java
Author: mfranklin
Date: Thu Feb 28 20:11:23 2013
New Revision: 1451324
URL: http://svn.apache.org/r1451324
Log:
Fixed incorrect sequence generator used RAVE-903
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaActivityStreamsItem.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaActivityStreamsMediaLink.java
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaActivityStreamsItem.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaActivityStreamsItem.java?rev=1451324&r1=1451323&r2=1451324&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaActivityStreamsItem.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaActivityStreamsItem.java Thu Feb 28 20:11:23 2013
@@ -28,14 +28,15 @@ import java.util.HashMap;
@Access(AccessType.FIELD)
@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
@Table(name = "activities")
-@SequenceGenerator(name="activityEntrySequence", sequenceName = "activity_entry_sequence")
@DiscriminatorValue("Item")
public class JpaActivityStreamsItem implements ActivityStreamsItem, BasicEntity {
private static final long serialVersionUID = 1L;
@Id
- @GeneratedValue(strategy=GenerationType.SEQUENCE, generator = "activityEntrySequence")
+ @GeneratedValue(strategy = GenerationType.TABLE, generator = "activityEntrySequence")
+ @TableGenerator(name = "activityEntrySequence", table = "RAVE_PORTAL_SEQUENCES", pkColumnName = "SEQ_NAME",
+ valueColumnName = "SEQ_COUNT", pkColumnValue = "activity_entry", allocationSize = 1, initialValue = 1)
protected Long entityId;
@Basic
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaActivityStreamsMediaLink.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaActivityStreamsMediaLink.java?rev=1451324&r1=1451323&r2=1451324&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaActivityStreamsMediaLink.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaActivityStreamsMediaLink.java Thu Feb 28 20:11:23 2013
@@ -29,7 +29,6 @@ import java.util.HashMap;
@Access(AccessType.FIELD)
@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
@Table(name = "activitystreams_medialink")
-@SequenceGenerator(name="activityMediaLinkSequence", sequenceName = "activity_media_link_sequence")
@NamedQueries({
@NamedQuery(name = JpaActivityStreamsMediaLink.FIND_BY_ID, query = "SELECT a FROM JpaActivityStreamsMediaLink a WHERE a.id = :id")
})
@@ -40,7 +39,9 @@ public class JpaActivityStreamsMediaLink
public static final String FIND_BY_ID = "JpaActivityStreamsMediaLink.findById";
@Id
- @GeneratedValue(strategy=GenerationType.SEQUENCE, generator = "activityMediaLinkSequence")
+ @GeneratedValue(strategy = GenerationType.TABLE, generator = "activityMediaSequence")
+ @TableGenerator(name = "activityMediaSequence", table = "RAVE_PORTAL_SEQUENCES", pkColumnName = "SEQ_NAME",
+ valueColumnName = "SEQ_COUNT", pkColumnValue = "activity_media", allocationSize = 1, initialValue = 1)
private Long entityId;
@Basic