Author: solomax
Date: Wed Mar 11 05:07:46 2015
New Revision: 1665761
URL: http://svn.apache.org/r1665761
Log:
Additional parameters are added to the general configuration page, typos are
fixed
Modified:
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml
openmeetings/trunk/site/GeneralConfiguration.html
Modified:
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1665761&r1=1665760&r2=1665761&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java
(original)
+++
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java
Wed Mar 11 05:07:46 2015
@@ -52,6 +52,7 @@ import java.util.Hashtable;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
@@ -323,7 +324,7 @@ public class ImportInitvalues {
"this is the smtp server port normally 25");
configurationDao.add("system_email_addr", cfg.mailReferer,
- null, "all send EMails by the system will have
this address");
+ null, "all send e-mails by the system will have
this address");
configurationDao.add("email_username", cfg.mailAuthName,
null, "System auth email username");
@@ -335,10 +336,10 @@ public class ImportInitvalues {
cfg.mailUseTls, null, "Enable TLS 1=true,
0=false");
configurationDao.add("mail.smtp.connection.timeout", "30000",
null,
- "Socket connection timeout value in
milliseconds. Default is infinite timeout.");
+ "Socket connection timeout value in
milliseconds. Default is 30 seconds (30000).");
configurationDao.add("mail.smtp.timeout", "30000", null,
- "Socket I/O timeout value in milliseconds.
Default is infinite timeout.");
+ "Socket I/O timeout value in milliseconds.
Default is 30 seconds (30000).");
configurationDao.add("application.name",
ConfigurationDao.DEFAULT_APP_NAME, null,
@@ -760,10 +761,10 @@ public class ImportInitvalues {
public void loadLanguagesFile(String langName) throws Exception {
Map<Integer, Map<String, Object>> listlanguages =
getLanguageFiles();
log.debug("Number of languages found: " + listlanguages.size());
- for (int langId : listlanguages.keySet()) {
- Map<String, Object> langMap = listlanguages.get(langId);
+ for (Entry<Integer, Map<String, Object>> me :
listlanguages.entrySet()) {
+ Map<String, Object> langMap = me.getValue();
if (langName.equals(langMap.get("name"))) {
- loadLanguagesFile(listlanguages, new
Hashtable<Long, Fieldvalues>(3000), langId);
+ loadLanguagesFile(listlanguages, new
Hashtable<Long, Fieldvalues>(3000), me.getKey());
break;
}
}
@@ -780,15 +781,15 @@ public class ImportInitvalues {
log.debug("loadInitLanguages rtl from xml: " + rtl);
- Boolean langRtl = false;
-
- if (rtl != null && rtl.equals("true")) {
- langRtl = true;
- }
+ boolean langRtl = Boolean.TRUE.toString().equals(rtl);
long ticks = System.currentTimeMillis();
FieldLanguage lang = fieldLanguageDaoImpl.addLanguage(langId,
langName, langRtl, code);
+ if (lang == null) {
+ log.error("Failed to create language");
+ throw new Exception("Failed to create language");
+ }
SAXReader reader = new SAXReader();
Document document = reader.read(new File(
OmFileHelper.getLanguagesDir(), langName +
".xml"));
@@ -844,17 +845,6 @@ public class ImportInitvalues {
fieldLanguageDaoImpl.updateLanguage(lang);
log.debug("Lang ADDED: " + lang + "; seconds passed: " +
(System.currentTimeMillis() - ticks) / 1000);
}
-
- public static void main(String... args) {
- int pr = 22;
- int progressDelta = 50 - pr;
-
- double deltaProgressPerLanguageFile = new
Double(progressDelta)/new Double(34);
-
- pr += (2 * deltaProgressPerLanguageFile);
-
- System.err.println("deltaProgressPerLanguageFile:
"+deltaProgressPerLanguageFile +" "+ pr);
- }
public void loadLanguagesFiles() throws Exception {
Map<Integer, Map<String, Object>> listlanguages =
getLanguageFiles();
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1665761&r1=1665760&r2=1665761&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
Wed Mar 11 05:07:46 2015
@@ -329,10 +329,10 @@ public class ImportInitvalues {
cfgDao.add("mail.smtp.starttls.enable", cfg.mailUseTls, null,
"Enable TLS 1=true, 0=false");
cfgDao.add("mail.smtp.connection.timeout", "30000", null,
- "Socket connection timeout value in
milliseconds. Default is infinite timeout.");
+ "Socket connection timeout value in
milliseconds. Default is 30 seconds (30000).");
cfgDao.add("mail.smtp.timeout", "30000", null,
- "Socket I/O timeout value in milliseconds.
Default is infinite timeout.");
+ "Socket I/O timeout value in milliseconds.
Default is 30 seconds (30000).");
cfgDao.add(CONFIG_APPLICATION_NAME,
ConfigurationDao.DEFAULT_APP_NAME, null, "Name of the Browser Title window");
Modified:
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml?rev=1665761&r1=1665760&r2=1665761&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml
Wed Mar 11 05:07:46 2015
@@ -114,6 +114,54 @@
</tr>
<tr>
+ <td> 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> 25 </td>
+ <td> this is the smtp server port
normally 25 </td>
+ <td> 1.9.x </td>
+ </tr>
+ <tr>
+ <td> email_username </td>
+ <td> </td>
+ <td> System auth email username </td>
+ <td> 1.9.x </td>
+ </tr>
+ <tr>
+ <td> email_userpass </td>
+ <td> </td>
+ <td> System auth email password </td>
+ <td> 1.9.x </td>
+ </tr>
+ <tr>
+ <td> mail.smtp.starttls.enable </td>
+ <td> 0 </td>
+ <td> Enable TLS 1=true, 0=false </td>
+ <td> 1.9.x </td>
+ </tr>
+ <tr>
+ <td> mail.smtp.connection.timeout </td>
+ <td> 30000 </td>
+ <td> Socket connection timeout value in
milliseconds. Default is 30 seconds (30000). </td>
+ <td> 1.9.x </td>
+ </tr>
+ <tr>
+ <td> mail.smtp.timeout </td>
+ <td> 30000 </td>
+ <td> Socket I/O timeout value in
milliseconds. Default is 30 seconds (30000). </td>
+ <td> 1.9.x </td>
+ </tr>
+ <tr>
+ <td> system_email_addr </td>
+ <td> [email protected]
</td>
+ <td> all send e-mails by the system
will have this address </td>
+ <td> 1.9.x </td>
+ </tr>
+ <tr>
<td> inviter.email.as.replyto </td>
<td> 1 </td>
<td> Set inviter's email address as
ReplyTo in email invitations (1 == set, 0 == NOT set) </td>
Modified: openmeetings/trunk/site/GeneralConfiguration.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/site/GeneralConfiguration.html?rev=1665761&r1=1665760&r2=1665761&view=diff
==============================================================================
--- openmeetings/trunk/site/GeneralConfiguration.html (original)
+++ openmeetings/trunk/site/GeneralConfiguration.html Wed Mar 11 05:07:46 2015
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2015-02-15
+ | Generated by Apache Maven Doxia at 2015-03-11
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
@@ -8,7 +8,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="author" content="OpenMeetings Team" />
- <meta name="Date-Revision-yyyymmdd" content="20150215" />
+ <meta name="Date-Revision-yyyymmdd" content="20150311" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project – List of general configuration
options</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1.min.css" />
@@ -43,7 +43,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2015-02-15
+ <li id="publishDate">Last Published: 2015-03-11
</li>
@@ -915,6 +915,94 @@
</tr>
<tr class="a">
+
+<td> smtp_server </td>
+
+<td> localhost </td>
+
+<td> this is the smtp server to send messages </td>
+
+<td> 1.9.x </td>
+ </tr>
+
+<tr class="b">
+
+<td> smtp_port </td>
+
+<td> 25 </td>
+
+<td> this is the smtp server port normally 25 </td>
+
+<td> 1.9.x </td>
+ </tr>
+
+<tr class="a">
+
+<td> email_username </td>
+
+<td> </td>
+
+<td> System auth email username </td>
+
+<td> 1.9.x </td>
+ </tr>
+
+<tr class="b">
+
+<td> email_userpass </td>
+
+<td> </td>
+
+<td> System auth email password </td>
+
+<td> 1.9.x </td>
+ </tr>
+
+<tr class="a">
+
+<td> mail.smtp.starttls.enable </td>
+
+<td> 0 </td>
+
+<td> Enable TLS 1=true, 0=false </td>
+
+<td> 1.9.x </td>
+ </tr>
+
+<tr class="b">
+
+<td> mail.smtp.connection.timeout </td>
+
+<td> 30000 </td>
+
+<td> Socket connection timeout value in milliseconds. Default is 30 seconds
(30000). </td>
+
+<td> 1.9.x </td>
+ </tr>
+
+<tr class="a">
+
+<td> mail.smtp.timeout </td>
+
+<td> 30000 </td>
+
+<td> Socket I/O timeout value in milliseconds. Default is 30 seconds (30000).
</td>
+
+<td> 1.9.x </td>
+ </tr>
+
+<tr class="b">
+
+<td> system_email_addr </td>
+
+<td> [email protected] </td>
+
+<td> all send e-mails by the system will have this address </td>
+
+<td> 1.9.x </td>
+ </tr>
+
+<tr class="a">
<td> inviter.email.as.replyto </td>
