You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2019/03/06 17:05:03 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2028] initial
site clean-up
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 27b8847 [OPENMEETINGS-2028] initial site clean-up
27b8847 is described below
commit 27b88477337ebdf2692433debcdcaeccc000f4c1
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Mar 7 00:04:45 2019 +0700
[OPENMEETINGS-2028] initial site clean-up
---
openmeetings-core/pom.xml | 2 +-
.../java/org/apache/openmeetings/cli/Admin.java | 4 +-
.../src/main/assembly/scripts/admin.bat | 6 +--
.../src/main/assembly/scripts/admin.sh | 6 +--
openmeetings-server/src/site/site.xml | 1 -
openmeetings-server/src/site/xdoc/Clustering.xml | 30 ++++-----------
.../src/site/xdoc/EditTemplates.xml | 8 ++--
openmeetings-server/src/site/xdoc/IBMDB2Config.xml | 2 +-
.../src/site/xdoc/JVMPerformanceTuning.xml | 44 +--------------------
openmeetings-server/src/site/xdoc/LdapAndADS.xml | 4 +-
openmeetings-server/src/site/xdoc/MSSQLConfig.xml | 4 +-
openmeetings-server/src/site/xdoc/MySQLConfig.xml | 4 +-
openmeetings-server/src/site/xdoc/Navigation.xml | 44 ---------------------
openmeetings-server/src/site/xdoc/OracleConfig.xml | 4 +-
openmeetings-server/src/site/xdoc/PortSettings.xml | 34 ++--------------
.../src/site/xdoc/PostgresConfig.xml | 2 +-
.../src/site/xdoc/RTMPSAndHTTPS.xml | 8 ++--
.../src/site/xdoc/RestrictedAccess.xml | 45 +++++-----------------
openmeetings-server/src/site/xdoc/Upgrade.xml | 4 +-
.../src/site/xdoc/WebappNamePath.xml | 19 +++------
openmeetings-server/src/site/xdoc/index.xml | 2 +-
openmeetings-server/src/site/xdoc/installation.xml | 8 ++--
.../src/site/xdoc/voip-sip-integration.xml | 4 +-
.../openmeetings/util/OpenmeetingsVariables.java | 10 -----
openmeetings-web/pom.xml | 1 -
.../web/app/Application.properties.xml | 2 +-
.../web/app/Application_ar.properties.xml | 2 +-
.../web/app/Application_bg.properties.xml | 2 +-
.../web/app/Application_bn.properties.xml | 2 +-
.../web/app/Application_ca.properties.xml | 2 +-
.../web/app/Application_cs.properties.xml | 2 +-
.../web/app/Application_da.properties.xml | 2 +-
.../web/app/Application_de.properties.xml | 2 +-
.../web/app/Application_el.properties.xml | 2 +-
.../web/app/Application_es.properties.xml | 2 +-
.../web/app/Application_fa.properties.xml | 2 +-
.../web/app/Application_fi.properties.xml | 2 +-
.../web/app/Application_fr.properties.xml | 2 +-
.../web/app/Application_gl.properties.xml | 2 +-
.../web/app/Application_he.properties.xml | 2 +-
.../web/app/Application_hu.properties.xml | 2 +-
.../web/app/Application_in.properties.xml | 2 +-
.../web/app/Application_it.properties.xml | 2 +-
.../web/app/Application_ja.properties.xml | 2 +-
.../web/app/Application_ko.properties.xml | 2 +-
.../web/app/Application_nl.properties.xml | 2 +-
.../web/app/Application_pl.properties.xml | 2 +-
.../web/app/Application_pt.properties.xml | 2 +-
.../web/app/Application_pt_BR.properties.xml | 2 +-
.../web/app/Application_ru.properties.xml | 2 +-
.../web/app/Application_sk.properties.xml | 2 +-
.../web/app/Application_sv.properties.xml | 2 +-
.../web/app/Application_th.properties.xml | 2 +-
.../web/app/Application_tr.properties.xml | 2 +-
.../web/app/Application_uk.properties.xml | 2 +-
.../web/app/Application_zh_CN.properties.xml | 2 +-
.../web/app/Application_zh_TW.properties.xml | 2 +-
.../org/apache/openmeetings/cli/TestAdmin.java | 6 +--
58 files changed, 100 insertions(+), 270 deletions(-)
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 91b63d5..975f4e6 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -28,7 +28,7 @@
<artifactId>openmeetings-core</artifactId>
<packaging>jar</packaging>
<name>Openmeetings Core</name>
- <description>Module for OpenMeetings core and red5 related classes and services</description>
+ <description>Module for OpenMeetings core classes and services</description>
<properties>
<site.basedir>${project.parent.basedir}</site.basedir>
</properties>
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
index 00838cc..77b8c9c 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
@@ -95,7 +95,7 @@ public class Admin {
private static final String REP_DELETED = "\t\t\tdeleted: ";
private static final String REP_MISSING = "\t\t\tmissing count: ";
- public static final String RED5_HOME = "red5_home";
+ public static final String OM_HOME = "om_home";
private boolean verbose = false;
private InstallationConfig cfg = null;
@@ -114,7 +114,7 @@ public class Admin {
}
String ctxName = System.getProperty("context", DEFAULT_CONTEXT_NAME);
setWicketApplicationName(ctxName);
- home = new File(System.getProperty(RED5_HOME));
+ home = new File(System.getProperty(OM_HOME));
if (OmFileHelper.getOmHome() == null) {
OmFileHelper.setOmHome(new File(new File(home, "webapps"), ctxName));
}
diff --git a/openmeetings-server/src/main/assembly/scripts/admin.bat b/openmeetings-server/src/main/assembly/scripts/admin.bat
index b5ee98c..0c69c30 100644
--- a/openmeetings-server/src/main/assembly/scripts/admin.bat
+++ b/openmeetings-server/src/main/assembly/scripts/admin.bat
@@ -12,10 +12,10 @@ REM See the License for the specific language governing permissions and
REM limitations under the License.
REM #############################################
@echo off
-set RED5_HOME=%~dp0
+set OM_HOME=%~dp0
set OM_CONTEXT=openmeetings
-set CLASSPATH=%RED5_HOME%\*;%RED5_HOME%\lib\*;%RED5_HOME%\webapps\%OM_CONTEXT%\WEB-INF\lib\*;%RED5_HOME%\webapps\%OM_CONTEXT%\WEB-INF;%RED5_HOME%\webapps\%OM_CONTEXT%\WEB-INF\classes
+set CLASSPATH=%OM_HOME%\*;%OM_HOME%\lib\*;%OM_HOME%\webapps\%OM_CONTEXT%\WEB-INF\lib\*;%OM_HOME%\webapps\%OM_CONTEXT%\WEB-INF;%OM_HOME%\webapps\%OM_CONTEXT%\WEB-INF\classes
-java -cp "%CLASSPATH%" -Dred5_home=%RED5_HOME% -Dcontext=%OM_CONTEXT% org.apache.openmeetings.cli.Admin %*
+java -cp "%CLASSPATH%" -Dom_home=%OM_HOME% -Dcontext=%OM_CONTEXT% org.apache.openmeetings.cli.Admin %*
diff --git a/openmeetings-server/src/main/assembly/scripts/admin.sh b/openmeetings-server/src/main/assembly/scripts/admin.sh
index 593aad1..3d9c59f 100644
--- a/openmeetings-server/src/main/assembly/scripts/admin.sh
+++ b/openmeetings-server/src/main/assembly/scripts/admin.sh
@@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# #############################################
-export RED5_HOME=$(cd $(dirname "$0"); pwd)
+export OM_HOME=$(cd $(dirname "$0"); pwd)
export OM_CONTEXT=openmeetings
-export CLASSPATH=$RED5_HOME/*:$RED5_HOME/lib/*:$RED5_HOME/webapps/${OM_CONTEXT}/WEB-INF/lib/*:$RED5_HOME/webapps/${OM_CONTEXT}/WEB-INF:$RED5_HOME/webapps/${OM_CONTEXT}/WEB-INF/classes
+export CLASSPATH=$OM_HOME/*:$OM_HOME/lib/*:$OM_HOME/webapps/${OM_CONTEXT}/WEB-INF/lib/*:$OM_HOME/webapps/${OM_CONTEXT}/WEB-INF:$OM_HOME/webapps/${OM_CONTEXT}/WEB-INF/classes
-java -cp "$CLASSPATH" -Dred5_home=${RED5_HOME} -Dcontext=${OM_CONTEXT} org.apache.openmeetings.cli.Admin $*
+java -cp "$CLASSPATH" -Dom_home=${OM_HOME} -Dcontext=${OM_CONTEXT} org.apache.openmeetings.cli.Admin $*
diff --git a/openmeetings-server/src/site/site.xml b/openmeetings-server/src/site/site.xml
index faabb8e..1a754e8 100644
--- a/openmeetings-server/src/site/site.xml
+++ b/openmeetings-server/src/site/site.xml
@@ -93,7 +93,6 @@
</item>
<item name="Customization" href="#customize">
<item name="Webapp name/path" href="/WebappNamePath.html" />
- <item name="Navigation" href="/Navigation.html" />
<item name="Calendar and timezone" href="/CalendarAndTimezone.html" />
<item name="Custom room type" href="/CustomRoomTypeHowTo.html" />
<item name="Custom crypt mechanism" href="/CustomCryptMechanism.html" />
diff --git a/openmeetings-server/src/site/xdoc/Clustering.xml b/openmeetings-server/src/site/xdoc/Clustering.xml
index 8d43da0..1b2fd9a 100644
--- a/openmeetings-server/src/site/xdoc/Clustering.xml
+++ b/openmeetings-server/src/site/xdoc/Clustering.xml
@@ -79,7 +79,7 @@
</div>
<ul>
<li>Add users who can connect to the database remotely</li>
- <li>Update <tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/META-INF/persistence.xml</tt>
+ <li>Update <tt>/opt/om/webapps/openmeetings/WEB-INF/classes/META-INF/persistence.xml</tt>
set correct server address, login and password. Also uncomment following line:
<source><![CDATA[<property name="openjpa.RemoteCommitProvider" value="tcp(Addresses=127.0.0.1)" />]]></source>
</li>
@@ -91,8 +91,8 @@
<ul>
<li>Install NFS to the data server. In the file <tt>/etc/exports</tt> add the following lines:
<source>
-/opt/red5/webapps/openmeetings/upload 10.1.1.2(rw,sync,no_subtree_check,no_root_squash)
-/opt/red5/webapps/openmeetings/streams 10.1.1.2(rw,sync,no_subtree_check,no_root_squash)
+/opt/om/webapps/openmeetings/upload 10.1.1.2(rw,sync,no_subtree_check,no_root_squash)
+/opt/om/webapps/openmeetings/streams 10.1.1.2(rw,sync,no_subtree_check,no_root_squash)
</source>
Here 10.1.1.2 - is node ip for NFS remote access. Add these lines for all nodes except node with
folders.
@@ -100,10 +100,10 @@
<li>
Install NFS common tools to other nodes. In the file <tt>/etc/fstab</tt> do the following:
<source>
-10.1.1.1:/opt/red5/webapps/openmeetings/upload/
-/opt/red5/webapps/openmeetings/upload nfs timeo=50,hard,intr
-10.1.1.1:/opt/red5/webapps/openmeetings/streams/
-/opt/red5/webapps/openmeetings/streams nfs timeo=50,hard,intr
+10.1.1.1:/opt/om/webapps/openmeetings/upload/
+/opt/om/webapps/openmeetings/upload nfs timeo=50,hard,intr
+10.1.1.1:/opt/om/webapps/openmeetings/streams/
+/opt/om/webapps/openmeetings/streams nfs timeo=50,hard,intr
</source>
Here 10.1.1.1 – data server ip. And run the command:
<source>mount -a</source>
@@ -113,7 +113,7 @@
<subsection name="OM nodes configuration">
<ol>
<li>
- <p>In the file <tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/hazelcast.xml</tt>:</p>
+ <p>In the file <tt>/opt/om/webapps/openmeetings/WEB-INF/classes/hazelcast.xml</tt>:</p>
<ul>
<li>Set <tt>instance-name</tt> for each server to unique value</li>
<li>
@@ -134,20 +134,6 @@
</li>
</ul>
</li>
- <li>
- <p>In the file <tt>/opt/red5/webapps/root/crossdomain.xml</tt>:</p>
- <ul>
- <li>
- Update policy to allow requests from other servers (<a href="https://www.adobe.com/devnet-docs/acrobatetk/tools/AppSec/xdomain.html">the guide</a>)<br/>
- Here is example of very permissive policy (not recommended)<br/>
- <source><![CDATA[
-<cross-domain-policy>
- <allow-access-from domain="*" />
-</cross-domain-policy>
- ]]></source>
- </li>
- </ul>
- </li>
</ol>
</subsection>
<subsection name="Ensure everything works as expected">
diff --git a/openmeetings-server/src/site/xdoc/EditTemplates.xml b/openmeetings-server/src/site/xdoc/EditTemplates.xml
index b86c2fc..b3702ca 100644
--- a/openmeetings-server/src/site/xdoc/EditTemplates.xml
+++ b/openmeetings-server/src/site/xdoc/EditTemplates.xml
@@ -43,18 +43,18 @@
</p>
<div>To do that:
<ul>
- <li>Stop the Red5/OpenMeetings service</li>
- <li>Goto: <tt>$RED5_HOME/webapps/openmeetings/WEB-INF/classes/org/apache/openmeetings/service/mail/template/</tt></li>
+ <li>Stop the OpenMeetings service</li>
+ <li>Goto: <tt>$OM_HOME/webapps/openmeetings/WEB-INF/classes/org/apache/openmeetings/service/mail/template/</tt></li>
<li>Change HTML file(s) according to your needs, BUT do not remove
elements with <tt>wicket:id</tt> attributes! You can hide those
elements by adding <tt>wicket:visible="false"</tt> attribute
</li>
<li>Starting OM 3.1.4 you can change Appointment reminder subject by
modifying "subject" fragment in file
- <tt>$RED5_HOME/webapps/openmeetings/WEB-INF/classes/org/apache/openmeetings/service/mail/template/subject/AbstractSubjectEmailTemplate.html</tt>
+ <tt>$OM_HOME/webapps/openmeetings/WEB-INF/classes/org/apache/openmeetings/service/mail/template/subject/AbstractSubjectEmailTemplate.html</tt>
as described in previous bullet.
</li>
- <li>Start the Red5/OpenMeetings service</li>
+ <li>Start the OpenMeetings service</li>
</ul>
</div>
</section>
diff --git a/openmeetings-server/src/site/xdoc/IBMDB2Config.xml b/openmeetings-server/src/site/xdoc/IBMDB2Config.xml
index 49f81f8..f977ce3 100644
--- a/openmeetings-server/src/site/xdoc/IBMDB2Config.xml
+++ b/openmeetings-server/src/site/xdoc/IBMDB2Config.xml
@@ -49,7 +49,7 @@
<subsection name="Steps todo">
<ul>
<li>
- Run red5-service and goto the web-based installer:
+ Run OpenMeetings and goto the web-based installer:
http://localhost:5080/openmeetings/install
</li>
</ul>
diff --git a/openmeetings-server/src/site/xdoc/JVMPerformanceTuning.xml b/openmeetings-server/src/site/xdoc/JVMPerformanceTuning.xml
index 82c819b..38f72d8 100644
--- a/openmeetings-server/src/site/xdoc/JVMPerformanceTuning.xml
+++ b/openmeetings-server/src/site/xdoc/JVMPerformanceTuning.xml
@@ -19,49 +19,9 @@
<title>Performance Tuning</title>
<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
</properties>
-
<body>
-
<section name="Performance Tuning">
-
- <p>To use the optimum of performance from your server there is a
- start-script for red5 available that does some basic settings in the
- JVM. It is called red5-highperf.sh. It is recommended to use that
- script for production and high-load scenarios.
- </p>
- <source>
-<![CDATA[
-#!/bin/bash
-
-if [ -z "$RED5_HOME" ]; then export RED5_HOME=.; fi
-
-# Previous option set
-export JAVA_OPTS="-Xrs -Xms512M -Xmx1024M -Xss128K -XX:NewSize=256m \
- -XX:SurvivorRatio=16 -XX:MinHeapFreeRatio=20 -XX:+ExplicitGCInvokesConcurrent \
- -Djava.net.preferIPv4Stack=true -Xverify:none"
-
-# start Red5
-echo "Setting Hi Performance Options"
-exec $RED5_HOME/red5.sh >> $RED5_HOME/logs/jvm.stdout 2>&1 &
-]]>
- </source>
-
- <p>You have to exclude the "-XX:+UseConcMarkSweepGC" param from the
- default red5-highperf.sh to make it functional! However if you are a
- performance expert you might also play with the values to find
- perfect matches for your use-case.
- </p>
- <p>
- For a complete overview about possible arguments and their meaning
- see:
- <a
- href="http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html#PerformanceTuning"
- rel="nofollow">http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html#PerformanceTuning
- </a>
- </p>
-
+ TBD
</section>
-
</body>
-
-</document>
\ No newline at end of file
+</document>
diff --git a/openmeetings-server/src/site/xdoc/LdapAndADS.xml b/openmeetings-server/src/site/xdoc/LdapAndADS.xml
index 87c17dd..84a2578 100644
--- a/openmeetings-server/src/site/xdoc/LdapAndADS.xml
+++ b/openmeetings-server/src/site/xdoc/LdapAndADS.xml
@@ -63,7 +63,7 @@ TLS_CACERT /etc/ssl/certs/ca-certificates.crt
</div>
</section>
<section name="LDAP and Active Directory Integration">
- <p> In: $RED5_HOME/webapps/openmeetings/conf<br/>
+ <p> In: $OM_HOME/webapps/openmeetings/conf<br/>
you will find sample configurations for LDAP and Active Directory. The
nature of those Directory Servers are that they are individual for
every organization, so you have to modify of course at least the
@@ -88,7 +88,7 @@ TLS_CACERT /etc/ssl/certs/ca-certificates.crt
You can configure multiple domains or different user-paths in the Administration of OpenMeetings.
</p>
<p>
- <b>NOTE: </b>You should specify file name <i>RELATIVE</i> to <tt>$RED5_HOME/webapps/openmeetings/conf</tt>
+ <b>NOTE: </b>You should specify file name <i>RELATIVE</i> to <tt>$OM_HOME/webapps/openmeetings/conf</tt>
</p>
</section>
diff --git a/openmeetings-server/src/site/xdoc/MSSQLConfig.xml b/openmeetings-server/src/site/xdoc/MSSQLConfig.xml
index 0f454bb..b8365c6 100644
--- a/openmeetings-server/src/site/xdoc/MSSQLConfig.xml
+++ b/openmeetings-server/src/site/xdoc/MSSQLConfig.xml
@@ -50,10 +50,10 @@
<a href="http://www.microsoft.com/en-us/download/details.aspx?displaylang=en&id=11774" target="_blank"
rel="nofollow">http://www.microsoft.com/en-us/download/details.aspx?displaylang=en&id=11774</a>
Unarchive appropriate file from it (sqljdbc.jar or sqljdbc4.jar) and place it into:
- <tt>$red5/webapps/openmeetings/WEB-INF/lib/</tt>
+ <tt>$OM_HOME/webapps/openmeetings/WEB-INF/lib/</tt>
</li>
<li>
- Run red5-service and goto the web-based installer:
+ Run OpenMeetings and goto the web-based installer:
http://localhost:5080/openmeetings/install
</li>
</ul>
diff --git a/openmeetings-server/src/site/xdoc/MySQLConfig.xml b/openmeetings-server/src/site/xdoc/MySQLConfig.xml
index 31d9bf2..7c71949 100644
--- a/openmeetings-server/src/site/xdoc/MySQLConfig.xml
+++ b/openmeetings-server/src/site/xdoc/MySQLConfig.xml
@@ -49,10 +49,10 @@
<a href="http://www.mysql.com/downloads/connector/j/" target="_blank"
rel="nofollow">http://www.mysql.com/downloads/connector/j/</a>
and place it into:
- <tt>$red5/webapps/openmeetings/WEB-INF/lib/</tt>
+ <tt>$OM_HOME/webapps/openmeetings/WEB-INF/lib/</tt>
</li>
<li>
- Run red5-service and goto the web-based installer:
+ Run OpenMeetings and goto the web-based installer:
http://localhost:5080/openmeetings/install
</li>
</ul>
diff --git a/openmeetings-server/src/site/xdoc/Navigation.xml b/openmeetings-server/src/site/xdoc/Navigation.xml
deleted file mode 100644
index 2b2e861..0000000
--- a/openmeetings-server/src/site/xdoc/Navigation.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- 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">
- <properties>
- <title>Change main navigation</title>
- <author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
- </properties>
-
- <body>
-
- <section name="Changing the main navigation">
-
- <p>To customize the main menu (for example remove entries or changing
- the order) you can edit the tables: </p>
- <ul>
- <li>navimain </li>
- <li>naviglobal </li>
- </ul>
- <p></p>
- <p>
- You need to make sure that you
- <strong>restart red5 after doing changes to the database</strong>
- , there is a database cache, so changes might not take affect as
- long as you did not restart.
- </p>
- </section>
-
- </body>
-
-</document>
\ No newline at end of file
diff --git a/openmeetings-server/src/site/xdoc/OracleConfig.xml b/openmeetings-server/src/site/xdoc/OracleConfig.xml
index e59c78a..266e3a3 100644
--- a/openmeetings-server/src/site/xdoc/OracleConfig.xml
+++ b/openmeetings-server/src/site/xdoc/OracleConfig.xml
@@ -27,7 +27,7 @@
<ul>
<li>Download the latest JDBC Driver from Oracle for your database
version. Place those JARs into
- $Red5/webapps/openmeetings/WEB-INF/lib
+ $OM_HOME/webapps/openmeetings/WEB-INF/lib
</li>
<li>If you encounter issues, you can drop the db and then run
the web based installer again
@@ -38,7 +38,7 @@
<subsection name="Steps todo">
<ul>
<li>
- Run red5-service and goto the web-based installer:
+ Run OpenMeetings and goto the web-based installer:
http://localhost:5080/openmeetings/install
</li>
</ul>
diff --git a/openmeetings-server/src/site/xdoc/PortSettings.xml b/openmeetings-server/src/site/xdoc/PortSettings.xml
index 91904d8..892463a 100644
--- a/openmeetings-server/src/site/xdoc/PortSettings.xml
+++ b/openmeetings-server/src/site/xdoc/PortSettings.xml
@@ -22,46 +22,20 @@
<body>
<section name="Default Configuration">
<ul>
- <li>Port 5080: HTTP (For example for file upload and download) </li>
- <li>Port 1935: RTMP (Flash Stream and Remoting/RPC) </li>
+ <li>Port 5443: HTTPS (For web interface) </li>
+ <li>Port 5080: HTTP (For unsecured web interface, useful if SSL proxy is being used) </li>
</ul>
- <p>Additionally red5 uses some ports internally. However those ports
- are not in use by OpenMeetings by default.
- </p>
</section>
<section name="Configure alternative ports">
<p>You need to change two files: </p>
<ul>
- <li>Server-Side configuration: $RED5_HOME/conf/red5.properties, you
- need to restart the red5-service so that changes are online.
+ <li>Server-Side configuration: $OM_HOME/conf/server.xml, you
+ need to restart the OpenMeetings so that changes are online.
</li>
</ul>
- <p></p>
- <table>
- <tr>
- <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Config-Name </th>
- <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Default-value </th>
- <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Name in red5.properties </th>
- </tr>
- <tr>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> HTTP </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 5080 </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> http.port </td>
- </tr>
- <tr>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> RTMP </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 1935 </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> rtmp.port </td>
- </tr>
- </table>
</section>
<section name="Preventing Firewall issues">
<p>A common way of bypassing the firewall is to change HTTP port to 80</p>
- <p>A short description about the connection mechanism: The
- application first tries connecting to rtmp 3 times, because rtmp is
- the protocol that is less performance hungry. If that fails the
- application will fallback to rtmpT.
- </p>
</section>
<section name="OpenMeetings over SSL">
<p>
diff --git a/openmeetings-server/src/site/xdoc/PostgresConfig.xml b/openmeetings-server/src/site/xdoc/PostgresConfig.xml
index 6021c24..2411f38 100644
--- a/openmeetings-server/src/site/xdoc/PostgresConfig.xml
+++ b/openmeetings-server/src/site/xdoc/PostgresConfig.xml
@@ -48,7 +48,7 @@
<subsection name="Steps todo">
<ul>
<li>
- Run red5-service and goto the web-based installer:
+ Run OpenMeetings and goto the web-based installer:
http://localhost:5080/openmeetings/install
</li>
</ul>
diff --git a/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml b/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
index 66ce74e..8604ab6 100644
--- a/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
+++ b/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
@@ -156,19 +156,19 @@ openssl pkcs12 -export -in red5.crt -inkey red5.key -out red5.p12 -name red5 -ce
]]></source>
</li>
<li>Import resulting red5.p12 into keystore:<source><![CDATA[
-keytool -importkeystore -srcstorepass changeit -srckeystore red5.p12 -srcstoretype PKCS12 -deststorepass changeit -destkeystore /opt/red5/conf/keystore.jks -alias red5
+keytool -importkeystore -srcstorepass changeit -srckeystore red5.p12 -srcstoretype PKCS12 -deststorepass changeit -destkeystore /opt/om/conf/keystore.jks -alias red5
]]></source>
This command creates the keystore.jks with password changeit (may be any password)
</li>
<li>Import your CA's root certificate into the keystore:<source><![CDATA[
-keytool -import -alias root -keystore /opt/red5/conf/keystore.jks -keystorepass changeit -trustcacerts -file ca.crt
+keytool -import -alias root -keystore /opt/om/conf/keystore.jks -keystorepass changeit -trustcacerts -file ca.crt
]]></source>
</li>
<li>copy keystore to truststore<source><![CDATA[
-cp /opt/red5/conf/keystore.jks /opt/red5/conf/truststore.jks
+cp /opt/om/conf/keystore.jks /opt/om/conf/truststore.jks
]]></source>
</li>
- <li>Change passwords in /opt/red5/conf/red5.properties<source><![CDATA[
+ <li>Change passwords in /opt/om/conf/red5.properties<source><![CDATA[
rtmps.keystorepass=changeit
rtmps.truststorepass=changeit
jmx.keystorepass=changeit
diff --git a/openmeetings-server/src/site/xdoc/RestrictedAccess.xml b/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
index 0d309e1..fabcbf0 100644
--- a/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
+++ b/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
@@ -23,44 +23,17 @@
<body>
<section name="Server Side">
<p>You can protect your OpenMeetings instance from beeing accessed
- from 3th party by using the file:
+ from 3th party by setting up <tt>RemoteAddrValve</tt><br/>
+ Here <tt>$OM_HOME/conf/server.xml</tt> (will affect the whole Tomcat<br/>)
+ Or here $OM_HOME/webapps/openmeetings/META-INF/context.xml
</p>
- <p>$RED5_HOME/webapps/openmeetings/WEB-INF/red5-web.properties </p>
- <p>Content: </p>
- <source>webapp.virtualHosts=*,localhost, 127.0.0.1</source>
- <p>
- Sample file:
- <a
- href="https://github.com/apache/openmeetings/blob/master/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties"
- rel="nofollow">https://github.com/apache/openmeetings/blob/master/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties
- </a>
- </p>
- </section>
- <section name="Client Side">
- <p>And you can restrict the access also for the client side: Every
- Flash Plugin will check a file called "crossdomain.xml" before it
- tries to access the server using rtmp/RPC. This file is located: </p>
- <p>$RED5_HOME/webapps/root/crossdomain.xml </p>
- <p>Content: </p>
- <source>
-<![CDATA[
-<?xml version="1.0"?>
-<cross-domain-policy>
- <site-control permitted-cross-domain-policies="all"/>
- <allow-access-from domain="localhost" to-ports="20-65535"/>
- <allow-access-from domain="*.local" to-ports="20-65535"/>
-</cross-domain-policy>
-]]>
- </source>
- <p>
- If you accessing your application behind an Apache Webservre (using
- mod_proxy or mod_jk2) be careful to make the crossdomain.xml
- accessible. Flash will always search for this file in the www-root
- directory of every URL you connect to. You might use
- <a href="https://addons.mozilla.org/de/firefox/addon/firebug/" rel="nofollow">FireBug
- </a>
- for example to lookup requests.
+ <p>Please check Tomcat documentation for more details
+ <a href="https://tomcat.apache.org/tomcat-9.0-doc/config/context.html">Docs about context</a>, <a
+ href="https://tomcat.apache.org/tomcat-9.0-doc/config/valve.html#Remote_Address_Valve">Docs about RemoteAddrValve</a>
</p>
+ <p>For example: To allow access only for the clients connecting from localhost:</p>
+ <source><![CDATA[<Valve className="org.apache.catalina.valves.RemoteAddrValve"
+allow="127\.\d+\.\d+\.\d+|::1|0:0:0:0:0:0:0:1"/>]]></source>
</section>
</body>
</document>
diff --git a/openmeetings-server/src/site/xdoc/Upgrade.xml b/openmeetings-server/src/site/xdoc/Upgrade.xml
index 078547d..1425c8a 100644
--- a/openmeetings-server/src/site/xdoc/Upgrade.xml
+++ b/openmeetings-server/src/site/xdoc/Upgrade.xml
@@ -61,8 +61,8 @@
</p>
<p>
Alternatively to the Web-Installer you can also export and import via the command line. <br/>
- <b>You should shutdown the Red5-Service while doing CLI export or import operations</b><br />
- Cd to your red5-home directory, type "./admin.sh" and hit enter. You will get options available.<br />
+ <b>You should shutdown the OpenMeetings while doing CLI export or import operations</b><br />
+ Cd to your OM_HOME directory, type "./admin.sh" and hit enter. You will get options available.<br />
<br />
A typical export would be:<br />
<tt>./admin.sh -b -file backup_today.zip</tt><br />
diff --git a/openmeetings-server/src/site/xdoc/WebappNamePath.xml b/openmeetings-server/src/site/xdoc/WebappNamePath.xml
index 0700f37..a3b7ad9 100644
--- a/openmeetings-server/src/site/xdoc/WebappNamePath.xml
+++ b/openmeetings-server/src/site/xdoc/WebappNamePath.xml
@@ -24,7 +24,7 @@
<p>If you want to set up your logo in Openmeetings header you can do the following:</p>
<ol>
<li>create your logo image as PNG 40px height</li>
- <li>replace <tt>/opt/red5/webapps/openmeetings/css/images/logo.png</tt> with your logo file</li>
+ <li>replace <tt>/opt/om/webapps/openmeetings/css/images/logo.png</tt> with your logo file</li>
</ol>
</section>
<section name="Renaming /openmeetings context">
@@ -38,15 +38,15 @@
<ol>
<li>stop openmmetings if it is running </li>
<li>
- go to openmeetings install dir (for ex. <tt>/opt/red5</tt>)
+ go to openmeetings install dir (for ex. <tt>/opt/om</tt>)
</li>
<li>
- rename <tt>/opt/red5/webapps/openmeetings</tt> to <tt>/opt/red5/webapps/yourmeetings</tt>
- (for ex. <tt>mv /opt/red5/webapps/openmeetings /opt/red5/webapps/yourmeetings</tt>)
+ rename <tt>/opt/om/webapps/openmeetings</tt> to <tt>/opt/om/webapps/yourmeetings</tt>
+ (for ex. <tt>mv /opt/om/webapps/openmeetings /opt/om/webapps/yourmeetings</tt>)
</li>
<li>
- open <tt>/opt/red5/webapps/root/index.html</tt>
- using your favorite text editor (for ex. <tt>vim /opt/red5/webapps/root/index.html</tt>)
+ open <tt>/opt/om/webapps/root/index.html</tt>
+ using your favorite text editor (for ex. <tt>vim /opt/om/webapps/root/index.html</tt>)
<ul>
<li>
find and modify <tt><meta http-equiv="REFRESH" content="0;url=openmeetings/"></tt>
@@ -117,13 +117,6 @@
<tt>http://yourcorp.com:5080/openmeetings1</tt><br/>
<tt>http://yourcorp.com:5080/openmeetings2</tt><br/> etc.<br/> you need to do the following:
</p>
- <ol>
- <li>in case of java memory problems modify <tt>red5.sh</tt> add following line:<br/>
- <source>export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -XX:MaxPermSize=128M"</source>
- or <tt>red5.bat</tt>:<br/>
- <source>set JAVA_OPTS=-XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -XX:MaxPermSize=128M</source>
- </li>
- </ol>
</section>
</body>
</document>
diff --git a/openmeetings-server/src/site/xdoc/index.xml b/openmeetings-server/src/site/xdoc/index.xml
index 145c7b1..e72d130 100644
--- a/openmeetings-server/src/site/xdoc/index.xml
+++ b/openmeetings-server/src/site/xdoc/index.xml
@@ -58,7 +58,7 @@
<section name="Apache OpenMeetings - Features and overview">
<p> Openmeetings provides video conferencing, instant messaging,
white board, collaborative document editing and other groupware
- tools using API functions of the Red5 Streaming Server for Remoting
+ tools using API functions of the Kurento Media Server for Remoting
and Streaming.
</p>
<p>
diff --git a/openmeetings-server/src/site/xdoc/installation.xml b/openmeetings-server/src/site/xdoc/installation.xml
index fda1cd9..095c66d 100644
--- a/openmeetings-server/src/site/xdoc/installation.xml
+++ b/openmeetings-server/src/site/xdoc/installation.xml
@@ -42,8 +42,8 @@
<div class="small">Java 8 required</div>
</li>
<li class="step unpack">
- <div>Unpack + run red5.bat (.sh)</div>
- <div class="small">(Windows: double click red5.bat)</div>
+ <div>Unpack + run bin/startup.bat (.sh)</div>
+ <div class="small">(Windows: double click startup.bat)</div>
</li>
<li class="step run">
<div>Run Web Installer</div>
@@ -248,7 +248,7 @@
<section name="Tips and Tricks">
<ul>
<li>
- Use the Debug-Application: open <tt>$RED5_HOME/webapps/openmeetings/WEB-INF/web.xml</tt> change
+ Use the Debug-Application: open <tt>$OM_HOME/webapps/openmeetings/WEB-INF/web.xml</tt> change
<source><![CDATA[
<init-param>
<param-name>configuration</param-name>
@@ -264,7 +264,7 @@
then access your OM installation
</li>
<li>If you have Problems with conversion-jobs check your openmeetings log
- output (available at <tt>$RED5_HOME/logs/openmeetings.log</tt>). There will be error Messages which help you. You must
+ output (available at <tt>$OM_HOME/logs/openmeetings.log</tt>). There will be error Messages which help you. You must
install OpenOffice, ImageMagick and GhostScript to run
all conversion-Jobs correctly.
</li>
diff --git a/openmeetings-server/src/site/xdoc/voip-sip-integration.xml b/openmeetings-server/src/site/xdoc/voip-sip-integration.xml
index f1e38f4..7692c59 100644
--- a/openmeetings-server/src/site/xdoc/voip-sip-integration.xml
+++ b/openmeetings-server/src/site/xdoc/voip-sip-integration.xml
@@ -168,7 +168,7 @@ sippeers => mysql,general,sipusers
; To Check if your astDB has been created do the following in a terminal window type the following:
; asterisk –rx “database show”
; If you do not receive an output with that resembles openmeetings/rooms/400## where “##” will equal the extension assigned when you created your room
-; If you do not receive the above output check your parameters in /opt/red5/webapps/openmeetings/WEB-INF/classes/applicationContext.xml
+; If you do not receive the above output check your parameters in /opt/om/webapps/openmeetings/WEB-INF/classes/applicationContext.xml
; Go back into the Administrator Panel and remove the PIN number in each room save the record with no PIN number and then re-enter the pin again resave the record.
; *****************************************************
@@ -248,7 +248,7 @@ write = all
</div><br />
<div>
Update OpenMeetings with credentials for Asterisk manager.
- Modify <tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/applicationContext.xml</tt><br />
+ Modify <tt>/opt/om/webapps/openmeetings/WEB-INF/classes/applicationContext.xml</tt><br />
find <strong><bean id="sipDao" class="org.apache.openmeetings.db.dao.room.SipDao"></strong>
uncomment its parameters and set it to your custom values.<br/>
set value for <tt>uid</tt> property to unique secret value (can be generated here <a href="https://www.uuidgenerator.net">https://www.uuidgenerator.net</a>)
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 f0062d5..f977b31 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
@@ -105,16 +105,6 @@ public class OpenmeetingsVariables {
public static final String DEFAULT_APP_NAME = "OpenMeetings";
public static final String DEFAULT_CONTEXT_NAME = "openmeetings";
public static final long DEFAULT_MAX_UPLOAD_SIZE = 100 * 1024 * 1024L; // 100MB
- public static final String FLASH_SECURE = "secure";
- public static final String FLASH_NATIVE_SSL = "native";
- public static final String FLASH_PORT = "rtmpPort";
- public static final String FLASH_SSL_PORT = "rtmpsPort";
- public static final String FLASH_VIDEO_CODEC = "videoCodec";
- public static final String FLASH_FPS = "fps";
- public static final String FLASH_BANDWIDTH = "bandwidth";
- public static final String FLASH_QUALITY = "quality";
- public static final String FLASH_ECHO_PATH = "echoPath";
- public static final String FLASH_MIC_RATE = "micRate";
public static final int DEFAULT_MINUTES_REMINDER_SEND = 15;
public static final String DEFAULT_BASE_URL = "http://localhost:5080/openmeetings/";
public static final String DEFAULT_SIP_CONTEXT = "rooms";
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 6d7439b..e7ab3ab 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -543,7 +543,6 @@
<systemPropertyVariables>
<om.home>${project.build.directory}/test-root</om.home>
<languages.home>${project.build.directory}/test-root/languages</languages.home>
- <red5.root>red5.root</red5.root>
<backups.dir>${old-backups.dir}</backups.dir>
<catalina.useNaming>true</catalina.useNaming>
<current_openmeetings_log_dir>${project.build.directory}</current_openmeetings_log_dir>
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 e8c547b..692aac0 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
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
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 c558c43..2515a09 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
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index c60e24d..5fc4c6f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
index caf4c04..70db325 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index 01318d8..c3cb8f2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index 88b272f..b8cd8bf 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index 173af9e..ea0fb41 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index ddfe89b..3a1206f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[Alle]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Veröffentlichen. Nutzer:]]></entry>
- <entry key="1505"><![CDATA[Um Zeit und Internet-Verkehr sparen, können Sie den Befehl admin für Backup/Wiederherstellen/Aktualisieren verwenden. <ol> <li>Gehen sie zum OM-Installationspfad (z.b. /opt/red5)</li> <li>Stopen Sie OM (z.b. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/heute_om_backup.zip (Backup vom bestehenden OM erstellen)</li> <li>Laden Sie die neue Version OM herunter</li> <li>mv /opt/red5 /opt.red5.bak (kopieren Sie die existierende OM-Version für den Fall :))</li> [...]
+ <entry key="1505"><![CDATA[Um Zeit und Internet-Verkehr sparen, können Sie den Befehl admin für Backup/Wiederherstellen/Aktualisieren verwenden. <ol> <li>Gehen sie zum OM-Installationspfad (z.b. /opt/om)</li> <li>Stopen Sie OM (z.b. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/heute_om_backup.zip (Backup vom bestehenden OM erstellen)</li> <li>Laden Sie die neue Version OM herunter</li> <li>mv /opt/om /opt/om.bak (kopieren Sie die existierende OM-Version für den Fall :))</li> <li>En [...]
<entry key="1506"><![CDATA[gemeinsame Räume für alle Benutzer]]></entry>
<entry key="1507"><![CDATA[gemeinsame Räume für die aktuelle Benutzer-Gruppe]]></entry>
<entry key="1508"><![CDATA[Räume des aktuellen Benutzers]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index d9e8209..29bae9b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index aa1d7ba..9b632b0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[Todo]]></entry>
<entry key="1500"><![CDATA[Nombre del Servidor]]></entry>
<entry key="1504"><![CDATA[Publicando. Usuario:]]></entry>
- <entry key="1505"><![CDATA[Para guardar hora y tráfico de internet puede emplear la linea de comandos como administrador para hacer backup/restaurar/actualizar: <ol> <li>ir al directorio de instalación en OM (por ejemplo /opt/red5)</li> <li>detenga OM (por ejemplo ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (hacer backup del actual OM)</li> <li>descargar archivo con el nuevo OM</li> <li> (mover versión de trabajo de OM solo en el caso :))</li> <li>extraer el O [...]
+ <entry key="1505"><![CDATA[Para guardar hora y tráfico de internet puede emplear la linea de comandos como administrador para hacer backup/restaurar/actualizar: <ol> <li>ir al directorio de instalación en OM (por ejemplo /opt/om)</li> <li>detenga OM (por ejemplo ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (hacer backup del actual OM)</li> <li>descargar archivo con el nuevo OM</li> <li> (mover versión de trabajo de OM solo en el caso :))</li> <li>extraer el OM d [...]
<entry key="1506"><![CDATA[Salas comunes a todos los usuarios]]></entry>
<entry key="1507"><![CDATA[Salas comunes al grupo de usuarios actual]]></entry>
<entry key="1508"><![CDATA[Salas del usuario actual]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index d542119..89efbc6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[همه]]></entry>
<entry key="1500"><![CDATA[نام سرور]]></entry>
<entry key="1504"><![CDATA[انتشار. کاربر:]]></entry>
- <entry key="1505"><![CDATA[برای ذخیره زمان و ترافیک اینترنت شما می توانید از دستور زیر استفاده کنید backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i [...]
+ <entry key="1505"><![CDATA[برای ذخیره زمان و ترافیک اینترنت شما می توانید از دستور زیر استفاده کنید backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/t [...]
<entry key="1506"><![CDATA[اتاق های مشترک برای تمام کاربران]]></entry>
<entry key="1507"><![CDATA[اتاق های مشترک برای گروه کاربر فعلی]]></entry>
<entry key="1508"><![CDATA[اتاق های کاربر فعلی]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index 26d81f3..4497ba7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index 4cc20fe..dc5f643 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[Tous]]></entry>
<entry key="1500"><![CDATA[Nom du serveur]]></entry>
<entry key="1504"><![CDATA[Publier. Utilisateur :]]></entry>
- <entry key="1505"><![CDATA[Pour économiser du temps et de la bande passante vous pouvez utiliser la ligne de commande pour sauvegarder/restaurer/mettre à niveau votre système <ol> <li>Aller dans le répertoire d'installation d'OM (par ex. /opt/red5)</li> <li>Arrêter OM (par ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/nom_de_la_sauvegarde.zip (créer la sauvegarde d'OM)</li> <li>télécharger la nouvelle version d'OM</li> <li>mv /opt/red5 /opt.red5.bak (déplacer la version d'OM qu [...]
+ <entry key="1505"><![CDATA[Pour économiser du temps et de la bande passante vous pouvez utiliser la ligne de commande pour sauvegarder/restaurer/mettre à niveau votre système <ol> <li>Aller dans le répertoire d'installation d'OM (par ex. /opt/om)</li> <li>Arrêter OM (par ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/nom_de_la_sauvegarde.zip (créer la sauvegarde d'OM)</li> <li>télécharger la nouvelle version d'OM</li> <li>mv /opt/om /opt/om.bak (déplacer la version d'OM qui fonct [...]
<entry key="1506"><![CDATA[Salles pour tous les utilisateurs]]></entry>
<entry key="1507"><![CDATA[Salles pour les utilisateurs du groupe actuel]]></entry>
<entry key="1508"><![CDATA[Salles de l'utilisateur]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index 28c4517..4e2cce7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
index e8c547b..692aac0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index be37b3d..077a27c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[Mindenki]]></entry>
<entry key="1500"><![CDATA[Szerver neve]]></entry>
<entry key="1504"><![CDATA[Közzététel. Felhasználó:]]></entry>
- <entry key="1505"><![CDATA[Időt és adatforgalmat takarít meg ha a parancssori admint használja a mentésekhez backup/restore/upgrade: <ol> <li>lépjen be az OM telepített könyvtárába (pl.: /opt/red5)</li> <li>állítsa meg az OM-et (cmd: ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (backup készítése az aktuális OM -ről)</li> <li>töltse le az új OM-et</li> <li>mv /opt/red5 /opt.red5.bak (A működő OM verziót őrizze meg :))</li> <li>Csomagolja ki az új OM-et /opt/red5 [...]
+ <entry key="1505"><![CDATA[Időt és adatforgalmat takarít meg ha a parancssori admint használja a mentésekhez backup/restore/upgrade: <ol> <li>lépjen be az OM telepített könyvtárába (pl.: /opt/om)</li> <li>állítsa meg az OM-et (cmd: ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (backup készítése az aktuális OM -ről)</li> <li>töltse le az új OM-et</li> <li>mv /opt/om /opt/om.bak (A működő OM verziót őrizze meg :))</li> <li>Csomagolja ki az új OM-et /opt/om</li> <li [...]
<entry key="1506"><![CDATA[Közös termek minden felhasználó számára]]></entry>
<entry key="1507"><![CDATA[Közös termek a csoport felhasználói számára]]></entry>
<entry key="1508"><![CDATA[A felhasználó termei]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
index c8d56f3..6f00d4c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index 454ceaa..19dc644 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[Tutti]]></entry>
<entry key="1500"><![CDATA[Nome Server]]></entry>
<entry key="1504"><![CDATA[Pubblicazione. Utente:]]></entry>
- <entry key="1505"><![CDATA[Per risparmiare tempo e traffico Internet puoi usare i comandi di amministrazione da riga di comando per backup/ripristino/aggiornamento: <ol> <li>vai alla cartella di installazione di OM (per es. /opt/red5)</li> <li>ferma OM (per es. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (crea il backup di OM attuale)</li> <li>scarica archivio con il nuovo OM</li> <li>mv /opt/red5 /opt.red5.bak (sposta l'attuale versione di OM per qualsiasi ev [...]
+ <entry key="1505"><![CDATA[Per risparmiare tempo e traffico Internet puoi usare i comandi di amministrazione da riga di comando per backup/ripristino/aggiornamento: <ol> <li>vai alla cartella di installazione di OM (per es. /opt/om)</li> <li>ferma OM (per es. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (crea il backup di OM attuale)</li> <li>scarica archivio con il nuovo OM</li> <li>mv /opt/om /opt/om.bak (sposta l'attuale versione di OM per qualsiasi evenienza [...]
<entry key="1506"><![CDATA[Stanze comuni a tutti gli utenti]]></entry>
<entry key="1507"><![CDATA[Stanze comuni all'Organizzazione corrente]]></entry>
<entry key="1508"><![CDATA[Stanze dell'utente corrente]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index a25dabf..ea1affe 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[すべて]]></entry>
<entry key="1500"><![CDATA[サーバー名]]></entry>
<entry key="1504"><![CDATA[公開中。ユーザー：]]></entry>
- <entry key="1505"><![CDATA[バックアップ／リストア／アップグレードを行なう際にコマンドライン・ツールを利用すると、時間とインターネット・トラフィックを節約することができます: <ol> <li>オープンミーティングスのインストール・ディレクトリに移動する (例：/opt/red5)</li> <li>オープン・ミーティングスを停止する(例： ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (オープン・ミーティングスの現状バックアップを作成する)</li> <li>オープン・ミーティングスの最新アーカイブをダウンロードする</li> <li>mv /opt/red5 /opt.red5.bak (必要に応じて、現環境を移動しておく)</li> <li>/opt/red5 にダウンロードしたアーカイブを展開する</li> <li>./admin.sh -i -file ~/today_om_backup.zip<br/> (既定のデータベースを使用してい [...]
+ <entry key="1505"><![CDATA[バックアップ／リストア／アップグレードを行なう際にコマンドライン・ツールを利用すると、時間とインターネット・トラフィックを節約することができます: <ol> <li>オープンミーティングスのインストール・ディレクトリに移動する (例：/opt/om)</li> <li>オープン・ミーティングスを停止する(例： ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (オープン・ミーティングスの現状バックアップを作成する)</li> <li>オープン・ミーティングスの最新アーカイブをダウンロードする</li> <li>mv /opt/om /opt/om.bak (必要に応じて、現環境を移動しておく)</li> <li>/opt/om にダウンロードしたアーカイブを展開する</li> <li>./admin.sh -i -file ~/today_om_backup.zip<br/> (既定のデータベースを使用していない場合は './ [...]
<entry key="1506"><![CDATA[全ユーザーに供用される会議室]]></entry>
<entry key="1507"><![CDATA[現ユーザー・グループに供用される会議室]]></entry>
<entry key="1508"><![CDATA[現ユーザーの会議室]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index 40cbd56..ab5115a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index c63e917..5298605 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index 1d5d758..b5498f0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index eefc1d4..27f083d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index fb8cb02..b45be2f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[Todos / tudo]]></entry>
<entry key="1500"><![CDATA[Nome do servidor]]></entry>
<entry key="1504"><![CDATA[Publicando...usuário]]></entry>
- <entry key="1505"><![CDATA[Para ganhar tempo e economizar tráfego na internet você pode usar "command line admin" para backupear / restaurar / atualizar / upgrade:\n 1) Vá ao diretório instalador TVQWEB (por ex. /opt/red5) \n 2) pare o TVQWEB (por ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to t [...]
+ <entry key="1505"><![CDATA[Para ganhar tempo e economizar tráfego na internet você pode usar "command line admin" para backupear / restaurar / atualizar / upgrade:\n 1) Vá ao diretório instalador TVQWEB (por ex. /opt/om) \n 2) pare o TVQWEB (por ex. ./bin/shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/om /opt/om.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt [...]
<entry key="1506"><![CDATA[Salas comuns a todos os usuários]]></entry>
<entry key="1507"><![CDATA[Salas comuns ao atual grupo de usuários]]></entry>
<entry key="1508"><![CDATA[Salas do atual usuário]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
index 7d6a6cf..78bdc39 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[Все]]></entry>
<entry key="1500"><![CDATA[Имя Сервера]]></entry>
<entry key="1504"><![CDATA[Сообщение. Пользователю:]]></entry>
- <entry key="1505"><![CDATA[Что бы уменьшить время и интернет траффик вы можете воспользоватся командной строкой admin для копирования/восстановления/обновления: <ol> <li>войдите в установочную папку OM (например /opt/red5)</li> <li>остановите OM (./red5-shutdown.sh)</li> <li>выполняем ./admin.sh -b -file ~/today_om_backup.zip (создает резервную копию OM)</li> <li>загрузите новый дистрибутив OM</li> <li>mv /opt/red5 /opt.red5.bak (перемещаем рабочую версию OM :))</li> <li>распаковываем д [...]
+ <entry key="1505"><![CDATA[Что бы уменьшить время и интернет траффик вы можете воспользоватся командной строкой admin для копирования/восстановления/обновления: <ol> <li>войдите в установочную папку OM (например /opt/om)</li> <li>остановите OM (./bin/shutdown.sh)</li> <li>выполняем ./admin.sh -b -file ~/today_om_backup.zip (создает резервную копию OM)</li> <li>загрузите новый дистрибутив OM</li> <li>mv /opt/om /opt/om.bak (перемещаем рабочую версию OM :))</li> <li>распаковываем дистрибу [...]
<entry key="1506"><![CDATA[Общие комнаты для всех пользователей]]></entry>
<entry key="1507"><![CDATA[Общие комнаты для текущей группы пользователей]]></entry>
<entry key="1508"><![CDATA[Комнаты данного пользователя]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index 20b6dcd..693cd40 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index 2d700f9..7a21631 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index ef1e6fc..3a36b46 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index 175b72c..4133edd 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index 2f40928..3f1f3d7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[]]></entry>
<entry key="1500"><![CDATA[Ім'я Сервера]]></entry>
<entry key="1504"><![CDATA[Повідомлення. Користувачеві:]]></entry>
- <entry key="1505"><![CDATA[Що б зменшити час і інтернет трафік ви можете скористатися командним рядком admin для копіювання/відновлення/поновлення: <ol> <li>увійдіть у настановну папку OM (наприклад, /opt/red5)</li> <li>зупиніть OM (./red5-shutdown.sh)</li> <li>виконуємо ./admin.sh -b -файл ~/today_om_backup.zip (створює резервну копію OM)</li> <li>завантажити новий дистрибутив OM</li> <li>mv /opt/red5 /opt.red5.bak (переміщуємо робочу версію OM :))</li> <li>розпаковуємо дистрибутив OM [...]
+ <entry key="1505"><![CDATA[Що б зменшити час і інтернет трафік ви можете скористатися командним рядком admin для копіювання/відновлення/поновлення: <ol> <li>увійдіть у настановну папку OM (наприклад, /opt/om)</li> <li>зупиніть OM (./bin/shutdown.sh)</li> <li>виконуємо ./admin.sh -b -файл ~/today_om_backup.zip (створює резервну копію OM)</li> <li>завантажити новий дистрибутив OM</li> <li>mv /opt/om /opt/om.bak (переміщуємо робочу версію OM :))</li> <li>розпаковуємо дистрибутив OM в катал [...]
<entry key="1506"><![CDATA[Загальні кімнати для усіх користувачів]]></entry>
<entry key="1507"><![CDATA[Загальні кімнати для поточної групи користувачів]]></entry>
<entry key="1508"><![CDATA[Кімнати даного користувача]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index 79c3ba1..68feabe 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[全部]]></entry>
<entry key="1500"><![CDATA[服务器名字]]></entry>
<entry key="1504"><![CDATA[发布. 用户:]]></entry>
- <entry key="1505"><![CDATA[为了节省时间和网络流量，您可以使用命令行管理 backup/restore/upgrade: <ol> <li>到OM安装目录 (for ex. /opt/red5)</li> <li>停止OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (对当前OM产生备份)</li> <li>下载新OM的文件</li> <li>mv /opt/red5 /opt.red5.bak (移动OM的工作版本只是以防万一 :))</li> <li>将下载的OM解压到 /opt/red5</li> <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' 在使用非默认数据库的情况下 [...]
+ <entry key="1505"><![CDATA[为了节省时间和网络流量，您可以使用命令行管理 backup/restore/upgrade: <ol> <li>到OM安装目录 (for ex. /opt/om)</li> <li>停止OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (对当前OM产生备份)</li> <li>下载新OM的文件</li> <li>mv /opt/om /opt/om.bak (移动OM的工作版本只是以防万一 :))</li> <li>将下载的OM解压到 /opt/om</li> <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' 在使用非默认数据库的情况下 )</li> <l [...]
<entry key="1506"><![CDATA[所有用户共同的房间]]></entry>
<entry key="1507"><![CDATA[当前用户群共同的房间]]></entry>
<entry key="1508"><![CDATA[当前用户的房间]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
index e322e7d..7d85d2f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
@@ -530,7 +530,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1494"><![CDATA[All]]></entry>
<entry key="1500"><![CDATA[Server Name]]></entry>
<entry key="1504"><![CDATA[Publishing. User:]]></entry>
- <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/red5)</li> <li>stop OM (for ex. ./red5-shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/red5</li> <li>./admin.sh -i -file [...]
+ <entry key="1505"><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade: <ol> <li>go to OM install dir (for ex. /opt/om)</li> <li>stop OM (for ex. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li> <li>download archive with new OM</li> <li>mv /opt/om /opt/om.bak (move working version of OM just in case :))</li> <li>extract downloaded OM to the /opt/om</li> <li>./admin.sh -i -file ~/today_ [...]
<entry key="1506"><![CDATA[Rooms common to all user]]></entry>
<entry key="1507"><![CDATA[Rooms common to the current user group]]></entry>
<entry key="1508"><![CDATA[Rooms of the current user]]></entry>
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
index d6e0395..1623837 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
@@ -24,7 +24,7 @@ import static org.apache.openmeetings.AbstractJUnitDefaults.email;
import static org.apache.openmeetings.AbstractJUnitDefaults.group;
import static org.apache.openmeetings.AbstractJUnitDefaults.userpass;
import static org.apache.openmeetings.AbstractSpringTest.setOmHome;
-import static org.apache.openmeetings.cli.Admin.RED5_HOME;
+import static org.apache.openmeetings.cli.Admin.OM_HOME;
import static org.apache.openmeetings.db.util.ApplicationHelper.destroyApplication;
import static org.apache.openmeetings.util.OmFileHelper.getOmHome;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getWicketApplicationName;
@@ -55,14 +55,14 @@ public class TestAdmin {
setOmHome();
tempFolder = Files.createTempDirectory("omtempdb").toFile();
System.setProperty("user.dir", tempFolder.getCanonicalPath());
- System.setProperty(RED5_HOME, getOmHome().getCanonicalPath());
+ System.setProperty(OM_HOME, getOmHome().getCanonicalPath());
setDerbyHome(tempFolder);
}
@After
public void tearDown() throws IOException {
resetDerbyHome();
- System.getProperties().remove(RED5_HOME);
+ System.getProperties().remove(OM_HOME);
deleteDirectory(tempFolder);
WebApplication app = (WebApplication)Application.get(getWicketApplicationName());
if (app != null) {