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 2015/04/19 19:57:32 UTC

svn commit: r1674651 - in /openmeetings: branches/3.0.x/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java

Author: solomax
Date: Sun Apr 19 17:57:32 2015
New Revision: 1674651

URL: http://svn.apache.org/r1674651
Log:
[OPENMEETINGS-1198] Backup panel is improved

Modified:
    openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java

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=1674651&r1=1674650&r2=1674651&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 Sun Apr 19 17:57:32 2015
@@ -75,7 +75,7 @@
 			<property name="openjpa.ConnectionDriverName" value="org.apache.commons.dbcp2.BasicDataSource" />
 			<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
+					, Url=jdbc:mysql://localhost:3306/openmeetings_3_0?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/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java?rev=1674651&r1=1674650&r2=1674651&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java Sun Apr 19 17:57:32 2015
@@ -149,7 +149,7 @@ public class BackupPanel extends AdminPa
 						timer.stop(target);
 						//TODO change text, localize
 						progressBar.setVisible(false);
-						feedback.error(th);
+						feedback.error(th.getMessage());
 						target.add(feedback);
 					} else {
 						progressBar.setModelObject(progressHolder.getProgress());