Revision: 3986
Author:   solomax666
Date:     Wed Jul 13 00:44:51 2011
Log: - *persistent.xml files are moved to new (editable) location (outside openmeetings.jar)
http://code.google.com/p/openmeetings/source/detail?r=3986

Added:
 /branches/dev/om_openjpa/src/META-INF/mysql_persistence.xml
 /branches/dev/om_openjpa/src/META-INF/postgres_persistence.xml
Deleted:
 /branches/dev/om_openjpa/WebContent/conf/mysql_persistence.xml
 /branches/dev/om_openjpa/WebContent/conf/persistence.xml
 /branches/dev/om_openjpa/WebContent/conf/postgres_persistence.xml
Modified:
 /branches/dev/om_openjpa/build.xml
 /branches/dev/om_openjpa/src/META-INF/persistence.xml

=======================================
--- /dev/null
+++ /branches/dev/om_openjpa/src/META-INF/mysql_persistence.xml Wed Jul 13 00:44:51 2011
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- persistence.xml schema -->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"; version="2.0">
+       <persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+               
<class>org.openmeetings.app.hibernate.beans.adresses.Adresses</class>
+               
<class>org.openmeetings.app.hibernate.beans.adresses.States</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.Configuration</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.ErrorType</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.ErrorValues</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.LdapConfig</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.Naviglobal</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.Navimain</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.Navisub</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.OmTimeZone</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.Sessiondata</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.SOAPLogin</class>
+               
<class>org.openmeetings.app.hibernate.beans.calendar.Appointment</class>
+ <class>org.openmeetings.app.hibernate.beans.calendar.AppointmentCategory</class> + <class>org.openmeetings.app.hibernate.beans.calendar.AppointmentReminderTyps</class> + <class>org.openmeetings.app.hibernate.beans.calendar.MeetingMember</class>
+               
<class>org.openmeetings.app.hibernate.beans.domain.Organisation</class>
+ <class>org.openmeetings.app.hibernate.beans.domain.Organisation_Users</class> + <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecording</class> + <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecordingLog</class> + <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecordingMetaData</class> + <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecordingMetaDelta</class> + <class>org.openmeetings.app.hibernate.beans.invitation.Invitations</class>
+               
<class>org.openmeetings.app.hibernate.beans.lang.FieldLanguage</class>
+ <class>org.openmeetings.app.hibernate.beans.lang.Fieldlanguagesvalues</class>
+               
<class>org.openmeetings.app.hibernate.beans.lang.Fieldvalues</class>
+               
<class>org.openmeetings.app.hibernate.beans.logs.ConferenceLog</class>
+ <class>org.openmeetings.app.hibernate.beans.logs.ConferenceLogType</class> + <class>org.openmeetings.app.hibernate.beans.recording.ChatvaluesEvent</class>
+               
<class>org.openmeetings.app.hibernate.beans.recording.Recording</class>
+ <class>org.openmeetings.app.hibernate.beans.recording.RecordingClient</class> + <class>org.openmeetings.app.hibernate.beans.recording.RecordingConversionJob</class>
+               
<class>org.openmeetings.app.hibernate.beans.recording.RoomClient</class>
+ <class>org.openmeetings.app.hibernate.beans.recording.RoomRecording</class>
+               
<class>org.openmeetings.app.hibernate.beans.recording.RoomStream</class>
+ <class>org.openmeetings.app.hibernate.beans.recording.WhiteBoardEvent</class>
+               
<class>org.openmeetings.app.hibernate.beans.rooms.RoomModerators</class>
+               <class>org.openmeetings.app.hibernate.beans.rooms.Rooms</class>
+               
<class>org.openmeetings.app.hibernate.beans.rooms.RoomTypes</class>
+ <class>org.openmeetings.app.hibernate.beans.rooms.Rooms_Organisation</class> + <class>org.openmeetings.app.hibernate.beans.sip.OpenXGReturnObject</class>
+               
<class>org.openmeetings.app.hibernate.beans.user.PrivateMessages</class>
+ <class>org.openmeetings.app.hibernate.beans.user.PrivateMessageFolder</class>
+               
<class>org.openmeetings.app.hibernate.beans.user.Salutations</class>
+               
<class>org.openmeetings.app.hibernate.beans.user.UserContacts</class>
+               
<class>org.openmeetings.app.hibernate.beans.user.Userdata</class>
+               
<class>org.openmeetings.app.hibernate.beans.user.Usergroups</class>
+               
<class>org.openmeetings.app.hibernate.beans.user.Userlevel</class>
+               
<class>org.openmeetings.app.hibernate.beans.user.Users_Usergroups</class>
+               
<class>org.openmeetings.app.hibernate.beans.user.UserSipData</class>
+               <class>org.openmeetings.app.hibernate.beans.user.Users</class>
+ <class>org.openmeetings.app.hibernate.beans.files.FileExplorerItem</class>
+               <exclude-unlisted-classes>false</exclude-unlisted-classes>
+               <properties>
+ <property name="openjpa.ConnectionProperties" value="DriverClassName=com.mysql.jdbc.Driver, Url=jdbc:mysql://localhost:3306/openmeetings?autoReconnect=true&amp;useUnicode=true&amp;createDatabaseIfNotExist=true&amp;characterEncoding=utf-8&amp;connectionCollation=utf8_general_ci&amp;cachePrepStmts=true&amp;cacheCallableStatements=true&amp;cacheServerConfiguration=true&amp;useLocalSessionState=true&amp;elideSetAutoCommits=true&amp;alwaysSendSetIsolation=false&amp;enableQueryTimeouts=false&amp;prepStmtCacheSize=3000&amp;prepStmtCacheSqlLimit=1000, MaxActive=100, MaxWait=10000, TestOnBorrow=true, poolPreparedStatements=true, Username=root, Password="/>
+                               <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.apache.commons.dbcp.BasicDataSource"/>
+                               <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>
+</persistence>
=======================================
--- /dev/null
+++ /branches/dev/om_openjpa/src/META-INF/postgres_persistence.xml Wed Jul 13 00:44:51 2011
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- persistence.xml schema -->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"; version="2.0">
+       <persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+               
<class>org.openmeetings.app.hibernate.beans.adresses.Adresses</class>
+               
<class>org.openmeetings.app.hibernate.beans.adresses.States</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.Configuration</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.ErrorType</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.ErrorValues</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.LdapConfig</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.Naviglobal</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.Navimain</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.Navisub</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.OmTimeZone</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.Sessiondata</class>
+               
<class>org.openmeetings.app.hibernate.beans.basic.SOAPLogin</class>
+               
<class>org.openmeetings.app.hibernate.beans.calendar.Appointment</class>
+ <class>org.openmeetings.app.hibernate.beans.calendar.AppointmentCategory</class> + <class>org.openmeetings.app.hibernate.beans.calendar.AppointmentReminderTyps</class> + <class>org.openmeetings.app.hibernate.beans.calendar.MeetingMember</class>
+               
<class>org.openmeetings.app.hibernate.beans.domain.Organisation</class>
+ <class>org.openmeetings.app.hibernate.beans.domain.Organisation_Users</class> + <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecording</class> + <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecordingLog</class> + <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecordingMetaData</class> + <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecordingMetaDelta</class> + <class>org.openmeetings.app.hibernate.beans.invitation.Invitations</class>
+               
<class>org.openmeetings.app.hibernate.beans.lang.FieldLanguage</class>
+ <class>org.openmeetings.app.hibernate.beans.lang.Fieldlanguagesvalues</class>
+               
<class>org.openmeetings.app.hibernate.beans.lang.Fieldvalues</class>
+               
<class>org.openmeetings.app.hibernate.beans.logs.ConferenceLog</class>
+ <class>org.openmeetings.app.hibernate.beans.logs.ConferenceLogType</class> + <class>org.openmeetings.app.hibernate.beans.recording.ChatvaluesEvent</class>
+               
<class>org.openmeetings.app.hibernate.beans.recording.Recording</class>
+ <class>org.openmeetings.app.hibernate.beans.recording.RecordingClient</class> + <class>org.openmeetings.app.hibernate.beans.recording.RecordingConversionJob</class>
+               
<class>org.openmeetings.app.hibernate.beans.recording.RoomClient</class>
+ <class>org.openmeetings.app.hibernate.beans.recording.RoomRecording</class>
+               
<class>org.openmeetings.app.hibernate.beans.recording.RoomStream</class>
+ <class>org.openmeetings.app.hibernate.beans.recording.WhiteBoardEvent</class>
+               
<class>org.openmeetings.app.hibernate.beans.rooms.RoomModerators</class>
+               <class>org.openmeetings.app.hibernate.beans.rooms.Rooms</class>
+               
<class>org.openmeetings.app.hibernate.beans.rooms.RoomTypes</class>
+ <class>org.openmeetings.app.hibernate.beans.rooms.Rooms_Organisation</class> + <class>org.openmeetings.app.hibernate.beans.sip.OpenXGReturnObject</class>
+               
<class>org.openmeetings.app.hibernate.beans.user.PrivateMessages</class>
+ <class>org.openmeetings.app.hibernate.beans.user.PrivateMessageFolder</class>
+               
<class>org.openmeetings.app.hibernate.beans.user.Salutations</class>
+               
<class>org.openmeetings.app.hibernate.beans.user.UserContacts</class>
+               
<class>org.openmeetings.app.hibernate.beans.user.Userdata</class>
+               
<class>org.openmeetings.app.hibernate.beans.user.Usergroups</class>
+               
<class>org.openmeetings.app.hibernate.beans.user.Userlevel</class>
+               
<class>org.openmeetings.app.hibernate.beans.user.Users_Usergroups</class>
+               
<class>org.openmeetings.app.hibernate.beans.user.UserSipData</class>
+               <class>org.openmeetings.app.hibernate.beans.user.Users</class>
+ <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&amp;useUnicode=true&amp;createDatabaseIfNotExist=true&amp;characterEncoding=utf-8&amp;connectionCollation=utf8_general_ci&amp;cachePrepStmts=true&amp;cacheCallableStatements=true&amp;cacheServerConfiguration=true&amp;useLocalSessionState=true&amp;elideSetAutoCommits=true&amp;alwaysSendSetIsolation=false&amp;enableQueryTimeouts=false&amp;prepStmtCacheSize=3000&amp;prepStmtCacheSqlLimit=1000, MaxActive=100, MaxWait=10000, TestOnBorrow=true, poolPreparedStatements=true, Username=root, Password="/>
+                               <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.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>
+</persistence>
=======================================
--- /branches/dev/om_openjpa/WebContent/conf/mysql_persistence.xml Fri Jul 8 01:31:52 2011
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- persistence.xml schema -->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"; version="2.0">
-       <persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
- <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-               
<class>org.openmeetings.app.hibernate.beans.adresses.Adresses</class>
-               
<class>org.openmeetings.app.hibernate.beans.adresses.States</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.Configuration</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.ErrorType</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.ErrorValues</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.LdapConfig</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.Naviglobal</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.Navimain</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.Navisub</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.OmTimeZone</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.Sessiondata</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.SOAPLogin</class>
-               
<class>org.openmeetings.app.hibernate.beans.calendar.Appointment</class>
- <class>org.openmeetings.app.hibernate.beans.calendar.AppointmentCategory</class> - <class>org.openmeetings.app.hibernate.beans.calendar.AppointmentReminderTyps</class> - <class>org.openmeetings.app.hibernate.beans.calendar.MeetingMember</class>
-               
<class>org.openmeetings.app.hibernate.beans.domain.Organisation</class>
- <class>org.openmeetings.app.hibernate.beans.domain.Organisation_Users</class> - <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecording</class> - <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecordingLog</class> - <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecordingMetaData</class> - <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecordingMetaDelta</class> - <class>org.openmeetings.app.hibernate.beans.invitation.Invitations</class>
-               
<class>org.openmeetings.app.hibernate.beans.lang.FieldLanguage</class>
- <class>org.openmeetings.app.hibernate.beans.lang.Fieldlanguagesvalues</class>
-               
<class>org.openmeetings.app.hibernate.beans.lang.Fieldvalues</class>
-               
<class>org.openmeetings.app.hibernate.beans.logs.ConferenceLog</class>
- <class>org.openmeetings.app.hibernate.beans.logs.ConferenceLogType</class> - <class>org.openmeetings.app.hibernate.beans.recording.ChatvaluesEvent</class>
-               
<class>org.openmeetings.app.hibernate.beans.recording.Recording</class>
- <class>org.openmeetings.app.hibernate.beans.recording.RecordingClient</class> - <class>org.openmeetings.app.hibernate.beans.recording.RecordingConversionJob</class>
-               
<class>org.openmeetings.app.hibernate.beans.recording.RoomClient</class>
- <class>org.openmeetings.app.hibernate.beans.recording.RoomRecording</class>
-               
<class>org.openmeetings.app.hibernate.beans.recording.RoomStream</class>
- <class>org.openmeetings.app.hibernate.beans.recording.WhiteBoardEvent</class>
-               
<class>org.openmeetings.app.hibernate.beans.rooms.RoomModerators</class>
-               <class>org.openmeetings.app.hibernate.beans.rooms.Rooms</class>
-               
<class>org.openmeetings.app.hibernate.beans.rooms.RoomTypes</class>
- <class>org.openmeetings.app.hibernate.beans.rooms.Rooms_Organisation</class> - <class>org.openmeetings.app.hibernate.beans.sip.OpenXGReturnObject</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.PrivateMessages</class>
- <class>org.openmeetings.app.hibernate.beans.user.PrivateMessageFolder</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.Salutations</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.UserContacts</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.Userdata</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.Usergroups</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.Userlevel</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.Users_Usergroups</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.UserSipData</class>
-               <class>org.openmeetings.app.hibernate.beans.user.Users</class>
- <class>org.openmeetings.app.hibernate.beans.files.FileExplorerItem</class>
-               <exclude-unlisted-classes>false</exclude-unlisted-classes>
-               <properties>
- <property name="openjpa.ConnectionProperties" value="DriverClassName=com.mysql.jdbc.Driver, Url=jdbc:mysql://localhost:3306/openmeetings?autoReconnect=true&amp;useUnicode=true&amp;createDatabaseIfNotExist=true&amp;characterEncoding=utf-8&amp;connectionCollation=utf8_general_ci&amp;cachePrepStmts=true&amp;cacheCallableStatements=true&amp;cacheServerConfiguration=true&amp;useLocalSessionState=true&amp;elideSetAutoCommits=true&amp;alwaysSendSetIsolation=false&amp;enableQueryTimeouts=false&amp;prepStmtCacheSize=3000&amp;prepStmtCacheSqlLimit=1000, MaxActive=100, MaxWait=10000, TestOnBorrow=true, poolPreparedStatements=true, Username=root, Password="/>
-                               <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.apache.commons.dbcp.BasicDataSource"/>
-                               <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>
-</persistence>
=======================================
--- /branches/dev/om_openjpa/WebContent/conf/persistence.xml Fri Jul 8 01:31:52 2011
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- persistence.xml schema -->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"; version="2.0">
-       <persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
- <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-               
<class>org.openmeetings.app.hibernate.beans.adresses.Adresses</class>
-               
<class>org.openmeetings.app.hibernate.beans.adresses.States</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.Configuration</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.ErrorType</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.ErrorValues</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.LdapConfig</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.Naviglobal</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.Navimain</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.Navisub</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.OmTimeZone</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.Sessiondata</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.SOAPLogin</class>
-               
<class>org.openmeetings.app.hibernate.beans.calendar.Appointment</class>
- <class>org.openmeetings.app.hibernate.beans.calendar.AppointmentCategory</class> - <class>org.openmeetings.app.hibernate.beans.calendar.AppointmentReminderTyps</class> - <class>org.openmeetings.app.hibernate.beans.calendar.MeetingMember</class>
-               
<class>org.openmeetings.app.hibernate.beans.domain.Organisation</class>
- <class>org.openmeetings.app.hibernate.beans.domain.Organisation_Users</class> - <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecording</class> - <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecordingLog</class> - <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecordingMetaData</class> - <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecordingMetaDelta</class> - <class>org.openmeetings.app.hibernate.beans.invitation.Invitations</class>
-               
<class>org.openmeetings.app.hibernate.beans.lang.FieldLanguage</class>
- <class>org.openmeetings.app.hibernate.beans.lang.Fieldlanguagesvalues</class>
-               
<class>org.openmeetings.app.hibernate.beans.lang.Fieldvalues</class>
-               
<class>org.openmeetings.app.hibernate.beans.logs.ConferenceLog</class>
- <class>org.openmeetings.app.hibernate.beans.logs.ConferenceLogType</class> - <class>org.openmeetings.app.hibernate.beans.recording.ChatvaluesEvent</class>
-               
<class>org.openmeetings.app.hibernate.beans.recording.Recording</class>
- <class>org.openmeetings.app.hibernate.beans.recording.RecordingClient</class> - <class>org.openmeetings.app.hibernate.beans.recording.RecordingConversionJob</class>
-               
<class>org.openmeetings.app.hibernate.beans.recording.RoomClient</class>
- <class>org.openmeetings.app.hibernate.beans.recording.RoomRecording</class>
-               
<class>org.openmeetings.app.hibernate.beans.recording.RoomStream</class>
- <class>org.openmeetings.app.hibernate.beans.recording.WhiteBoardEvent</class>
-               
<class>org.openmeetings.app.hibernate.beans.rooms.RoomModerators</class>
-               <class>org.openmeetings.app.hibernate.beans.rooms.Rooms</class>
-               
<class>org.openmeetings.app.hibernate.beans.rooms.RoomTypes</class>
- <class>org.openmeetings.app.hibernate.beans.rooms.Rooms_Organisation</class> - <class>org.openmeetings.app.hibernate.beans.sip.OpenXGReturnObject</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.PrivateMessages</class>
- <class>org.openmeetings.app.hibernate.beans.user.PrivateMessageFolder</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.Salutations</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.UserContacts</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.Userdata</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.Usergroups</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.Userlevel</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.Users_Usergroups</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.UserSipData</class>
-               <class>org.openmeetings.app.hibernate.beans.user.Users</class>
- <class>org.openmeetings.app.hibernate.beans.files.FileExplorerItem</class>
-               <exclude-unlisted-classes>false</exclude-unlisted-classes>
-               <properties>
- <property name="openjpa.ConnectionProperties" value="DriverClassName=com.mysql.jdbc.Driver, Url=jdbc:mysql://localhost:3306/openmeetings?autoReconnect=true&amp;useUnicode=true&amp;createDatabaseIfNotExist=true&amp;characterEncoding=utf-8&amp;connectionCollation=utf8_general_ci&amp;cachePrepStmts=true&amp;cacheCallableStatements=true&amp;cacheServerConfiguration=true&amp;useLocalSessionState=true&amp;elideSetAutoCommits=true&amp;alwaysSendSetIsolation=false&amp;enableQueryTimeouts=false&amp;prepStmtCacheSize=3000&amp;prepStmtCacheSqlLimit=1000, MaxActive=100, MaxWait=10000, TestOnBorrow=true, poolPreparedStatements=true, Username=root, Password="/>
-                               <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.apache.commons.dbcp.BasicDataSource"/>
-                               <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>
-</persistence>
=======================================
--- /branches/dev/om_openjpa/WebContent/conf/postgres_persistence.xml Fri Jul 8 01:31:52 2011
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- persistence.xml schema -->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"; version="2.0">
-       <persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
- <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-               
<class>org.openmeetings.app.hibernate.beans.adresses.Adresses</class>
-               
<class>org.openmeetings.app.hibernate.beans.adresses.States</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.Configuration</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.ErrorType</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.ErrorValues</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.LdapConfig</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.Naviglobal</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.Navimain</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.Navisub</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.OmTimeZone</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.Sessiondata</class>
-               
<class>org.openmeetings.app.hibernate.beans.basic.SOAPLogin</class>
-               
<class>org.openmeetings.app.hibernate.beans.calendar.Appointment</class>
- <class>org.openmeetings.app.hibernate.beans.calendar.AppointmentCategory</class> - <class>org.openmeetings.app.hibernate.beans.calendar.AppointmentReminderTyps</class> - <class>org.openmeetings.app.hibernate.beans.calendar.MeetingMember</class>
-               
<class>org.openmeetings.app.hibernate.beans.domain.Organisation</class>
- <class>org.openmeetings.app.hibernate.beans.domain.Organisation_Users</class> - <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecording</class> - <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecordingLog</class> - <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecordingMetaData</class> - <class>org.openmeetings.app.hibernate.beans.flvrecord.FlvRecordingMetaDelta</class> - <class>org.openmeetings.app.hibernate.beans.invitation.Invitations</class>
-               
<class>org.openmeetings.app.hibernate.beans.lang.FieldLanguage</class>
- <class>org.openmeetings.app.hibernate.beans.lang.Fieldlanguagesvalues</class>
-               
<class>org.openmeetings.app.hibernate.beans.lang.Fieldvalues</class>
-               
<class>org.openmeetings.app.hibernate.beans.logs.ConferenceLog</class>
- <class>org.openmeetings.app.hibernate.beans.logs.ConferenceLogType</class> - <class>org.openmeetings.app.hibernate.beans.recording.ChatvaluesEvent</class>
-               
<class>org.openmeetings.app.hibernate.beans.recording.Recording</class>
- <class>org.openmeetings.app.hibernate.beans.recording.RecordingClient</class> - <class>org.openmeetings.app.hibernate.beans.recording.RecordingConversionJob</class>
-               
<class>org.openmeetings.app.hibernate.beans.recording.RoomClient</class>
- <class>org.openmeetings.app.hibernate.beans.recording.RoomRecording</class>
-               
<class>org.openmeetings.app.hibernate.beans.recording.RoomStream</class>
- <class>org.openmeetings.app.hibernate.beans.recording.WhiteBoardEvent</class>
-               
<class>org.openmeetings.app.hibernate.beans.rooms.RoomModerators</class>
-               <class>org.openmeetings.app.hibernate.beans.rooms.Rooms</class>
-               
<class>org.openmeetings.app.hibernate.beans.rooms.RoomTypes</class>
- <class>org.openmeetings.app.hibernate.beans.rooms.Rooms_Organisation</class> - <class>org.openmeetings.app.hibernate.beans.sip.OpenXGReturnObject</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.PrivateMessages</class>
- <class>org.openmeetings.app.hibernate.beans.user.PrivateMessageFolder</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.Salutations</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.UserContacts</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.Userdata</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.Usergroups</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.Userlevel</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.Users_Usergroups</class>
-               
<class>org.openmeetings.app.hibernate.beans.user.UserSipData</class>
-               <class>org.openmeetings.app.hibernate.beans.user.Users</class>
- <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&amp;useUnicode=true&amp;createDatabaseIfNotExist=true&amp;characterEncoding=utf-8&amp;connectionCollation=utf8_general_ci&amp;cachePrepStmts=true&amp;cacheCallableStatements=true&amp;cacheServerConfiguration=true&amp;useLocalSessionState=true&amp;elideSetAutoCommits=true&amp;alwaysSendSetIsolation=false&amp;enableQueryTimeouts=false&amp;prepStmtCacheSize=3000&amp;prepStmtCacheSqlLimit=1000, MaxActive=100, MaxWait=10000, TestOnBorrow=true, poolPreparedStatements=true, Username=root, Password="/>
-                               <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.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>
-</persistence>
=======================================
--- /branches/dev/om_openjpa/build.xml  Fri Jul  8 01:31:52 2011
+++ /branches/dev/om_openjpa/build.xml  Wed Jul 13 00:44:51 2011
@@ -241,6 +241,10 @@
             </fileset>
             <fileset dir="${jmf.lib}" includes="*.jar"/>
         </copy>
