Repository: openmeetings Updated Branches: refs/heads/master 4a5e859f8 -> e1ca1d3f0
no jira: defauld upload size is changed to be 100MB Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/e1ca1d3f Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/e1ca1d3f Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/e1ca1d3f Branch: refs/heads/master Commit: e1ca1d3f0ca9a55fd7b62e47b94d456f004cb6e7 Parents: 4a5e859 Author: Maxim Solodovnik <[email protected]> Authored: Tue Jun 20 10:42:41 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Jun 20 10:43:14 2017 +0700 ---------------------------------------------------------------------- .../org/apache/openmeetings/installation/ImportInitvalues.java | 2 +- openmeetings-server/src/site/xdoc/GeneralConfiguration.xml | 6 +++--- .../org/apache/openmeetings/util/OpenmeetingsVariables.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e1ca1d3f/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java index c620c7e..4a11079 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java @@ -319,7 +319,7 @@ public class ImportInitvalues { "Display name of the user who draw the current object (User Name auto-disapper after 3 seconds."); cfgDao.add(CONFIG_MAX_UPLOAD_SIZE_KEY, "" + DEFAULT_MAX_UPLOAD_SIZE, null, - "Maximum size of upload file (bytes)"); // defaults to 1GB + "Maximum size of upload file (bytes)"); // defaults to 100MB cfgDao.add(CONFIG_APPOINTMENT_REMINDER_MINUTES, "15", null, "The number of minutes before reminder emails are send. Set to 0 to disable reminder emails"); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e1ca1d3f/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml b/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml index 20159ee..ed3af37 100644 --- a/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml +++ b/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml @@ -90,9 +90,9 @@ </tr> <tr> <td> max_upload_size </td> - <td> 1073741824 </td> - <td> Maximum size of upload file (bytes) 1073741824 bytes = 1GB </td> - <td> 1.8.x </td> + <td> 104857600 </td> + <td> Maximum size of upload file (bytes) 104857600 bytes = 100MB </td> + <td> 1.8.x <b>default value changed in 3.3.0</b> </td> </tr> <tr> <td> show.whiteboard.draw.status </td> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e1ca1d3f/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java index 310d833..10dda21 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java @@ -79,6 +79,6 @@ public class OpenmeetingsVariables { public static String wicketApplicationName = null; public static String APPLICATION_NAME = null; public static final String DEFAULT_APP_NAME = "OpenMeetings"; - public static final long DEFAULT_MAX_UPLOAD_SIZE = 1024 * 1024 * 1024; // 1GB + public static final long DEFAULT_MAX_UPLOAD_SIZE = 100 * 1024 * 1024; // 100MB public static int EXT_PROCESS_TTL = 20; }
