[4/4] openmeetings git commit: [OPENMEETINGS-1691] config names are unified

[so...@apache.org]

[OPENMEETINGS-1691] config names are unified


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/6ac6ec5f
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/6ac6ec5f
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/6ac6ec5f

Branch: refs/heads/master
Commit: 6ac6ec5f67f4e30103c4bb345e6d5fd14e76f750
Parents: ffe78cd
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Tue Sep 5 18:26:18 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Tue Sep 5 18:26:18 2017 +0700

----------------------------------------------------------------------
 .../core/converter/BaseConverter.java           |  10 +-
 .../core/converter/DocumentConverter.java       |   3 +-
 .../openmeetings/core/mail/MailHandler.java     |  16 +--
 .../openmeetings/core/remote/MobileService.java |  15 +--
 .../db/dao/basic/ConfigurationDao.java          |  10 +-
 .../openmeetings/db/dao/room/RoomDao.java       |   3 +-
 .../openmeetings/db/dao/user/UserDao.java       |   4 +-
 .../openmeetings/db/entity/user/User.java       |   4 +-
 .../apache/openmeetings/db/util/UserHelper.java |   8 +-
 .../openmeetings/backup/BackupImport.java       |  59 +++++++++-
 .../installation/ImportInitvalues.java          | 108 ++++++++++---------
 .../installation/InstallationConfig.java        |  14 ++-
 .../src/site/xdoc/CustomCryptMechanism.xml      |   2 +-
 openmeetings-server/src/site/xdoc/Dashboard.xml |   4 +-
 .../src/site/xdoc/GeneralConfiguration.xml      |  39 ++++---
 .../src/site/xdoc/ManualTesting.xml             |  30 +++---
 .../openmeetings/service/mail/EmailManager.java |   7 +-
 .../mail/template/AbstractTemplatePanel.java    |   4 +-
 .../openmeetings/service/user/UserManager.java  |  14 +--
 .../util/OpenmeetingsVariables.java             |  57 ++++++----
 .../openmeetings/web/admin/users/UserForm.java  |   3 +-
 .../web/app/Application.properties.xml          |  33 +++---
 .../web/app/Application_ar.properties.xml       |  33 +++---
 .../web/app/Application_bg.properties.xml       |  33 +++---
 .../web/app/Application_ca.properties.xml       |  33 +++---
 .../web/app/Application_cs.properties.xml       |  33 +++---
 .../web/app/Application_da.properties.xml       |  33 +++---
 .../web/app/Application_de.properties.xml       |  33 +++---
 .../web/app/Application_el.properties.xml       |  33 +++---
 .../web/app/Application_es.properties.xml       |  33 +++---
 .../web/app/Application_fa.properties.xml       |  33 +++---
 .../web/app/Application_fi.properties.xml       |  33 +++---
 .../web/app/Application_fr.properties.xml       |  33 +++---
 .../web/app/Application_gl.properties.xml       |  33 +++---
 .../web/app/Application_hu.properties.xml       |  23 ++--
 .../web/app/Application_id.properties.xml       |  33 +++---
 .../web/app/Application_it.properties.xml       |  33 +++---
 .../web/app/Application_ja.properties.xml       |  33 +++---
 .../web/app/Application_ko.properties.xml       |  33 +++---
 .../web/app/Application_nl.properties.xml       |  33 +++---
 .../web/app/Application_pl.properties.xml       |  33 +++---
 .../web/app/Application_pt.properties.xml       |  33 +++---
 .../web/app/Application_pt_BR.properties.xml    |  33 +++---
 .../web/app/Application_ru.properties.xml       |  33 +++---
 .../web/app/Application_sk.properties.xml       |  33 +++---
 .../web/app/Application_sv.properties.xml       |  33 +++---
 .../web/app/Application_th.properties.xml       |  33 +++---
 .../web/app/Application_tr.properties.xml       |  33 +++---
 .../web/app/Application_uk.properties.xml       |  33 +++---
 .../web/app/Application_zh_CN.properties.xml    |  33 +++---
 .../web/app/Application_zh_TW.properties.xml    |  33 +++---
 .../apache/openmeetings/web/app/WebSession.java |  12 +--
 .../web/pages/auth/RegisterDialog.java          |   6 +-
 .../openmeetings/web/pages/auth/SignInPage.java |   4 +-
 .../install/InstallWizard$ParamsStep2.html      |   3 -
 .../install/InstallWizard$ParamsStep4.html      |  22 ++--
 .../web/pages/install/InstallWizard.java        |   8 +-
 .../web/room/menu/RoomMenuPanel.java            |   4 +-
 .../org/apache/openmeetings/web/room/wb/wb.js   |  23 ++--
 .../web/user/dashboard/RssWidgetView.java       |   8 +-
 .../web/user/profile/WidgetsPanel.java          |   8 +-
 .../test/backup/TestOldBackups.java             |   4 +-
 .../openmeetings/test/config/TestConfig.java    |   3 +-
 pom.xml                                         |   2 +-
 64 files changed, 776 insertions(+), 725 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
index 24b877a..5671715 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
@@ -23,7 +23,9 @@ import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
 import static org.apache.openmeetings.util.OmFileHelper.getRecordingMetaData;
 import static org.apache.openmeetings.util.OmFileHelper.getStreamsSubDir;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_IMAGEMAGIC_PATH;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_FFMPEG;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_IMAGEMAGIC;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_SOX;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 
 import java.io.File;
