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 2017/05/19 04:53:29 UTC
openmeetings git commit: no jira: constants are moved to correct class
Repository: openmeetings
Updated Branches:
refs/heads/3.3.x aa8b1687b -> 62460a267
no jira: constants are moved to correct class
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/62460a26
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/62460a26
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/62460a26
Branch: refs/heads/3.3.x
Commit: 62460a267797e886fa1847d0eaf902fe50be2609
Parents: aa8b168
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri May 19 11:53:21 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri May 19 11:53:21 2017 +0700
----------------------------------------------------------------------
.../org/apache/openmeetings/db/dao/basic/ConfigurationDao.java | 4 ++--
.../org/apache/openmeetings/installation/ImportInitvalues.java | 4 ++--
.../org/apache/openmeetings/installation/InstallationConfig.java | 4 ++--
.../java/org/apache/openmeetings/util/OpenmeetingsVariables.java | 2 ++
4 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/62460a26/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
index 3697e01..fa921ec 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
@@ -26,7 +26,9 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_HEADER_C
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_HEADER_XFRAME;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MAX_UPLOAD_SIZE_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SIP_ENABLED;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_APP_NAME;
import static org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_BASE_URL;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_MAX_UPLOAD_SIZE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.configKeyCryptClassName;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.util.OpenmeetingsVariables.whiteboardDrawStatus;
@@ -67,8 +69,6 @@ import org.springframework.transaction.annotation.Transactional;
@Transactional
public class ConfigurationDao implements IDataProviderDao<Configuration> {
private static final Logger log = Red5LoggerFactory.getLogger(ConfigurationDao.class, webAppRootKey);
- public static final long DEFAULT_MAX_UPLOAD_SIZE = 1024 * 1024 * 1024; // 1GB
- public static final String DEFAULT_APP_NAME = "OpenMeetings";
public final static String[] searchFields = {"key", "value"};
@PersistenceContext
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/62460a26/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 e7099b9..4b13cec 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
@@ -18,8 +18,6 @@
*/
package org.apache.openmeetings.installation;
-import static org.apache.openmeetings.db.dao.basic.ConfigurationDao.DEFAULT_APP_NAME;
-import static org.apache.openmeetings.db.dao.basic.ConfigurationDao.DEFAULT_MAX_UPLOAD_SIZE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_BASE_URL;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_NAME;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPOINTMENT_REMINDER_MINUTES;
@@ -52,6 +50,8 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSH
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SIP_ENABLED;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SOAP_REGISTER_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SYSTEM_EMAIL;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_APP_NAME;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_MAX_UPLOAD_SIZE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.HEADER_CSP_SELF;
import static org.apache.openmeetings.util.OpenmeetingsVariables.HEADER_XFRAME_SAMEORIGIN;
import static org.apache.openmeetings.util.OpenmeetingsVariables.LEVEL_ADMIN;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/62460a26/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
index 6f0d3d7..15f5f8c 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
@@ -18,17 +18,17 @@
*/
package org.apache.openmeetings.installation;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_APP_NAME;
import static org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_BASE_URL;
import java.io.Serializable;
-import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.util.crypt.SCryptImplementation;
public class InstallationConfig implements Serializable {
private static final long serialVersionUID = 1L;
- public String appName = ConfigurationDao.DEFAULT_APP_NAME;
+ public String appName = DEFAULT_APP_NAME;
public String username;
private String password;
public String email;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/62460a26/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 6fa19d9..ee9c749 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
@@ -71,4 +71,6 @@ public class OpenmeetingsVariables {
public static Boolean whiteboardDrawStatus = null;
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
}