Revision: 3987
Author: solomax666
Date: Fri Jul 15 03:10:54 2011
Log: - the code modified to work with postgress DB
http://code.google.com/p/openmeetings/source/detail?r=3987
Modified:
/branches/dev/om_openjpa/src/META-INF/postgres_persistence.xml
/branches/dev/om_openjpa/src/app/org/openmeetings/app/data/user/Usermanagement.java
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/basic/Sessiondata.java
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/flvrecord/FlvRecordingLog.java
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/lang/Fieldlanguagesvalues.java
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/recording/ChatvaluesEvent.java
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/recording/Recording.java
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/recording/RecordingConversionJob.java
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/recording/RoomRecording.java
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/recording/WhiteBoardEvent.java
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/rooms/Rooms.java
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/user/PrivateMessages.java
=======================================
--- /branches/dev/om_openjpa/src/META-INF/postgres_persistence.xml Wed Jul
13 00:44:51 2011
+++ /branches/dev/om_openjpa/src/META-INF/postgres_persistence.xml Fri Jul
15 03:10:54 2011
@@ -57,14 +57,16 @@
<class>org.openmeetings.app.hibernate.beans.files.FileExplorerItem</class>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
- <property name="openjpa.ConnectionProperties"
value="DriverClassName=org.postgresql.Driver,
Url=jdbc:postgresql://localhost:3306/openmeetings?autoReconnect=true&useUnicode=true&createDatabaseIfNotExist=true&characterEncoding=utf-8&connectionCollation=utf8_general_ci&cachePrepStmts=true&cacheCallableStatements=true&cacheServerConfiguration=true&useLocalSessionState=true&elideSetAutoCommits=true&alwaysSendSetIsolation=false&enableQueryTimeouts=false&prepStmtCacheSize=3000&prepStmtCacheSqlLimit=1000,
MaxActive=100, MaxWait=10000, TestOnBorrow=true,
poolPreparedStatements=true, Username=root, Password="/>
+ <property name="openjpa.ConnectionURL"
value="jdbc:postgresql://localhost:5432/openmeetings"/>
+ <property name="openjpa.ConnectionUserName" value="postgres"/>
+ <property name="openjpa.ConnectionPassword" value=""/>
<property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema"/>
- <property name="openjpa.RuntimeUnenhancedClasses"
value="unsupported"/>
- <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"
/>
- <property name="openjpa.ConnectionDriverName"
value="org.postgresql.Driver"/>
+ <property name="openjpa.RuntimeUnenhancedClasses"
value="unsupported"/>
+ <property name="openjpa.Log" value="DefaultLevel=WARN,
Tool=INFO" />
+ <property name="openjpa.ConnectionDriverName"
value="org.postgresql.Driver"/>
+ <property name="openjpa.jdbc.DBDictionary"
value="postgres"/>
<property name="openjpa.DataCache"
value="true"/>
<property name="openjpa.QueryCache"
value="true"/>
- <property name="openjpa.jdbc.DBDictionary"
value="batchLimit=100,tableType=myisam"/>
<property name="openjpa.jdbc.QuerySQLCache"
value="false"/>
</properties>
</persistence-unit>
=======================================
---
/branches/dev/om_openjpa/src/app/org/openmeetings/app/data/user/Usermanagement.java
Fri Jul 8 01:31:52 2011
+++
/branches/dev/om_openjpa/src/app/org/openmeetings/app/data/user/Usermanagement.java
Fri Jul 15 03:10:54 2011
@@ -385,7 +385,7 @@
Path<String> path = c.get(searchcriteria);
Predicate predicate = cb.like(path, literal);
Predicate condition = cb.notEqual(c.get("deleted"),
"true");
- cq.where(condition).having(predicate);
+ cq.where(condition, predicate);
cq.distinct(asc);
if (asc){
cq.orderBy(cb.asc(c.get(orderby)));
=======================================
---
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/basic/Sessiondata.java
Fri Jul 8 01:31:52 2011
+++
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/basic/Sessiondata.java
Fri Jul 15 03:10:54 2011
@@ -9,6 +9,7 @@
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.Lob;
import javax.persistence.Table;
@Entity
@@ -28,7 +29,8 @@
private Date starttermin_time;
@Column(name="refresh_time")
private Date refresh_time;
- @Column(name="sessionXml", columnDefinition="longtext")
+ @Lob
+ @Column(name="sessionXml")
private String sessionXml;
@Column(name="storePermanent")
private Boolean storePermanent;
=======================================
---
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/flvrecord/FlvRecordingLog.java
Fri Jul 8 01:31:52 2011
+++
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/flvrecord/FlvRecordingLog.java
Fri Jul 15 03:10:54 2011
@@ -12,6 +12,7 @@
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
/**
@@ -40,7 +41,8 @@
private Date inserted;
@Column(name="msg_type")
private String msgType;
- @Column(name="ful_message", columnDefinition="longtext")
+ @Lob
+ @Column(name="ful_message")
private String fullMessage;
@Column(name="exit_value")
private String exitValue;
=======================================
---
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/lang/Fieldlanguagesvalues.java
Fri Jul 8 01:31:52 2011
+++
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/lang/Fieldlanguagesvalues.java
Fri Jul 15 03:10:54 2011
@@ -10,6 +10,7 @@
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.Lob;
import javax.persistence.Table;
@Entity
@@ -31,7 +32,8 @@
private Date updatetime;
@Column(name="deleted")
private String deleted;
- @Column(name="value", columnDefinition="longtext")
+ @Lob
+ @Column(name="value")
private String value;
public Fieldlanguagesvalues() {
=======================================
---
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/recording/ChatvaluesEvent.java
Fri Jul 8 01:31:52 2011
+++
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/recording/ChatvaluesEvent.java
Fri Jul 15 03:10:54 2011
@@ -9,6 +9,7 @@
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -31,7 +32,8 @@
private Long chatvaluesEventId;
@Column(name="starttime")
private Long starttime;
- @Column(name="action", columnDefinition="longtext")
+ @Lob
+ @Column(name="action")
private String action;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="roomrecording_id", updatable=true, insertable=true)
=======================================
---
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/recording/Recording.java
Fri Jul 8 01:31:52 2011
+++
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/recording/Recording.java
Fri Jul 15 03:10:54 2011
@@ -10,6 +10,7 @@
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -35,7 +36,8 @@
private String name;
@Column(name="duration")
private Long duration;
- @Column(name="xmlString", columnDefinition="longtext")
+ @Lob
+ @Column(name="xmlString")
private String xmlString;
@Column(name="comment_field")
private String comment;
=======================================
---
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/recording/RecordingConversionJob.java
Fri Jul 8 01:31:52 2011
+++
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/recording/RecordingConversionJob.java
Fri Jul 15 03:10:54 2011
@@ -10,6 +10,7 @@
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
@@ -38,7 +39,8 @@
//this is only the end Date for the SVG Conversion
@Column(name="ended")
private Date ended;
- @Column(name="currentwhiteboardasxml", columnDefinition="longtext")
+ @Lob
+ @Column(name="currentwhiteboardasxml")
private String currentWhiteBoardAsXml;
@Column(name="endtimeinmilliseconds")
private Long endTimeInMilliSeconds;
=======================================
---
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/recording/RoomRecording.java
Fri Jul 8 01:31:52 2011
+++
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/recording/RoomRecording.java
Fri Jul 15 03:10:54 2011
@@ -11,6 +11,7 @@
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -39,7 +40,8 @@
private String comment;
@Transient
private Object initwhiteboardvars;
- @Column(name="initwhiteboardvars_in_xml", columnDefinition="longtext")
+ @Lob
+ @Column(name="initwhiteboardvars_in_xml")
private String initwhiteboardvarsInXml;
@Column(name="recordingname")
private String recordingName;
=======================================
---
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/recording/WhiteBoardEvent.java
Fri Jul 8 01:31:52 2011
+++
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/recording/WhiteBoardEvent.java
Fri Jul 15 03:10:54 2011
@@ -9,6 +9,7 @@
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -32,7 +33,8 @@
//flexibility, otherwise a change in the Whiteboard
//Object (for example a new Font-Color) will need a change in the
//database scheme and or course big effort in maintaining the Recording
- @Column(name="action", columnDefinition="longtext")
+ @Lob
+ @Column(name="action")
private String action;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name="roomrecording_id", insertable=true, updatable=true)
=======================================
---
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/rooms/Rooms.java
Fri Jul 8 01:31:52 2011
+++
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/rooms/Rooms.java
Fri Jul 15 03:10:54 2011
@@ -13,6 +13,7 @@
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.JoinColumn;
import javax.persistence.Table;
@@ -30,7 +31,8 @@
private Long rooms_id;
@Column(name="name")
private String name;
- @Column(name="comment_field", columnDefinition="longtext")
+ @Lob //@Basic(fetch=FetchType.LAZY)
+ @Column(name="comment_field")
private String comment;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn (name="roomtypes_id")
=======================================
---
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/user/PrivateMessages.java
Fri Jul 8 01:31:52 2011
+++
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/user/PrivateMessages.java
Fri Jul 15 03:10:54 2011
@@ -12,6 +12,7 @@
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.JoinColumn;
import javax.persistence.Table;
@@ -28,7 +29,8 @@
private long privateMessageId;
@Column(name="subject")
private String subject;
- @Column(name="message", columnDefinition="longtext")
+ @Lob
+ @Column(name="message")
private String message;
@Column(name="inserted")
--
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.
