You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2013/02/10 02:25:39 UTC
svn commit: r1444470 - in
/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans:
basic/ calendar/ chat/ domain/ flvrecord/ invitation/ lang/ logs/ poll/
room/ user/
Author: sebawagner
Date: Sun Feb 10 01:25:38 2013
New Revision: 1444470
URL: http://svn.apache.org/r1444470
Log:
Adding @ForeignKey at least at the ManyToOne relations that are truely mapped
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Naviglobal.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentCategory.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentReminderTyps.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/chat/ChatMessage.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaData.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/invitation/Invitations.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/logs/ConferenceLog.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/PollType.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPoll.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPollAnswers.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Room.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomModerator.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomOrganisation.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/User.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/UserContact.java
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Configuration.java Sun Feb 10 01:25:38 2013
@@ -34,6 +34,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.apache.openmeetings.persistence.beans.user.User;
import org.simpleframework.xml.Element;
@@ -88,6 +89,7 @@ public class Configuration implements Se
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_id")
+ @ForeignKey(enabled = true)
@Element(name = "user_id", data = true, required = false)
private User user;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java Sun Feb 10 01:25:38 2013
@@ -34,6 +34,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.apache.openmeetings.persistence.beans.user.User;
import org.simpleframework.xml.Element;
@@ -80,10 +81,12 @@ public class LdapConfig implements Seria
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="insertedby_id", updatable=true, insertable=true)
+ @ForeignKey(enabled = true)
public User insertedby;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="updatedby_id", updatable=true, insertable=true)
+ @ForeignKey(enabled = true)
public User updatedby;
@Column(name="deleted")
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Naviglobal.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Naviglobal.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Naviglobal.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Naviglobal.java Sun Feb 10 01:25:38 2013
@@ -36,6 +36,7 @@ import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Transient;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
@Entity
@@ -98,6 +99,7 @@ public class Naviglobal implements Seria
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@JoinColumn(name = "global_id")
+ @ForeignKey(enabled = true)
private List<Navimain> mainnavi;
@Transient
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java Sun Feb 10 01:25:38 2013
@@ -35,6 +35,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.apache.openmeetings.persistence.beans.user.User;
import org.simpleframework.xml.Element;
@@ -79,10 +80,12 @@ public class Server implements Serializa
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "insertedby_id", updatable = true, insertable = true)
+ @ForeignKey(enabled = true)
public User insertedby;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "updatedby_id", updatable = true, insertable = true)
+ @ForeignKey(enabled = true)
public User updatedby;
@Lob
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/Appointment.java Sun Feb 10 01:25:38 2013
@@ -38,6 +38,7 @@ import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.persistence.beans.room.Room;
import org.apache.openmeetings.persistence.beans.user.User;
import org.simpleframework.xml.Element;
@@ -100,11 +101,13 @@ public class Appointment implements Seri
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "category_id", nullable = true)
+ @ForeignKey(enabled = true)
@Element(name="categoryId", data=true, required=false)
private AppointmentCategory appointmentCategory;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "user_id", nullable = true)
+ @ForeignKey(enabled = true)
@Element(name="users_id", data=true, required=false)
private User userId;
@@ -120,6 +123,7 @@ public class Appointment implements Seri
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "remind_id", nullable = true)
+ @ForeignKey(enabled = true)
@Element(name="typId", data=true, required=false)
private AppointmentReminderTyps remind;
@@ -141,6 +145,7 @@ public class Appointment implements Seri
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "room_id", nullable = true)
+ @ForeignKey(enabled = true)
@Element(name="room_id", data=true, required=false)
private Room room;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentCategory.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentCategory.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentCategory.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentCategory.java Sun Feb 10 01:25:38 2013
@@ -21,21 +21,20 @@ package org.apache.openmeetings.persiste
import java.io.Serializable;
import java.util.Date;
-import org.apache.openmeetings.persistence.beans.user.User;
-
-
-
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.JoinColumn;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
-import javax.persistence.JoinColumn;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
+import org.apache.openmeetings.persistence.beans.user.User;
+
@Entity
@Table(name = "appointmentcategory")
public class AppointmentCategory implements Serializable {
@@ -50,6 +49,7 @@ public class AppointmentCategory impleme
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="user_id", nullable=true)
+ @ForeignKey(enabled = true)
private User user;
@Column(name="starttime")
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentReminderTyps.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentReminderTyps.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentReminderTyps.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentReminderTyps.java Sun Feb 10 01:25:38 2013
@@ -31,6 +31,7 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.persistence.beans.user.User;
@@ -48,6 +49,7 @@ public class AppointmentReminderTyps imp
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="user_id", nullable=true)
+ @ForeignKey(enabled = true)
private User user;
@Column(name="starttime")
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java Sun Feb 10 01:25:38 2013
@@ -31,6 +31,7 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.invitation.Invitations;
import org.apache.openmeetings.persistence.beans.user.User;
@@ -51,11 +52,13 @@ public class MeetingMember implements Se
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="user_id", nullable=true)
+ @ForeignKey(enabled = true)
@Element(name="userid", data=true, required=false)
private User userid;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="appointment_id", nullable=true)
+ @ForeignKey(enabled = true)
@Element(data=true, required=false)
private Appointment appointment;
@@ -99,9 +102,11 @@ public class MeetingMember implements Se
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="invitation", nullable=true, insertable=false)
+ @ForeignKey(enabled = true)
private Invitations invitation;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="omtimezoneId", nullable=true, insertable=true)
+ @ForeignKey(enabled = true)
private OmTimeZone omTimeZone;
@Column(name="is_connected_event")
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/chat/ChatMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/chat/ChatMessage.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/chat/ChatMessage.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/chat/ChatMessage.java Sun Feb 10 01:25:38 2013
@@ -32,6 +32,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.apache.openmeetings.persistence.beans.room.Room;
import org.apache.openmeetings.persistence.beans.user.User;
@@ -57,6 +58,7 @@ public class ChatMessage implements Seri
@ManyToOne
@JoinColumn(name = "from_user_id")
@Element(name = "fromUserId", data = true, required = false)
+ @ForeignKey(enabled = true)
private User fromUser;
// necessary to hold messages from external guests enters by invitation hash
@@ -71,11 +73,13 @@ public class ChatMessage implements Seri
@ManyToOne
@JoinColumn(name = "to_room_id")
@Element(name = "toRoomId", data = true, required = false)
+ @ForeignKey(enabled = true)
private Room toRoom;
@ManyToOne
@JoinColumn(name = "to_user_id")
@Element(name = "toUserId", data = true, required = false)
+ @ForeignKey(enabled = true)
private User toUser;
// necessary to hold messages to external guests enters by invitation hash
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/domain/Organisation_Users.java Sun Feb 10 01:25:38 2013
@@ -33,6 +33,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.apache.openmeetings.persistence.beans.user.User;
import org.simpleframework.xml.Element;
@@ -58,6 +59,7 @@ public class Organisation_Users implemen
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "organisation_id", insertable = true, updatable = true)
+ @ForeignKey(enabled = true)
@Element(name="organisation_id", required=false)
private Organisation organisation;
@@ -67,6 +69,7 @@ public class Organisation_Users implemen
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "user_id", insertable = true, updatable = true)
+ @ForeignKey(enabled = true)
private User user;
@Column(name = "starttime")
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaData.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaData.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaData.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/flvrecord/FlvRecordingMetaData.java Sun Feb 10 01:25:38 2013
@@ -31,6 +31,7 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.data.flvrecord.listener.async.StreamAudioWriter;
import org.apache.openmeetings.data.flvrecord.listener.async.StreamVideoWriter;
import org.simpleframework.xml.Element;
@@ -58,6 +59,7 @@ public class FlvRecordingMetaData implem
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "flvrecording_id", nullable = true)
+ @ForeignKey(enabled = true)
private FlvRecording flvRecording;
@Column(name = "record_start")
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/invitation/Invitations.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/invitation/Invitations.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/invitation/Invitations.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/invitation/Invitations.java Sun Feb 10 01:25:38 2013
@@ -31,6 +31,7 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.room.Room;
import org.apache.openmeetings.persistence.beans.user.User;
@@ -47,6 +48,7 @@ public class Invitations implements Seri
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "invitedBy", nullable = true)
+ @ForeignKey(enabled = true)
private User invitedBy;
@Column(name = "starttime")
@@ -60,6 +62,7 @@ public class Invitations implements Seri
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "roomid", nullable = true)
+ @ForeignKey(enabled = true)
private Room room;
// the hash for the link
@@ -112,6 +115,7 @@ public class Invitations implements Seri
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "omtimezoneId", insertable = true, updatable = true)
+ @ForeignKey(enabled = true)
private OmTimeZone omTimeZone; // In UTC +/- hours
private boolean allowEntry = true;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java Sun Feb 10 01:25:38 2013
@@ -21,8 +21,6 @@ package org.apache.openmeetings.persiste
import java.io.Serializable;
import java.util.Date;
-
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -36,6 +34,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
@Entity
@@ -86,6 +85,7 @@ public class Fieldlanguagesvalues implem
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "fieldvalues_id")
+ @ForeignKey(enabled = true)
private Fieldvalues fieldvalues;
public Fieldlanguagesvalues() {
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/logs/ConferenceLog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/logs/ConferenceLog.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/logs/ConferenceLog.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/logs/ConferenceLog.java Sun Feb 10 01:25:38 2013
@@ -31,6 +31,8 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
+
@Entity
@@ -44,6 +46,7 @@ public class ConferenceLog implements Se
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="conferencelogtype_id", updatable=true, insertable=true)
+ @ForeignKey(enabled = true)
private ConferenceLogType conferenceLogType;
@Column(name="inserted")
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/PollType.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/PollType.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/PollType.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/PollType.java Sun Feb 10 01:25:38 2013
@@ -28,6 +28,7 @@ import javax.persistence.JoinColumn;
import javax.persistence.OneToOne;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
@Entity
@@ -40,6 +41,7 @@ public class PollType {
@OneToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "fieldvalues_id")
+ @ForeignKey(enabled = true)
private Fieldvalues label;
@Column(name = "numeric_answer")
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPoll.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPoll.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPoll.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPoll.java Sun Feb 10 01:25:38 2013
@@ -34,6 +34,7 @@ import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.persistence.beans.room.Room;
import org.apache.openmeetings.persistence.beans.user.User;
import org.simpleframework.xml.Element;
@@ -67,16 +68,19 @@ public class RoomPoll {
@OneToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "poll_type_id")
+ @ForeignKey(enabled = true)
@Element(name="polltypeid", data=true, required=false)
private PollType pollType;
@OneToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "users_id")
+ @ForeignKey(enabled = true)
@Element(name="createdbyuserid", data=true, required=false)
private User createdBy;
@OneToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "rooms_id")
+ @ForeignKey(enabled = true)
@Element(name="roomid", data=true, required=false)
private Room room;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPollAnswers.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPollAnswers.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPollAnswers.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/poll/RoomPollAnswers.java Sun Feb 10 01:25:38 2013
@@ -23,10 +23,14 @@ import java.util.Date;
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.JoinColumn;
import javax.persistence.OneToOne;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.persistence.beans.user.User;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@@ -35,8 +39,15 @@ import org.simpleframework.xml.Root;
@Table(name = "room_poll_answers")
@Root(name="roompollanswer")
public class RoomPollAnswers {
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "id")
+ private Long id;
+
@OneToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "users_id")
+ @ForeignKey(enabled = true)
@Element(name="voteduserid", data=false, required=false)
private User votedUser;
@@ -55,6 +66,14 @@ public class RoomPollAnswers {
@OneToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "room_poll_id")
private RoomPoll roomPoll;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
/**
* @return the answer
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Room.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Room.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Room.java Sun Feb 10 01:25:38 2013
@@ -233,11 +233,13 @@ public class Room implements Serializabl
@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
@JoinColumn(name = "roomId")
+ @ForeignKey(enabled = true)
@ElementList(name = "room_moderators", required=false)
private List<RoomModerator> moderators;
@OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
@PrimaryKeyJoinColumn(name="confno", referencedColumnName="confno")
+ @ForeignKey(enabled = true)
@Element(name = "meetme", required = false)
private MeetMe meetme;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomModerator.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomModerator.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomModerator.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomModerator.java Sun Feb 10 01:25:38 2013
@@ -33,6 +33,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.persistence.beans.user.User;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@@ -67,6 +68,7 @@ public class RoomModerator implements Se
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn (name="user_id")
+ @ForeignKey(enabled = true)
@Element(name="user_id", data = true, required=false)
private User user;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomOrganisation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomOrganisation.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomOrganisation.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomOrganisation.java Sun Feb 10 01:25:38 2013
@@ -33,6 +33,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.persistence.beans.domain.Organisation;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@@ -56,7 +57,7 @@ import org.simpleframework.xml.Root;
+ "where c.room.rooms_id = :rooms_id "
+ "AND c.organisation.organisation_id = :organisation_id "
+ "AND c.deleted <> :deleted"),
- @NamedQuery(name = "getRoomsOrganisationByRoomsId", query = "select c from Rooms_Organisation as c "
+ @NamedQuery(name = "getRoomsOrganisationByRoomsId", query = "select c from RoomOrganisation as c "
+ "where c.room.rooms_id = :rooms_id "
+ "AND c.deleted <> :deleted")
})
@@ -72,11 +73,13 @@ public class RoomOrganisation implements
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name="rooms_id", nullable=true)
+ @ForeignKey(enabled = true)
@Element(name="rooms_id", data=true, required=false)
private Room room;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="organisation_id", nullable=true)
+ @ForeignKey(enabled = true)
@Element(name="organisation_id", data=true, required=false)
private Organisation organisation;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/PrivateMessage.java Sun Feb 10 01:25:38 2013
@@ -34,6 +34,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.persistence.beans.room.Room;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@@ -91,16 +92,19 @@ public class PrivateMessage implements S
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="from_id")
+ @ForeignKey(enabled = true)
@Element(data=true, required=false)
private User from;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="to_id")
+ @ForeignKey(enabled = true)
@Element(data=true, required=false)
private User to;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="owner_id")
+ @ForeignKey(enabled = true)
@Element(data=true, required=false)
private User owner;
@@ -111,6 +115,7 @@ public class PrivateMessage implements S
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="rooms_id")
+ @ForeignKey(enabled = true)
@Element(data=true, required=false)
private Room room;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/User.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/User.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/User.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/User.java Sun Feb 10 01:25:38 2013
@@ -47,6 +47,7 @@ import org.apache.openjpa.persistence.Fe
import org.apache.openjpa.persistence.FetchGroup;
import org.apache.openjpa.persistence.FetchGroups;
import org.apache.openjpa.persistence.LoadFetchGroup;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
@@ -189,6 +190,7 @@ public class User implements Serializabl
@ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
@JoinColumn(name = "adresses_id", insertable = true, updatable = true)
+ @ForeignKey(enabled = true)
@Element(name = "address", required = false)
private Address adresses;
@@ -223,6 +225,7 @@ public class User implements Serializabl
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "omtimezoneId", insertable = true, updatable = true)
+ @ForeignKey(enabled = true)
@Element(data = true, required = false)
private OmTimeZone omTimeZone; // In UTC +/- hours
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/UserContact.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/UserContact.java?rev=1444470&r1=1444469&r2=1444470&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/UserContact.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/UserContact.java Sun Feb 10 01:25:38 2013
@@ -33,6 +33,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@@ -82,6 +83,7 @@ public class UserContact implements Seri
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="owner_id")
+ @ForeignKey(enabled = true)
@Element(data=true, required=false)
private User owner;