Revision: 4387
Author: seba.wagner
Date: Sat Oct 8 01:28:22 2011
Log: Add Zero Conf DB Configuration (Issue 1537)
http://code.google.com/p/openmeetings/source/detail?r=4387
Added:
/tags/1_8/lib/database/derby.jar
/tags/1_8/lib/database/derbyclient.jar
/tags/1_8/src/META-INF/db2_persistence.xml
Modified:
/tags/1_8/src/META-INF/mysql_persistence.xml
/tags/1_8/src/META-INF/persistence.xml
=======================================
--- /dev/null
+++ /tags/1_8/lib/database/derby.jar Sat Oct 8 01:28:22 2011
File is too large to display a diff.
=======================================
--- /dev/null
+++ /tags/1_8/lib/database/derbyclient.jar Sat Oct 8 01:28:22 2011
Binary file, no diff available.
=======================================
--- /dev/null
+++ /tags/1_8/src/META-INF/db2_persistence.xml Sat Oct 8 01:28:22 2011
@@ -0,0 +1,72 @@
+<?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.persistence.beans.adresses.Adresses</class>
+
<class>org.openmeetings.app.persistence.beans.adresses.States</class>
+
<class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
+
<class>org.openmeetings.app.persistence.beans.basic.ErrorType</class>
+
<class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
+
<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
+
<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
+
<class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
+
<class>org.openmeetings.app.persistence.beans.basic.Navisub</class>
+
<class>org.openmeetings.app.persistence.beans.basic.OmTimeZone</class>
+
<class>org.openmeetings.app.persistence.beans.basic.Sessiondata</class>
+
<class>org.openmeetings.app.persistence.beans.basic.SOAPLogin</class>
+
<class>org.openmeetings.app.persistence.beans.calendar.Appointment</class>
+
<class>org.openmeetings.app.persistence.beans.calendar.AppointmentCategory</class>
+
<class>org.openmeetings.app.persistence.beans.calendar.AppointmentReminderTyps</class>
+
<class>org.openmeetings.app.persistence.beans.calendar.MeetingMember</class>
+
<class>org.openmeetings.app.persistence.beans.domain.Organisation</class>
+
<class>org.openmeetings.app.persistence.beans.domain.Organisation_Users</class>
+
<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecording</class>
+
<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingLog</class>
+
<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaData</class>
+
<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaDelta</class>
+
<class>org.openmeetings.app.persistence.beans.invitation.Invitations</class>
+
<class>org.openmeetings.app.persistence.beans.lang.FieldLanguage</class>
+
<class>org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues</class>
+
<class>org.openmeetings.app.persistence.beans.lang.Fieldvalues</class>
+
<class>org.openmeetings.app.persistence.beans.logs.ConferenceLog</class>
+
<class>org.openmeetings.app.persistence.beans.logs.ConferenceLogType</class>
+
<class>org.openmeetings.app.persistence.beans.recording.ChatvaluesEvent</class>
+
<class>org.openmeetings.app.persistence.beans.recording.Recording</class>
+
<class>org.openmeetings.app.persistence.beans.recording.RecordingClient</class>
+
<class>org.openmeetings.app.persistence.beans.recording.RecordingConversionJob</class>
+
<class>org.openmeetings.app.persistence.beans.recording.RoomClient</class>
+
<class>org.openmeetings.app.persistence.beans.recording.RoomRecording</class>
+
<class>org.openmeetings.app.persistence.beans.recording.RoomStream</class>
+
<class>org.openmeetings.app.persistence.beans.recording.WhiteBoardEvent</class>
+
<class>org.openmeetings.app.persistence.beans.rooms.RoomModerators</class>
+
<class>org.openmeetings.app.persistence.beans.rooms.Rooms</class>
+
<class>org.openmeetings.app.persistence.beans.rooms.RoomTypes</class>
+
<class>org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation</class>
+
<class>org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject</class>
+
<class>org.openmeetings.app.persistence.beans.user.PrivateMessages</class>
+
<class>org.openmeetings.app.persistence.beans.user.PrivateMessageFolder</class>
+
<class>org.openmeetings.app.persistence.beans.user.Salutations</class>
+
<class>org.openmeetings.app.persistence.beans.user.UserContacts</class>
+
<class>org.openmeetings.app.persistence.beans.user.Userdata</class>
+
<class>org.openmeetings.app.persistence.beans.user.Usergroups</class>
+
<class>org.openmeetings.app.persistence.beans.user.Userlevel</class>
+
<class>org.openmeetings.app.persistence.beans.user.Users_Usergroups</class>
+
<class>org.openmeetings.app.persistence.beans.user.UserSipData</class>
+ <class>org.openmeetings.app.persistence.beans.user.Users</class>
+
<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="com.ibm.db2.jcc.DB2Driver"/>
+ <property name="openjpa.ConnectionProperties" value="username=db2admin,
password=admin"/>
+ <property name="openjpa.ConnectionURL"
value="jdbc:db2://localhost:50000/openmeet"/>
+ <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"/>
+ </properties>
+ </persistence-unit>
+</persistence>
=======================================
--- /tags/1_8/src/META-INF/mysql_persistence.xml Sat Jul 23 04:28:08 2011
+++ /tags/1_8/src/META-INF/mysql_persistence.xml Sat Oct 8 01:28:22 2011
@@ -57,7 +57,15 @@
<class>org.openmeetings.app.persistence.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&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.ConnectionProperties"
+
value="DriverClassName=com.mysql.jdbc.Driver
+ ,
Url=jdbc:mysql://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=$USER_NAME
+ , Password=$USER_PASS"/>
<property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema"/>
<property name="openjpa.RuntimeUnenhancedClasses"
value="unsupported"/>
<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"
/>
=======================================
--- /tags/1_8/src/META-INF/persistence.xml Mon Sep 12 13:46:45 2011
+++ /tags/1_8/src/META-INF/persistence.xml Sat Oct 8 01:28:22 2011
@@ -1,8 +1,12 @@
<?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>
+<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.persistence.beans.adresses.Adresses</class>
<class>org.openmeetings.app.persistence.beans.adresses.States</class>
<class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
@@ -57,15 +61,23 @@
<class>org.openmeetings.app.persistence.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&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.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>
+ <property name="openjpa.ConnectionProperties"
+
value="DriverClassName=org.apache.derby.jdbc.ClientDriver,
+
Url=jdbc:derby:openmeetings;create=true,
+ create=true,
+ MaxActive=100,
+ MaxWait=10000,
+ TestOnBorrow=true,
+ Username=user,
+ Password=secret" />
+ <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" />
+ <property name="openjpa.jdbc.QuerySQLCache" value="false"
/>
+ </properties>
</persistence-unit>
</persistence>
--
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.
