You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/07/31 16:14:55 UTC
openmeetings git commit: [OPENMEETINGS-1677] documentation update
Repository: openmeetings
Updated Branches:
refs/heads/3.3.x cb0a60b9a -> ec5ec2267
[OPENMEETINGS-1677] documentation update
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/ec5ec226
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/ec5ec226
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/ec5ec226
Branch: refs/heads/3.3.x
Commit: ec5ec2267c6f1b4149d85037083fd64dcaf0e811
Parents: cb0a60b
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Jul 31 23:14:47 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Jul 31 23:14:47 2017 +0700
----------------------------------------------------------------------
.../src/site/resources/images/cluster1.png | Bin 51076 -> 0 bytes
.../src/site/xdoc/Clustering.xml | 50 +++----------------
.../classes/META-INF/db2_persistence.xml | 2 +-
.../classes/META-INF/mssql_persistence.xml | 2 +-
.../classes/META-INF/mysql_persistence.xml | 2 +-
.../classes/META-INF/oracle_persistence.xml | 2 +-
.../classes/META-INF/postgresql_persistence.xml | 2 +-
7 files changed, 11 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ec5ec226/openmeetings-server/src/site/resources/images/cluster1.png
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/resources/images/cluster1.png b/openmeetings-server/src/site/resources/images/cluster1.png
deleted file mode 100644
index 672ffc4..0000000
Binary files a/openmeetings-server/src/site/resources/images/cluster1.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ec5ec226/openmeetings-server/src/site/xdoc/Clustering.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/Clustering.xml b/openmeetings-server/src/site/xdoc/Clustering.xml
index b23aab6..3f58db1 100644
--- a/openmeetings-server/src/site/xdoc/Clustering.xml
+++ b/openmeetings-server/src/site/xdoc/Clustering.xml
@@ -74,14 +74,15 @@
</ol>
</subsection>
<subsection name="Database">
- <p>All servers should be configured to use the same database. It can be on the server or on the one node
- of the cluster.</p>
+ <div>All servers should be configured to use the same database. It can be on the server or on the one node
+ of the cluster.<br/>
+ <div class="bs-callout bs-callout-danger">NOTE: Db other than Derby should be used</div>
+ </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>
- set correct server address, login and password. Also add the following section:
- <source><![CDATA[<property name="openjpa.RemoteCommitProvider" value="tcp(Addresses=10.1.1.1;10.1.1.2)" />]]></source>
- Instead of the <tt>10.1.1.1</tt> and <tt>10.1.1.2</tt> set semicolon separated IPs of all nodes of the cluster.
+ 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>
</ul>
</subsection>
@@ -113,25 +114,6 @@
<subsection name="OM nodes configuration">
<ol>
<li>
- <p>In the file <tt>/opt/red5/conf/jee-container.xml</tt> add following block to <tt>baseHost</tt> property:</p>
- <source><![CDATA[
-<property name="cluster">
- <bean class="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
-</property>
- ]]></source>
- So the result will be:
- <source><![CDATA[
-<property name="baseHost">
- <bean class="org.apache.catalina.core.StandardHost">
- <property name="name" value="${http.host}" />
- <property name="cluster">
- <bean class="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
- </property>
- </bean>
-</property>
- ]]></source>
- </li>
- <li>
<p>In the file <tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/hazelcast.xml</tt>:</p>
<ul>
<li>Set <tt>instance-name</tt> for each server to unique value</li>
@@ -143,26 +125,6 @@
</li>
</ol>
</subsection>
- <subsection name="Configuring cluster in Administration">
- <p>Run red5 on each node. Login to the system as admin.</p>
- <ul>
- <li>Go to the <tt>Administration -> Users</tt> and create Webservice user (only access via SOAP).</li>
- <li>
- Go to the <tt>Administration -> Servers</tt> and add all cluster nodes with the following settings:
- <source>
-Server Name = node name;
-Active = check the checkbox. If the checkbox is checked it means node is active and you can use this node;
-Server Address = node ip;
-HTTP Port = 5080 - port for http part of Openmeetings;
-User (SOAP Access) = login of Webservice user from the previous step;
-Password = password of Webservise user;
-Webapp path = openmeetings - path where OM installed on this node, it would be better if this path will be the same for all nodes;
-Protocol = http.
- </source>
- </li>
- </ul>
- <img src="images/cluster1.png" alt="" width="650" height="461" />
- </subsection>
<subsection name="Ensure everything works as expected">
<ul>
<li>Set up the cluster and loggin with two users, go to the same room (also check before room
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ec5ec226/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
index 6500518..4f59627 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
@@ -80,7 +80,7 @@
<property name="openjpa.QueryCache" value="true" />
<property name="openjpa.jdbc.DBDictionary" value="batchLimit=100" />
<property name="openjpa.jdbc.QuerySQLCache" value="false" />
- <property name="openjpa.RemoteCommitProvider" value="tcp(Addresses=127.0.0.1)" />
+ <!--property name="openjpa.RemoteCommitProvider" value="tcp(Addresses=127.0.0.1)" /-->
</properties>
</persistence-unit>
</persistence>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ec5ec226/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
index a41e133..311d32f 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
@@ -76,7 +76,7 @@
<property name="openjpa.QueryCache" value="true" />
<property name="openjpa.jdbc.DBDictionary" value="sqlserver(batchLimit=100,charTypeName=nchar,varcharTypeName=nvarchar,longVarcharTypeName=ntext)" />
<property name="openjpa.jdbc.QuerySQLCache" value="false" />
- <property name="openjpa.RemoteCommitProvider" value="tcp(Addresses=127.0.0.1)" />
+ <!--property name="openjpa.RemoteCommitProvider" value="tcp(Addresses=127.0.0.1)" /-->
</properties>
</persistence-unit>
</persistence>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ec5ec226/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
index 356503a..d897520 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
@@ -80,7 +80,7 @@
<property name="openjpa.QueryCache" value="true" />
<property name="openjpa.jdbc.DBDictionary" value="batchLimit=100" />
<property name="openjpa.jdbc.QuerySQLCache" value="false" />
- <property name="openjpa.RemoteCommitProvider" value="tcp(Addresses=127.0.0.1)" />
+ <!--property name="openjpa.RemoteCommitProvider" value="tcp(Addresses=127.0.0.1)" /-->
</properties>
</persistence-unit>
</persistence>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ec5ec226/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
index 6ddf090..87faf64 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
@@ -80,7 +80,7 @@
<property name="openjpa.QueryCache" value="true" />
<property name="openjpa.jdbc.DBDictionary" value="oracle(UseTriggersForAutoAssign=true, MaxAutoAssignNameLength=28, BatchLimit=100)" />
<property name="openjpa.jdbc.QuerySQLCache" value="false" />
- <property name="openjpa.RemoteCommitProvider" value="tcp(Addresses=127.0.0.1)" />
+ <!--property name="openjpa.RemoteCommitProvider" value="tcp(Addresses=127.0.0.1)" /-->
</properties>
</persistence-unit>
</persistence>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ec5ec226/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
index cd233ce..fc25f9f 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
@@ -79,7 +79,7 @@
<property name="openjpa.DataCache" value="true" />
<property name="openjpa.QueryCache" value="true" />
<property name="openjpa.jdbc.QuerySQLCache" value="false" />
- <property name="openjpa.RemoteCommitProvider" value="tcp(Addresses=127.0.0.1)" />
+ <!--property name="openjpa.RemoteCommitProvider" value="tcp(Addresses=127.0.0.1)" /-->
</properties>
</persistence-unit>
</persistence>