@@ -84,15 +86,15 @@ public abstract class BaseConverter {
 	}
 
 	public String getPathToFFMPEG() {
-		return getPath("ffmpeg_path", "ffmpeg");
+		return getPath(CONFIG_PATH_FFMPEG, "ffmpeg");
 	}
 
 	protected String getPathToSoX() {
-		return getPath("sox_path", "sox");
+		return getPath(CONFIG_PATH_SOX, "sox");
 	}
 
 	protected String getPathToConvert() {
-		return getPath(CONFIG_IMAGEMAGIC_PATH, "convert") + EXEC_EXT;
+		return getPath(CONFIG_PATH_IMAGEMAGIC, "convert") + EXEC_EXT;
 	}
 
 	protected File getStreamFolder(Recording recording) {

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java
index dcae322..909dc1c 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java
@@ -20,6 +20,7 @@ package org.apache.openmeetings.core.converter;
 
 import static org.apache.commons.io.FileUtils.copyFile;
 import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PDF;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_OFFICE;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 
 import java.io.File;
@@ -69,7 +70,7 @@ public class DocumentConverter {
 	 */
 	public ConverterProcessResult doJodConvert(File in, File out) {
 		try {
-			String officePath = configurationDao.getConfValue("office.path", String.class, null);
+			String officePath = configurationDao.getConfValue(CONFIG_PATH_OFFICE, String.class, null);
 			DefaultOfficeManagerConfiguration configuration = new DefaultOfficeManagerConfiguration();
 			if (!Strings.isEmpty(officePath)) {
 				configuration.setOfficeHome(officePath);

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
index a77e397..4b2e4b7 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
@@ -19,7 +19,11 @@
 package org.apache.openmeetings.core.mail;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SYSTEM_EMAIL;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_PASS;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_PORT;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_SERVER;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_SYSTEM_EMAIL;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_USER;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 
 import java.io.ByteArrayInputStream;
@@ -89,11 +93,11 @@ public class MailHandler {
 	private int smtpTimeOut;
 
 	private void init() {
-		smtpServer = cfgDao.getConfValue("smtp_server", String.class, null);
-		smtpPort = cfgDao.getConfValue("smtp_port", String.class, "25");
-		from = cfgDao.getConfValue(CONFIG_SYSTEM_EMAIL, String.class, null);
-		mailAuthUser = cfgDao.getConfValue("email_username", String.class, null);
-		mailAuthPass = cfgDao.getConfValue("email_userpass", String.class, null);
+		smtpServer = cfgDao.getConfValue(CONFIG_SMTP_SERVER, String.class, null);
+		smtpPort = cfgDao.getConfValue(CONFIG_SMTP_PORT, String.class, "25");
+		from = cfgDao.getConfValue(CONFIG_SMTP_SYSTEM_EMAIL, String.class, null);
+		mailAuthUser = cfgDao.getConfValue(CONFIG_SMTP_USER, String.class, null);
+		mailAuthPass = cfgDao.getConfValue(CONFIG_SMTP_PASS, String.class, null);
 		mailTls = "1".equals(cfgDao.getConfValue("mail.smtp.starttls.enable", String.class, "0"));
 		mailAddReplyTo = "1".equals(cfgDao.getConfValue("inviter.email.as.replyto", String.class, "1"));
 		smtpConnectionTimeOut = cfgDao.getConfValue("mail.smtp.connection.timeout", Integer.class, "30000");

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
index 855d95a..0990c42 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
@@ -21,8 +21,9 @@ package org.apache.openmeetings.core.remote;
 import static org.apache.openmeetings.db.util.LocaleHelper.getCountryName;
 import static org.apache.openmeetings.util.OmException.UNKNOWN;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FRONTEND_REGISTER_KEY;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_OAUTH_REGISTER_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_VERIFICATION;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_FRONTEND;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_OAUTH;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 import static org.apache.openmeetings.util.Version.getVersion;
 
@@ -112,8 +113,8 @@ public class MobileService {
 
 	public Map<String, Object> checkServer() {
 		Map<String, Object> result = new HashMap<>();
-		result.put("allowSelfRegister",  "1".equals(cfgDao.getConfValue(CONFIG_FRONTEND_REGISTER_KEY, String.class, "0")));
-		result.put("allowOauthRegister",  "1".equals(cfgDao.getConfValue(CONFIG_OAUTH_REGISTER_KEY, String.class, "0")));
+		result.put("allowSelfRegister",  "1".equals(cfgDao.getConfValue(CONFIG_REGISTER_FRONTEND, String.class, "0")));
+		result.put("allowOauthRegister",  "1".equals(cfgDao.getConfValue(CONFIG_REGISTER_OAUTH, String.class, "0")));
 		return result;
 	}
 
@@ -132,7 +133,7 @@ public class MobileService {
 	public Map<String, Object> loginGoogle(Map<String, String> umap) {
 		Map<String, Object> result = getResult();
 		try {
-			if ("1".equals(cfgDao.getConfValue(CONFIG_OAUTH_REGISTER_KEY, String.class, "0"))) {
+			if ("1".equals(cfgDao.getConfValue(CONFIG_REGISTER_OAUTH, String.class, "0"))) {
 				User u = userManager.loginOAuth(umap, 2); //TODO hardcoded
 				result = login(u, result);
 			}
@@ -145,7 +146,7 @@ public class MobileService {
 	public Map<String, Object> registerUser(Map<String, String> umap) {
 		Map<String, Object> result = getResult();
 		try {
-			if ("1".equals(cfgDao.getConfValue(CONFIG_FRONTEND_REGISTER_KEY, String.class, "0"))) {
+			if ("1".equals(cfgDao.getConfValue(CONFIG_REGISTER_FRONTEND, String.class, "0"))) {
 				String login = umap.get("login");
 				String email = umap.get("email");
 				String lastname = umap.get("lastname");
@@ -166,7 +167,7 @@ public class MobileService {
 
 				String baseURL = cfgDao.getBaseUrl();
 				boolean sendConfirmation = !Strings.isEmpty(baseURL)
-						&& 1 == cfgDao.getConfValue("sendEmailWithVerficationCode", Integer.class, "0");
+						&& 1 == cfgDao.getConfValue(CONFIG_EMAIL_VERIFICATION, Integer.class, "0");
 				Object user = userManager.registerUserInit(UserDao.getDefaultRights(), login, password, lastname
 						, firstname, email, null /* age/birthday */, "" /* street */
 						, "" /* additionalname */, "" /* fax */, "" /* zip */, country

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/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 c35bdc9..edf14db 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
@@ -21,11 +21,11 @@ package org.apache.openmeetings.db.dao.basic;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.APPLICATION_NAME;
 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_CRYPT_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EXT_PROCESS_TTL;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_HEADER_CSP;
 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_MAX_UPLOAD_SIZE;
 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;
@@ -253,7 +253,7 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> {
 			entity = em.merge(entity);
 		}
 		switch (key) {
-			case CONFIG_CRYPT_KEY:
+			case CONFIG_CRYPT:
 				configKeyCryptClassName = value;
 				CryptProvider.reset();
 				break;
@@ -300,7 +300,7 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> {
 	 */
 	public long getMaxUploadSize() {
 		try {
-			return getConfValue(CONFIG_MAX_UPLOAD_SIZE_KEY, Long.class, "" + DEFAULT_MAX_UPLOAD_SIZE);
+			return getConfValue(CONFIG_MAX_UPLOAD_SIZE, Long.class, "" + DEFAULT_MAX_UPLOAD_SIZE);
 		} catch (Exception e) {
 			log.error("Invalid value saved for max_upload_size conf key: ", e);
 		}
@@ -309,7 +309,7 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> {
 
 	public String getCryptKey() {
 		if (configKeyCryptClassName == null) {
-			String cryptClass = getConfValue(CONFIG_CRYPT_KEY, String.class, null);
+			String cryptClass = getConfValue(CONFIG_CRYPT, String.class, null);
 			if (cryptClass != null) {
 				configKeyCryptClassName = cryptClass;
 			}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
index 0ea7a43..5bdcbc2 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
@@ -18,6 +18,7 @@
  */
 package org.apache.openmeetings.db.dao.room;
 
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SIP_ROOM_PREFIX;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.RECENT_ROOMS_COUNT;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 
@@ -210,7 +211,7 @@ public class RoomDao implements IGroupAdminDataProviderDao<Room> {
 
 	private String getSipNumber(long roomId) {
 		if (cfgDao.isSipEnabled()) {
-			return cfgDao.getConfValue("red5sip.room_prefix", String.class, "400") + roomId;
+			return cfgDao.getConfValue(CONFIG_SIP_ROOM_PREFIX, String.class, "400") + roomId;
 		}
 		return null;
 	}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
index 4fe9eda..3a0c5e5 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
@@ -19,7 +19,7 @@
 package org.apache.openmeetings.db.dao.user;
 
 import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 
 import java.security.NoSuchAlgorithmException;
@@ -106,7 +106,7 @@ public class UserDao implements IGroupAdminDataProviderDao<User> {
 		User user = new User();
 		user.setSalutation(Salutation.mr); // TODO: Fix default selection to be configurable
 		user.setRights(getDefaultRights());
-		user.setLanguageId(cfgDao.getConfValue(CONFIG_DEFAULT_LANG_KEY, Long.class, "1"));
+		user.setLanguageId(cfgDao.getConfValue(CONFIG_DEFAULT_LANG, Long.class, "1"));
 		user.setTimeZoneId(timezoneUtil.getTimeZone(currentUser).getID());
 		user.setForceTimeZoneCheck(false);
 		user.setSendSMS(false);

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
index c38a75a..b4407f7 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
@@ -18,6 +18,8 @@
  */
 package org.apache.openmeetings.db.entity.user;
 
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SIP_EXTEN_CONTEXT;
+
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -385,7 +387,7 @@ public class User implements IDataProviderEntity {
 			if (u == null) {
 				setSipUser(u = new AsteriskSipUser());
 			}
-			String defaultRoomContext = configDao.getConfValue("red5sip.exten_context", String.class, "rooms");
+			String defaultRoomContext = configDao.getConfValue(CONFIG_SIP_EXTEN_CONTEXT, String.class, "rooms");
 			u.setName(login);
 			u.setDefaultuser(login);
 			u.setMd5secret(MD5.checksum(login + ":asterisk:" + pass));

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/UserHelper.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/UserHelper.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/UserHelper.java
index 32a0945..d8dc04d 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/UserHelper.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/UserHelper.java
@@ -18,8 +18,8 @@
  */
 package org.apache.openmeetings.db.util;
 
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_LOGIN_MIN_LENGTH_KEY;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PASS_MIN_LENGTH_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_LOGIN_MIN_LENGTH;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PASS_MIN_LENGTH;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.USER_LOGIN_MINIMUM_LENGTH;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.USER_PASSWORD_MINIMUM_LENGTH;
 
@@ -27,10 +27,10 @@ import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 
 public class UserHelper {
 	public static int getMinLoginLength(ConfigurationDao cfgDao) {
-		return cfgDao.getConfValue(CONFIG_LOGIN_MIN_LENGTH_KEY, Integer.class, "" + USER_LOGIN_MINIMUM_LENGTH);
+		return cfgDao.getConfValue(CONFIG_LOGIN_MIN_LENGTH, Integer.class, "" + USER_LOGIN_MINIMUM_LENGTH);
 	}
 
 	public static int getMinPasswdLength(ConfigurationDao cfgDao) {
-		return cfgDao.getConfValue(CONFIG_PASS_MIN_LENGTH_KEY, Integer.class, "" + USER_PASSWORD_MINIMUM_LENGTH);
+		return cfgDao.getConfValue(CONFIG_PASS_MIN_LENGTH, Integer.class, "" + USER_PASSWORD_MINIMUM_LENGTH);
 	}
 }

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index fad26ab..7cb704b 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -38,8 +38,31 @@ import static org.apache.openmeetings.util.OmFileHelper.getUploadRoomDir;
 import static org.apache.openmeetings.util.OmFileHelper.profilesPrefix;
 import static org.apache.openmeetings.util.OmFileHelper.recordingFileName;
 import static org.apache.openmeetings.util.OmFileHelper.thumbImagePrefix;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_RSS_FEED1;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_RSS_FEED2;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LDAP_ID;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_AT_REGISTER;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_VERIFICATION;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_IGNORE_BAD_SSL;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MAX_UPLOAD_SIZE;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_FFMPEG;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_IMAGEMAGIC;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_OFFICE;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_SOX;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_FRONTEND;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_QUALITY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SIP_ENABLED;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SIP_EXTEN_CONTEXT;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SIP_ROOM_PREFIX;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_PASS;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_PORT;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_SERVER;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_SYSTEM_EMAIL;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_USER;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 
 import java.io.File;
@@ -138,6 +161,34 @@ public class BackupImport {
 	private static final Logger log = Red5LoggerFactory.getLogger(BackupImport.class, webAppRootKey);
 	private static final String LDAP_EXT_TYPE = "LDAP";
 	private static final Properties countries = new Properties();
+	private static final Map<String, String> outdatedConfigKeys = new HashMap<>();
+	static {
+		outdatedConfigKeys.put("crypt_ClassName", CONFIG_CRYPT);
+		outdatedConfigKeys.put("system_email_addr", CONFIG_SMTP_SYSTEM_EMAIL);
+		outdatedConfigKeys.put("smtp_server", CONFIG_SMTP_SERVER);
+		outdatedConfigKeys.put("smtp_port", CONFIG_SMTP_PORT);
+		outdatedConfigKeys.put("email_username", CONFIG_SMTP_USER);
+		outdatedConfigKeys.put("email_userpass", CONFIG_SMTP_PASS);
+		outdatedConfigKeys.put("default_lang_id", CONFIG_DEFAULT_LANG);
+		outdatedConfigKeys.put("allow_frontend_register", CONFIG_REGISTER_FRONTEND);
+		outdatedConfigKeys.put("max_upload_size", CONFIG_MAX_UPLOAD_SIZE);
+		outdatedConfigKeys.put("rss_feed1", CONFIG_DASHBOARD_RSS_FEED1);
+		outdatedConfigKeys.put("rss_feed2", CONFIG_DASHBOARD_RSS_FEED2);
+		outdatedConfigKeys.put("oauth2.ignore_bad_ssl", CONFIG_IGNORE_BAD_SSL);
+		outdatedConfigKeys.put("default.quality.screensharing", CONFIG_SCREENSHARING_QUALITY);
+		outdatedConfigKeys.put("default.fps.screensharing", CONFIG_SCREENSHARING_FPS);
+		outdatedConfigKeys.put("ldap_default_id", CONFIG_DEFAULT_LDAP_ID);
+		outdatedConfigKeys.put("default_group_id", CONFIG_DEFAULT_GROUP_ID);
+		outdatedConfigKeys.put("imagemagick_path", CONFIG_PATH_IMAGEMAGIC);
+		outdatedConfigKeys.put("sox_path", CONFIG_PATH_SOX);
+		outdatedConfigKeys.put("ffmpeg_path", CONFIG_PATH_FFMPEG);
+		outdatedConfigKeys.put("office.path", CONFIG_PATH_OFFICE);
+		outdatedConfigKeys.put("red5sip.enable", CONFIG_SIP_ENABLED);
+		outdatedConfigKeys.put("red5sip.room_prefix", CONFIG_SIP_ROOM_PREFIX);
+		outdatedConfigKeys.put("red5sip.exten_context", CONFIG_SIP_EXTEN_CONTEXT);
+		outdatedConfigKeys.put("sendEmailAtRegister", CONFIG_EMAIL_AT_REGISTER);
+		outdatedConfigKeys.put("sendEmailWithVerficationCode", CONFIG_EMAIL_VERIFICATION);
+	}
 
 	@Autowired
 	private AppointmentDao appointmentDao;
@@ -272,7 +323,11 @@ public class BackupImport {
 				if (c.getUser() != null && c.getUser().getId() == null) {
 					c.setUser(null);
 				}
-				if (CONFIG_CRYPT_KEY.equals(c.getKey())) {
+				String newKey = outdatedConfigKeys.get(c.getKey());
+				if (newKey != null) {
+					c.setKey(newKey);
+				}
+				if (CONFIG_CRYPT.equals(c.getKey())) {
 					try {
 						Class<?> clazz = Class.forName(c.getValue());
 						clazz.newInstance();

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/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 7185e44..2e39c2f 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
@@ -22,16 +22,20 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICAT
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_NAME;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPOINTMENT_REMINDER_MINUTES;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CALENDAR_FIRST_DAY;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_RSS_FEED1;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_RSS_FEED2;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_SHOW_CHAT;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_SHOW_MYROOMS_KEY;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_SHOW_RSS_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_SHOW_MYROOMS;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_SHOW_RSS;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANDING_ZONE;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LDAP_ID;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DOCUMENT_DPI;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DOCUMENT_QUALITY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_AT_REGISTER;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_VERIFICATION;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EXT_PROCESS_TTL;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_CAM_QUALITY;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_ECHO_PATH;
@@ -41,26 +45,32 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_SE
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_VIDEO_BANDWIDTH;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_VIDEO_CODEC;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_VIDEO_FPS;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FRONTEND_REGISTER_KEY;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_GOOGLE_ANALYTICS_CODE;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_HEADER_CSP;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_HEADER_XFRAME;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_IGNORE_BAD_SSL;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_IMAGEMAGIC_PATH;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_LOGIN_MIN_LENGTH_KEY;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MAX_UPLOAD_SIZE_KEY;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_OAUTH_REGISTER_KEY;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PASS_MIN_LENGTH_KEY;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_RSS_FEED1_KEY;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_RSS_FEED2_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_LOGIN_MIN_LENGTH;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MAX_UPLOAD_SIZE;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PASS_MIN_LENGTH;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_FFMPEG;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_IMAGEMAGIC;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_OFFICE;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_SOX;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT_URL_FOR_EXTERNAL;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_FRONTEND;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_OAUTH;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_SOAP;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_ALLOW_REMOTE;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS_SHOW;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_QUALITY;
 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.CONFIG_SIP_EXTEN_CONTEXT;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SIP_ROOM_PREFIX;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_PORT;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_SERVER;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_SYSTEM_EMAIL;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_USER;
 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.EXT_PROCESS_TTL;
@@ -164,29 +174,29 @@ public class ImportInitvalues {
 	}
 
 	public void loadConfiguration(InstallationConfig cfg) {
-		cfgDao.add(CONFIG_CRYPT_KEY, cfg.cryptClassName, null,
+		cfgDao.add(CONFIG_CRYPT, cfg.cryptClassName, null,
 				"This Class is used for Authentification-Crypting. "
 						+ "Be carefull what you do here! If you change it while "
 						+ "running previous Pass of users will not be workign anymore! "
 						+ "for more Information see http://openmeetings.apache.org/CustomCryptMechanism.html");
 
-		cfgDao.add(CONFIG_FRONTEND_REGISTER_KEY, cfg.allowFrontendRegister, null, "Is user register available on login screen");
-		cfgDao.add(CONFIG_SOAP_REGISTER_KEY, "1", null, "Is user register available via SOAP/REST");
-		cfgDao.add(CONFIG_OAUTH_REGISTER_KEY, "1", null, "Is user register available via OAuth");
+		cfgDao.add(CONFIG_REGISTER_FRONTEND, cfg.allowFrontendRegister, null, "Is user register available on login screen");
+		cfgDao.add(CONFIG_REGISTER_SOAP, "1", null, "Is user register available via SOAP/REST");
+		cfgDao.add(CONFIG_REGISTER_OAUTH, "1", null, "Is user register available via OAuth");
 		// this group_id is the Group of users who register through the frontend or SOAP
 		cfgDao.add(CONFIG_DEFAULT_GROUP_ID, "1", null, "");
 
-		cfgDao.add("smtp_server", cfg.smtpServer, null,
+		cfgDao.add(CONFIG_SMTP_SERVER, cfg.smtpServer, null,
 				"this is the smtp server to send messages");
 
-		cfgDao.add("smtp_port", "" + cfg.smtpPort, null,
+		cfgDao.add(CONFIG_SMTP_PORT, "" + cfg.smtpPort, null,
 				"this is the smtp server port normally 25");
 
-		cfgDao.add(CONFIG_SYSTEM_EMAIL, cfg.mailReferer, null, "all send e-mails by the system will have this address");
+		cfgDao.add(CONFIG_SMTP_SYSTEM_EMAIL, cfg.mailReferer, null, "all send e-mails by the system will have this address");
 
-		cfgDao.add("email_username", cfg.mailAuthName, null, "System auth email username");
+		cfgDao.add(CONFIG_SMTP_USER, cfg.mailAuthName, null, "System auth email username");
 
-		cfgDao.add("email_userpass", cfg.mailAuthPass, null, "System auth email password");
+		cfgDao.add(CONFIG_SMTP_PORT, cfg.mailAuthPass, null, "System auth email password");
 
 		cfgDao.add("mail.smtp.starttls.enable", cfg.mailUseTls, null, "Enable TLS 1=true, 0=false");
 
@@ -199,7 +209,7 @@ public class ImportInitvalues {
 		cfgDao.add(CONFIG_APPLICATION_NAME, DEFAULT_APP_NAME, null, "Name of the Browser Title window");
 
 		// "1" == "EN"
-		cfgDao.add(CONFIG_DEFAULT_LANG_KEY, cfg.defaultLangId, null, "Default System Language ID see languages.xml");
+		cfgDao.add(CONFIG_DEFAULT_LANG, cfg.defaultLangId, null, "Default System Language ID see languages.xml");
 
 		cfgDao.add(CONFIG_DOCUMENT_DPI, "" + cfg.docDpi, null,
 				"dpi for conversion of PDF to images (should be an integer between 50 and  600 with a default value of 150 dpi)");
@@ -207,43 +217,37 @@ public class ImportInitvalues {
 		cfgDao.add(CONFIG_DOCUMENT_QUALITY, "" + cfg.docQuality, null,
 				"compression quality for conversion of PDF to images (should be an integer between 1 and 100, with a default value of 90)");
 
-		cfgDao.add(CONFIG_IMAGEMAGIC_PATH, cfg.imageMagicPath, null, "Path to ImageMagick tools");
+		cfgDao.add(CONFIG_PATH_IMAGEMAGIC, cfg.imageMagicPath, null, "Path to ImageMagick tools");
 
-		cfgDao.add("sox_path", cfg.soxPath, null, "Path To SoX-Tools");
+		cfgDao.add(CONFIG_PATH_SOX, cfg.soxPath, null, "Path To SoX-Tools");
 
-		cfgDao.add("ffmpeg_path", cfg.ffmpegPath, null, "Path To FFMPEG");
-		cfgDao.add("office.path", cfg.officePath, null,
+		cfgDao.add(CONFIG_PATH_FFMPEG, cfg.ffmpegPath, null, "Path To FFMPEG");
+		cfgDao.add(CONFIG_PATH_OFFICE, cfg.officePath, null,
 				"The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically");
 
-		cfgDao.add(CONFIG_RSS_FEED1_KEY, cfg.urlFeed, null, "Feed URL");
+		cfgDao.add(CONFIG_DASHBOARD_RSS_FEED1, cfg.urlFeed, null, "Feed URL 1");
 
-		cfgDao.add(CONFIG_RSS_FEED2_KEY, cfg.urlFeed2, null, "Feed URL 2");
+		cfgDao.add(CONFIG_DASHBOARD_RSS_FEED2, cfg.urlFeed2, null, "Feed URL 2");
 
-		cfgDao.add("sendEmailAtRegister", cfg.sendEmailAtRegister, null,
+		cfgDao.add(CONFIG_EMAIL_AT_REGISTER, cfg.sendEmailAtRegister, null,
 				"User get a EMail with their Account data. Values: 0(No) or 1(Yes)");
 
-		cfgDao.add("sendEmailWithVerficationCode", cfg.sendEmailWithVerficationCode, null,
-				"User must activate their account by clicking on the "
+		cfgDao.add(CONFIG_EMAIL_VERIFICATION, cfg.sendEmailWithVerficationCode, null,
+				String.format("User must activate their account by clicking on the "
 					+ "activation-link in the registering Email. Values: 0(No) or 1(Yes) "
-					+ "It makes no sense to make this(sendEmailWithVerficationCode) 1(Yes) while "
-					+ "sendEmailAtRegister is 0(No) cause you need"
-					+ "to send a EMail.");
-		cfgDao.add("default_export_font", cfg.defaultExportFont, null,
-				"The Name of the Font used for exporting/render Images from Whiteboard"
-					+ "The Font has to exist on the Server which runs Red5");
+					+ "It makes no sense to make this(%s) 1(Yes) while "
+					+ "%s is 0(No) cause you need to send a EMail.", CONFIG_EMAIL_VERIFICATION, CONFIG_EMAIL_AT_REGISTER));
 
 		cfgDao.add(CONFIG_APPLICATION_BASE_URL, cfg.baseUrl, null, "Base URL your OPenmeetings installation will be accessible at.");
 
 		// ***************************************
 		// ***************************************
-		// red5SIP Integration Coniguration Values
+		// SIP Integration Coniguration Values
 		// ***************************************
 
-		cfgDao.add(CONFIG_SIP_ENABLED, cfg.red5SipEnable, null, "Enable to enable the red5SIP integration ");
-		cfgDao.add("red5sip.room_prefix", cfg.red5SipRoomPrefix, null,
-				"Numerical prefix for OM rooms created inside the SIP");
-		cfgDao.add("red5sip.exten_context", cfg.red5SipExtenContext, null,
-				"Enable to enable the red5SIP integration ");
+		cfgDao.add(CONFIG_SIP_ENABLED, cfg.sipEnable, null, "Enable to enable the red5SIP integration ");
+		cfgDao.add(CONFIG_SIP_ROOM_PREFIX, cfg.sipRoomPrefix, null, "Numerical prefix for OM rooms created inside the SIP");
+		cfgDao.add(CONFIG_SIP_EXTEN_CONTEXT, cfg.sipExtenContext, null, "Enable to enable the red5SIP integration ");
 
 		// ***************************************
 		// ***************************************
@@ -264,25 +268,25 @@ public class ImportInitvalues {
 		cfgDao.add(CONFIG_SCREENSHARING_FPS_SHOW, "true", null, "Is screensharing FPS should be displayed or not (true/false)");
 		cfgDao.add(CONFIG_SCREENSHARING_ALLOW_REMOTE, "true", null, "Is remote control will be enabled while screensharing. Allowing remote control will be not possible in case it is set to 'false' (true/false)");
 
-		cfgDao.add(CONFIG_DASHBOARD_SHOW_MYROOMS_KEY, "1", null, "Show My Rooms Tab");
+		cfgDao.add(CONFIG_DASHBOARD_SHOW_MYROOMS, "1", null, "Show My Rooms Tab");
 
 		cfgDao.add(CONFIG_DASHBOARD_SHOW_CHAT, "1", null, "Show Chat Tab");
 
-		cfgDao.add(CONFIG_DASHBOARD_SHOW_RSS_KEY, "0", null, "Show RSS Tab");
+		cfgDao.add(CONFIG_DASHBOARD_SHOW_RSS, "0", null, "Show RSS Tab");
 
 		cfgDao.add("show.whiteboard.draw.status", "0", null,
 				"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,
+		cfgDao.add(CONFIG_MAX_UPLOAD_SIZE, "" + DEFAULT_MAX_UPLOAD_SIZE, null,
 				"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");
 
-		cfgDao.add(CONFIG_LOGIN_MIN_LENGTH_KEY, "" + USER_LOGIN_MINIMUM_LENGTH, null,
+		cfgDao.add(CONFIG_LOGIN_MIN_LENGTH, "" + USER_LOGIN_MINIMUM_LENGTH, null,
 				"Number of chars needed in a user login");
 
-		cfgDao.add(CONFIG_PASS_MIN_LENGTH_KEY, "" + USER_PASSWORD_MINIMUM_LENGTH, null,
+		cfgDao.add(CONFIG_PASS_MIN_LENGTH, "" + USER_PASSWORD_MINIMUM_LENGTH, null,
 				"Number of chars needed in a user password");
 
 		cfgDao.add("calendar.conference.rooms.default.size", "50", null,
@@ -311,7 +315,7 @@ public class ImportInitvalues {
 		cfgDao.add(CONFIG_IGNORE_BAD_SSL, "no", null,
 				"Set \"yes\" or \"no\" to enable/disable ssl certifications checking for OAuth2");
 
-		cfgDao.add(CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY, "", null,
+		cfgDao.add(CONFIG_REDIRECT_URL_FOR_EXTERNAL, "", null,
 				"Users entered the room via invitationHash or secureHash will be redirected to this URL on connection lost");
 		cfgDao.add(CONFIG_CALENDAR_FIRST_DAY, "0", null, "The day that each week begins. The value must be a number that represents the day of the week. Sunday=0, Monday=1, Tuesday=2, etc.");
 		cfgDao.add(CONFIG_GOOGLE_ANALYTICS_CODE, null, null, "Code for Google Analytics");

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/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 3db003e..ea3d475 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
@@ -58,10 +58,9 @@ public class InstallationConfig implements Serializable {
 	public String urlFeed = "http://mail-archives.apache.org/mod_mbox/openmeetings-user/?format=atom";
 	public String urlFeed2 = "http://mail-archives.apache.org/mod_mbox/openmeetings-dev/?format=atom";
 	public String sendEmailWithVerficationCode = "0";
-	public String defaultExportFont = "TimesNewRoman";
-	public String red5SipEnable = "no";
-	public String red5SipRoomPrefix = "400";
-	public String red5SipExtenContext = "rooms";
+	public String sipEnable = "no";
+	public String sipRoomPrefix = "400";
+	public String sipExtenContext = "rooms";
 	public String replyToOrganizer = "1";
 	public String baseUrl = DEFAULT_BASE_URL;
 
@@ -88,10 +87,9 @@ public class InstallationConfig implements Serializable {
 				+ ", defaultLangId=" + defaultLangId + ", sendEmailAtRegister="
 				+ sendEmailAtRegister + ", urlFeed=" + urlFeed + ", urlFeed2="
 				+ urlFeed2 + ", sendEmailWithVerficationCode="
-				+ sendEmailWithVerficationCode + ", defaultExportFont="
-				+ defaultExportFont + ", red5SipEnable="
-				+ red5SipEnable + ", red5SipRoomPrefix=" + red5SipRoomPrefix
-				+ ", red5SipExtenContext=" + red5SipExtenContext
+				+ sendEmailWithVerficationCode + ", sipEnable="
+				+ sipEnable + ", sipRoomPrefix=" + sipRoomPrefix
+				+ ", sipExtenContext=" + sipExtenContext
 				+ ", replyToOrganizer=" + replyToOrganizer
 				+ ", ical_timeZone=" + ical_timeZone
 				+ "]";

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/openmeetings-server/src/site/xdoc/CustomCryptMechanism.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/CustomCryptMechanism.xml b/openmeetings-server/src/site/xdoc/CustomCryptMechanism.xml
index b3de07b..8493b2c 100644
--- a/openmeetings-server/src/site/xdoc/CustomCryptMechanism.xml
+++ b/openmeetings-server/src/site/xdoc/CustomCryptMechanism.xml
@@ -51,7 +51,7 @@
 				OpenMeetings-Webapp (make it available to the webapp-classpath) and
 				use your custom-class-name instead of
 				org.apache.openmeetings.util.crypt.SCryptImplementation during the Installation or
-				at runtime by editing the config-key crypt_ClassName</p>
+				at runtime by editing the config-key <tt>crypt.class.name</tt></p>
 		</section>
 		<section name="Configuration of Custom Crypt-Style">
 			<p>credits goto Mika for sharing his Implementation of the MD5Crypt-Style</p>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/openmeetings-server/src/site/xdoc/Dashboard.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/Dashboard.xml b/openmeetings-server/src/site/xdoc/Dashboard.xml
index 7c43c94..8c25a81 100644
--- a/openmeetings-server/src/site/xdoc/Dashboard.xml
+++ b/openmeetings-server/src/site/xdoc/Dashboard.xml
@@ -51,12 +51,12 @@
 					<td> If the RSS-Feed tab should be visible or not </td>
 				</tr>
 				<tr>
-					<td> rss_feed1 </td>
+					<td> dashboard.rss.feed1 </td>
 					<td> http-URL </td>
 					<td> ATOM-Feed URL for the dashboard RSS Tab </td>
 				</tr>
 				<tr>
-					<td> rss_feed2 </td>
+					<td> dashboard.rss.feed2 </td>
 					<td> http-URL </td>
 					<td> ATOM-Feed URL for the dashboard RSS Tab </td>
 				</tr>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/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 ed3af37..2933596 100644
--- a/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml
+++ b/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml
@@ -33,6 +33,15 @@
 					<th> availabe since OpenMeetings version </th>
 				</tr>
 				<tr>
+					<td> crypt.class.name </td>
+					<td> org.apache.openmeetings.util.crypt.SCryptImplementation </td>
+					<td> This Class is used for Authentification-Crypting. 
+						Be carefull what you do here! If you change it while 
+						running previous Pass of users will not be workign anymore! 
+						for more Information see http://openmeetings.apache.org/CustomCryptMechanism.html </td>
+					<td> 1.9.x </td>
+				</tr>
+				<tr>
 					<td> dashboard.show.myrooms </td>
 					<td> 0 or 1 </td>
 					<td> Dashboard: If the MyRooms widget should be visible or not </td>
@@ -51,19 +60,19 @@
 					<td> 1.9.x </td>
 				</tr>
 				<tr>
-					<td> rss_feed1 </td>
+					<td> dashboard.rss.feed1 </td>
 					<td> http-URL </td>
 					<td> Dashboard: ATOM-Feed URL for the dashboard RSS Tab </td>
 					<td> 1.9.x </td>
 				</tr>
 				<tr>
-					<td> rss_feed2 </td>
+					<td> dashboard.rss.feed2 </td>
 					<td> http-URL </td>
 					<td> Dashboard: ATOM-Feed URL for the dashboard RSS Tab </td>
 					<td> 1.9.x </td>
 				</tr>
 				<tr>
-					<td> ldap_default_id </td>
+					<td> default.ldap.id </td>
 					<td> 0 </td>
 					<td> Ldap domain selected by default in the login screen </td>
 					<td> 1.9.x </td>
@@ -89,7 +98,7 @@
 					<td> 1.9.x </td>
 				</tr>
 				<tr>
-					<td> max_upload_size </td>
+					<td> max.upload.size </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>
@@ -103,25 +112,25 @@
 					<td> 1.8.x </td>
 				</tr>
 				<tr>
-					<td> smtp_server </td>
+					<td> mail.smtp.server </td>
 					<td> localhost </td>
 					<td> this is the smtp server to send messages </td>
 					<td> 1.9.x </td>
 				</tr>
 				<tr>
-					<td> smtp_port </td>
+					<td> mail.smtp.port </td>
 					<td> 25 </td>
 					<td> this is the smtp server port normally 25 </td>
 					<td> 1.9.x </td>
 				</tr>
 				<tr>
-					<td> email_username </td>
+					<td> mail.smtp.user </td>
 					<td> </td>
 					<td> System auth email username </td>
 					<td> 1.9.x </td>
 				</tr>
 				<tr>
-					<td> email_userpass </td>
+					<td> mail.smtp.pass </td>
 					<td> </td>
 					<td> System auth email password </td>
 					<td> 1.9.x </td>
@@ -145,7 +154,7 @@
 					<td> 1.9.x </td>
 				</tr>
 				<tr>
-					<td> system_email_addr </td>
+					<td> mail.smtp.system.email </td>
 					<td> noreply@openmeetings.apache.org </td>
 					<td> all send e-mails by the system will have this address </td>
 					<td> 1.9.x </td>
@@ -157,7 +166,7 @@
 					<td> 2.0.x </td>
 				</tr>
 				<tr>
-					<td> office.path </td>
+					<td> path.office </td>
 					<td> </td>
 					<td> The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically	</td>
 					<td> 2.0.x </td>
@@ -206,13 +215,13 @@
 					<td> 4.0.x </td>
 				</tr>
 				<tr>
-					<td> sendEmailAtRegister </td>
+					<td> send.email.at.register </td>
 					<td> 0 </td>
 					<td> User get a EMail with their Account data. Values: 0(No) or 1(Yes) </td>
 					<td> 2.0.x </td>
 				</tr>
 				<tr>
-					<td> sendEmailWithVerficationCode </td>
+					<td> send.email.with.verfication </td>
 					<td> 0 </td>
 					<td> User must activate their account by clicking on the 
 								activation-link in the registering Email. Values: 0(No) or 1(Yes) 
@@ -228,7 +237,7 @@
 					<td> 2.2.x </td>
 				</tr>
 				<tr>
-					<td> allow_frontend_register </td>
+					<td> allow.frontend.register </td>
 					<td> (configurable during install) </td>
 					<td> Is user register available on login screen </td>
 					<td> 1.8.x </td>
@@ -252,7 +261,7 @@
 					<td> 3.0.2 </td>
 				</tr>
 				<tr>
-					<td> default.quality.screensharing </td>
+					<td> screensharing.default.quality </td>
 					<td> 1 </td>
 					<td> Default selection in ScreenSharing Quality:<br/>
 						0 - bigger frame rate, no resize<br/>
@@ -262,7 +271,7 @@
 					<td> 3.0.3 </td>
 				</tr>
 				<tr>
-					<td> default.fps.screensharing </td>
+					<td> screensharing.default.fps </td>
 					<td> 10 </td>
 					<td> Default selection in ScreenSharing FPS. </td>
 					<td> 3.0.3 </td>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/openmeetings-server/src/site/xdoc/ManualTesting.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/ManualTesting.xml b/openmeetings-server/src/site/xdoc/ManualTesting.xml
index e6f6390..d3e5876 100644
--- a/openmeetings-server/src/site/xdoc/ManualTesting.xml
+++ b/openmeetings-server/src/site/xdoc/ManualTesting.xml
@@ -12,8 +12,9 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  -->
-<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
 	<properties>
 		<title>Manual Testing</title>
 		<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
@@ -198,7 +199,7 @@
 								<li>Ellipse </li>
 								<li>Arrow </li>
 								<li>Cliparts</li>
-							</ol>						
+							</ol>
 						</li>
 						<li>
 							Presentation room testing – chat (should be tested with at least 3 attendees)
@@ -253,8 +254,8 @@
 								<li>Change a user for video pod </li>
 								<li>Start/stop recordings </li>
 							</ol>
-						</li>						
-					</ol>			
+						</li>
+					</ol>
 				</li>
 				<li>
 					<b>Admin GUI tests</b>
@@ -310,27 +311,27 @@
 								<li>Check that "Allow font styles" switch works as expected </li>
 							</ol>
 						</li>
-						<li>					
+						<li>
 							Configuration
 							<ol>
-								<li>Allow_frontend_register </li>
+								<li>allow.frontend.register </li>
 								<li>Mail server settings </li>
 								<li>SMS provider settings </li>
-								<li>Application.name </li>
-								<li>Default_lang_id </li>
+								<li>application.name </li>
+								<li>default.lang.id </li>
 								<li>default time zone </li>
 								<li>SIP settings </li>
 								<li>Reminder minutes </li>
 							</ol>
 						</li>
-						<li>					
+						<li>
 							Language editor 
 							<ol>
 								<li>Add/remove/edit/search a key </li>
 								<li>Import/export of localization files </li>
 							</ol>
 						</li>
-						<li>					
+						<li>
 							LDAP: Add/remove/edit/search a record
 						</li>
 						<li>
@@ -343,7 +344,7 @@
 						</li>
 						<li>
 							Servers: Add/remove/edit/search a server
-						</li>						
+						</li>
 					</ol>
 				</li>
 				<li>
@@ -492,10 +493,7 @@
 						</li>
 					</ol>
 				</li>
-
 			</ol>
 		</section>
-
 	</body>
-
-</document>
\ No newline at end of file
+</document>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
index 577f129..37375a1 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
@@ -19,7 +19,8 @@
 package org.apache.openmeetings.service.mail;
 
 import static org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_AT_REGISTER;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
 
@@ -62,9 +63,9 @@ public class EmailManager {
 	 */
 	public void sendMail(String username, String email, String hash, Boolean sendEmailWithVerficationCode, Long langId) {
 		log.debug("sendMail:: username = {}, email = {}", username, email);
-		Integer sendEmailAtRegister = configurationDao.getConfValue("sendEmailAtRegister", Integer.class, "0");
+		Integer sendEmailAtRegister = configurationDao.getConfValue(CONFIG_EMAIL_AT_REGISTER, Integer.class, "0");
 
-		ensureApplication(langId != null ? langId : configurationDao.getConfValue(CONFIG_DEFAULT_LANG_KEY, Long.class, "1"));
+		ensureApplication(langId != null ? langId : configurationDao.getConfValue(CONFIG_DEFAULT_LANG, Long.class, "1"));
 		String link = ((IApplication)Application.get(wicketApplicationName)).urlForActivatePage(new PageParameters().add("u",  hash));
 
 		if (sendEmailAtRegister == 1) {

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
index ac3e666..06a7c6d 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
@@ -19,7 +19,7 @@
 package org.apache.openmeetings.service.mail.template;
 
 import static org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG;
 
 import java.util.Locale;
 
@@ -46,7 +46,7 @@ public abstract class AbstractTemplatePanel extends Panel {
 	}
 
 	private static Locale getDefault() {
-		long langId = getBean(ConfigurationDao.class).getConfValue(CONFIG_DEFAULT_LANG_KEY, Long.class, "1");
+		long langId = getBean(ConfigurationDao.class).getConfValue(CONFIG_DEFAULT_LANG, Long.class, "1");
 		return LabelDao.languages.get(langId);
 	}
 

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
index 885891c..c027cf1 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
@@ -22,8 +22,9 @@ import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength;
 import static org.apache.openmeetings.util.OmException.UNKNOWN;
 import static org.apache.openmeetings.util.OmFileHelper.HIBERNATE;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG_KEY;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SOAP_REGISTER_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_VERIFICATION;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_SOAP;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 
 import java.io.IOException;
@@ -91,8 +92,7 @@ public class UserManager implements IUserManager {
 	/**
 	 * Method to register a new User, User will automatically be added to the
 	 * default user_level(1) new users will be automatically added to the
-	 * Group with the id specified in the configuration value
-	 * default_group_id
+	 * Group with the id specified in the configuration value default.group.id
 	 *
 	 * @param login
 	 * @param Userpass
@@ -122,12 +122,12 @@ public class UserManager implements IUserManager {
 			boolean generateSipUserData, String jNameTimeZone, Boolean sendConfirmation) {
 		try {
 			// Checks if FrontEndUsers can register
-			if ("1".equals(cfgDao.getConfValue(CONFIG_SOAP_REGISTER_KEY, String.class, "0"))) {
+			if ("1".equals(cfgDao.getConfValue(CONFIG_REGISTER_SOAP, String.class, "0"))) {
 				if (sendConfirmation == null) {
 					String baseURL = cfgDao.getBaseUrl();
 					sendConfirmation = baseURL != null
 							&& !baseURL.isEmpty()
-							&& 1 == cfgDao.getConfValue("sendEmailWithVerficationCode", Integer.class, "0");
+							&& 1 == cfgDao.getConfValue(CONFIG_EMAIL_VERIFICATION, Integer.class, "0");
 				}
 				// TODO: Read and generate SIP-Data via RPC-Interface Issue 1098
 
@@ -305,7 +305,7 @@ public class UserManager implements IUserManager {
 				}
 			}
 		}
-		return cfgDao.getConfValue(CONFIG_DEFAULT_LANG_KEY, Long.class, "1");
+		return cfgDao.getConfValue(CONFIG_DEFAULT_LANG, Long.class, "1");
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/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 8120902..b3fd0ab 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
@@ -19,36 +19,45 @@
 package org.apache.openmeetings.util;
 
 public class OpenmeetingsVariables {
-	public static final String CONFIG_CRYPT_KEY = "crypt_ClassName";
+	public static final String CONFIG_CRYPT = "crypt.class.name";
 	public static final String CONFIG_DASHBOARD_SHOW_CHAT = "dashboard.show.chat";
-	public static final String CONFIG_DASHBOARD_SHOW_MYROOMS_KEY = "dashboard.show.myrooms";
-	public static final String CONFIG_DASHBOARD_SHOW_RSS_KEY = "dashboard.show.rssfeed";
-	public static final String CONFIG_DEFAULT_LANG_KEY = "default_lang_id";
-	public static final String CONFIG_FRONTEND_REGISTER_KEY = "allow_frontend_register";
-	public static final String CONFIG_SOAP_REGISTER_KEY = "allow.soap.register";
-	public static final String CONFIG_OAUTH_REGISTER_KEY = "allow.oauth.register";
-	public static final String CONFIG_LOGIN_MIN_LENGTH_KEY = "user.login.minimum.length";
-	public static final String CONFIG_MAX_UPLOAD_SIZE_KEY = "max_upload_size";
-	public static final String CONFIG_SIP_ENABLED = "red5sip.enable";
-	public static final String CONFIG_PASS_MIN_LENGTH_KEY = "user.pass.minimum.length";
-	public static final String CONFIG_RSS_FEED1_KEY = "rss_feed1";
-	public static final String CONFIG_RSS_FEED2_KEY = "rss_feed2";
-	public static final String CONFIG_IGNORE_BAD_SSL = "oauth2.ignore_bad_ssl";
+	public static final String CONFIG_DASHBOARD_SHOW_MYROOMS = "dashboard.show.myrooms";
+	public static final String CONFIG_DASHBOARD_SHOW_RSS = "dashboard.show.rssfeed";
+	public static final String CONFIG_DASHBOARD_RSS_FEED1 = "dashboard.rss.feed1";
+	public static final String CONFIG_DASHBOARD_RSS_FEED2 = "dashboard.rss.feed2";
+	public static final String CONFIG_DEFAULT_LANG = "default.lang.id";
 	public static final String CONFIG_DEFAULT_LANDING_ZONE = "default.landing.zone";
-	public static final String CONFIG_DEFAULT_LDAP_ID = "ldap_default_id";
-	public static final String CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY = "redirect.url.for.external.users";
+	public static final String CONFIG_DEFAULT_LDAP_ID = "default.ldap.id";
+	public static final String CONFIG_DEFAULT_GROUP_ID = "default.group.id";
+	public static final String CONFIG_REGISTER_FRONTEND = "allow.frontend.register";
+	public static final String CONFIG_REGISTER_SOAP = "allow.soap.register";
+	public static final String CONFIG_REGISTER_OAUTH = "allow.oauth.register";
+	public static final String CONFIG_LOGIN_MIN_LENGTH = "user.login.minimum.length";
+	public static final String CONFIG_MAX_UPLOAD_SIZE = "max.upload.size";
+	public static final String CONFIG_SIP_ENABLED = "sip.enable";
+	public static final String CONFIG_SIP_ROOM_PREFIX = "sip.room.prefix";
+	public static final String CONFIG_SIP_EXTEN_CONTEXT = "sip.exten.context";
+	public static final String CONFIG_PASS_MIN_LENGTH = "user.pass.minimum.length";
+	public static final String CONFIG_IGNORE_BAD_SSL = "oauth2.ignore.bad.ssl";
+	public static final String CONFIG_REDIRECT_URL_FOR_EXTERNAL = "redirect.url.for.external.users";
 	public static final String CONFIG_APPOINTMENT_REMINDER_MINUTES = "number.minutes.reminder.send";
 	public static final String CONFIG_APPLICATION_NAME = "application.name";
 	public static final String CONFIG_APPLICATION_BASE_URL = "application.base.url";
-	public static final String CONFIG_SCREENSHARING_QUALITY = "default.quality.screensharing";
-	public static final String CONFIG_SCREENSHARING_FPS = "default.fps.screensharing";
+	public static final String CONFIG_SCREENSHARING_QUALITY = "screensharing.default.quality";
+	public static final String CONFIG_SCREENSHARING_FPS = "screensharing.default.fps";
 	public static final String CONFIG_SCREENSHARING_FPS_SHOW = "screensharing.fps.show";
 	public static final String CONFIG_SCREENSHARING_ALLOW_REMOTE = "screensharing.allow.remote";
 	public static final String CONFIG_CALENDAR_FIRST_DAY = "calendar.firstday";
-	public static final String CONFIG_DEFAULT_GROUP_ID = "default_group_id";
 	public static final String CONFIG_GOOGLE_ANALYTICS_CODE = "google.analytics.code";
-	public static final String CONFIG_SYSTEM_EMAIL = "system_email_addr";
-	public static final String CONFIG_IMAGEMAGIC_PATH = "imagemagick_path";
+	public static final String CONFIG_SMTP_SERVER = "mail.smtp.server";
+	public static final String CONFIG_SMTP_PORT = "mail.smtp.port";
+	public static final String CONFIG_SMTP_USER = "mail.smtp.user";
+	public static final String CONFIG_SMTP_PASS = "mail.smtp.pass";
+	public static final String CONFIG_SMTP_SYSTEM_EMAIL = "mail.smtp.system.email";
+	public static final String CONFIG_PATH_IMAGEMAGIC = "path.imagemagick";
+	public static final String CONFIG_PATH_SOX = "path.sox";
+	public static final String CONFIG_PATH_FFMPEG = "path.ffmpeg";
+	public static final String CONFIG_PATH_OFFICE = "path.office";
 	public static final String CONFIG_DOCUMENT_DPI = "document.dpi";
 	public static final String CONFIG_DOCUMENT_QUALITY = "document.quality";
 	public static final String CONFIG_FLASH_SECURE = "flash.secure";
@@ -61,15 +70,17 @@ public class OpenmeetingsVariables {
 	public static final String CONFIG_FLASH_ECHO_PATH = "flash.echoPath";
 	public static final String CONFIG_HEADER_XFRAME = "header.x.frame.options";
 	public static final String CONFIG_EXT_PROCESS_TTL = "external.process.ttl";
+	public static final String CONFIG_HEADER_CSP = "header.content.security.policy";
+	public static final String CONFIG_EMAIL_AT_REGISTER = "send.email.at.register";
+	public static final String CONFIG_EMAIL_VERIFICATION = "send.email.with.verfication";
+
 	public static final String HEADER_XFRAME_SAMEORIGIN = "SAMEORIGIN";
 	public static final String HEADER_CSP_SELF = "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval';";
-	public static final String CONFIG_HEADER_CSP = "header.content.security.policy";
 	public static final String MENU_ROOMS_NAME = "Conference Rooms";
 	public static final int RECENT_ROOMS_COUNT = 5;
 	public static final int LEVEL_USER = 1;
 	public static final int LEVEL_GROUP_ADMIN = 2;
 	public static final int LEVEL_ADMIN = 3;
-
 	public static int DEFAULT_MINUTES_REMINDER_SEND = 15;
 	public static String DEFAULT_BASE_URL = "http://localhost:5080/openmeetings/";
 

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
index 329598c..ec189c1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
@@ -21,6 +21,7 @@ package org.apache.openmeetings.web.admin.users;
 import static org.apache.openmeetings.db.util.AuthLevelUtil.hasGroupAdminLevel;
 import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength;
 import static org.apache.openmeetings.db.util.UserHelper.getMinPasswdLength;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_AT_REGISTER;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 import static org.apache.openmeetings.web.app.Application.getBean;
@@ -181,7 +182,7 @@ public class UserForm extends AdminBaseForm<User> {
 		User u = getModelObject();
 		try {
 			boolean isNew = (u.getId() == null);
-			boolean sendEmailAtRegister = (1 == getBean(ConfigurationDao.class).getConfValue("sendEmailAtRegister", Integer.class, "0"));
+			boolean sendEmailAtRegister = (1 == getBean(ConfigurationDao.class).getConfValue(CONFIG_EMAIL_AT_REGISTER, Integer.class, "0"));
 			if (isNew && sendEmailAtRegister) {
 				u.setActivatehash(UUID.randomUUID().toString());
 			}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index 62fb494..96c3317 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
@@ -801,25 +801,24 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step1.userdata"><![CDATA[Userdata]]></entry>
 	<entry key="install.wizard.params.step1.username"><![CDATA[Username]]></entry>
 	<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
-	<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering (allow_frontend_register)]]></entry>
+	<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
 	<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
 	<entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
-	<entry key="install.wizard.params.step2.defaultExportFont"><![CDATA[Default Font for Export [default_export_font]]]></entry>
 	<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
-	<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username (email_username)]]></entry>
+	<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
 	<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
-	<entry key="install.wizard.params.step2.mailAuthPass"><![CDATA[SMTP-Userpass (email_userpass)]]></entry>
+	<entry key="install.wizard.params.step2.mailAuthPass"><![CDATA[SMTP-Userpass]]></entry>
 	<entry key="install.wizard.params.step2.mailAuthPass.title"><![CDATA[Enter the mail-userpass]]></entry>
-	<entry key="install.wizard.params.step2.mailReferer"><![CDATA[Mail-Referer (system_email_addr)]]></entry>
+	<entry key="install.wizard.params.step2.mailReferer"><![CDATA[Mail-Referer]]></entry>
 	<entry key="install.wizard.params.step2.mailReferer.title"><![CDATA[Enter a Referer]]></entry>
 	<entry key="install.wizard.params.step2.mailUseTls"><![CDATA[Enable TLS in Mail Server Auth]]></entry>
 	<entry key="install.wizard.params.step2.replyToOrganizer"><![CDATA[Set inviter's email
-					address as ReplyTo in email invitations (inviter.email.as.replyto)]]></entry>
-	<entry key="install.wizard.params.step2.sendEmailAtRegister"><![CDATA[Send Email to new registered Users (sendEmailAtRegister)]]></entry>
-	<entry key="install.wizard.params.step2.sendEmailWithVerficationCode"><![CDATA[New Users need to verify their EMail (sendEmailWithVerficationCode)]]></entry>
-	<entry key="install.wizard.params.step2.smtpPort"><![CDATA[SMTP-Server Port(default Smtp-Server Port is 25) (smtp_port)]]></entry>
+					address as ReplyTo in email invitations]]></entry>
+	<entry key="install.wizard.params.step2.sendEmailAtRegister"><![CDATA[Send Email to new registered Users]]></entry>
+	<entry key="install.wizard.params.step2.sendEmailWithVerficationCode"><![CDATA[New Users need to verify their EMail]]></entry>
+	<entry key="install.wizard.params.step2.smtpPort"><![CDATA[SMTP-Server Port(default Smtp-Server Port is 25)]]></entry>
 	<entry key="install.wizard.params.step2.smtpPort.title"><![CDATA[Enter a SMTP-Server.Port normally 25]]></entry>
-	<entry key="install.wizard.params.step2.smtpServer"><![CDATA[SMTP-Server (smtp_server)]]></entry>
+	<entry key="install.wizard.params.step2.smtpServer"><![CDATA[SMTP-Server]]></entry>
 	<entry key="install.wizard.params.step2.smtpServer.title"><![CDATA[Enter a SMTP-Server]]></entry>
 	<entry key="install.wizard.params.step3.converters"><![CDATA[Converters]]></entry>
 	<entry key="install.wizard.params.step3.docDpi"><![CDATA[Document conversion DPI]]></entry>
@@ -854,13 +853,13 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 		usable anymore
 	]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.title"><![CDATA[Enter the Class name of the Encryption Class. DO NOT ALTER THIS IF YOU ARE NOT SURE]]></entry>
-	<entry key="install.wizard.params.step4.red5SIP"><![CDATA[red5SIP Configuration]]></entry>
-	<entry key="install.wizard.params.step4.red5SipEnable"><![CDATA[Enable SIP]]></entry>
-	<entry key="install.wizard.params.step4.red5SipEnable.text"><![CDATA[Enable red5SIP integration]]></entry>
-	<entry key="install.wizard.params.step4.red5SipExtenContext"><![CDATA[SIP extensions context]]></entry>
-	<entry key="install.wizard.params.step4.red5SipExtenContext.text"><![CDATA[Context of Asterisk extensions]]></entry>
-	<entry key="install.wizard.params.step4.red5SipRoomPrefix"><![CDATA[SIP rooms prefix]]></entry>
-	<entry key="install.wizard.params.step4.red5SipRoomPrefix.text"><![CDATA[Prefix for phone number of conference rooms]]></entry>
+	<entry key="install.wizard.params.step4.sip"><![CDATA[red5SIP Configuration]]></entry>
+	<entry key="install.wizard.params.step4.sipEnable"><![CDATA[Enable SIP]]></entry>
+	<entry key="install.wizard.params.step4.sipEnable.text"><![CDATA[Enable red5SIP integration]]></entry>
+	<entry key="install.wizard.params.step4.sipExtenContext"><![CDATA[SIP extensions context]]></entry>
+	<entry key="install.wizard.params.step4.sipExtenContext.text"><![CDATA[Context of Asterisk extensions]]></entry>
+	<entry key="install.wizard.params.step4.sipRoomPrefix"><![CDATA[SIP rooms prefix]]></entry>
+	<entry key="install.wizard.params.step4.sipRoomPrefix.text"><![CDATA[Prefix for phone number of conference rooms]]></entry>
 	<entry key="install.wizard.welcome.panel"><![CDATA[
 	<ol>
 		<li><h4>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6ac6ec5f/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index d303c3e..7f9d3d3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -801,25 +801,24 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step1.userdata"><![CDATA[Userdata]]></entry>
 	<entry key="install.wizard.params.step1.username"><![CDATA[Username]]></entry>
 	<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
-	<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering (allow_frontend_register)]]></entry>
+	<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
 	<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
 	<entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
-	<entry key="install.wizard.params.step2.defaultExportFont"><![CDATA[Default Font for Export [default_export_font]]]></entry>
 	<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
-	<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username (email_username)]]></entry>
+	<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
 	<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
-	<entry key="install.wizard.params.step2.mailAuthPass"><![CDATA[SMTP-Userpass (email_userpass)]]></entry>
+	<entry key="install.wizard.params.step2.mailAuthPass"><![CDATA[SMTP-Userpass]]></entry>
 	<entry key="install.wizard.params.step2.mailAuthPass.title"><![CDATA[Enter the mail-userpass]]></entry>
-	<entry key="install.wizard.params.step2.mailReferer"><![CDATA[Mail-Referer (system_email_addr)]]></entry>
+	<entry key="install.wizard.params.step2.mailReferer"><![CDATA[Mail-Referer]]></entry>
 	<entry key="install.wizard.params.step2.mailReferer.title"><![CDATA[Enter a Referer]]></entry>
 	<entry key="install.wizard.params.step2.mailUseTls"><![CDATA[Enable TLS in Mail Server Auth]]></entry>
 	<entry key="install.wizard.params.step2.replyToOrganizer"><![CDATA[Set inviter's email
-					address as ReplyTo in email invitations (inviter.email.as.replyto)]]></entry>
-	<entry key="install.wizard.params.step2.sendEmailAtRegister"><![CDATA[Send Email to new registered Users (sendEmailAtRegister)]]></entry>
-	<entry key="install.wizard.params.step2.sendEmailWithVerficationCode"><![CDATA[New Users need to verify their EMail (sendEmailWithVerficationCode)]]></entry>
-	<entry key="install.wizard.params.step2.smtpPort"><![CDATA[SMTP-Server Port(default Smtp-Server Port is 25) (smtp_port)]]></entry>
+					address as ReplyTo in email invitations]]></entry>
+	<entry key="install.wizard.params.step2.sendEmailAtRegister"><![CDATA[Send Email to new registered Users]]></entry>
+	<entry key="install.wizard.params.step2.sendEmailWithVerficationCode"><![CDATA[New Users need to verify their EMail]]></entry>
+	<entry key="install.wizard.params.step2.smtpPort"><![CDATA[SMTP-Server Port(default Smtp-Server Port is 25)]]></entry>
 	<entry key="install.wizard.params.step2.smtpPort.title"><![CDATA[Enter a SMTP-Server.Port normally 25]]></entry>
-	<entry key="install.wizard.params.step2.smtpServer"><![CDATA[SMTP-Server (smtp_server)]]></entry>
+	<entry key="install.wizard.params.step2.smtpServer"><![CDATA[SMTP-Server]]></entry>
 	<entry key="install.wizard.params.step2.smtpServer.title"><![CDATA[Enter a SMTP-Server]]></entry>
 	<entry key="install.wizard.params.step3.converters"><![CDATA[Converters]]></entry>
 	<entry key="install.wizard.params.step3.docDpi"><![CDATA[Document conversion DPI]]></entry>
@@ -854,13 +853,13 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 		usable anymore
 	]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.title"><![CDATA[Enter the Class name of the Encryption Class. DO NOT ALTER THIS IF YOU ARE NOT SURE]]></entry>
-	<entry key="install.wizard.params.step4.red5SIP"><![CDATA[red5SIP Configuration]]></entry>
-	<entry key="install.wizard.params.step4.red5SipEnable"><![CDATA[Enable SIP]]></entry>
-	<entry key="install.wizard.params.step4.red5SipEnable.text"><![CDATA[Enable red5SIP integration]]></entry>
-	<entry key="install.wizard.params.step4.red5SipExtenContext"><![CDATA[SIP extensions context]]></entry>
-	<entry key="install.wizard.params.step4.red5SipExtenContext.text"><![CDATA[Context of Asterisk extensions]]></entry>
-	<entry key="install.wizard.params.step4.red5SipRoomPrefix"><![CDATA[SIP rooms prefix]]></entry>
-	<entry key="install.wizard.params.step4.red5SipRoomPrefix.text"><![CDATA[Prefix for phone number of conference rooms]]></entry>
+	<entry key="install.wizard.params.step4.sip"><![CDATA[red5SIP Configuration]]></entry>
+	<entry key="install.wizard.params.step4.sipEnable"><![CDATA[Enable SIP]]></entry>
+	<entry key="install.wizard.params.step4.sipEnable.text"><![CDATA[Enable red5SIP integration]]></entry>
+	<entry key="install.wizard.params.step4.sipExtenContext"><![CDATA[SIP extensions context]]></entry>
+	<entry key="install.wizard.params.step4.sipExtenContext.text"><![CDATA[Context of Asterisk extensions]]></entry>
+	<entry key="install.wizard.params.step4.sipRoomPrefix"><![CDATA[SIP rooms prefix]]></entry>
+	<entry key="install.wizard.params.step4.sipRoomPrefix.text"><![CDATA[Prefix for phone number of conference rooms]]></entry>
 	<entry key="install.wizard.welcome.panel"><![CDATA[
 	<ol>
 		<li><h4>