+ <copy todir="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/classes/META-INF">
+               <fileset file="src/META-INF/persistence.xml">
+               </fileset>
+        </copy>

<chmod dir="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/lib" perm="755" includes="**/*.sh"/>

=======================================
--- /branches/dev/om_openjpa/src/META-INF/persistence.xml Fri Jul 8 01:31:52 2011 +++ /branches/dev/om_openjpa/src/META-INF/persistence.xml Wed Jul 13 00:44:51 2011
@@ -57,7 +57,7 @@
<class>org.openmeetings.app.hibernate.beans.files.FileExplorerItem</class>
                <exclude-unlisted-classes>false</exclude-unlisted-classes>
                <properties>
- <property name="openjpa.ConnectionProperties" value="DriverClassName=com.mysql.jdbc.Driver, Url=jdbc:mysql://localhost:3306/openmeetings?autoReconnect=true&amp;useUnicode=true&amp;createDatabaseIfNotExist=true&amp;characterEncoding=utf-8&amp;connectionCollation=utf8_general_ci&amp;cachePrepStmts=true&amp;cacheCallableStatements=true&amp;cacheServerConfiguration=true&amp;useLocalSessionState=true&amp;elideSetAutoCommits=true&amp;alwaysSendSetIsolation=false&amp;enableQueryTimeouts=false&amp;prepStmtCacheSize=3000&amp;prepStmtCacheSqlLimit=1000, MaxActive=100, MaxWait=10000, TestOnBorrow=true, poolPreparedStatements=true, Username=root, Password=root"/> + <property name="openjpa.ConnectionProperties" value="DriverClassName=com.mysql.jdbc.Driver, Url=jdbc:mysql://localhost:3306/openmeetings?autoReconnect=true&amp;useUnicode=true&amp;createDatabaseIfNotExist=true&amp;characterEncoding=utf-8&amp;connectionCollation=utf8_general_ci&amp;cachePrepStmts=true&amp;cacheCallableStatements=true&amp;cacheServerConfiguration=true&amp;useLocalSessionState=true&amp;elideSetAutoCommits=true&amp;alwaysSendSetIsolation=false&amp;enableQueryTimeouts=false&amp;prepStmtCacheSize=3000&amp;prepStmtCacheSqlLimit=1000, MaxActive=100, MaxWait=10000, TestOnBorrow=true, poolPreparedStatements=true, Username=root, Password="/>
                                <property name="openjpa.jdbc.SynchronizeMappings" 
value="buildSchema"/>
<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/> <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" />

--
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.

Reply via email to