Revision: 4637
Author: solomax666
Date: Mon Nov 28 07:58:13 2011
Log: - Oracle support is added
http://code.google.com/p/openmeetings/source/detail?r=4637
Added:
/trunk/singlewebapp/lib/database/ojdbc5.jar
/trunk/singlewebapp/lib/database/orai18n.jar
Modified:
/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaData.java
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaDelta.java
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/lang/Fieldlanguagesvalues.java
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/recording/ChatvaluesEvent.java
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/recording/RecordingConversionJob.java
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/recording/RoomStream.java
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/recording/WhiteBoardEvent.java
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/sip/OpenXGReturnObject.java
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/user/PrivateMessageFolder.java
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/user/PrivateMessages.java
=======================================
--- /dev/null
+++ /trunk/singlewebapp/lib/database/ojdbc5.jar Mon Nov 28 07:58:13 2011
File is too large to display a diff.
=======================================
--- /dev/null
+++ /trunk/singlewebapp/lib/database/orai18n.jar Mon Nov 28 07:58:13 2011
File is too large to display a diff.
=======================================
--- /trunk/singlewebapp/src/META-INF/oracle_persistence.xml Sat Oct 1
11:15:55 2011
+++ /trunk/singlewebapp/src/META-INF/oracle_persistence.xml Mon Nov 28
07:58:13 2011
@@ -60,16 +60,17 @@
<class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
- <property name="openjpa.RuntimeUnenhancedClasses"
value="supported"/>
- <property name="openjpa.ConnectionDriverName"
value="oracle.jdbc.driver.OracleDriver"/>
- <property
name="openjpa.ConnectionProperties" value="username=SYSTEM,
password=admin"/>
- <property name="openjpa.ConnectionURL"
value="jdbc:oracle:thin:@localhost:1521:openmeetings"/>
- <property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema"/>
- <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"
/>
- <property name="openjpa.DataCache"
value="true"/>
- <property name="openjpa.QueryCache"
value="true"/>
- <property name="openjpa.jdbc.DBDictionary"
value="batchLimit=100"/>
- <property name="openjpa.jdbc.QuerySQLCache"
value="false"/>
+ <property name="openjpa.RuntimeUnenhancedClasses"
value="supported"/>
+ <property name="openjpa.ConnectionDriverName"
value="oracle.jdbc.driver.OracleDriver"/>
+ <property name="openjpa.ConnectionProperties" value="username=SYSTEM,
password=admin"/>
+ <property name="openjpa.ConnectionURL"
value="jdbc:oracle:thin:@localhost:1521:openmeetings"/>
+ <property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema"/>
+ <property name="openjpa.Log" value="DefaultLevel=WARN,
Tool=INFO" />
+ <property name="openjpa.DataCache" value="true"/>
+ <property name="openjpa.QueryCache" value="true"/>
+ <property name="openjpa.jdbc.DBDictionary"
value="BatchLimit=100" />
+ <property name="openjpa.jdbc.DBDictionary"
value="oracle(UseTriggersForAutoAssign=true, MaxAutoAssignNameLength=28,
BatchLimit=100)" />
+ <property name="openjpa.jdbc.QuerySQLCache"
value="false"/>
</properties>
</persistence-unit>
</persistence>
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaData.java
Sat Jul 23 04:28:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaData.java
Mon Nov 28 07:58:13 2011
@@ -16,9 +16,6 @@
import javax.persistence.Table;
/**
*
- * @hibernate.class table="flvrecording_metadata"
- * lazy="false"
- *
*/
@Entity
@Table(name = "flvrecording_metadata")
@@ -30,9 +27,9 @@
private static final long serialVersionUID = 8444176152324513716L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
- @Column(name="flvrecording_metadata_id")
+ @Column(name="flv_meta_id")
private long flvRecordingMetaDataId;
+
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="flvrecording_id", nullable=true)
private FlvRecording flvRecording;
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaDelta.java
Sat Jul 23 04:28:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/flvrecord/FlvRecordingMetaDelta.java
Mon Nov 28 07:58:13 2011
@@ -11,8 +11,6 @@
import javax.persistence.Table;
/**
*
- * @hibernate.class table="flvrecording_meta_delta"
- * lazy="false"
*
*/
@Entity
@@ -25,7 +23,7 @@
private static final long serialVersionUID = -733483974696234137L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="flvrecording_meta_delta_id")
+ @Column(name="flv_delta_id")
private long flvRecordingMetaDeltaId;
@Column(name="flvrecording_metadata_id")
private Long flvRecordingMetaDataId;
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/lang/Fieldlanguagesvalues.java
Sat Jul 23 04:28:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/lang/Fieldlanguagesvalues.java
Mon Nov 28 07:58:13 2011
@@ -20,7 +20,7 @@
private static final long serialVersionUID = 1965055047163639210L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="fieldlanguagesvalues_id")
+ @Column(name="lang_val_id")
private Long fieldlanguagesvalues_id;
@Column(name="fieldvalues_id")
private Long fieldvalues_id;
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/recording/ChatvaluesEvent.java
Sat Jul 23 04:28:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/recording/ChatvaluesEvent.java
Mon Nov 28 07:58:13 2011
@@ -27,9 +27,9 @@
//see WhiteboardEvent for Documentation, Comments
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
- @Column(name="recording_chatvaluesevent_id")
+ @Column(name="chat_event_id")
private Long chatvaluesEventId;
+
@Column(name="starttime")
private Long starttime;
@Lob
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/recording/RecordingConversionJob.java
Sat Jul 23 04:28:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/recording/RecordingConversionJob.java
Mon Nov 28 07:58:13 2011
@@ -26,9 +26,9 @@
private static final long serialVersionUID = -1553612596973538373L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
- @Column(name="recording_conversion_job_id")
+ @Column(name="job_id")
private long recordingConversionJobId;
+
@Column(name="imagenumber")
private Long imageNumber = 0L;
@ManyToOne(fetch = FetchType.EAGER)
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/recording/RoomStream.java
Sat Jul 23 04:28:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/recording/RoomStream.java
Mon Nov 28 07:58:13 2011
@@ -22,9 +22,9 @@
private static final long serialVersionUID = -5168450841189553968L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
- @Column(name="recording_roomstream_id")
+ @Column(name="roomstream_id")
private Long roomStreamId;
+
@Column(name="streamname")
private String streamName;
@Column(name="streamstart")
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/recording/WhiteBoardEvent.java
Sat Jul 23 04:28:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/recording/WhiteBoardEvent.java
Mon Nov 28 07:58:13 2011
@@ -23,9 +23,9 @@
private static final long serialVersionUID = -1745738413294075264L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
- @Column(name="recording_whiteboardevent_id")
+ @Column(name="wb_event_id")
private Long whiteBoardEventId = null;
+
@Column(name="starttime")
private Long starttime;
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/sip/OpenXGReturnObject.java
Sat Jul 23 04:28:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/sip/OpenXGReturnObject.java
Mon Nov 28 07:58:13 2011
@@ -20,9 +20,9 @@
private static final long serialVersionUID = -5240675684036197687L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
- @Column(name="open_xg_return_object_id")
+ @Column(name="object_id")
private Long openXGReturnObjectId;
+
@Column(name="method_name")
private String methodName;
@Column(name="inserted")
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/user/PrivateMessageFolder.java
Sat Jul 23 04:28:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/user/PrivateMessageFolder.java
Mon Nov 28 07:58:13 2011
@@ -19,7 +19,7 @@
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="private_message_folder_id")
+ @Column(name="msg_folder_id")
private long privateMessageFolderId;
@Column(name="folder_name")
private String folderName;
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/user/PrivateMessages.java
Sat Jul 23 04:28:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/user/PrivateMessages.java
Mon Nov 28 07:58:13 2011
@@ -25,7 +25,7 @@
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name="private_message_id")
+ @Column(name="msg_id")
private long privateMessageId;
@Column(name="subject")
private String subject;
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
