You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/05/18 05:39:16 UTC
[16/23] openmeetings git commit: Normalize all the line endings
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml b/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml
index 481521f..ac74b31 100644
--- a/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml
+++ b/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml
@@ -1,305 +1,305 @@
-<?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>Build instructions version 3.0.x</title>
- <author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
- </properties>
-
- <body>
- <section name="Nightly Builds">
- <p>
- You can find Nightly Builds of the software at:
- <a href="https://builds.apache.org/view/M-R/view/OpenMeetings/" rel="nofollow" target="_blank">
- https://builds.apache.org/view/M-R/view/OpenMeetings/
- </a>
- </p>
- </section>
-
- <section name="These instructions are for 3.0.x version only"/>
-
- <section name="How to Build a Distribution">
- <div>
- <p>To build a binary release of OpenMeetings you need: </p>
- <ul>
- <li>Oracle JDK7</li>
- <li>Apache ANT (minimum) 1.8.3</li>
- <li>
- SVN Command line client (Subversion 1.7 required!)
- <a href="http://subversion.apache.org/packages.html" target="_blank" rel="nofollow">http://subversion.apache.org/packages.html</a>
- </li>
- </ul>
- </div>
-
- <p>Get the source: </p>
- <source><![CDATA[svn checkout https://svn.apache.org/repos/asf/openmeetings/application/branches/3.0.x]]></source>
- <p>Run the command: </p>
- <source><![CDATA[ant ]]></source>
- <p>There is no need to compile the client additionally! The ant task
- does it all! You will find a directory dist that contains
- OpenMeetings and a red5-server.
- </p>
- <p>To compile the client you can also use ant: </p>
- <source>
-<![CDATA[
-ant # compiles a complete package into the folder dist
-ant compile.laszlo.main # compiles the client into main.as3.swf10.swf and main.swf8.swf
-ant compile.laszlo.main.debug # compiles the debug-client into maindebug.as3.swf10.swf and maindebug.swf8.swf
-ant -Ddb=<name of DB> # will copy <name of DB>_persistense.xml to persistense.xml
- #(for ex. ant -Ddb=mysql will set mysql as default DB)
-]]>
- </source>
- <p>To compile just the openmeetings JAR file: </p>
- <source><![CDATA[ant jar.only]]></source>
- <p>
- To run Junit tests using ANT see
- <a href="JUnitTesting.html">JUnitTesting</a>
- </p>
- </section>
-
- <section name="Run, Develop, Test">
-
- <p>
- To develop or build OpenMeetings you checkout the source as Eclipse
- project. You need the Subclipse or Subversive Plugin for Eclipse. If
- you just need to change 3 lines of code then your probably better
- switch to
- <a href="#How_to_build_a_distribution" rel="nofollow">How to build a
- distribution
- </a>
- .
- </p>
-
- <subsection name="Step1 - Get required Software">
-
- <p>To develop OpenMeetings you need at least: </p>
- <ul>
- <li>Eclipse in a up to date copy and Oracle JDK7 </li>
- <li>Apache ANT (minimum) 1.8.3</li>
- <li>
- Subclipse 1.8 (Subversion 1.7 required!)
- <a href="http://subclipse.tigris.org/" target="_blank" rel="nofollow">http://subclipse.tigris.org/
- </a>
- </li>
- <li>
- SVN Command line client (Subversion 1.7 required!)
- <a href="http://subversion.apache.org/packages.html" target="_blank"
- rel="nofollow">http://subversion.apache.org/packages.html</a>
- </li>
- <li>Spring IDE for Eclipse (installable via Help > Eclipse
- Marketplace)
- </li>
- <li>
- Apache IvyDE™ For Eclipse (installable via Help > Install
- New Software)
- URL: http://www.apache.org/dist/ant/ivyde/updatesite
- detailed steps can be found here:
- <a href="http://ant.apache.org/ivy/ivyde/download.cgi" target="_blank"
- rel="nofollow">http://ant.apache.org/ivy/ivyde/download.cgi</a>
- </li>
- <li>MySQL (or Postgres, or other Databases supported by openJPA)
- are optionally but handy to have them
- </li>
- </ul>
-
- </subsection>
-
- <subsection name="Step2 - Download the Source">
-
- <p>Advanced Users: Check out the Code from the Repository as a
- Java
- project into Eclipse.
- </p>
- <p>
- URL:
- <a href="https://svn.apache.org/repos/asf/openmeetings/branches/3.0.x/">
- https://svn.apache.org/repos/asf/openmeetings/branches/3.0.x/
- </a>
- </p>
- <p>To download the required JARs for building and developing
- OpenMeetings you need to run the ANT comand:
- </p>
- <source><![CDATA[ant -Ddb=<your_DB> dist prepare-eclipse]]></source>
- <p>After the ANT command you need to press F5 and rebuild the
- project from inside Eclipse
- </p>
- <p>Step-By-Step: </p>
- <p>1) Start Eclipse </p>
- <p>
- 2) Change Perspective to SVN Repository Exploring:
- <br />
- <br />
- <a class="fancybox-buttons" href="images/checkout_1.png">
- <img src="images/checkout_1.png" alt="" width="400" height="289" />
- </a>
-
- </p>
- <p>
- 3) Select SVN Repository Exploring and click ok.
- <br />
- <br />
- <a class="fancybox-buttons" href="images/checkout_2.png">
- <img src="images/checkout_2.png" alt="" width="304" height="417" />
- </a>
- </p>
- <p>
- 4) A new Dialog in Eclipse opens
- <strong>SVN Repositories</strong>
- <br />
- <br />
- <a class="fancybox-buttons" href="images/checkout_3.png">
- <img src="images/checkout_3.png" alt="" width="460" height="102" />
- </a>
- </p>
- <p>
- 5) Click on the icon with the plus in the top right corner in the
- SVN Repository Dialog
- <br />
- <br />
- <a class="fancybox-buttons" href="images/checkout_4.png">
- <img src="images/checkout_4.png" alt="" width="57" height="38" />
- </a>
- </p>
- <p>
- 6) Add the URL
- <a href="https://svn.apache.org/repos/asf/openmeetings/branches/3.0.x/" rel="nofollow">
- https://svn.apache.org/repos/asf/openmeetings/branches/3.0.x/
- </a>
- and click Finish
- <br />
- <br />
- <a class="fancybox-buttons" href="images/checkout_5.png">
- <img src="images/checkout_5.png" alt="" width="455" height="272" />
- </a>
- </p>
- <p>
- 7) After download is complete you see a new Source Repository in
- the Repository Explorer. Right click on it and choose
- <strong>checkout</strong>
- <br />
- <br />
- <a class="fancybox-buttons" href="images/checkout_6.png">
- <img src="images/checkout_6.png" alt="" width="340" height="135" />
- </a>
- </p>
- <p>
- 8) In the Dialog the opens now just click next
- <br />
- <br />
- <a class="fancybox-buttons" href="images/checkout_7.png">
- <img src="images/checkout_7.png" alt="" width="390" height="338" />
- </a>
- </p>
- <p>
- 9) In the next Dialog just click Finish, Eclipse will then download
- the sources
- <br />
- <br />
- <a class="fancybox-buttons" href="images/checkout_8.png">
- <img src="images/checkout_8.png" alt="" width="390" height="338" />
- </a>
- </p>
- <p>
- 10) After the download is complete you will see a new Project in
- the Package Explorer Dialog of Eclipse
- <br />
- <br />
- <a class="fancybox-buttons" href="images/checkout_9.png">
- <img src="images/checkout_9.png" alt="" width="310" height="297" />
- </a>
- </p>
- <div>
- 11) Please run
- <source><![CDATA[ant dist prepare-eclipse]]></source>
- to download all necessary jar files, and perform source
- <tt>Refresh</tt>
- to resolve all compilation issues.
- </div>
- </subsection>
-
- <subsection name="Step3 - Deploy and Run">
-
- <p>
- see the first chapter about the ANT tasks to compile the code. You
- will find a directory called
- <strong>dist</strong>
- which contains a regular openmeetings including red5. You can then
- use the usual process like described at
- <a href="installation.html">installation</a>
- to run the code then.
- </p>
- </subsection>
-
- </section>
-
- <section name="Links">
-
- <ul>
- <li>
- Getting Started with OpenLaszlo, checkout
- <a
- href="http://www.openlaszlo.org/demos#Laszlo10"
- target="_blank" rel="nofollow">Laszlo-in-10-Minutes</a>
- and the
- <a href="http://www.openlaszlo.org/taxonomy/term/14" target="_blank"
- rel="nofollow">Application Developer's Guide</a>
- or try the
- <a href="http://www.openlaszlo.org/getstarted" target="_blank"
- rel="nofollow">ScreenCast</a>
- </li>
- <li>
- <a href="http://openmeetings.apache.org/source-repository.html">
- browse SVN source
- </a>
- </li>
- </ul>
-
- </section>
-
- <section name="Tips and Gotchas">
-
- <p>When you want to develop only client side there are handy ANT
- tasks so that you only rebuild the SWFs, same for the Java side.
- </p>
- <p>
- It
- also takes much less time if you do use MySQL as database then
- rebuilding the software and waiting for Apache Derby to set up the
- database everytime you did rebuild.
- </p>
- <p>
- <b>Working behind a proxy:</b>
- If you are sitting behind a proxy you should add some proxy settings
- before starting the build process.
- <br />
- For Apache Ivy see:
- <a href="http://ant.apache.org/ivy/faq.html" target="_blank" rel="nofollow">http://ant.apache.org/ivy/faq.html
- </a>
- <br />
- For SVN Command Line Client (From CollabNet 1.7) see:
- <a
- href="https://ctf6latest.collab.net/internal-help/index.jsp?topic=/teamforge610/faq/client_proxy_settings.html"
- target="_blank" rel="nofollow">https://ctf6latest.collab.net/internal-help/index.jsp?topic=/teamforge610/faq/client_proxy_settings.html
- </a>
- </p>
-
- </section>
-
- </body>
-
+<?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>Build instructions version 3.0.x</title>
+ <author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
+ </properties>
+
+ <body>
+ <section name="Nightly Builds">
+ <p>
+ You can find Nightly Builds of the software at:
+ <a href="https://builds.apache.org/view/M-R/view/OpenMeetings/" rel="nofollow" target="_blank">
+ https://builds.apache.org/view/M-R/view/OpenMeetings/
+ </a>
+ </p>
+ </section>
+
+ <section name="These instructions are for 3.0.x version only"/>
+
+ <section name="How to Build a Distribution">
+ <div>
+ <p>To build a binary release of OpenMeetings you need: </p>
+ <ul>
+ <li>Oracle JDK7</li>
+ <li>Apache ANT (minimum) 1.8.3</li>
+ <li>
+ SVN Command line client (Subversion 1.7 required!)
+ <a href="http://subversion.apache.org/packages.html" target="_blank" rel="nofollow">http://subversion.apache.org/packages.html</a>
+ </li>
+ </ul>
+ </div>
+
+ <p>Get the source: </p>
+ <source><![CDATA[svn checkout https://svn.apache.org/repos/asf/openmeetings/application/branches/3.0.x]]></source>
+ <p>Run the command: </p>
+ <source><![CDATA[ant ]]></source>
+ <p>There is no need to compile the client additionally! The ant task
+ does it all! You will find a directory dist that contains
+ OpenMeetings and a red5-server.
+ </p>
+ <p>To compile the client you can also use ant: </p>
+ <source>
+<![CDATA[
+ant # compiles a complete package into the folder dist
+ant compile.laszlo.main # compiles the client into main.as3.swf10.swf and main.swf8.swf
+ant compile.laszlo.main.debug # compiles the debug-client into maindebug.as3.swf10.swf and maindebug.swf8.swf
+ant -Ddb=<name of DB> # will copy <name of DB>_persistense.xml to persistense.xml
+ #(for ex. ant -Ddb=mysql will set mysql as default DB)
+]]>
+ </source>
+ <p>To compile just the openmeetings JAR file: </p>
+ <source><![CDATA[ant jar.only]]></source>
+ <p>
+ To run Junit tests using ANT see
+ <a href="JUnitTesting.html">JUnitTesting</a>
+ </p>
+ </section>
+
+ <section name="Run, Develop, Test">
+
+ <p>
+ To develop or build OpenMeetings you checkout the source as Eclipse
+ project. You need the Subclipse or Subversive Plugin for Eclipse. If
+ you just need to change 3 lines of code then your probably better
+ switch to
+ <a href="#How_to_build_a_distribution" rel="nofollow">How to build a
+ distribution
+ </a>
+ .
+ </p>
+
+ <subsection name="Step1 - Get required Software">
+
+ <p>To develop OpenMeetings you need at least: </p>
+ <ul>
+ <li>Eclipse in a up to date copy and Oracle JDK7 </li>
+ <li>Apache ANT (minimum) 1.8.3</li>
+ <li>
+ Subclipse 1.8 (Subversion 1.7 required!)
+ <a href="http://subclipse.tigris.org/" target="_blank" rel="nofollow">http://subclipse.tigris.org/
+ </a>
+ </li>
+ <li>
+ SVN Command line client (Subversion 1.7 required!)
+ <a href="http://subversion.apache.org/packages.html" target="_blank"
+ rel="nofollow">http://subversion.apache.org/packages.html</a>
+ </li>
+ <li>Spring IDE for Eclipse (installable via Help > Eclipse
+ Marketplace)
+ </li>
+ <li>
+ Apache IvyDE™ For Eclipse (installable via Help > Install
+ New Software)
+ URL: http://www.apache.org/dist/ant/ivyde/updatesite
+ detailed steps can be found here:
+ <a href="http://ant.apache.org/ivy/ivyde/download.cgi" target="_blank"
+ rel="nofollow">http://ant.apache.org/ivy/ivyde/download.cgi</a>
+ </li>
+ <li>MySQL (or Postgres, or other Databases supported by openJPA)
+ are optionally but handy to have them
+ </li>
+ </ul>
+
+ </subsection>
+
+ <subsection name="Step2 - Download the Source">
+
+ <p>Advanced Users: Check out the Code from the Repository as a
+ Java
+ project into Eclipse.
+ </p>
+ <p>
+ URL:
+ <a href="https://svn.apache.org/repos/asf/openmeetings/branches/3.0.x/">
+ https://svn.apache.org/repos/asf/openmeetings/branches/3.0.x/
+ </a>
+ </p>
+ <p>To download the required JARs for building and developing
+ OpenMeetings you need to run the ANT comand:
+ </p>
+ <source><![CDATA[ant -Ddb=<your_DB> dist prepare-eclipse]]></source>
+ <p>After the ANT command you need to press F5 and rebuild the
+ project from inside Eclipse
+ </p>
+ <p>Step-By-Step: </p>
+ <p>1) Start Eclipse </p>
+ <p>
+ 2) Change Perspective to SVN Repository Exploring:
+ <br />
+ <br />
+ <a class="fancybox-buttons" href="images/checkout_1.png">
+ <img src="images/checkout_1.png" alt="" width="400" height="289" />
+ </a>
+
+ </p>
+ <p>
+ 3) Select SVN Repository Exploring and click ok.
+ <br />
+ <br />
+ <a class="fancybox-buttons" href="images/checkout_2.png">
+ <img src="images/checkout_2.png" alt="" width="304" height="417" />
+ </a>
+ </p>
+ <p>
+ 4) A new Dialog in Eclipse opens
+ <strong>SVN Repositories</strong>
+ <br />
+ <br />
+ <a class="fancybox-buttons" href="images/checkout_3.png">
+ <img src="images/checkout_3.png" alt="" width="460" height="102" />
+ </a>
+ </p>
+ <p>
+ 5) Click on the icon with the plus in the top right corner in the
+ SVN Repository Dialog
+ <br />
+ <br />
+ <a class="fancybox-buttons" href="images/checkout_4.png">
+ <img src="images/checkout_4.png" alt="" width="57" height="38" />
+ </a>
+ </p>
+ <p>
+ 6) Add the URL
+ <a href="https://svn.apache.org/repos/asf/openmeetings/branches/3.0.x/" rel="nofollow">
+ https://svn.apache.org/repos/asf/openmeetings/branches/3.0.x/
+ </a>
+ and click Finish
+ <br />
+ <br />
+ <a class="fancybox-buttons" href="images/checkout_5.png">
+ <img src="images/checkout_5.png" alt="" width="455" height="272" />
+ </a>
+ </p>
+ <p>
+ 7) After download is complete you see a new Source Repository in
+ the Repository Explorer. Right click on it and choose
+ <strong>checkout</strong>
+ <br />
+ <br />
+ <a class="fancybox-buttons" href="images/checkout_6.png">
+ <img src="images/checkout_6.png" alt="" width="340" height="135" />
+ </a>
+ </p>
+ <p>
+ 8) In the Dialog the opens now just click next
+ <br />
+ <br />
+ <a class="fancybox-buttons" href="images/checkout_7.png">
+ <img src="images/checkout_7.png" alt="" width="390" height="338" />
+ </a>
+ </p>
+ <p>
+ 9) In the next Dialog just click Finish, Eclipse will then download
+ the sources
+ <br />
+ <br />
+ <a class="fancybox-buttons" href="images/checkout_8.png">
+ <img src="images/checkout_8.png" alt="" width="390" height="338" />
+ </a>
+ </p>
+ <p>
+ 10) After the download is complete you will see a new Project in
+ the Package Explorer Dialog of Eclipse
+ <br />
+ <br />
+ <a class="fancybox-buttons" href="images/checkout_9.png">
+ <img src="images/checkout_9.png" alt="" width="310" height="297" />
+ </a>
+ </p>
+ <div>
+ 11) Please run
+ <source><![CDATA[ant dist prepare-eclipse]]></source>
+ to download all necessary jar files, and perform source
+ <tt>Refresh</tt>
+ to resolve all compilation issues.
+ </div>
+ </subsection>
+
+ <subsection name="Step3 - Deploy and Run">
+
+ <p>
+ see the first chapter about the ANT tasks to compile the code. You
+ will find a directory called
+ <strong>dist</strong>
+ which contains a regular openmeetings including red5. You can then
+ use the usual process like described at
+ <a href="installation.html">installation</a>
+ to run the code then.
+ </p>
+ </subsection>
+
+ </section>
+
+ <section name="Links">
+
+ <ul>
+ <li>
+ Getting Started with OpenLaszlo, checkout
+ <a
+ href="http://www.openlaszlo.org/demos#Laszlo10"
+ target="_blank" rel="nofollow">Laszlo-in-10-Minutes</a>
+ and the
+ <a href="http://www.openlaszlo.org/taxonomy/term/14" target="_blank"
+ rel="nofollow">Application Developer's Guide</a>
+ or try the
+ <a href="http://www.openlaszlo.org/getstarted" target="_blank"
+ rel="nofollow">ScreenCast</a>
+ </li>
+ <li>
+ <a href="http://openmeetings.apache.org/source-repository.html">
+ browse SVN source
+ </a>
+ </li>
+ </ul>
+
+ </section>
+
+ <section name="Tips and Gotchas">
+
+ <p>When you want to develop only client side there are handy ANT
+ tasks so that you only rebuild the SWFs, same for the Java side.
+ </p>
+ <p>
+ It
+ also takes much less time if you do use MySQL as database then
+ rebuilding the software and waiting for Apache Derby to set up the
+ database everytime you did rebuild.
+ </p>
+ <p>
+ <b>Working behind a proxy:</b>
+ If you are sitting behind a proxy you should add some proxy settings
+ before starting the build process.
+ <br />
+ For Apache Ivy see:
+ <a href="http://ant.apache.org/ivy/faq.html" target="_blank" rel="nofollow">http://ant.apache.org/ivy/faq.html
+ </a>
+ <br />
+ For SVN Command Line Client (From CollabNet 1.7) see:
+ <a
+ href="https://ctf6latest.collab.net/internal-help/index.jsp?topic=/teamforge610/faq/client_proxy_settings.html"
+ target="_blank" rel="nofollow">https://ctf6latest.collab.net/internal-help/index.jsp?topic=/teamforge610/faq/client_proxy_settings.html
+ </a>
+ </p>
+
+ </section>
+
+ </body>
+
</document>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-server/src/site/xdoc/CalendarAndTimezone.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/CalendarAndTimezone.xml b/openmeetings-server/src/site/xdoc/CalendarAndTimezone.xml
index 9be46b9..a024075 100644
--- a/openmeetings-server/src/site/xdoc/CalendarAndTimezone.xml
+++ b/openmeetings-server/src/site/xdoc/CalendarAndTimezone.xml
@@ -1,68 +1,68 @@
-<?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>Changing the Calendar and Timezone default</title>
- <author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
- </properties>
-
- <body>
-
- <section name="Changing the Calendar and Timezone default">
-
- <p>
- In general the timezone is configured in the user profile of each
- user, so changing the server timezone has no effect how to the users
- calendar for example.
- <br />
- <br />
- However there are some circumstances where there is no user profile
- available.
- </p>
- </section>
-
- <section
- name="Changing servers default timzeone for Emails and Invitations (display)">
- <p>
- Goto Administration > Configuration and change the config-key:
- <tt>default.timezone</tt>
- </p>
- <p>Valid timezone have to meet standards! </p>
- </section>
-
- <section
- name="Changing first day in week for calendar from Sunday to Monday">
- <p>
- Goto Administration > Configuration and change the config-key:
- <tt>calendar.firstday</tt>
- </p>
- <p>The day that each week begins. The value must be a number that represents the day of the week. Sunday=0, Monday=1, Tuesday=2, etc.</p>
- </section>
-
- <section
- name="Changing the default number of max participants of a conference room created via calendar">
-
- <p>Goto
- Administration > Configuration and change the config-key:
- <tt>calendar.conference.rooms.default.size</tt>
- </p>
- </section>
-
- </body>
-
+<?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>Changing the Calendar and Timezone default</title>
+ <author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
+ </properties>
+
+ <body>
+
+ <section name="Changing the Calendar and Timezone default">
+
+ <p>
+ In general the timezone is configured in the user profile of each
+ user, so changing the server timezone has no effect how to the users
+ calendar for example.
+ <br />
+ <br />
+ However there are some circumstances where there is no user profile
+ available.
+ </p>
+ </section>
+
+ <section
+ name="Changing servers default timzeone for Emails and Invitations (display)">
+ <p>
+ Goto Administration > Configuration and change the config-key:
+ <tt>default.timezone</tt>
+ </p>
+ <p>Valid timezone have to meet standards! </p>
+ </section>
+
+ <section
+ name="Changing first day in week for calendar from Sunday to Monday">
+ <p>
+ Goto Administration > Configuration and change the config-key:
+ <tt>calendar.firstday</tt>
+ </p>
+ <p>The day that each week begins. The value must be a number that represents the day of the week. Sunday=0, Monday=1, Tuesday=2, etc.</p>
+ </section>
+
+ <section
+ name="Changing the default number of max participants of a conference room created via calendar">
+
+ <p>Goto
+ Administration > Configuration and change the config-key:
+ <tt>calendar.conference.rooms.default.size</tt>
+ </p>
+ </section>
+
+ </body>
+
</document>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-server/src/site/xdoc/CallForLogo.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/CallForLogo.xml b/openmeetings-server/src/site/xdoc/CallForLogo.xml
index dfbee67..d8044af 100644
--- a/openmeetings-server/src/site/xdoc/CallForLogo.xml
+++ b/openmeetings-server/src/site/xdoc/CallForLogo.xml
@@ -1,243 +1,243 @@
-<?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>Call For Logo</title>
- <author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
- </properties>
- <body>
- <section name="OpenMeetings Call For Logo">
- <p>
- As you may know, Apache Openmeetings is part of the Apache Software Foundation, which is a non-profit organization.
- In order to celebrate The Apache Software Foundation's 15th Anniversary and promote the ASF's more than 200 projects,
- Apache has launched an effort to get folks who use Apache projects to note that by including one or more of the newly-designed
- "Powered By Apache" logos on their websites, documentation, marketing materials, etc.<br/><br/>
-
- Guidelines for use are available here: <a href="http://apache.org/foundation/press/kit/">http://apache.org/foundation/press/kit</a><br/><br/>
-
- Unfortunately we have no suitable logo for this :(<br/><br/>
-
- This page is designed to test all proposed logo and choose the best one
- </p>
- <p>
- Please send your logos and opinions to <a href="mail-lists.html">user@ mail list</a> (you need to subscribe first)<br/>
- Thanks in advance :)
- </p>
- </section>
- <section name="Preview">
- <div class="powered-preview">
- </div>
- </section>
- <section name="Logos">
- <script type="text/javascript">
- //<![CDATA[
- function applyLogoBig(e) {
- var ib = e.closest('table').find('.logo-big');
- var bi = $('#bannerLeft img');
- bi.attr('src', ib.attr('src'));
- $('.subhead')[0].scrollIntoView()
- }
- function applyLogoSmall(e) {
- var pp = $('.powered-preview');
- var l = pp.children('.powered-preview-logo');
- if (!l.length) {
- l = $("<div class='powered-preview-logo'></div>");
- pp.append(l);
- }
- var ib = e.closest('table').find('.logo-square');
- l.css('background-image', 'url(' + ib.attr('src') + ')');
- $('#Preview')[0].scrollIntoView();
- }
- //]]>
- </script>
- <h3>Big version</h3>
- <ol>
- <li>
- <table>
- <tr>
- <td><img class="logo-big" src="images/logo.png" alt="Apache OpenMeetings"/></td>
- <td><span class="btn btn-primary" onclick="applyLogoBig($(this));">Apply</span></td>
- </tr>
- <tr>
- <td>Author</td>
- <td>Denis Kandrov</td>
- </tr>
- </table>
- </li>
- <li>
- <table>
- <tr>
- <td><img class="logo-big" src="images/logos/logo_om_big3.png" alt="Apache OpenMeetings"/></td>
- <td><span class="btn btn-primary" onclick="applyLogoBig($(this));">Apply</span></td>
- </tr>
- <tr>
- <td>Author</td>
- <td>Vital Trizna</td>
- </tr>
- </table>
- </li>
- <li>
- <table>
- <tr>
- <td><img class="logo-big" src="images/logos/logo_om_big4.png" alt="Apache OpenMeetings"/></td>
- <td><span class="btn btn-primary" onclick="applyLogoBig($(this));">Apply</span></td>
- </tr>
- <tr>
- <td>Author</td>
- <td>Vital Trizna</td>
- </tr>
- </table>
- </li>
- <li>
- <table>
- <tr>
- <td><img class="logo-big" src="images/logos/logo_om_big5.png" alt="Apache OpenMeetings"/></td>
- <td><span class="btn btn-primary" onclick="applyLogoBig($(this));">Apply</span></td>
- </tr>
- <tr>
- <td>Author</td>
- <td>Vital Trizna</td>
- </tr>
- </table>
- </li>
- <li>
- <table>
- <tr>
- <td><img class="logo-big" src="images/logos/logo_om_big6.png" alt="Apache OpenMeetings"/></td>
- <td><span class="btn btn-primary" onclick="applyLogoBig($(this));">Apply</span></td>
- </tr>
- <tr>
- <td>Author</td>
- <td>Daniel Baker</td>
- </tr>
- </table>
- </li>
- </ol>
- <h3>Square version</h3>
- <ol>
- <li>
- <table>
- <tr>
- <td><img class="logo-square" src="images/logos/logo_om1.png" alt="Square version" width="50"/></td>
- <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td>
- </tr>
- <tr>
- <td>Author</td>
- <td>Denis Kandrov</td>
- </tr>
- </table>
- </li>
- <li>
- <table>
- <tr>
- <td><img class="logo-square" src="images/logos/logo_om_small2.png" alt="Square version" width="50"/></td>
- <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td>
- </tr>
- <tr>
- <td>Author</td>
- <td>Alvaro Bustos</td>
- </tr>
- </table>
- </li>
- <li>
- <table>
- <tr>
- <td><img class="logo-square" src="images/logos/logo_om_small3.png" alt="Square version" width="50"/></td>
- <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td>
- </tr>
- <tr>
- <td>Author</td>
- <td>Vital Trizna</td>
- </tr>
- </table>
- </li>
- <li>
- <table>
- <tr>
- <td><img class="logo-square" src="images/logos/logo_om_small4.png" alt="Square version" width="50"/></td>
- <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td>
- </tr>
- <tr>
- <td>Author</td>
- <td>Vital Trizna</td>
- </tr>
- </table>
- </li>
- <li>
- <table>
- <tr>
- <td><img class="logo-square" src="images/logos/logo_om_small5.png" alt="Square version" width="50"/></td>
- <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td>
- </tr>
- <tr>
- <td>Author</td>
- <td>Alvaro Bustos</td>
- </tr>
- </table>
- </li>
- <li>
- <table>
- <tr>
- <td><img class="logo-square" src="images/logos/logo_om_small6.png" alt="Square version" width="50"/></td>
- <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td>
- </tr>
- <tr>
- <td>Author</td>
- <td>Johan Strombom</td>
- </tr>
- </table>
- </li>
- <li>
- <table>
- <tr>
- <td><img class="logo-square" src="images/logos/logo_om_small7.png" alt="Square version" width="50"/></td>
- <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td>
- </tr>
- <tr>
- <td>Author</td>
- <td>Amir Januzaj</td>
- </tr>
- </table>
- </li>
- <li>
- <table>
- <tr>
- <td><img class="logo-square" src="images/logos/logo_om_small8.png" alt="Square version" width="50"/></td>
- <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td>
- </tr>
- <tr>
- <td>Author</td>
- <td>Alexander J. Tanchoco</td>
- </tr>
- </table>
- </li>
- <li>
- <table>
- <tr>
- <td><img class="logo-square" src="images/logos/logo_om_small9.png" alt="Square version" width="50"/></td>
- <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td>
- </tr>
- <tr>
- <td>Author</td>
- <td>Daniel Baker</td>
- </tr>
- </table>
- </li>
- </ol>
- </section>
- </body>
-</document>
+<?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>Call For Logo</title>
+ <author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
+ </properties>
+ <body>
+ <section name="OpenMeetings Call For Logo">
+ <p>
+ As you may know, Apache Openmeetings is part of the Apache Software Foundation, which is a non-profit organization.
+ In order to celebrate The Apache Software Foundation's 15th Anniversary and promote the ASF's more than 200 projects,
+ Apache has launched an effort to get folks who use Apache projects to note that by including one or more of the newly-designed
+ "Powered By Apache" logos on their websites, documentation, marketing materials, etc.<br/><br/>
+
+ Guidelines for use are available here: <a href="http://apache.org/foundation/press/kit/">http://apache.org/foundation/press/kit</a><br/><br/>
+
+ Unfortunately we have no suitable logo for this :(<br/><br/>
+
+ This page is designed to test all proposed logo and choose the best one
+ </p>
+ <p>
+ Please send your logos and opinions to <a href="mail-lists.html">user@ mail list</a> (you need to subscribe first)<br/>
+ Thanks in advance :)
+ </p>
+ </section>
+ <section name="Preview">
+ <div class="powered-preview">
+ </div>
+ </section>
+ <section name="Logos">
+ <script type="text/javascript">
+ //<![CDATA[
+ function applyLogoBig(e) {
+ var ib = e.closest('table').find('.logo-big');
+ var bi = $('#bannerLeft img');
+ bi.attr('src', ib.attr('src'));
+ $('.subhead')[0].scrollIntoView()
+ }
+ function applyLogoSmall(e) {
+ var pp = $('.powered-preview');
+ var l = pp.children('.powered-preview-logo');
+ if (!l.length) {
+ l = $("<div class='powered-preview-logo'></div>");
+ pp.append(l);
+ }
+ var ib = e.closest('table').find('.logo-square');
+ l.css('background-image', 'url(' + ib.attr('src') + ')');
+ $('#Preview')[0].scrollIntoView();
+ }
+ //]]>
+ </script>
+ <h3>Big version</h3>
+ <ol>
+ <li>
+ <table>
+ <tr>
+ <td><img class="logo-big" src="images/logo.png" alt="Apache OpenMeetings"/></td>
+ <td><span class="btn btn-primary" onclick="applyLogoBig($(this));">Apply</span></td>
+ </tr>
+ <tr>
+ <td>Author</td>
+ <td>Denis Kandrov</td>
+ </tr>
+ </table>
+ </li>
+ <li>
+ <table>
+ <tr>
+ <td><img class="logo-big" src="images/logos/logo_om_big3.png" alt="Apache OpenMeetings"/></td>
+ <td><span class="btn btn-primary" onclick="applyLogoBig($(this));">Apply</span></td>
+ </tr>
+ <tr>
+ <td>Author</td>
+ <td>Vital Trizna</td>
+ </tr>
+ </table>
+ </li>
+ <li>
+ <table>
+ <tr>
+ <td><img class="logo-big" src="images/logos/logo_om_big4.png" alt="Apache OpenMeetings"/></td>
+ <td><span class="btn btn-primary" onclick="applyLogoBig($(this));">Apply</span></td>
+ </tr>
+ <tr>
+ <td>Author</td>
+ <td>Vital Trizna</td>
+ </tr>
+ </table>
+ </li>
+ <li>
+ <table>
+ <tr>
+ <td><img class="logo-big" src="images/logos/logo_om_big5.png" alt="Apache OpenMeetings"/></td>
+ <td><span class="btn btn-primary" onclick="applyLogoBig($(this));">Apply</span></td>
+ </tr>
+ <tr>
+ <td>Author</td>
+ <td>Vital Trizna</td>
+ </tr>
+ </table>
+ </li>
+ <li>
+ <table>
+ <tr>
+ <td><img class="logo-big" src="images/logos/logo_om_big6.png" alt="Apache OpenMeetings"/></td>
+ <td><span class="btn btn-primary" onclick="applyLogoBig($(this));">Apply</span></td>
+ </tr>
+ <tr>
+ <td>Author</td>
+ <td>Daniel Baker</td>
+ </tr>
+ </table>
+ </li>
+ </ol>
+ <h3>Square version</h3>
+ <ol>
+ <li>
+ <table>
+ <tr>
+ <td><img class="logo-square" src="images/logos/logo_om1.png" alt="Square version" width="50"/></td>
+ <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td>
+ </tr>
+ <tr>
+ <td>Author</td>
+ <td>Denis Kandrov</td>
+ </tr>
+ </table>
+ </li>
+ <li>
+ <table>
+ <tr>
+ <td><img class="logo-square" src="images/logos/logo_om_small2.png" alt="Square version" width="50"/></td>
+ <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td>
+ </tr>
+ <tr>
+ <td>Author</td>
+ <td>Alvaro Bustos</td>
+ </tr>
+ </table>
+ </li>
+ <li>
+ <table>
+ <tr>
+ <td><img class="logo-square" src="images/logos/logo_om_small3.png" alt="Square version" width="50"/></td>
+ <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td>
+ </tr>
+ <tr>
+ <td>Author</td>
+ <td>Vital Trizna</td>
+ </tr>
+ </table>
+ </li>
+ <li>
+ <table>
+ <tr>
+ <td><img class="logo-square" src="images/logos/logo_om_small4.png" alt="Square version" width="50"/></td>
+ <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td>
+ </tr>
+ <tr>
+ <td>Author</td>
+ <td>Vital Trizna</td>
+ </tr>
+ </table>
+ </li>
+ <li>
+ <table>
+ <tr>
+ <td><img class="logo-square" src="images/logos/logo_om_small5.png" alt="Square version" width="50"/></td>
+ <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td>
+ </tr>
+ <tr>
+ <td>Author</td>
+ <td>Alvaro Bustos</td>
+ </tr>
+ </table>
+ </li>
+ <li>
+ <table>
+ <tr>
+ <td><img class="logo-square" src="images/logos/logo_om_small6.png" alt="Square version" width="50"/></td>
+ <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td>
+ </tr>
+ <tr>
+ <td>Author</td>
+ <td>Johan Strombom</td>
+ </tr>
+ </table>
+ </li>
+ <li>
+ <table>
+ <tr>
+ <td><img class="logo-square" src="images/logos/logo_om_small7.png" alt="Square version" width="50"/></td>
+ <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td>
+ </tr>
+ <tr>
+ <td>Author</td>
+ <td>Amir Januzaj</td>
+ </tr>
+ </table>
+ </li>
+ <li>
+ <table>
+ <tr>
+ <td><img class="logo-square" src="images/logos/logo_om_small8.png" alt="Square version" width="50"/></td>
+ <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td>
+ </tr>
+ <tr>
+ <td>Author</td>
+ <td>Alexander J. Tanchoco</td>
+ </tr>
+ </table>
+ </li>
+ <li>
+ <table>
+ <tr>
+ <td><img class="logo-square" src="images/logos/logo_om_small9.png" alt="Square version" width="50"/></td>
+ <td><span class="btn btn-primary" onclick="applyLogoSmall($(this));">Apply</span></td>
+ </tr>
+ <tr>
+ <td>Author</td>
+ <td>Daniel Baker</td>
+ </tr>
+ </table>
+ </li>
+ </ol>
+ </section>
+ </body>
+</document>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/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 9d073d1..134e364 100644
--- a/openmeetings-server/src/site/xdoc/Clustering.xml
+++ b/openmeetings-server/src/site/xdoc/Clustering.xml
@@ -1,139 +1,139 @@
-<?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>Clustering</title>
- <author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
- </properties>
-
- <body>
- <section name="Description">
- <p>
- OpenMeetings 2.1 or later is required to use clustering. One database is used for all OpenMeetings
- servers, so all database tables are shared across OM instances. Certain folders should be shared
- between all servers to allow access to the files/recording.</p>
- </section>
- <section name="Configuration">
- <ul>
- <li>
- Multiple OM servers should be set up as described in
- <a href="installation.html" target="_blank">
- <b>Installation</b>
- </a>
- </li>
- <li>All servers should be configured to have same Time zone (To avoid
- Schedulers to drop user sessions as outdated)
- </li>
- <li>All servers should be configured to use the same DB</li>
- <li>Servers should be added in Administration -> Servers section</li>
- </ul>
- </section>
- <section 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>
- <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 10.1.1.1 and 10.1.1.2 set semicolon separated IPs of all nodes of the cluster.
- </li>
- </ul>
- </section>
- <section name="File systems">
- <p>If files and recordings using the same physical folders the files and recordings will be available for
- each node. You can do this using Samba or NFS, for example. For using NFS do the following:</p>
- <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)
- </source>
- Here 10.1.1.2 - is node ip for NFS remote access. Add these lines for all nodes except node with
- folders.
- </li>
- <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
- </source>
- Here 10.1.1.1 – data server ip. And run the command:
- <source>mount -a</source>
- </li>
- </ul>
- </section>
- <section name="OM nodes configuration">
- <p>In the file <tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/applicationContext.xml</tt>:</p>
- <ul>
- <li>
- For each node uncomment line:
- <source>
-<![CDATA[
-<!-- Need to be uncommented and set to the real ID if in cluster mode-->
-<property name="serverId" value="1" />
-]]>
- </source>
- and input the unique value for each node.
- </li>
- <li>
- Replace <tt><ref bean="openmeetings.HashMapStore" /> <!-- Memory based session cache by default --></tt><br/>
- with <tt><ref bean="openmeetings.DatabaseStore" /></tt>
- (Currently commented out with following comment: <tt>"The following section should be used in clustering mode"</tt>)
- </li>
- </ul>
- </section>
- <section 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" />
- </section>
- <section 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
- entering that the status page with the room list shows the correct number of participants before
- entering the room). You should login to the same server initially, the server will redirect you
- for the conference room to the appropriate server automatically. Both users should be in the same room.
- </li>
- <li>Do the same with only two users but go to _different_ rooms. The calculation should send
- both users to different servers, cause based on the calculation two different rooms on a cluster
- with two nodes should go exactly one room for each node. You can now loggin really to node1
- and node2 of your cluster while those users are loggedin and go to <tt>Administration > Connections</tt>
- and check in the column "servers" where they are located. They should be on different server.
- </li>
- </ul>
- <img src="images/cluster2.png" alt="" width="650" height="369" />
- </section>
- </body>
-</document>
+<?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>Clustering</title>
+ <author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
+ </properties>
+
+ <body>
+ <section name="Description">
+ <p>
+ OpenMeetings 2.1 or later is required to use clustering. One database is used for all OpenMeetings
+ servers, so all database tables are shared across OM instances. Certain folders should be shared
+ between all servers to allow access to the files/recording.</p>
+ </section>
+ <section name="Configuration">
+ <ul>
+ <li>
+ Multiple OM servers should be set up as described in
+ <a href="installation.html" target="_blank">
+ <b>Installation</b>
+ </a>
+ </li>
+ <li>All servers should be configured to have same Time zone (To avoid
+ Schedulers to drop user sessions as outdated)
+ </li>
+ <li>All servers should be configured to use the same DB</li>
+ <li>Servers should be added in Administration -> Servers section</li>
+ </ul>
+ </section>
+ <section 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>
+ <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 10.1.1.1 and 10.1.1.2 set semicolon separated IPs of all nodes of the cluster.
+ </li>
+ </ul>
+ </section>
+ <section name="File systems">
+ <p>If files and recordings using the same physical folders the files and recordings will be available for
+ each node. You can do this using Samba or NFS, for example. For using NFS do the following:</p>
+ <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)
+ </source>
+ Here 10.1.1.2 - is node ip for NFS remote access. Add these lines for all nodes except node with
+ folders.
+ </li>
+ <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
+ </source>
+ Here 10.1.1.1 – data server ip. And run the command:
+ <source>mount -a</source>
+ </li>
+ </ul>
+ </section>
+ <section name="OM nodes configuration">
+ <p>In the file <tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/applicationContext.xml</tt>:</p>
+ <ul>
+ <li>
+ For each node uncomment line:
+ <source>
+<![CDATA[
+<!-- Need to be uncommented and set to the real ID if in cluster mode-->
+<property name="serverId" value="1" />
+]]>
+ </source>
+ and input the unique value for each node.
+ </li>
+ <li>
+ Replace <tt><ref bean="openmeetings.HashMapStore" /> <!-- Memory based session cache by default --></tt><br/>
+ with <tt><ref bean="openmeetings.DatabaseStore" /></tt>
+ (Currently commented out with following comment: <tt>"The following section should be used in clustering mode"</tt>)
+ </li>
+ </ul>
+ </section>
+ <section 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" />
+ </section>
+ <section 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
+ entering that the status page with the room list shows the correct number of participants before
+ entering the room). You should login to the same server initially, the server will redirect you
+ for the conference room to the appropriate server automatically. Both users should be in the same room.
+ </li>
+ <li>Do the same with only two users but go to _different_ rooms. The calculation should send
+ both users to different servers, cause based on the calculation two different rooms on a cluster
+ with two nodes should go exactly one room for each node. You can now loggin really to node1
+ and node2 of your cluster while those users are loggedin and go to <tt>Administration > Connections</tt>
+ and check in the column "servers" where they are located. They should be on different server.
+ </li>
+ </ul>
+ <img src="images/cluster2.png" alt="" width="650" height="369" />
+ </section>
+ </body>
+</document>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml b/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml
index 41630e9..c0fa323 100644
--- a/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml
+++ b/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml
@@ -1,100 +1,100 @@
-<?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>Command line admin</title>
- <author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
- </properties>
- <body>
- <section name="Usage">
- <p>To avoid intensive traffic utilization and save your time you can
- use command line admin to achieve following tasks:</p>
- <ul>
- <li>Install using defaults</li>
- <li>Install from backup</li>
- <li>Backup</li>
- <li>Cleanup</li>
- </ul>
- <p>Some example commands:</p>
- <p>MySQL (requires to place the MySQL JDBC driver into webapps/openmeetings/WEB-INF/lib before running the command):</p>
- <source>./admin.sh -i -v -tz Europe/Berlin -email your.email@gmail.com -group webbase -user admin --smtp-server localhost \
- --db-type mysql --db-name openmeetings_db --email-auth-user noreply@webbase-design.de --password 123qweasd \
- --system-email-address noreply@webbase-design.de --db-user root --db-host localhost --email-auth-pass 123qweasd
- </source>
- <p>Derby (Not recommended for production environment):</p>
- <source>./admin.sh -i -v -tz Europe/Berlin -email seba.wagner@gmail.com -group webbase -user admin --smtp-server localhost \
- --email-auth-user noreply@webbase-design.de --password 123qweasd --system-email-address noreply@webbase-design.de --email-auth-pass 123qweasd
- </source>
- </section>
- <section name="Command reference">
-<source><![CDATA[
- -v,--verbose verbose error messages
---------------------------------------------------------------------------------------------------
- -h,--help prints this message
---------------------------------------------------------------------------------------------------
- -b,--backup Backups OM
- -file <arg> (optional) file used for backup/restore/install
- --exclude-files (optional) should backup exclude files [default: include]
---------------------------------------------------------------------------------------------------
- -r,--restore Restores OM
- -file <arg> file used for backup/restore/install
---------------------------------------------------------------------------------------------------
- -l,--LDAP Import LDAP users into DB
- -d,--domain-id <arg> LDAP domain Id
- --print-only (optional) Print users found instead of importing
---------------------------------------------------------------------------------------------------
- -i,--install Fill DB table, and make OM usable
- -tz <arg> Default server time zone, and time zone for the selected user
- (mutually exclusive with 'file')
- -group <arg> The name of the default user group (mutually exclusive with
- 'file')
- -email <arg> Email of the default user (mutually exclusive with 'file')
- -user <arg> Login name of the default user, minimum 4 characters (mutually
- exclusive with 'file')
- -file <arg> file used for backup/restore/install
- --password <arg> (optional) Password of the default user, minimum 4 characters
- (will be prompted if not set)
- --system-email-address <arg> (optional) System e-mail address [default:
- noreply@openmeetings.apache.org]
- --smtp-server <arg> (optional) SMTP server for outgoing e-mails [default:
- localhost]
- --smtp-port <arg> (optional) SMTP server for outgoing e-mails [default: 25]
- --email-auth-user <arg> (optional) Email auth username (anonymous connection will be
- used if not set)
- --email-auth-pass <arg> (optional) Email auth password (anonymous connection will be
- used if not set)
- --email-use-tls (optional) Is secure e-mail connection [default: no]
- --skip-default-rooms (optional) Do not create default rooms [created by default]
- --disable-frontend-register (optional) Do not allow front end register [allowed by default]
- --db-type <arg> (optional) The type of the DB to be used
- --db-host <arg> (optional) DNS name or IP address of database
- --db-port <arg> (optional) Database port
- --db-name <arg> (optional) The name of Openmeetings database
- --db-user <arg> (optional) User with write access to the DB specified
- --db-pass <arg> (optional) Password of the user with write access to the DB
- specified
- --drop (optional) Drop database before installation
- --force (optional) Install without checking the existence of old data
- in the database.
---------------------------------------------------------------------------------------------------
- -f,--files File operations - statictics/cleanup
- --cleanup (optional) Should intermediate files be clean up
---------------------------------------------------------------------------------------------------
-]]></source>
- </section>
- </body>
-</document>
+<?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>Command line admin</title>
+ <author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
+ </properties>
+ <body>
+ <section name="Usage">
+ <p>To avoid intensive traffic utilization and save your time you can
+ use command line admin to achieve following tasks:</p>
+ <ul>
+ <li>Install using defaults</li>
+ <li>Install from backup</li>
+ <li>Backup</li>
+ <li>Cleanup</li>
+ </ul>
+ <p>Some example commands:</p>
+ <p>MySQL (requires to place the MySQL JDBC driver into webapps/openmeetings/WEB-INF/lib before running the command):</p>
+ <source>./admin.sh -i -v -tz Europe/Berlin -email your.email@gmail.com -group webbase -user admin --smtp-server localhost \
+ --db-type mysql --db-name openmeetings_db --email-auth-user noreply@webbase-design.de --password 123qweasd \
+ --system-email-address noreply@webbase-design.de --db-user root --db-host localhost --email-auth-pass 123qweasd
+ </source>
+ <p>Derby (Not recommended for production environment):</p>
+ <source>./admin.sh -i -v -tz Europe/Berlin -email seba.wagner@gmail.com -group webbase -user admin --smtp-server localhost \
+ --email-auth-user noreply@webbase-design.de --password 123qweasd --system-email-address noreply@webbase-design.de --email-auth-pass 123qweasd
+ </source>
+ </section>
+ <section name="Command reference">
+<source><![CDATA[
+ -v,--verbose verbose error messages
+--------------------------------------------------------------------------------------------------
+ -h,--help prints this message
+--------------------------------------------------------------------------------------------------
+ -b,--backup Backups OM
+ -file <arg> (optional) file used for backup/restore/install
+ --exclude-files (optional) should backup exclude files [default: include]
+--------------------------------------------------------------------------------------------------
+ -r,--restore Restores OM
+ -file <arg> file used for backup/restore/install
+--------------------------------------------------------------------------------------------------
+ -l,--LDAP Import LDAP users into DB
+ -d,--domain-id <arg> LDAP domain Id
+ --print-only (optional) Print users found instead of importing
+--------------------------------------------------------------------------------------------------
+ -i,--install Fill DB table, and make OM usable
+ -tz <arg> Default server time zone, and time zone for the selected user
+ (mutually exclusive with 'file')
+ -group <arg> The name of the default user group (mutually exclusive with
+ 'file')
+ -email <arg> Email of the default user (mutually exclusive with 'file')
+ -user <arg> Login name of the default user, minimum 4 characters (mutually
+ exclusive with 'file')
+ -file <arg> file used for backup/restore/install
+ --password <arg> (optional) Password of the default user, minimum 4 characters
+ (will be prompted if not set)
+ --system-email-address <arg> (optional) System e-mail address [default:
+ noreply@openmeetings.apache.org]
+ --smtp-server <arg> (optional) SMTP server for outgoing e-mails [default:
+ localhost]
+ --smtp-port <arg> (optional) SMTP server for outgoing e-mails [default: 25]
+ --email-auth-user <arg> (optional) Email auth username (anonymous connection will be
+ used if not set)
+ --email-auth-pass <arg> (optional) Email auth password (anonymous connection will be
+ used if not set)
+ --email-use-tls (optional) Is secure e-mail connection [default: no]
+ --skip-default-rooms (optional) Do not create default rooms [created by default]
+ --disable-frontend-register (optional) Do not allow front end register [allowed by default]
+ --db-type <arg> (optional) The type of the DB to be used
+ --db-host <arg> (optional) DNS name or IP address of database
+ --db-port <arg> (optional) Database port
+ --db-name <arg> (optional) The name of Openmeetings database
+ --db-user <arg> (optional) User with write access to the DB specified
+ --db-pass <arg> (optional) Password of the user with write access to the DB
+ specified
+ --drop (optional) Drop database before installation
+ --force (optional) Install without checking the existence of old data
+ in the database.
+--------------------------------------------------------------------------------------------------
+ -f,--files File operations - statictics/cleanup
+ --cleanup (optional) Should intermediate files be clean up
+--------------------------------------------------------------------------------------------------
+]]></source>
+ </section>
+ </body>
+</document>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml b/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml
index df66401..5703eeb 100644
--- a/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml
+++ b/openmeetings-server/src/site/xdoc/ConferenceRoomLayoutOptions.xml
@@ -1,87 +1,87 @@
-<?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>Layout options for a conference room in OpenMeetings</title>
- <author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
- </properties>
- <body>
- <section name="Layout options for conference rooms">
- <p>
- Each room has a number of attributes to generate different layouts.
- You can change those values individually for each room in Administration > Rooms
- </p>
- <p></p>
- <table>
- <tr>
- <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> key </th>
- <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> default </th>
- <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> meaning </th>
- <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> availabe since OpenMeetings version </th>
- </tr>
- <tr>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideTopBar </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the top bar with the menus and exit button </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
- </tr>
- <tr>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideChat </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the chat tab and use space for whiteboard </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
- </tr>
- <tr>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideActivitiesAndActions </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the activities window with the notofications aber user activities</td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
- </tr>
- <tr>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideFilesExplorer </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the file explorer</td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
- </tr>
- <tr>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideActionsMenu </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the menu with the actions</td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
- </tr>
- <tr>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideScreenSharing </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the button to start screensharing/recording</td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
- </tr>
- <tr>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideWhiteboard </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the whiteboard, if this option is true, the videos will be in the area of the whiteboard</td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
- </tr>
- <tr>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> showMicrophoneStatus </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Show the current status of the microphone (off/on) on the bottom of each video view</td>
- <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
- </tr>
- </table>
- </section>
- </body>
-</document>
+<?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>Layout options for a conference room in OpenMeetings</title>
+ <author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
+ </properties>
+ <body>
+ <section name="Layout options for conference rooms">
+ <p>
+ Each room has a number of attributes to generate different layouts.
+ You can change those values individually for each room in Administration > Rooms
+ </p>
+ <p></p>
+ <table>
+ <tr>
+ <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> key </th>
+ <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> default </th>
+ <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> meaning </th>
+ <th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> availabe since OpenMeetings version </th>
+ </tr>
+ <tr>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideTopBar </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the top bar with the menus and exit button </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+ </tr>
+ <tr>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideChat </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the chat tab and use space for whiteboard </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+ </tr>
+ <tr>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideActivitiesAndActions </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the activities window with the notofications aber user activities</td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+ </tr>
+ <tr>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideFilesExplorer </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the file explorer</td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+ </tr>
+ <tr>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideActionsMenu </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the menu with the actions</td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+ </tr>
+ <tr>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideScreenSharing </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the button to start screensharing/recording</td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+ </tr>
+ <tr>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> hideWhiteboard </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Hide the whiteboard, if this option is true, the videos will be in the area of the whiteboard</td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+ </tr>
+ <tr>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> showMicrophoneStatus </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> false </td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Show the current status of the microphone (off/on) on the bottom of each video view</td>
+ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.x </td>
+ </tr>
+ </table>
+ </section>
+ </body>
+</document>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml b/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml
index 7df5844..c59c8d3 100644
--- a/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml
+++ b/openmeetings-server/src/site/xdoc/ConfluencePlugin.xml
@@ -1,49 +1,49 @@
-<?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>Confluence Plugin</title>
- <author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
- </properties>
-
- <body>
- <section name="Confluence Plugin for OpenMeetings">
- <p>Sources are available at <a href="https://svn.apache.org/repos/asf/openmeetings/plugin/trunk/confluence">https://svn.apache.org/repos/asf/openmeetings/plugin/trunk/confluence</a></p>
- <p>
- To get SNAPSHOTS for testing please contact <a href="mail-lists.html">Mailing lists</a>
- </p>
- </section>
-
- <section name="Features">
- <p>The plugin contains the following features: </p>
- <ul>
- <li>Create videoconference rooms through Confluence: </li>
- <li>
- <ol>
- <li>Integrated with Confluence content </li>
- <li>Configurable room type </li>
- </ol>
- </li>
- </ul>
- </section>
-
- <section name="Demo video">
- <p>The demo video of Confluence plugin show you the plugin in action </p>
- <iframe width="640" height="390" src="http://www.youtube.com/embed/YFKlXggtld0" frameborder="0" allowfullscreen=""></iframe>
- </section>
- </body>
-</document>
+<?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>Confluence Plugin</title>
+ <author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
+ </properties>
+
+ <body>
+ <section name="Confluence Plugin for OpenMeetings">
+ <p>Sources are available at <a href="https://svn.apache.org/repos/asf/openmeetings/plugin/trunk/confluence">https://svn.apache.org/repos/asf/openmeetings/plugin/trunk/confluence</a></p>
+ <p>
+ To get SNAPSHOTS for testing please contact <a href="mail-lists.html">Mailing lists</a>
+ </p>
+ </section>
+
+ <section name="Features">
+ <p>The plugin contains the following features: </p>
+ <ul>
+ <li>Create videoconference rooms through Confluence: </li>
+ <li>
+ <ol>
+ <li>Integrated with Confluence content </li>
+ <li>Configurable room type </li>
+ </ol>
+ </li>
+ </ul>
+ </section>
+
+ <section name="Demo video">
+ <p>The demo video of Confluence plugin show you the plugin in action </p>
+ <iframe width="640" height="390" src="http://www.youtube.com/embed/YFKlXggtld0" frameborder="0" allowfullscreen=""></iframe>
+ </section>
+ </body>
+</document>