Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RestrictedAccess.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RestrictedAccess.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RestrictedAccess.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RestrictedAccess.xml Fri Nov 13 01:24:41 2015 @@ -12,8 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> - +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>How to restrict access to your Openmeetings server</title> <author email="[email protected]"> @@ -30,13 +31,11 @@ </p> <p>$RED5_HOME/webapps/openmeetings/WEB-INF/red5-web.properties </p> <p>Content: </p> - <div class="xmlcode"> - webapp.virtualHosts=*,localhost, 127.0.0.1 - </div> + <source>webapp.virtualHosts=*,localhost, 127.0.0.1</source> Sample file: <a - href="http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/red5-web.properties"; - rel="nofollow">http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/WEB-INF/red5-web.properties + href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties"; + rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties </a> </section> @@ -47,34 +46,29 @@ tries to access the server using rtmp/RPC. This file is located: </p> <p>$RED5_HOME/webapps/root/crossdomain.xml </p> <p>Content: </p> - <div class="xmlcode"> - <?xml version="1.0"?><br/> - <cross-domain-policy><br/> - <site-control permitted-cross-domain-policies="all"/><br/> - <allow-access-from domain="localhost" to-ports="20-65535"/><br/> - <allow-access-from domain="*.local" to-ports="20-65535"/><br/> - </cross-domain-policy><br/> - </div> + <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> - Sample file: - <a - href="http://code.google.com/p/red5/source/browse/java/server/trunk/webapps/root/crossdomain.xml"; - rel="nofollow">http://code.google.com/p/red5/source/browse/java/server/trunk/webapps/root/crossdomain.xml + <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> - <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> </section> </body> -</document> \ No newline at end of file +</document>
Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/SakaiPlugin.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/SakaiPlugin.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/SakaiPlugin.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/SakaiPlugin.xml Fri Nov 13 01:24:41 2015 @@ -12,8 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> - +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Sakai Plugin</title> <author email="[email protected]"> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/SugarCRMPlugin.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/SugarCRMPlugin.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/SugarCRMPlugin.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/SugarCRMPlugin.xml Fri Nov 13 01:24:41 2015 @@ -12,8 +12,8 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> - +<document xmlns="http://maven.apache.org/XDOC/2.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>SugarCRM Plugin</title> <author email="[email protected]"> @@ -31,17 +31,11 @@ </p> <p> You can find the OpenMeetings Plugin also in the - <a href="http://www.sugarforge.org/projects/openmeetings/"; - target="_BLANK" rel="nofollow">SugarCRM Plugin database</a> + <a href="http://www.sugarforge.org/projects/openmeetings/"; target="_blank" rel="nofollow">SugarCRM Plugin database</a> . </p> - <p> - A demo version of the SugarCRM plugin is available at - <a href="http://demo.e-schwert.de/sugarcrm/"; target="_BLANK" rel="nofollow">demo.e-schwert.de</a> - . Username: demo Password: Demouser55 - </p> </section> - + <section name="Features"> <p>The plugin contains the following features: </p> <ul> @@ -50,38 +44,32 @@ <ol> <li>Integrated with calendar </li> <li>Integrated with SugarCRM meetings </li> - <li>Sends invetations emails to meeting participants </li> + <li>Sends invetations emails to meeting participants </li> <li>Configurable room type </li> </ol> </li> - </ul> + </ul> </section> - <section name="Installation the SugarCRM Plugin for OpenMeetings"> + <section name="Installation the SugarCRM Plugin for OpenMeetings"> <p>In SugarCRM's administration web-interface you will find the module loader. </p> - <a class="fancybox-buttons" href="images/moodle_plugin_conference.png"> - <img src="images/SugarCRM_Installation.png" alt="" width="640" - height="320" /> + <a class="fancybox-buttons" href="images/SugarCRM_Installation.png"> + <img src="images/SugarCRM_Installation.png" alt="" width="640" height="320" /> </a> <ol> <li>Upload the module with module loader in administration area. </li> <li>Configure OpenMeetings settings. </li> - <li>Create OpenMeetings rooms. </li> + <li>Create OpenMeetings rooms. </li> </ol> </section> - - <section name="Demo video"> - <p>The demo video of SugarCRM plugin show you the plugin in action </p> - <object style="height: 390px; width: 640px"> - <param name="movie" value="http://www.youtube.com/v/xrDbcXqxDq8?version=3&feature=player_detailpage"/> - <param name="allowFullScreen" value="true"/> - <param name="allowScriptAccess" value="always"/> - <embed src="http://www.youtube.com/v/xrDbcXqxDq8?version=3&feature=player_detailpage"; type="application/x-shockwave-flash" allowfullscreen="true" allowScriptAccess="always" width="640" height="360"/> - </object> + + <section name="Demo video"> + <p>The demo video of SugarCRM plugin show you the plugin in action </p> + <iframe width="640" height="390" src="http://www.youtube.com/embed/xrDbcXqxDq8"; frameborder="0" allowfullscreen=""></iframe> </section> </body> -</document> \ No newline at end of file +</document> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml Fri Nov 13 01:24:41 2015 @@ -12,8 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> - +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Timezones</title> <author email="[email protected]"> @@ -27,8 +28,8 @@ <p> List of default Timezones: <a - href="http://openmeetings.googlecode.com/svn/trunk/singlewebapp/src/main/webapp/languages/timezones.xml"; - rel="nofollow">http://openmeetings.googlecode.com/svn/trunk/singlewebapp/src/main/webapp/languages/timezones.xml + href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/timezones.xml"; + rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/timezones.xml </a> </p> <p> @@ -64,33 +65,26 @@ <section name="How to lookup timezone's"> - <div class="xmlcode"> - - String[] ids = TimeZone.getAvailableIDs();<br/> - for (String id : ids) {<br/> - - <div style="margin-left:20px"> - TimeZone timeZone = TimeZone.getTimeZone(id);<br/> - //TimeZone timeZone = timeRegistry.getTimeZone(id);<br/> - <br/> - Calendar cal = Calendar.getInstance();<br/> - <div style="margin-left:20px"> - cal.setTimeZone(timeZone);<br/> - // + cal.get(Calendar.DST_OFFSET)<br/> - int offset = cal.get(Calendar.ZONE_OFFSET);<br/> - <br/> - int offsetInMinutes = offset/1000/60;<br/> - <br/> - System.out.println("name" + id + "name offset "+offsetInMinutes+"offset "); - </div> - </div> - } - - </div> + <source> +<![CDATA[ +String[] ids = TimeZone.getAvailableIDs(); +for (String id : ids) { + TimeZone timeZone = TimeZone.getTimeZone(id); + //TimeZone timeZone = timeRegistry.getTimeZone(id); + Calendar cal = Calendar.getInstance(); + cal.setTimeZone(timeZone); + // + cal.get(Calendar.DST_OFFSET) + int offset = cal.get(Calendar.ZONE_OFFSET); + int offsetInMinutes = offset/1000/60; + + System.out.println("name" + id + "name offset "+offsetInMinutes+"offset "); +} +]]> + </source> </section> </body> -</document> \ No newline at end of file +</document> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Upgrade.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Upgrade.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Upgrade.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Upgrade.xml Fri Nov 13 01:24:41 2015 @@ -12,8 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> - +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Upgrade</title> <author email="[email protected]"> @@ -29,7 +30,7 @@ <a class="fancybox-buttons" href="images/backup.png"><img src="images/backup.png" alt="" width="600" /></a> <p> The Text in the Administration > Backup section actually just says - it all. The backup contains users, rooms, organizations and + it all. The backup contains users, rooms, groups and appointments (Invitations and Reminders are NOT included in the Backup and Reminders will not be send again!). The Backup contains also all uploaded Files and Documents and will re-import them again. @@ -75,7 +76,7 @@ that existed in the backup.<br /> A typical install from backup would be:<br /> <tt>./admin.sh -i -file backup_yesterday.zip</tt><br/> - please see <a href="CommandLineAdmin.html" target="_BLANK" rel="nofollow">Command Line Admin</a> for more options + please see <a href="CommandLineAdmin.html" target="_blank" rel="nofollow">Command Line Admin</a> for more options </p> <p><b>Detailed steps</b></p> <ol> @@ -85,7 +86,7 @@ <li><tt>./admin.sh -v -b -file ../backup_today.zip</tt></li> <li>Delete/move folder with existing installation of OM</li> <li>Unzip new version of OM into the same folder</li> - <li><tt>./admin.sh -v -i -file ../backup_today.zip --drop --skip-default-room</tt> (Optionally you can specify + <li><tt>./admin.sh -v -i -file ../backup_today.zip --drop --skip-default-rooms</tt> (Optionally you can specify additional parameters like DB host/user/pass/instance etc.)</li> <li>Start Openmeetings</li> <li>go to http://localhost:5080/openmeetings</li> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/WebappNamePath.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/WebappNamePath.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/WebappNamePath.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/WebappNamePath.xml Fri Nov 13 01:24:41 2015 @@ -12,13 +12,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> - +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Webapp Name / Path</title> - <author email="[email protected]"> - OpenMeetings Team - </author> + <author email="[email protected]">OpenMeetings Team</author> </properties> <body> @@ -28,8 +27,6 @@ <ol> <li>create your logo image as PNG 40px height</li> <li>replace <tt>/opt/red5/webapps/openmeetings/public/themes/basic-theme/general/logo.png</tt> with your logo file</li> - <li>(Advanced optional) you can modify <tt>/opt/red5/webapps/openmeetings/public/config.xml</tt> and modify <tt>appdisplay</tt> section: set position and display for the logo and/or name</li> - <li>(Advanced optional) you can modify <tt>/opt/red5/webapps/openmeetings/public/theme.xml</tt> (around line 57) and change image name/path</li> </ol> </section> <section name="Renaming /openmeetings context"> @@ -43,9 +40,7 @@ <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/red5</tt>) </li> <li> rename @@ -69,20 +64,16 @@ find and modify <tt><webAppRootKey>openmeetings</webAppRootKey></tt> to be - <tt><webAppRootKey></tt> - <strong>yourmeetings</strong> - <tt></webAppRootKey></tt> + <tt><webAppRootKey><strong>yourmeetings</strong></webAppRootKey></tt> </li> <li> find and modify <tt><httpRootKey>/openmeetings/</httpRootKey></tt> to be - <tt><httpRootKey></tt> - <strong>/yourmeetings/</strong> - <tt></httpRootKey></tt> + <tt><httpRootKey><strong>/yourmeetings/</strong></httpRootKey></tt> </li> </ol> - That's it + <p>That's it</p> </section> <section name="Changing hard-coded application name in string labels"> @@ -99,7 +90,7 @@ <li> ensure <strong> - <tt>$APP_NAME</tt> + <tt>{0}</tt> </strong> placeholder is used in <i>all</i> @@ -146,14 +137,13 @@ <strong>TOTAL</strong> Openmeetings clean up: </p> - <div class="xmlcode"> - <currentappname>OpenMeetings</currentappname> - <br /> - <currentappnameurl>http://openmeetings.apache.org</currentappnameurl> - <br /> - <currentappnamebugurl>https://issues.apache.org/jira/browse/OPENMEETINGS</currentappnamebugurl> - <br /> - </div> + <source> +<![CDATA[ +<currentappname>OpenMeetings</currentappname> +<currentappnameurl>http://openmeetings.apache.org</currentappnameurl> +<currentappnamebugurl>https://issues.apache.org/jira/browse/OPENMEETINGS</currentappnamebugurl> +]]> + </source> </section> @@ -169,13 +159,9 @@ <strong>every</strong> instance <strong>should</strong> match the folder name in webapps dir) </li> <li>in case of java memory problems modify <tt>red5.sh</tt> add following line:<br/> - <div class="xmlcode"> - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -XX:MaxPermSize=128M" - </div> + <source>export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -XX:MaxPermSize=128M"</source> or <tt>red5.bat</tt>:<br/> - <div class="xmlcode"> - set JAVA_OPTS=-XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -XX:MaxPermSize=128M - </div> + <source>set JAVA_OPTS=-XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -XX:MaxPermSize=128M</source> </li> </ol> </section> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/WebcamResolutions.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/WebcamResolutions.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/WebcamResolutions.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/WebcamResolutions.xml Fri Nov 13 01:24:41 2015 @@ -12,8 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> - +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>How to configure Camera default resolutions </title> <author email="[email protected]"> @@ -29,27 +30,27 @@ available the user can choose from. </p> <p>You can add/remove resolutions and also change the default selection. In the public/config.xml there is a section: </p> - <div class="xmlcode"> - <availableCameraResolutions><br/> - <div style="margin-left:20px"> - <resolution type="4:3 (~6 KByte/sec)" width="40" height="30" isDefault="false" /><br/> - <resolution type="4:3 (~12 KByte/sec)" width="80" height="60" isDefault="false" /><br/> - <resolution type="4:3 (~20 KByte/sec)" width="120" height="90" isDefault="true" /><br/> - <resolution type="QQVGA 4:3 (~36 KByte/sec)" width="160" height="120" isDefault="false" /><br/> - <resolution type="4:3 (~40 KByte/sec)" width="240" height="180" isDefault="false" /><br/> - <resolution type="HVGA 4:3 (~56 KByte/sec)" width="320" height="240" isDefault="false" /><br/> - <resolution type="4:3 (~60 KByte/sec)" width="480" height="360" isDefault="false" /><br/> - <resolution type="4:3 (~68 KByte/sec)" width="640" height="480" isDefault="false" /><br/> - <resolution type="XGA 4:3" width="1024" height="768" isDefault="false" /><br/> - <resolution type="16:9" width="256" height="150" isDefault="false" /><br/> - <resolution type="WQVGA 9:5" width="432" height="240" isDefault="false" /><br/> - <resolution type="pseudo 16:9" width="480" height="234" isDefault="false" /><br/> - <resolution type="16:9" width="512" height="300" isDefault="false" /><br/> - <resolution type="nHD 16:9" width="640" height="360" isDefault="false" /><br/> - <resolution type="16:9" width="1024" height="600" isDefault="false" /><br/> - </div> - </availableCameraResolutions> - </div> + <source> +<![CDATA[ +<availableCameraResolutions> + <resolution type="4:3 (~6 KByte/sec)" width="40" height="30" isDefault="false" /> + <resolution type="4:3 (~12 KByte/sec)" width="80" height="60" isDefault="false" /> + <resolution type="4:3 (~20 KByte/sec)" width="120" height="90" isDefault="true" /> + <resolution type="QQVGA 4:3 (~36 KByte/sec)" width="160" height="120" isDefault="false" /> + <resolution type="4:3 (~40 KByte/sec)" width="240" height="180" isDefault="false" /> + <resolution type="HVGA 4:3 (~56 KByte/sec)" width="320" height="240" isDefault="false" /> + <resolution type="4:3 (~60 KByte/sec)" width="480" height="360" isDefault="false" /> + <resolution type="4:3 (~68 KByte/sec)" width="640" height="480" isDefault="false" /> + <resolution type="XGA 4:3" width="1024" height="768" isDefault="false" /> + <resolution type="16:9" width="256" height="150" isDefault="false" /> + <resolution type="WQVGA 9:5" width="432" height="240" isDefault="false" /> + <resolution type="pseudo 16:9" width="480" height="234" isDefault="false" /> + <resolution type="16:9" width="512" height="300" isDefault="false" /> + <resolution type="nHD 16:9" width="640" height="360" isDefault="false" /> + <resolution type="16:9" width="1024" height="600" isDefault="false" /> +</availableCameraResolutions> +]]> + </source> <p>Tip: You might edit the public/config.xml with an XML aware editor that correctly handles the XSD defintion to avoid misconfiguration. The openmeetings-config.xsd Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/WebsiteGuide.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/WebsiteGuide.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/WebsiteGuide.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/WebsiteGuide.xml Fri Nov 13 01:24:41 2015 @@ -12,24 +12,22 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> - +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> - <title>Release Guide</title> - <author email="[email protected]"> - OpenMeetings Team - </author> + <title>Website Guide</title> + <author email="[email protected]">OpenMeetings Team</author> </properties> <body> <section name="How to update Apache OpenMeetings website"> - <subsection name="Required tools"> <div> <ul> - <li>Sun JDK6</li> - <li>Apache ANT (1.8 or later)</li> + <li>Sun JDK7</li> + <li>Apache Maven (3.2.1 or later)</li> </ul> </div> </subsection> @@ -38,8 +36,8 @@ <div> <p> The Apache OpenMeetings HTML websites are generated from XML files. - You edit the XML files, run the ANT command "ant anakia" that generates the HTML files - and then you checkin to SVN both: XML and HTML files. + You edit the XML files, run the MAVEN command <source><![CDATA[mvn install -Dunpacked=true]]></source> that generates the HTML files + and then you copy generated HTML files into appropriate place and commit to SVN both: XML and HTML files. </p> <p> The website itself uses JQuery to generate the menu, the pop images and the image slider at the landing page. @@ -50,34 +48,21 @@ <subsection name="Editing the website"> <div> <p> - OpenMeetings website ( - <a href="http://openmeetings.apache.org/";>http://openmeetings.apache.org/</a> - ) is a copy from the SVN repository. - <br /> + OpenMeetings website (<a href="http://openmeetings.apache.org/";>http://openmeetings.apache.org/</a>) is a copy from the SVN repository.<br /> The file in the SVN to be synced are at: <br /> - <a - href="http://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/docs/";>http://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/docs/ - </a> - <br/>and<br/> - <a - href="http://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/xdocs/";>http://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/xdocs/ - </a> + <a href="http://svn.apache.org/repos/asf/openmeetings/trunk/site/";>http://svn.apache.org/repos/asf/openmeetings/trunk/site/</a><br/> </p> <div> - To update the website you checkout trunk: - <br /> - <a - href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/";>https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/ - </a> <br/> - edit the files in the folder <tt>xdocs</tt><br/> + To update the website you need to checkout trunk:<br /> + <a href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/";>https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/</a> <br/> + edit the files in the folder <tt>openmeetings-server/src/site</tt><br/> then you run the command: - <div class="xmlcode"> - ant anakia - </div> - control the output locally in the folder <tt>docs</tt><br/> - And then checkin into the SVN <i>both</i> the edited xml and generated html files. + <source><![CDATA[mvn install -Dunpacked=true]]></source> + control the output locally in the folder <tt>openmeetings-server/target/server/webapps/openmeetings/docs/</tt><br/> + copy site contents into target folder: <source><![CDATA[cp -r openmeetings-server/target/server/webapps/openmeetings/docs/* ../site/]]></source> + And then commit your changes into the SVN <i>both</i> the edited xml(s) and generated html files. </div> <p> @@ -94,25 +79,12 @@ <div> To add a new menu entry in the left side panel you need to modify the file: <br/> - <tt>xdocs/stylesheets/project.xml</tt> - </div> - </subsection> - - <subsection name="Writing a new macro"> - <div> - <p> - You can write macros in a template language to parse from the XML files certain aspects. - </p> - <p> - To add a new macro see the file:<br/> - <tt>xdocs/stylesheets/site.vsl</tt> - </p> + <tt>openmeetings-server/src/site/site.xml</tt> </div> - </subsection> </section> </body> -</document> \ No newline at end of file +</document> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/commercial-support.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/commercial-support.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/commercial-support.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/commercial-support.xml Fri Nov 13 01:24:41 2015 @@ -12,7 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Commercial Support</title> @@ -30,22 +32,16 @@ </p> <ul> <li> - <a href="http://www.webbase-design.de/"; target="_BLANK">webbase-design.de - </a> - owned by Sebastian Wagner + <a href="http://www.unipro.ru/eng/index.html"; target="_blank">unipro.ru</a> + run by Maxim Solodovnik, Timur Tleukenov, Irina Arkhipets, Denis Kandrov, Vasily Degtyarev </li> <li> - <a href="http://www.dataved.ru"; target="_BLANK">dataved.ru - </a> - run by Alexei Fedotov, Maxim Solodovnik, Timur Tleukenov, Irina Arkhipets, Denis Kandrov, Vasily Degtyarev - </li> - <li> - <a href="http://www.samoo.es"; target="_BLANK" rel="nofollow">samoo.es</a> + <a href="http://www.samoo.es"; target="_blank" rel="nofollow">samoo.es</a> provides support for the Sakai Plugin </li> </ul> <p> - Please write to <a href="mailto:[email protected]";>[email protected]</a> to get WebBase-Design or Dataved support + Please write to <a href="mailto:[email protected]";>[email protected]</a> to get UniPro support </p> <p> There are more companies offering installation, customization, hosting, conferencing and support services. You can add @@ -59,4 +55,4 @@ </body> -</document> \ No newline at end of file +</document> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/demo.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/demo.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/demo.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/demo.xml Fri Nov 13 01:24:41 2015 @@ -12,7 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Mailing Lists</title> @@ -31,7 +33,10 @@ This is a list of servers that you can use for testing OpenMeetings. </p> <p> - <a href="http://demo.dataved.ru/openmeetings"; target="_BLANK" rel="nofollow">http://demo.dataved.ru/openmeetings</a> + <a href="https://demo-openmeetings.apache.org/openmeetings"; target="_blank" rel="nofollow">https://demo-openmeetings.apache.org/openmeetings</a> + </p> + <p> + <a href="https://om.alteametasoft.com/openmeetings"; target="_blank" rel="nofollow">https://om.alteametasoft.com/openmeetings</a> </p> </section> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/documentation.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/documentation.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/documentation.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/documentation.xml Fri Nov 13 01:24:41 2015 @@ -1,46 +1,42 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- - - Copyright 2006 The Apache Software Foundation - - 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 + 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:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> + 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>Documentation</title> + <author email="[email protected]"> + Podling Documentation Team + </author> + </properties> + + <body> + <section name="OpenMeetings Documentation"> + + <p> + Wiki is to be linked here, coming soon ... + + <!-- ***************** TBD ************************** --> + <!-- ***************** TBD ************************** --> + <!-- ***************** TBD ************************** --> -<properties> -<title>Documentation</title> -<author email="[email protected]"> - Podling Documentation Team</author> -</properties> + </p> -<body> -<section name="OpenMeetings Documentation"> + </section> -<p> -Wiki is to be linked here, coming soon ... - -<!-- ***************** TBD ************************** --> -<!-- ***************** TBD ************************** --> -<!-- ***************** TBD ************************** --> - -</p> - -</section> - -</body> + </body> </document> - Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/downloads.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/downloads.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/downloads.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/downloads.xml Fri Nov 13 01:24:41 2015 @@ -12,7 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Downloads</title> @@ -24,31 +26,32 @@ <body> <section name="Downloads"> - <div> + <p> All downloads can be verified using the Apache OpenMeetings code - signing <a href="https://www.apache.org/dist/openmeetings/3.0.0/KEYS";>KEYS</a>. - </div> + signing <a href="https://www.apache.org/dist/openmeetings/3.0.7/KEYS";>KEYS</a>, changes: <a + href="https://www.apache.org/dist/openmeetings/3.0.7/CHANGELOG";>CHANGELOG</a>. + </p> <p> All are available for download as source and binary. </p> <subsection name="Latest Official Release"> <p> - Apache Openmeetings 3.0.0 + Apache Openmeetings 3.0.7 </p> <ul> <li> Binaries: <ul> <li> - <a href="http://www.apache.org/dyn/closer.lua/openmeetings/3.0.0/bin/apache-openmeetings-3.0.0.zip";>apache-openmeetings-3.0.0.zip</a> - <a href="http://www.apache.org/dist/openmeetings/3.0.0/bin/apache-openmeetings-3.0.0.zip.asc";>[SIG]</a> - <a href="http://www.apache.org/dist/openmeetings/3.0.0/bin/apache-openmeetings-3.0.0.zip.md5";>[MD5]</a> + <a href="http://www.apache.org/dyn/closer.lua/openmeetings/3.0.7/bin/apache-openmeetings-3.0.7.zip";>apache-openmeetings-3.0.7.zip</a> + <a href="http://www.apache.org/dist/openmeetings/3.0.7/bin/apache-openmeetings-3.0.7.zip.asc";>[SIG]</a> + <a href="http://www.apache.org/dist/openmeetings/3.0.7/bin/apache-openmeetings-3.0.7.zip.md5";>[MD5]</a> </li> <li> - <a href="http://www.apache.org/dyn/closer.lua/openmeetings/3.0.0/bin/apache-openmeetings-3.0.0.tar.gz";>apache-openmeetings-3.0.0.tar.gz</a> - <a href="http://www.apache.org/dist/openmeetings/3.0.0/bin/apache-openmeetings-3.0.0.tar.gz.asc";>[SIG]</a> - <a href="http://www.apache.org/dist/openmeetings/3.0.0/bin/apache-openmeetings-3.0.0.tar.gz.md5";>[MD5]</a> + <a href="http://www.apache.org/dyn/closer.lua/openmeetings/3.0.7/bin/apache-openmeetings-3.0.7.tar.gz";>apache-openmeetings-3.0.7.tar.gz</a> + <a href="http://www.apache.org/dist/openmeetings/3.0.7/bin/apache-openmeetings-3.0.7.tar.gz.asc";>[SIG]</a> + <a href="http://www.apache.org/dist/openmeetings/3.0.7/bin/apache-openmeetings-3.0.7.tar.gz.md5";>[MD5]</a> </li> </ul> </li> @@ -56,14 +59,14 @@ Sources: <ul> <li> - <a href="http://www.apache.org/dyn/closer.lua/openmeetings/3.0.0/src/apache-openmeetings-3.0.0-src.zip";>apache-openmeetings-3.0.0-src.zip</a> - <a href="http://www.apache.org/dist/openmeetings/3.0.0/src/apache-openmeetings-3.0.0-src.zip.asc";>[SIG]</a> - <a href="http://www.apache.org/dist/openmeetings/3.0.0/src/apache-openmeetings-3.0.0-src.zip.md5";>[MD5]</a> + <a href="http://www.apache.org/dyn/closer.lua/openmeetings/3.0.7/src/apache-openmeetings-3.0.7-src.zip";>apache-openmeetings-3.0.7-src.zip</a> + <a href="http://www.apache.org/dist/openmeetings/3.0.7/src/apache-openmeetings-3.0.7-src.zip.asc";>[SIG]</a> + <a href="http://www.apache.org/dist/openmeetings/3.0.7/src/apache-openmeetings-3.0.7-src.zip.md5";>[MD5]</a> </li> <li> - <a href="http://www.apache.org/dyn/closer.lua/openmeetings/3.0.0/src/apache-openmeetings-3.0.0-src.tar.gz";>apache-openmeetings-3.0.0-src.tar.gz</a> - <a href="http://www.apache.org/dist/openmeetings/3.0.0/src/apache-openmeetings-3.0.0-src.tar.gz.asc";>[SIG]</a> - <a href="http://www.apache.org/dist/openmeetings/3.0.0/src/apache-openmeetings-3.0.0-src.tar.gz.md5";>[MD5]</a> + <a href="http://www.apache.org/dyn/closer.lua/openmeetings/3.0.7/src/apache-openmeetings-3.0.7-src.tar.gz";>apache-openmeetings-3.0.7-src.tar.gz</a> + <a href="http://www.apache.org/dist/openmeetings/3.0.7/src/apache-openmeetings-3.0.7-src.tar.gz.asc";>[SIG]</a> + <a href="http://www.apache.org/dist/openmeetings/3.0.7/src/apache-openmeetings-3.0.7-src.tar.gz.md5";>[MD5]</a> </li> </ul> </li> @@ -85,14 +88,16 @@ <subsection name="Plugins / Non ASF downloads"> <p> - If you are looking for more plugins for 3th party applications (Moodle, Drupal, Joomla, ...) check out <a href="http://code.google.com/a/apache-extras.org/hosting/search?q=openmeetings"; target="_BLANK" rel="nofollow">apache-extras.org</a>. + If you are looking for more plugins for 3th party applications (Moodle, Drupal, Joomla, ...) check out + <a href="http://code.google.com/a/apache-extras.org/hosting/search?q=openmeetings"; target="_blank" rel="nofollow">apache-extras.org</a> or + ask <a href="commercial-support.html">commercial support</a>. </p> <p> OpenMeetings releases that are not part of the ASF can be downloaded from the old <a href="http://code.google.com/p/openmeetings/downloads/list"; - target="_BLANK">GoogleCode website</a> + target="_blank">GoogleCode website</a> </p> </subsection> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/get-involved.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/get-involved.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/get-involved.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/get-involved.xml Fri Nov 13 01:24:41 2015 @@ -12,7 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Get Involved</title> @@ -43,7 +45,7 @@ <li> Information on access to the project source code is available - <a href="svn.html">here</a> + <a href="source-repository.html">here</a> . </li> <li> @@ -65,20 +67,17 @@ </section> - <section name="Which taks could I potentially work on?"> + <section name="Which tasks could I potentially work on?"> <p> - No matter if you want to share your experiences, improve - documentation, localization, code Java, ActionScript or PHP, there - are dozens of areas where you can find task to work on and share - with others. - <br /> - <br /> - We tried to collect a list of ideas in our wiki: + No matter if you want to share your experiences, improve documentation, localization, code Java + , ActionScript or PHP, there are dozens of areas where you can find task to work on and share + with others.<br /> <br /> + We tried to collect a list of ideas in our wiki:<br /> <a href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/New+committers+and+developers+task+idea+list"; - target="_BLANK">https://cwiki.apache.org/confluence/display/OPENMEETINGS/New+committers+and+developers+task+idea+list + target="_blank">https://cwiki.apache.org/confluence/display/OPENMEETINGS/New+committers+and+developers+task+idea+list </a> </p> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/index.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/index.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/index.xml Fri Nov 13 01:24:41 2015 @@ -12,8 +12,8 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> - +<document xmlns="http://maven.apache.org/XDOC/2.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Home</title> <author email="[email protected]"> @@ -24,76 +24,75 @@ <body> <section name="Apache OpenMeetings - Features and overview"> - - <div id="coin-slider"> - <a href="#"> - <img src="images/cut_conference_room.png" alt="Conference Room" /> - <span> - <b>Audio/Video Conferencing</b> - <br /> - OpenMeetings enables you to make Audio/Video conferencing. - </span> - </a> - - <a href="#"> - <img src="images/cut_integrated_calendar.png" alt="Calendar" /> - <span> - <b>Calendar</b> - <br /> - You can create meetings with the integrated calendar, conference rooms and invitations are automatically send to everybody - </span> - </a> - - <a href="#"> - <img src="images/cut_file_explorer.png" alt="File Explorer" /> - <span> - <b>File Explorer</b> - <br /> - Each room has its own File-Explorer. Each user has his own private drive and additionally there is a public drive to share files with other participants - </span> - </a> - - <a href="#"> - <img src="images/cut_integration_api.png" alt="Integration API" /> - <span> - <b>Integration API</b> - <br /> - There is a SOAP/REST API to integrate into your website or intranet, as well - as LDAP/ADS connectors and VoIP/Asterisk integration modules - </span> - </a> - - <a href="#"> - <img src="images/cut_private_messages.png" alt="Private messages" /> - <span> - <b>Private messages and contacts</b> - <br /> - From the private message center you can send invitations by email - and attach meeting invitations to every email - </span> - </a> - - <a href="#"> - <img src="images/cut_administration_configuration.png" alt="Administration" /> - <span> - <b>Administration and Configuration</b> - <br /> - You can configure users, rooms, usergroups, config settings or - edit labels with a Web-Frontend integrated in the application - </span> - </a> - - <a href="#"> - <img src="images/cut_recordings_playback.png" alt="Share and Record" /> - <span> - <b>Screen sharing and Recording</b> - <br /> - You can do screen sharing as well as recording of whole sessions - including audio/video. Recordings can be downloaded as AVI/FLV or - watched online in the integrated player. - </span> - </a> - + <div id="slider"> + <div class="carousel-inner"> + <div class="item active"> + <img src="images/cut_conference_room.png" alt="Conference Room" /> + <span class="carousel-caption"> + <span class="title">Audio/Video Conferencing</span> + <span class="desc">OpenMeetings enables you to make Audio/Video conferencing.</span> + </span> + </div> + <div class="item"> + <img src="images/cut_integrated_calendar.png" alt="Calendar" /> + <span class="carousel-caption"> + <span class="title">Calendar</span> + <span class="desc">You can create meetings with the integrated calendar, conference rooms and invitations are + automatically send to everybody</span> + </span> + </div> + <div class="item"> + <img src="images/cut_file_explorer.png" alt="File Explorer" /> + <span class="carousel-caption"> + <span class="title">File Explorer</span> + <span class="desc">Each room has its own File-Explorer. Each user has his own private drive and additionally there + is a public drive to share files with other participants</span> + </span> + </div> + <div class="item"> + <img src="images/cut_integration_api.png" alt="Integration API" /> + <span class="carousel-caption"> + <span class="title">Integration API</span> + <span class="desc">There is a SOAP/REST API to integrate into your website or intranet, as well + as LDAP/ADS + connectors and VoIP/Asterisk integration modules + </span> + </span> + </div> + <div class="item"> + <img src="images/cut_private_messages.png" alt="Private messages" /> + <span class="carousel-caption"> + <span class="title">Private messages and contacts</span> + <span class="desc">From the private message center you can send invitations by email + and attach meeting invitations + to every email + </span> + </span> + </div> + <div class="item"> + <img src="images/cut_administration_configuration.png" alt="Administration" /> + <span class="carousel-caption"> + <span class="title">Administration and Configuration</span> + <span class="desc">You can configure users, rooms, usergroups, config settings or + edit labels with a Web-Frontend + integrated in the application + </span> + </span> + </div> + <div class="item"> + <img src="images/cut_recordings_playback.png" alt="Share and Record" /> + <span class="carousel-caption"> + <span class="title">Screen sharing and Recording</span> + <span class="desc">You can do screen sharing as well as recording of whole sessions + including audio/video. + Recordings can be downloaded as AVI/FLV or + watched online in the integrated player. + </span> + </span> + </div> + </div> + <a class="carousel-control left" href="#slider">‹</a> + <a class="carousel-control right" href="#slider">›</a> </div> @@ -105,358 +104,426 @@ <p> OpenMeetings is a project of the Apache, the old project - website at - <a href="http://code.google.com/p/openmeetings/"; target="_BLANK">GoogleCode - </a> - will receive no updates anymore. The website at Apache is the only - place that receives updates. + website at <a href="http://code.google.com/p/openmeetings/"; target="_blank">GoogleCode</a> + will receive no updates anymore. The website at Apache is the only place that receives updates. </p> </section> <section name="News"> - - <p> - <strong> - Version 2.2.0 released! See <a href="downloads.html">Downloads page</a>. - (2013-12-12) - </strong> - <br /> - <strong> - Version 2.1.1 released! See <a href="https://blogs.apache.org/openmeetings/entry/apache_openmeetings_2_1_11"; target="_BLANK">Project Blog</a> or <a href="downloads.html">Downloads page</a>. - (2013-07-06) - </strong> - <br /> - <strong> - OpenMeetings 2.1.0 is released! Please check <a href="downloads.html">Downloads page</a>. - (2013-04-01) - </strong> - <br /> - <strong> - OpenMeetings new URL, update your filters! - <a href="http://openmeetings.apache.org";>openmeetings.apache.org</a> is the new home. - (2013-01-28) - </strong> - <br /> - <strong> - OpenMeetings on the road to graduate from the Incubator - <a href="https://blogs.apache.org/openmeetings/entry/openmeetings_on_the_road_to"; target="_BLANK" rel="nofollow">at our blog</a> - (2012-12-07) - </strong> - <br /> - <strong> - Some slides from our Fast Feather Track at the ApacheCon Europe 2012 - <a href="https://blogs.apache.org/openmeetings/entry/openmeetings_apachecon_presentation_slide"; target="_BLANK" rel="nofollow">at our blog</a> - (2012-11-18) - </strong> - <br /> - <strong> - Update: Builds are available at - <a href="https://builds.apache.org/view/M-R/view/OpenMeetings/"; target="_BLANK" rel="nofollow">builds.apache.org</a> - (2012-08-03) - </strong> - <br /> - <strong> - <a href="https://blogs.apache.org/openmeetings/entry/apache_openmeetings_2_0_incubating"; target="_BLANK" rel="nofollow">Version 2.0 released</a> - (2012-07-26) - </strong> - <br /> - <strong>New committer: Timur Tleukenov (2012-03-06)</strong> - <br /> - <strong> - <a href="http://demo.openmeetings.de"; target="_BLANK" rel="nofollow">Demo - server</a> - updated to r1236172 (2012-01-26) - </strong> - <br /> - <strong>New committer: German Grekhov (2011-12-26)</strong> - <br /> - <strong>OpenMeetings has been accepted into the Apache Incubator - (2011-11-12). - </strong> - </p> - + <div class="bs-callout bs-callout-danger"> + <b>Version 3.0.7 released!</b> + <span>Service release 7 for 3.0.0 contains following improvements and bug fixes:<br/> + <br/> + <ul> + <li>Clustering was tested and fixed, now it works as expected both in OM and plugins</li> + <li>Moderator able to restrict video in restricted room from now on</li> + <li>Private messages with room booking are now works as expected</li> + <li>Crashes in admin are fixed</li> + <li>LDAP: group import</li> + </ul><br/> + <br/> + Other fixes<br/> + </span> + <span> + 20 issues are fixed please check + <a href="https://www.apache.org/dist/openmeetings/3.0.7/CHANGELOG";>CHANGELOG</a> and + <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12312720&version=12332443";>Detailed list</a> + </span> + <span> See <a href="downloads.html">Downloads page</a>.</span> + <span class="date">(2015-09-29)</span> + </div> + <div class="bs-callout bs-callout-info"> + <b>Version 3.0.6 released!</b> + <span>Service release 6 for 3.0.0 contains following improvements and bug fixes:<br/> + <br/> + Invitation:<br/> + <ul> + <li>Invitation hash sending from the room is fixed</li> + <li>Invitation hash is now enable for plugin users</li> + <li>First and last name can be passed to SOAP function for hash generation</li> + </ul><br/> + <br/> + Other fixes<br/> + </span> + <span>7 issues are fixed please check <a href="https://www.apache.org/dist/openmeetings/3.0.6/CHANGELOG";>CHANGELOG</a> for details + </span> + <span> See <a href="downloads.html">Downloads page</a>.</span> + <span class="date">(2015-05-25)</span> + </div> + <div class="bs-callout bs-callout-info"> + <b>Version 3.0.5 released!</b> + <span>Service release 5 for 3.0.0 contains following improvements and bug fixes:<br/> + <br/> + Installer:<br/> + <ul> + <li>Database configuration screen is added</li> + </ul><br/> + RTL:<br/> + <ul> + <li>Dashboard and Emails are more RTL friendly</li> + </ul> + <br/> + OAuth:<br/> + <ul> + <li>OAuth support is improved, crash is fixed</li> + </ul> + <br/> + Other fixes in SOAP, localizations, invitations etc.:<br/> + </span> + <span>18 issues are fixed please check <a href="https://www.apache.org/dist/openmeetings/3.0.5/CHANGELOG";>CHANGELOG</a> for details + </span> + <span> See <a href="downloads.html">Downloads page</a>.</span> + <span class="date">(2015-04-26)</span> + </div> + <div class="bs-callout bs-callout-info"> + <b>Version 3.0.4 released!</b> + <span>Service release 4 for 3.0.0 contains following improvements and bug fixes:<br/> + <br/> + Screen-Sharing:<br/> + <ol> + <li>web application is now signed with trusted certificate (no warnings)</li> + <li>RTMPT/RTMPS works as expected</li> + <li>audio/video synchronization is improved</li> + </ol><br/> + Recordings:<br/> + <ol> + <li>It is now possible to rename the recording</li> + <li>Recordings stability is improved</li> + </ol> + <br/> + RTL:<br/> + <ol> + <li>Dashboard, Calendar, Settings and Admin are more RTL friendly</li> + </ol> + <br/> + Calendar:<br/> + <ol> + <li>Time zone support is greatly improved</li> + </ol> + </span> + <span>67 issues are fixed please check <a href="https://www.apache.org/dist/openmeetings/3.0.4/CHANGELOG";>CHANGELOG</a> for details + </span> + <span> See <a href="downloads.html">Downloads page</a>.</span> + <span class="date">(2015-02-15)</span> + </div> + <div class="bs-callout bs-callout-info"> + <b>Version 3.0.3 released!</b> + <span>Service release 3 for 3.0.0, no new features were added, <br/> + More than 60 issues are fixed, recordings stability is improved, LDAP support is enhanced<br/> + please check <a href="https://www.apache.org/dist/openmeetings/3.0.3/CHANGELOG";>CHANGELOG</a> for details + </span> + <span> See <a href="downloads.html">Downloads page</a>.</span> + <span class="alert alert-error">please <b>NOTE</b> Java7 is required on both client and server from now on</span> + <span class="date">(2014-09-05)</span> + </div> + <div class="bs-callout bs-callout-info"> + <b>Version 3.0.2 released!</b> + <span>See <a href="http://archive.apache.org/dist/openmeetings/3.0.2";>Archived download</a>.</span> + <span class="date">(2014-06-04)</span> + </div> + <div class="bs-callout bs-callout-info"> + <b>Version 3.0.1 released!</b> + <span>See <a href="http://archive.apache.org/dist/openmeetings/3.0.1";>Archived download</a>.</span> + <span class="date">(2014-04-18)</span> + </div> + <div class="bs-callout bs-callout-info"> + <b>Version 3.0.0 released!</b> + <span>See <a href="http://archive.apache.org/dist/openmeetings/3.0.0";>Archived download</a>.</span> + <span class="date">(2014-03-07)</span> + </div> + <div class="bs-callout bs-callout-info"> + <b>Version 2.2.0 released!</b> + <span>See <a href="http://archive.apache.org/dist/openmeetings/2.2.0";>Archived download</a>.</span> + <span class="date">(2013-12-12)</span> + </div> + <div class="bs-callout bs-callout-info"> + <b>Version 2.1.1 released!</b> + <span>See <a href="https://blogs.apache.org/openmeetings/entry/apache_openmeetings_2_1_11"; target="_blank">Project Blog</a> + or <a href="http://archive.apache.org/dist/openmeetings/2.1.1";>Archived download</a>.</span> + <span class="date">(2013-07-06)</span> + </div> + <div class="bs-callout bs-callout-info"> + <b>OpenMeetings 2.1.0 is released!</b> + <span>Please check <a href="http://archive.apache.org/dist/openmeetings/2.1.0";>Archived download</a>.</span> + <span class="date">(2013-04-01)</span> + </div> + <div class="bs-callout bs-callout-info"> + <b>OpenMeetings new URL, update your filters!</b> + <span><a href="http://openmeetings.apache.org";>openmeetings.apache.org</a> is the new home.</span> + <span class="date">(2013-01-28)</span> + </div> + <div class="bs-callout bs-callout-info"> + <b>OpenMeetings on the road to graduate from the Incubator</b> + <span><a href="https://blogs.apache.org/openmeetings/entry/openmeetings_on_the_road_to"; target="_blank" rel="nofollow">at our blog</a></span> + <span class="date">(2012-12-07)</span> + </div> + <div class="bs-callout bs-callout-info"> + <b>Some slides from our Fast Feather Track at the ApacheCon Europe 2012</b> + <span><a href="https://blogs.apache.org/openmeetings/entry/openmeetings_apachecon_presentation_slide"; target="_blank" + rel="nofollow">at our blog</a></span> + <span class="date">(2012-11-18)</span> + </div> + <div class="bs-callout bs-callout-info"> + <b>Update: Builds are available at</b> + <span><a href="https://builds.apache.org/view/M-R/view/OpenMeetings/"; target="_blank" rel="nofollow">builds.apache.org</a></span> + <span class="date">(2012-08-03)</span> + </div> + <div class="bs-callout bs-callout-info"> + <b> + <a href="https://blogs.apache.org/openmeetings/entry/apache_openmeetings_2_0_incubating"; target="_blank" rel="nofollow">Version + 2.0 released</a> + </b> + <span class="date">(2012-07-26)</span> + </div> + <div class="bs-callout bs-callout-info"> + <b>New committer: Timur Tleukenov</b> + <span class="date">(2012-03-06)</span> + </div> + <div class="bs-callout bs-callout-info"> + <b> + <a href="https://demo-openmeetings.apache.org/openmeetings"; target="_blank" rel="nofollow">Demo server</a> + updated to r1236172 + </b> + <span class="date">(2012-01-26)</span> + </div> + <div class="bs-callout bs-callout-info"> + <b>New committer: German Grekhov</b> + <span class="date">(2011-12-26)</span> + </div> + <div class="bs-callout bs-callout-info"> + <b>OpenMeetings has been accepted into the Apache Incubator.</b> + <span class="date">(2011-11-12)</span> + </div> </section> <section name="Community"> - <div> - <strong>Who we are</strong> - <blockquote> - <a href="team-list.html">List of committers</a> - . - </blockquote> - </div> - <div> - <strong>Users!</strong> - <blockquote> - We'd love to have you involved. Check out the - <a href="get-involved.html">Get involved</a> - . - </blockquote> + <div class="bs-callout bs-callout-info"> + <b>Who we are</b> + <span><a href="team-list.html">List of committers</a>.</span> + </div> + <div class="bs-callout bs-callout-info"> + <b>Users!</b> + <span>We'd love to have you involved. Check out the <a href="get-involved.html">Get involved</a>.</span> </div> </section> <section name="Feature details"> - <feature title="Audio and Video Conferencing"> + <div class="feature clearfix"> + <span class="feature title">Audio and Video Conferencing</span> - <image fullhref="images/Features_Screen_Conference_Room_Thumb.png" - href="images/Features_Screen_Conference_Room_Thumb.png" title="OpenMeetings Conference Room" - width="250" height="175" /> - <text> - <div> - There are four options to use OpenMeetings audio/video functions, - which you can select during a conference session. + <img src="images/Features_Screen_Conference_Room_Thumb.png" title="OpenMeetings Conference Room" width="250" + height="175" /> + <span class="desc"> + <span class="p">There are four options to use OpenMeetings audio/video functions, + which you can select during a conference session. + </span> <ul> <li>audio + video</li> <li>audio only</li> <li>video only</li> <li>picture only</li> </ul> - Additional you can change video-/audio-quality, choose multiple - camera resolutions (4:3, 16:9 or 3:2) - and choose your input devices. - </div> - </text> - </feature> + <span class="p">Additional you can change video-/audio-quality, choose multiple + camera resolutions (4:3, 16:9 or 3:2) and choose your input devices. + </span> + </span> + </div> - <feature title="Meeting recording and Screen sharing"> + <div class="feature clearfix"> + <span class="feature title">Meeting recording and Screen sharing</span> - <image href="images/desktopsharing.png" fullhref="images/desktopsharing.png" - title="Screensharing-/recording" width="140" height="150" /> - <image href="images/recordings_timeleine.png" fullhref="images/recordings_timeleine.png" - title="Device" width="200" height="115" /> - - <text> - <div> + <span class="desc" style="float: left;"> + <img src="images/desktopsharing.png" title="Screensharing-recording" style="float:none; display: block; width: 140px; height: 150px" /> + <img src="images/recordings_timeleine.png" title="Device" style="float:none; display: block; width: 200px; height: 115px" /> + </span> + <span class="desc" style="margin-top: 50px;"> <ul> <li>Recorded sessions contain everything including sound recorded - from all audio streams in exactly the way you've seen it in the - conference. + from all audio streams in exactly the way you've seen it in the conference. </li> - </ul> - <ul> <li>Recorded sessions can be downloaded as AVI/FLV files.</li> - </ul> - <ul> <li>Possibility to select a screen area for sharing.</li> - </ul> - <ul> <li>Different quality steps for Screensharing.</li> + <li>Watch and organize recordings in an integrated Drag and Drop File-Explorer</li> </ul> - <ul> - <li>Watch and organize recordings in an integrated Drag and Drop - File-Explorer - </li> - </ul> - </div> - </text> - </feature> + </span> + </div> - <feature title="File Explorer"> + <div class="feature clearfix"> + <span class="feature title">File Explorer</span> - <image href="images/file_smal.png" title="File Explorer" - fullhref="images/file_smal.png" width="135" height="200" /> - <text> - <div> - Advanced File-Explorer in every conference room, Drag and Drop - interface for managing uploaded files, including the possibility to - create a document tree with folders. - <br /> + <img src="images/file_smal.png" title="File Explorer" width="135" height="200" /> + <span class="desc"> + <span class="p">Advanced File-Explorer in every conference room, Drag and Drop + interface for managing uploaded files, including the possibility to + create a document tree with folders. + </span> <br /> - Private and Public Drive in - File-Explorer. The File-Explorer has two - different views, one is the - <b>Private Drive</b> - and the other the - <b>Public Drive</b> - . The Private Drive - always contains the same files. - Those files are - visible only to the - user currently loggedin. The - Public Drive is not - bound to the user, - but to the conference room - instead. All users in - the conference room - have access to the Public - Drive. - </div> - </text> - </feature> + <span class="p"> + Private and Public Drive in File-Explorer. The File-Explorer has two different views, one is the + <b>Private Drive</b> and the other the <b>Public Drive</b>. The Private Drive always contains the same files. + Those files are visible only to the user currently loggedin. The Public Drive is not + bound to the user, but to the conference room instead. All users in the conference room + have access to the Public Drive. + </span> + </span> + </div> - <feature title="Moderating System"> + <div class="feature clearfix"> + <span class="feature title">Moderating System</span> - <image href="images/right_management.png" title="Right management" - fullhref="images/right_management.png" width="135" height="216" /> - <text> - <div> - During a conference, the moderator can adjust the user permission - to every user individually . + <img src="images/right_management.png" title="Right management" width="135" height="216" /> + <span class="desc"> + <span class="p">During a conference, the moderator can adjust the user permission to every user individually. + </span> <ul> <li> - <img class="alignnone" title="Allow modaration" src="images/user_add.png" - alt="" /> + <img class="alignnone" title="Allow modaration" src="images/user_add.png" alt="" /> Allow/Deny moderation </li> <li> - <img class="alignnone" title="Whiteboard Access" src="images/pencil_add.png" - alt="" /> + <img class="alignnone" title="Whiteboard Access" src="images/pencil_add.png" alt="" /> Allow/Deny to draw on white board </li> <li> - <img class="alignnone" title="Screenshare" src="images/monitor_add.png" - alt="" /> + <img class="alignnone" title="Screenshare" src="images/monitor_add.png" alt="" /> Allow/Deny screen-sharing/record screen </li> <li> - <img class="alignnone" title="Remote control" src="images/mouse_add.png" - alt="" /> + <img class="alignnone" title="Remote control" src="images/mouse_add.png" alt="" /> Allow/Deny Remote Control Screen </li> <li> - <img class="alignnone" title="Remote control" src="images/micro_small.png" - alt="" /> + <img class="alignnone" title="Remote control" src="images/micro_small.png" alt="" /> Give exclusive audio to others or self </li> <li> - <img class="alignnone" title="Video Audio" src="images/audio_and_video.png" - alt="" /> + <img class="alignnone" title="Video Audio" src="images/audio_and_video.png" alt="" /> (Re-) Start Audio, Video or Device settings </li> </ul> - </div> - </text> - </feature> + </span> + </div> + <div class="feature clearfix"> + <span class="feature title">Multi-Whiteboard and Chat</span> - <feature title="Multi-Whiteboard and Chat"> + <span class="desc" style="float: left;"> + <img src="images/whiteboard.png" title="Whiteboard" style="float:none; display: block; width: 240px; height: 165px" /> + <img src="images/chat.png" title="Chat in Conference Room" style="float:none; display: block; width: 240px; height: 68px" /> + </span> + <span class="desc" style="margin-top: 50px;"> + <span class="p"> + Multi-Whiteboard, you can add new whiteboard instances, each + white board can have the full range of tools and + documents inside. + <br /> + <br /> + Save white boards. You can save each whiteboard instance as a file. + The file is located in the File-Explorer and + can be drag n' drop'ed + to the white board again and organized like any other document, + image or folder. + <br /> + <br /> + White board with drawing, writing, Drag n' Drop, Resizing, Images + (Drag n' Drop from File-Explorer), + Symbol(s)/Cliparts . + <br /> + <br /> + Full-fit does rescale the document on the screen to be 100% visible + on all screens no matter what kind of screen + resolution different users have. + <br /> + <br /> + You can import from a wide range of document formats (PDF, DOC, ODT, PPT, et cetera...) + </span> + </span> + </div> - <image href="images/whiteboard.png" fullhref="images/whiteboard.png" - title="Whiteboard" width="240" height="165" /> - <image href="images/chat.png" fullhref="images/chat.png" - title="Chat in Conference Room" width="240" height="68" /> - <text> - <div> - Multi-Whiteboard, you can add new whiteboard instances, each - white - board can have the full range of tools and documents inside. - <br /> - <br /> - Save white boards. You can save each whiteboard instance as a file. - The file is located in the File-Explorer and can be drag n' drop'ed - to the white board again and organized like any other document, - image or folder. - <br /> - <br /> - White board with drawing, writing, Drag n' Drop, Resizing, Images - (Drag n' - Drop from File-Explorer), Symbol(s)/Cliparts . - <br /> - <br /> - Full-fit does rescale the document on the screen to be 100% visible - on all - screens no matter what kind of screen resolution different - users - have. - <br /> - <br /> - You can import from a wide range of document formats (PDF, DOC, - ODT, PPT, et cetera...) - </div> - </text> - </feature> + <div class="feature clearfix"> + <span class="feature title">User and room management</span> - <feature title="User and room management"> + <img src="images/dashboard.png" title="Dashboard with MyRooms" width="250" height="130" /> + <span class="desc"> + <span class="p"> + You can manage users and multiple organizations in a single + OpenMeetings instance. You can also create users that only have + access via the SOAP-API. + <br /> + <br /> + MyRooms section. Each user has by default 2 personal rooms that are + always accessible exclusively for that user. There are buttons to + enter those rooms from the Dashboard. + <br /> + <br /> + You can assign conference room to all users, or you can assign them + only to specific user-groups. + </span> + </span> + </div> - <image href="images/dashboard.png" fullhref="images/dashboard.png" - title="Dashboard with MyRooms" width="250" height="130" /> - <text> - <div> - You can manage users and multiple organizations in a single - OpenMeetings instance. You can also create users that only have - access via the SOAP-API. - <br /> - <br /> - MyRooms section. Each user has by default 2 personal rooms that - are - always accessible exclusively for that user. There are buttons - to - enter those rooms from the Dashboard. - <br /> - <br /> - You can assign conference room to all users, or you can assign them - only to specific user-groups. - </div> - </text> - </feature> + <div class="feature clearfix"> + <span class="feature title">Private message center</span> - <feature title="Private message center"> - <image href="images/privat_messages.png" fullhref="images/privat_messages.png" - title="Private Messages and Contact Search" width="230" height="125" /> - <text> - <div> - Send users messages and organize them in folders. You can book - conference rooms by sending private messages. The booked event - automatically is in your and the participants calendar, changes to - that event will be populated to all users booked to the event. - <br /> - <br /> - User contacts, you can search users and add them to your contacts. - You - can even give them the right to see your calendar. - </div> - </text> - </feature> + <img src="images/privat_messages.png" title="Private Messages and Contact Search" width="230" height="125" /> + <span class="desc"> + <span class="p"> + Send users messages and organize them in folders. You can book + conference rooms by sending private messages. The booked event + automatically is in your and the participants calendar, changes to + that event will be populated to all users booked to the event. + <br /> + <br /> + User contacts, you can search users and add them to your contacts. You + can even give them the right to see your calendar. + </span> + </span> + </div> + + <div class="feature clearfix"> + <span class="feature title">Plan meetings with integrated calendar</span> - <feature title="Plan meetings with integrated calendar"> - <image href="images/calendar.png" fullhref="images/calendar.png" - title="Calendar" width="200" height="115" /> - <text> - <div> + <img src="images/calendar.png" title="Calendar" width="200" height="115" /> + <span class="desc"> <ul> - <li>Plan your conferencing and invite attendees from OpenMeetings - or External. - </li> - <li>The invited attendees will recieve an E-mail with details to - the meetings and a link with a secure hash to the conference - room. + <li>Plan your conferencing and invite attendees from OpenMeetings or External.</li> + <li>The invited attendees will recieve an E-mail with details to the meetings and a link with a + secure hash to the conference room. </li> <li>Share your calendar with your contacts.</li> </ul> - </div> - </text> - </feature> + </span> + </div> - <feature title="Polls and Votes"> - <image href="images/poll.png" fullhref="images/poll.png" - title="Create a poll" width="250" height="250" /> - <text> - <div> - You can create a poll with yes/no or 1-10 questions, let the - user - vote and see the voting results. - <br /> - <br /> - Polls can be stored and results viewed as pie-chart - </div> - </text> - </feature> + <div class="feature clearfix"> + <span class="feature title">Polls and Votes</span> - <feature title="Backup"> - <image href="images/backup.png" fullhref="images/backup.png" title="Backup" width="250" /> - <text> - <div> - You can backup all user-generated data including files - uploaded by the users in a single ZIP file and import that ZIP into - a new installation of OpenMeetings again. - </div> - </text> - </feature> + <img src="images/poll.png" title="Create a poll" width="250" height="250" /> + <span class="desc"> + <span class="p"> + You can create a poll with yes/no or 1-10 questions, let the + user vote and see the voting results. + <br /> + <br /> + Polls can be stored and results viewed as pie-chart + </span> + </span> + </div> + <div class="feature clearfix"> + <span class="feature title">Backup</span> + <img src="images/backup.png" title="Backup" width="250" /> + <span class="desc"> + <span class="p">You can backup all user-generated data including files + uploaded by the users in a single ZIP file and import that ZIP into + a new installation of OpenMeetings again. + </span> + </span> + </div> </section> - </body> </document> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/installation.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/installation.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/installation.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/installation.xml Fri Nov 13 01:24:41 2015 @@ -12,8 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> - +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Home</title> <author email="[email protected]"> @@ -28,18 +29,18 @@ <p> To update from past versions or migrate see <a href="Upgrade.html">Upgrade</a>.<br/> If you are looking for commercial help have a look at - <a href="commercial-support.html" target="_BLANK" rel="nofollow">commercial support</a>. + <a href="commercial-support.html" target="_blank" rel="nofollow">commercial support</a>. </p> <div> <a href="downloads.html" rel="nofollow"> <img src="images/installation_instructions.png" alt="Installation in 3 simple steps" /> </a> <p> - <i>Note: OpenMeetings requires SUN/Oracle JRE 6, not openJDK!</i><br /> + <i>Note: Openmeetings requires JRE 7/8, JRE 6 is NOT compatible!</i><br /> <i> Since Version 2.0 you can also install OpenMeetings from command line. Just cd to the unpacked archive and type ./admin.sh or admin.bat, please see - <a href="CommandLineAdmin.html" target="_BLANK" rel="nofollow">Command Line Admin</a> + <a href="CommandLineAdmin.html" target="_blank" rel="nofollow">Command Line Admin</a> for more options </i> </p> @@ -67,13 +68,13 @@ Install <b>ImageMagick</b> on the server, you can get more information on - <a href="http://www.imagemagick.org"; rel="nofollow" target="_BLANK">http://www.imagemagick.org + <a href="http://www.imagemagick.org"; rel="nofollow" target="_blank">http://www.imagemagick.org </a> regarding installation. The instructions for installation can be found there <a href="http://www.imagemagick.org/script/binary-releases.php"; - target="_BLANK" rel="nofollow">http://www.imagemagick.org/script/binary-releases.php + target="_blank" rel="nofollow">http://www.imagemagick.org/script/binary-releases.php </a> , however on @@ -91,7 +92,7 @@ <b>GhostScript</b> on the server, you can get more information on - <a href="http://www.ghostscript.com/download/gsdnld.html"; target="_BLANK" + <a href="http://www.ghostscript.com/download/gsdnld.html"; target="_blank" rel="nofollow"> http://www.ghostscript.com/download/gsdnld.html </a> @@ -107,13 +108,13 @@ <b>SWFTools</b> on the server, you can get more information on - <a href="http://www.swftools.org/"; target="_BLANK" rel="nofollow">http://www.swftools.org/ + <a href="http://www.swftools.org/"; target="_blank" rel="nofollow">http://www.swftools.org/ </a> regarding installation. Some of the Linux distributions already have it in there package manager (see <a href="http://packages.debian.org/unstable/utils/swftools"; - target="_BLANK" rel="nofollow">http://packages.debian.org/unstable/utils/swftools + target="_blank" rel="nofollow">http://packages.debian.org/unstable/utils/swftools </a> ), the recommended version of SWFTools is 0.9 as prior version @@ -131,7 +132,7 @@ <div style="margin-top: 10px; margin-bottom:10px"> <ul> <li> - <a href="http://code.google.com/p/jodconverter/"; target="_BLANK" + <a href="http://code.google.com/p/jodconverter/"; target="_blank" rel="nofollow">JODConverter</a> installed (needed since v2.x) </li> @@ -155,7 +156,7 @@ . You should get FFMPEG in an up to date copy! OpenMeetings is tested with FFMPEG Version 10.3 and latest build from GIT For Windows you can download a Build for example from - <a href="http://ffmpeg.zeranoe.com/builds/"; target="_BLANK" + <a href="http://ffmpeg.zeranoe.com/builds/"; target="_blank" rel="nofollow">http://ffmpeg.zeranoe.com/builds/ </a> Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable @@ -164,7 +165,7 @@ <li> Install <b>SoX</b> - <a href="http://sox.sourceforge.net/"; target="_BLANK" rel="nofollow">http://sox.sourceforge.net/ + <a href="http://sox.sourceforge.net/"; target="_blank" rel="nofollow">http://sox.sourceforge.net/ </a> . You should install SoX in a up to date copy! SoX 12.xx will NOT @@ -185,22 +186,6 @@ </p> </section> - <section name="VMWare"> - <ul> - <li> - See - <a href="http://nightly.openmeetings.de/openmeetings/builds/vmware/"; - rel="nofollow">http://nightly.openmeetings.de/openmeetings/builds/vmware/</a> - </li> - <li> - VMWare 1.6.1 - <a - href="http://openstudio.no-ip.info/2011/01/openmeetings-1-6-rc1-vmware-appliance-using-ubuntu-server-10-04-lts/"; - rel="nofollow">blog-entry</a> - </li> - </ul> - </section> - <section name="Hardware Requirements"> <ul> <li> @@ -261,11 +246,6 @@ </li> <li> <a - href="http://aitinet.com/blog/wp-content/uploads/2009/08/TUTORIAL-PARA-INSTALACAO-DO-RED5-E-OPENMEETINGS-NO-LINUX-DEBIAN-LENNY-51.pdf"; - rel="nofollow">Portuguese Version for Debian Installation of 0.9 RC1</a> - </li> - <li> - <a href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/Tutorials+for+installing+OpenMeetings+and+Tools"; rel="nofollow">Automatic script installation for Ubuntu/Debian (beta)</a> </li> @@ -282,40 +262,30 @@ <section name="Tips and Tricks"> <ul> <li> - Use the Debug-Application: Enter in your browser - <a - href="http://$RED-HOST:$RED5-PORT/openmeetings/?swf=maindebug.as3.swf11.swf"; - rel="nofollow">http://$RED-HOST:$RED5-PORT/openmeetings/?swf=maindebug.as3.swf11.swf - </a> - for example - <a href="http://localhost:5080/openmeetings/?swf=maindebug.as3.swf11.swf"; - rel="nofollow">http://localhost:5080/openmeetings/?swf=maindebug.as3.swf11.swf - </a> + Use the Debug-Application: open <tt>$RED5_HOME/webapps/openmeetings/WEB-INF/web.xml</tt> change + <source><![CDATA[ +<init-param> + <param-name>configuration</param-name> + <param-value>DEPLOYMENT</param-value> +</init-param> + ]]></source> to be + <source><![CDATA[ +<init-param> + <param-name>configuration</param-name> + <param-value>DEVELOPMENT</param-value> +</init-param> + ]]></source> + then access your OM installation </li> - <li>If you have Problems with conversion-jobs check your Red5-Log - output. There will be error Messages which help you. You must + <li>If you have Problems with conversion-jobs check your openmeetings log + output (available at <tt>$RED5_HOME/log/openmeetings.log</tt>). There will be error Messages which help you. You must install OpenOffice, ImageMagick, GhostScript and SWFTools to run all conversion-Jobs correctly. </li> - <li>if you have problems in converting Files check the Batch-Scripts - in $OPENMEETINGS_HOME/jod - </li> - <li> - If you want to use red5 as a service (without red5.bat), you need - to move red5\wrapper\wrapper.exe to red5\wrapper.exe. Then change - some path in conf\wrapper.conf (like ..\lib\foo.jar to - lib\foo.jar). And finally change the register key in - HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Red5\ImagePath - to point to the new wrapper. - </li> <li> you can query a Mysql Database to get the schema_collection by using this query: - <div class="xmlcode"> - SELECT Table_name, TABLE_COLLATION FROM - information_schema.tables WHERE table_schema = 'openmeetings' - ORDER BY table_name DESC - </div> + <source><![CDATA[SELECT Table_name, TABLE_COLLATION FROM information_schema.tables WHERE table_schema = 'openmeetings' ORDER BY table_name DESC ]]></source> </li> </ul> </section> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/oauth2.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/oauth2.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/oauth2.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/oauth2.xml Fri Nov 13 01:24:41 2015 @@ -12,7 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="website.xsd"> +<document xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>OAuth2 integration</title> <author email="[email protected]">OpenMeetings Team</author>
