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 2014/10/01 16:44:32 UTC
svn commit: r1628718 - in /openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/META-INF: mysql_persistence.xml postgresql_persistence.xml

Author: solomax
Date: Wed Oct  1 14:44:31 2014
New Revision: 1628718

URL: http://svn.apache.org/r1628718
Log:
Occasionaly modified files are reverted

Modified:
    openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
    openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml

Modified: openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml?rev=1628718&r1=1628717&r2=1628718&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml Wed Oct  1 14:44:31 2014
@@ -78,7 +78,7 @@
 			<property name="openjpa.ConnectionDriverName" value="org.apache.commons.dbcp.BasicDataSource" />
 			<property name="openjpa.ConnectionProperties"
 				value="DriverClassName=com.mysql.jdbc.Driver
-					, Url=jdbc:mysql://localhost:3306/openmeetings_3_0_x?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
+					, 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

Modified: openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml?rev=1628718&r1=1628717&r2=1628718&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml Wed Oct  1 14:44:31 2014
@@ -83,8 +83,8 @@
 					, MaxWait=10000
 					, TestOnBorrow=true
 					, poolPreparedStatements=true
-					, Username=omadmin
-					, Password=omadmin" />
+					, Username=postgres
+					, Password=1" />
 			<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
 			<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" />
 			<property name="openjpa.DataCache" value="true" />