You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/04/16 08:06:24 UTC

svn commit: r1326497 - in /incubator/openmeetings/trunk/singlewebapp/src/META-INF: db2_persistence.xml derby_persistence.xml mysql_persistence.xml oracle_persistence.xml persistence.xml postgres_persistence.xml

Author: solomax
Date: Mon Apr 16 06:06:24 2012
New Revision: 1326497

URL: http://svn.apache.org/viewvc?rev=1326497&view=rev
Log:
percistense.xml seems to be added by mistake

Removed:
    incubator/openmeetings/trunk/singlewebapp/src/META-INF/persistence.xml
Modified:
    incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
    incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
    incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
    incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
    incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml

Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml?rev=1326497&r1=1326496&r2=1326497&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml Mon Apr 16 06:06:24 2012
@@ -69,9 +69,16 @@
 		<exclude-unlisted-classes>false</exclude-unlisted-classes>
 		<properties>
 			<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>
-			<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.ConnectionDriverName" value="org.apache.commons.dbcp.BasicDataSource" />
+			<property name="openjpa.ConnectionProperties"
+				value="DriverClassName=com.ibm.db2.jcc.DB2Driver
+					, Url=jdbc:db2://localhost:50000/openmeet
+					, MaxActive=100
+					, MaxWait=10000
+					, TestOnBorrow=true
+					, poolPreparedStatements=true
+					, Username=db2admin
+					, Password=admin"/>
 			<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema"/>
 			<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" />
 			<property name="openjpa.DataCache" value="true"/>

Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml?rev=1326497&r1=1326496&r2=1326497&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml Mon Apr 16 06:06:24 2012
@@ -71,6 +71,8 @@
         <class>org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe</class>
 		<exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
+            <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported" />
+            <property name="openjpa.ConnectionDriverName" value="org.apache.commons.dbcp.BasicDataSource" />
             <property name="openjpa.ConnectionProperties"
                 value="DriverClassName=org.apache.derby.jdbc.ClientDriver,
                                   Url=jdbc:derby:openmeetings;create=true, 
@@ -81,9 +83,7 @@
                                   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" />

Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml?rev=1326497&r1=1326496&r2=1326497&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml Mon Apr 16 06:06:24 2012
@@ -71,24 +71,24 @@
         <class>org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe</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"/>
-                <!-- QueryCache disabled due to changes outside of JPA doesn't take effect with caching -->
-				<property name="openjpa.QueryCache" value="false"/>
-				<property name="openjpa.jdbc.DBDictionary"  value="batchLimit=100,tableType=myisam"/> 
-				<property name="openjpa.jdbc.QuerySQLCache"  value="false"/> 
+		    <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>
+            <property name="openjpa.ConnectionDriverName" value="org.apache.commons.dbcp.BasicDataSource" />
+			<property name="openjpa.ConnectionProperties"
+				value="DriverClassName=com.mysql.jdbc.Driver
+					, Url=jdbc:mysql://192.168.72.105: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.Log" value="DefaultLevel=WARN, Tool=INFO" />
+			<property name="openjpa.DataCache" value="true"/>
+			<!-- QueryCache disabled due to changes outside of JPA doesn't take effect with caching -->
+			<property name="openjpa.QueryCache" value="false"/>
+			<property name="openjpa.jdbc.DBDictionary"  value="batchLimit=100,tableType=myisam"/> 
+			<property name="openjpa.jdbc.QuerySQLCache"  value="false"/> 
     	</properties>
 	</persistence-unit>
 </persistence>

Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml?rev=1326497&r1=1326496&r2=1326497&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml Mon Apr 16 06:06:24 2012
@@ -69,14 +69,19 @@
 		<exclude-unlisted-classes>false</exclude-unlisted-classes>
 		<properties>
 			<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>
-			<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.ConnectionProperties"
+                value="DriverClassName=oracle.jdbc.driver.OracleDriver
+                                  Url=jdbc:oracle:thin:@localhost:1521:openmeetings, 
+                                  create=true,
+                                  MaxActive=100, 
+                                  MaxWait=10000, 
+                                  TestOnBorrow=true, 
+                                  Username=SYSTEM, 
+                                  Password=admin" />
 			<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>

Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml?rev=1326497&r1=1326496&r2=1326497&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml Mon Apr 16 06:06:24 2012
@@ -68,14 +68,19 @@
 		<class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
 		<exclude-unlisted-classes>false</exclude-unlisted-classes>
 		<properties>
-				<property name="openjpa.ConnectionURL" value="jdbc:postgresql://localhost:5432/openmeetings"/>
-            	<property name="openjpa.ConnectionUserName" value="postgres"/>
-            	<property name="openjpa.ConnectionPassword" value=""/>
+			<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>
+            <property name="openjpa.ConnectionDriverName" value="org.apache.commons.dbcp.BasicDataSource" />
+			<property name="openjpa.ConnectionProperties"
+				value="DriverClassName=org.postgresql.Driver
+					, Url=jdbc:postgresql://localhost:5432/openmeetings
+					, MaxActive=100
+					, MaxWait=10000
+					, TestOnBorrow=true
+					, poolPreparedStatements=true
+					, Username=postgres
+					, Password=1"/>
 				<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.jdbc.DBDictionary" value="postgres"/>
 				<property name="openjpa.DataCache" value="true"/>
 				<property name="openjpa.QueryCache" value="true"/> 
 				<property name="openjpa.jdbc.QuerySQLCache"  value="false"/>