Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/GeneralConfiguration.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>List of general configuration options</title> @@ -24,158 +26,275 @@ <body> <section name="List of general configuration options"> - <style><!-- - .configCell { - border: 1px solid rgb(204, 204, 204); - padding: 5px; - } - --></style> <p>In Administration > Configuration there are a number of configuration values. </p> <p></p> <table> <tr> - <th class="configCell"> key </th> - <th class="configCell"> default </th> - <th class="configCell"> meaning </th> - <th class="configCell"> availabe since OpenMeetings version </th> + <th> key </th> + <th> default </th> + <th> meaning </th> + <th> availabe since OpenMeetings version </th> </tr> <tr> - <td class="configCell"> user.login.minimum.length </td> - <td class="configCell"> 4 </td> - <td class="configCell"> minimum chars required for the login to create a user </td> - <td class="configCell"> 1.9.x </td> + <td> dashboard.show.myrooms </td> + <td> 0 or 1 </td> + <td> Dashboard: If the MyRooms widget should be visible or not </td> + <td> 1.9.x </td> </tr> <tr> - <td class="configCell"> user.pass.minimum.length </td> - <td class="configCell"> 4 </td> - <td class="configCell"> minimum chars required for the password to create a + <td> dashboard.show.chat </td> + <td> 0 or 1 </td> + <td> Dashboard: If the Chat widget should be visible or not </td> + <td> 1.9.x </td> + </tr> + <tr> + <td> dashboard.show.rssfeed </td> + <td> 0 or 1 </td> + <td> Dashboard: If the RSS-Feed widget should be visible or not </td> + <td> 1.9.x </td> + </tr> + <tr> + <td> rss_feed1 </td> + <td> http-URL </td> + <td> Dashboard: ATOM-Feed URL for the dashboard RSS Tab </td> + <td> 1.9.x </td> + </tr> + <tr> + <td> rss_feed2 </td> + <td> http-URL </td> + <td> Dashboard: ATOM-Feed URL for the dashboard RSS Tab </td> + </tr> + <tr> + <td> user.login.minimum.length </td> + <td> 4 </td> + <td> minimum chars required for the login to create a user </td> + <td> 1.9.x </td> + </tr> + <tr> + <td> user.pass.minimum.length </td> + <td> 4 </td> + <td> minimum chars required for the password to create a user </td> - <td class="configCell"> 1.9.x </td> + <td> 1.9.x </td> </tr> <tr> - <td class="configCell"> number.minutes.reminder.send </td> - <td class="configCell"> 15 </td> - <td class="configCell"> minutes the one-time reminder in the calender is + <td> number.minutes.reminder.send </td> + <td> 15 </td> + <td> minutes the one-time reminder in the calender is send, set to 0 to disable reminder </td> - <td class="configCell"> 1.9.x </td> + <td> 1.9.x </td> </tr> <tr> - <td class="configCell"> max_upload_size </td> - <td class="configCell"> 1073741824 </td> - <td class="configCell"> Maximum size of upload file (bytes) 1073741824 bytes + <td> max_upload_size </td> + <td> 1073741824 </td> + <td> Maximum size of upload file (bytes) 1073741824 bytes = 1GB </td> - <td class="configCell"> 1.8.x </td> + <td> 1.8.x </td> </tr> <tr> - <td class="configCell"> show.whiteboard.draw.status </td> - <td class="configCell"> 0 </td> - <td class="configCell"> Display name of the user who draw the current object + <td> show.whiteboard.draw.status </td> + <td> 0 </td> + <td> Display name of the user who draw the current object (User Name auto-disapper after 3 seconds. </td> - <td class="configCell"> 1.8.x </td> + <td> 1.8.x </td> </tr> <tr> - <td class="configCell"> use.old.style.ffmpeg.map.option </td> - <td class="configCell"> 0 </td> - <td class="configCell"> If the system should "." (old ffmpeg) instead of ":" + <td> use.old.style.ffmpeg.map.option </td> + <td> 0 </td> + <td> If the system should "." (old ffmpeg) instead of ":" (new ffmpeg) for the -map option in FFMPEG </td> - <td class="configCell"> 1.9.x </td> + <td> 1.9.x </td> </tr> <tr> - <td class="configCell"> inviter.email.as.replyto </td> - <td class="configCell"> 1 </td> - <td class="configCell"> Set inviter's email address as ReplyTo in email invitations (1 == set, 0 == NOT set) </td> - <td class="configCell"> 2.0.x </td> + <td> smtp_server </td> + <td> localhost </td> + <td> this is the smtp server to send messages </td> + <td> 1.9.x </td> + </tr> + <tr> + <td> smtp_port </td> + <td> 25 </td> + <td> this is the smtp server port normally 25 </td> + <td> 1.9.x </td> + </tr> + <tr> + <td> email_username </td> + <td> </td> + <td> System auth email username </td> + <td> 1.9.x </td> + </tr> + <tr> + <td> email_userpass </td> + <td> </td> + <td> System auth email password </td> + <td> 1.9.x </td> + </tr> + <tr> + <td> mail.smtp.starttls.enable </td> + <td> 0 </td> + <td> Enable TLS 1=true, 0=false </td> + <td> 1.9.x </td> + </tr> + <tr> + <td> mail.smtp.connection.timeout </td> + <td> 30000 </td> + <td> Socket connection timeout value in milliseconds. Default is 30 seconds (30000). </td> + <td> 1.9.x </td> </tr> <tr> - <td class="configCell"> office.path </td> - <td class="configCell"> </td> - <td class="configCell"> The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically </td> - <td class="configCell"> 2.0.x </td> + <td> mail.smtp.timeout </td> + <td> 30000 </td> + <td> Socket I/O timeout value in milliseconds. Default is 30 seconds (30000). </td> + <td> 1.9.x </td> </tr> <tr> - <td class="configCell"> default.landing.zone </td> - <td class="configCell"> user/dashboard </td> - <td class="configCell"> Area to be shown to the user after login. Possible values are: user/dashboard, user/calendar, user/record, rooms/my, rooms/group, rooms/public, admin/user, admin/connection + <td> system_email_addr </td> + <td> [email protected] </td> + <td> all send e-mails by the system will have this address </td> + <td> 1.9.x </td> + </tr> + <tr> + <td> inviter.email.as.replyto </td> + <td> 1 </td> + <td> Set inviter's email address as ReplyTo in email invitations (1 == set, 0 == NOT set) </td> + <td> 2.0.x </td> + </tr> + <tr> + <td> office.path </td> + <td> </td> + <td> The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically </td> + <td> 2.0.x </td> + </tr> + <tr> + <td> default.landing.zone </td> + <td> user/dashboard </td> + <td> Area to be shown to the user after login. Possible values are: user/dashboard, user/calendar, user/record, rooms/my, rooms/group, rooms/public, admin/user, admin/connection , admin/group, admin/room, admin/config, admin/lang, admin/ldap, admin/backup, admin/server, admin/oauth2 </td> - <td class="configCell"> 2.1.x, <b> values are changed in 3.0.0</b> </td> + <td> 2.1.x, <b> values are changed in 3.0.0</b> </td> </tr> <tr> - <td class="configCell"> sms.provider </td> - <td class="configCell"> </td> - <td class="configCell"> SMS service provider (bulksms.http.1) </td> - <td class="configCell"> 2.1.x </td> + <td> sms.provider </td> + <td> </td> + <td> SMS service provider (bulksms.http.1) </td> + <td> 2.1.x </td> </tr> <tr> - <td class="configCell"> sms.Username </td> - <td class="configCell"> </td> - <td class="configCell"> Login for SMS service provider </td> - <td class="configCell"> 2.1.x </td> + <td> sms.Username </td> + <td> </td> + <td> Login for SMS service provider </td> + <td> 2.1.x </td> </tr> <tr> - <td class="configCell"> sms.Userpass </td> - <td class="configCell"> </td> - <td class="configCell"> Password for SMS service provider </td> - <td class="configCell"> 2.1.x </td> + <td> sms.Userpass </td> + <td> </td> + <td> Password for SMS service provider </td> + <td> 2.1.x </td> </tr> <tr> - <td class="configCell"> sms.subject </td> - <td class="configCell"> </td> - <td class="configCell"> Subject of SMS reminder message </td> - <td class="configCell"> 2.1.x </td> + <td> sms.subject </td> + <td> </td> + <td> Subject of SMS reminder message </td> + <td> 2.1.x </td> </tr> <tr> - <td class="configCell"> swftools_zoom </td> - <td class="configCell"> 100 </td> - <td class="configCell"> DPI for conversion of PDF to SWF (should be an integer between 50 and 600 with a default value of 100 DPI) </td> - <td class="configCell"> 2.0.x </td> + <td> swftools_zoom </td> + <td> 100 </td> + <td> DPI for conversion of PDF to SWF (should be an integer between 50 and 600 with a default value of 100 DPI) </td> + <td> 2.0.x </td> </tr> <tr> - <td class="configCell"> swftools_jpegquality </td> - <td class="configCell"> 85 </td> - <td class="configCell"> Compression quality for conversion of PDF to SWF (should be an integer between 1 and 100, with a default value of 85) </td> - <td class="configCell"> 2.0.x </td> + <td> swftools_jpegquality </td> + <td> 85 </td> + <td> Compression quality for conversion of PDF to SWF (should be an integer between 1 and 100, with a default value of 85) </td> + <td> 2.0.x </td> </tr> <tr> - <td class="configCell"> sendEmailAtRegister </td> - <td class="configCell"> 0 </td> - <td class="configCell"> User get a EMail with their Account data. Values: 0(No) or 1(Yes) </td> - <td class="configCell"> 2.0.x </td> + <td> sendEmailAtRegister </td> + <td> 0 </td> + <td> User get a EMail with their Account data. Values: 0(No) or 1(Yes) </td> + <td> 2.0.x </td> </tr> <tr> - <td class="configCell"> sendEmailWithVerficationCode </td> - <td class="configCell"> 0 </td> - <td class="configCell"> User must activate their account by clicking on the + <td> sendEmailWithVerficationCode </td> + <td> 0 </td> + <td> User must activate their account by clicking on the activation-link in the registering Email. Values: 0(No) or 1(Yes) It makes no sense to make this(sendEmailWithVerficationCode) 1(Yes) while sendEmailAtRegister is 0(No) cause you need to send a EMail. </td> - <td class="configCell"> 2.0.x </td> + <td> 2.0.x </td> + </tr> + <tr> + <td> redirect.url.for.external.users </td> + <td> </td> + <td> Users entered the room via invitationHash or secureHash will be redirected to this URL on connection lost </td> + <td> 2.2.x </td> + </tr> + <tr> + <td> allow_frontend_register </td> + <td> (configurable during install) </td> + <td> Is user register available on login screen </td> + <td> 1.8.x </td> + </tr> + <tr> + <td> allow.soap.register </td> + <td> 1 </td> + <td> Is user register available via SOAP/REST </td> + <td> 3.0.x </td> + </tr> + <tr> + <td> allow.oauth.register </td> + <td> 1 </td> + <td> Is user register available via OAuth </td> + <td> 3.0.x </td> + </tr> + <tr> + <td> application.base.url </td> + <td> http://localhost:5080/openmeetings </td> + <td> Base URL your OPenmeetings installation will be accessible at. </td> + <td> 3.0.2 </td> + </tr> + <tr> + <td> default.quality.screensharing </td> + <td> 1 </td> + <td> Default selection in ScreenSharing Quality:<br/> + 0 - bigger frame rate, no resize<br/> + 1 - no resize<br/> + 2 - size == 1/2 of selected area<br/> + 3 - size == 3/8 of selected area </td> + <td> 3.0.3 </td> + </tr> + <tr> + <td> default.fps.screensharing </td> + <td> 10 </td> + <td> Default selection in ScreenSharing FPS. </td> + <td> 3.0.3 </td> </tr> <tr> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> redirect.url.for.external.users </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Users entered the room via invitationHash or secureHash will be redirected to this URL on connection lost </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 2.2.x </td> + <td> screensharing.fps.show </td> + <td> true </td> + <td> Is screensharing FPS should be displayed or not (true/false). </td> + <td> 3.0.3 </td> </tr> <tr> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> allow_frontend_register </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> (configurable during install) </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Is user register available on login screen </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 1.8.x </td> + <td> screensharing.allow.remote </td> + <td> true </td> + <td> Is remote control will be enabled while screensharing. Allowing remote control will be not possible in case it is set to 'false' (true/false). </td> + <td> 3.0.4 </td> </tr> <tr> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> allow.soap.register </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 1 </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Is user register available via SOAP/REST </td> - <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> 3.0.x </td> + <td> calendar.firstday </td> + <td> 0 </td> + <td> 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. </td> + <td> 3.0.4 </td> </tr> </table> </section>
Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/GetVersionInfo.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/GetVersionInfo.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/GetVersionInfo.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/GetVersionInfo.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>How to check which Openmeetings version running</title> @@ -32,13 +34,13 @@ Open OM_HOME/log/openmeetings.log </p> <p>You get something like this: </p> - <div class="xmlcode"><pre> + <source> ################################################## # Openmeetings is up # # 2.1.1-RELEASE 1490720 7-June-2013 # # and ready to use # ################################################## - </pre></div> + </source> </section> <section name="How to check which Openmeetings version running (1.8.0 - 2.1.0)"> <p>If you need to know what version of OpenMeetings you are running, @@ -53,20 +55,16 @@ /META-INF/MANIFEST.MF </p> <p>You get something like this: </p> - <div class="xmlcode"> - Manifest-Version: 1.0 - <br /> - Ant-Version: Apache Ant 1.8.2 - <br /> - Created-By: 1.6.0_26-b03-383-11A511 (Apple Inc.) - <br /> - Built-By: OpenMeetings - http://openmeetings.googlecode.com - <br /> - Built-On: 23-October-2011 - <br /> - Svn-Revision: 4368 - <br /> - </div> + <source> +<![CDATA[ +Manifest-Version: 1.0 +Ant-Version: Apache Ant 1.8.2 +Created-By: 1.6.0_26-b03-383-11A511 (Apple Inc.) +Built-By: OpenMeetings - http://openmeetings.googlecode.com +Built-On: 23-October-2011 +Svn-Revision: 4368 +]]> + </source> <p>This version info is available since version 1.8.0. If you have an older version as version 1.8.0 then you might simply check the language files and the labelid in there, the numbers of labels are Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/HotKeys.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/HotKeys.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/HotKeys.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/HotKeys.xml Fri Nov 13 01:24:41 2015 @@ -12,12 +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>Hot Keys</title> - <author email="[email protected]"> - OpenMeetings Team - </author> + <author email="[email protected]">OpenMeetings Team</author> </properties> <body> <section name="Keys table"> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/IBMDB2Config.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/IBMDB2Config.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/IBMDB2Config.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/IBMDB2Config.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>IBM DB2 Configuration</title> <author email="[email protected]"> @@ -40,13 +41,9 @@ Create database for OpenMeetings using a pagesize bigger or equal 8K, sample query: <br /> - <div class="xmlcode"> - CREATE DATABASE openmeet AUTOMATIC STORAGE YES ON 'C:' DBPATH ON 'C:' - USING CODESET UTF-8 TERRITORY DE COLLATE USING System PAGESIZE 16 - K - </div> + <source><![CDATA[CREATE DATABASE openmeet AUTOMATIC STORAGE YES ON 'C:' DBPATH ON 'C:' USING CODESET UTF-8 TERRITORY DE COLLATE USING System PAGESIZE 16 K]]></source> </li> - <li>If you encounter issues, you can drop the db and then run + <li>If you encounter issues, you can drop the db and then run the web based installer again </li> </ul> </subsection> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Internationalisation.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Internationalisation.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Internationalisation.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Internationalisation.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]"> @@ -28,8 +29,8 @@ <p>You can find all current language files here: </p> <p> <a - href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/src/main/webapp/languages/"; - rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/src/main/webapp/languages/ + href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/"; + rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/ </a> </p> <p>Just take one file and translate it to your language. </p> @@ -55,8 +56,8 @@ <p> Once you have finished the translation you can add a new node to: <a - href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/src/main/webapp/languages/languages.xml"; - rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/src/main/webapp/languages/languages.xml + href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/languages.xml"; + rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/languages.xml </a> </p> <p>the name of the language should match the name of the file. Once @@ -67,4 +68,4 @@ </body> -</document> \ No newline at end of file +</document> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/JUnitTesting.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/JUnitTesting.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/JUnitTesting.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/JUnitTesting.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>JUnit Testing</title> <author email="[email protected]"> @@ -41,14 +42,10 @@ <li> <ul> <li>all tests: - <div class="xmlcode"> - ant test - </div> + <source>ant test</source> </li> <li>subset of tests by mask: - <div class="xmlcode"> - ant -Dtestcases=TestError* test - </div> + <source>ant -Dtestcases=TestError* test</source> </li> </ul> </li> @@ -56,9 +53,7 @@ <li> <ul> <li> - <div class="xmlcode"> - ant -Ddb=<your_DB> prepare-eclipse - </div> + <source><![CDATA[ant -Ddb=<your_DB> prepare-eclipse]]></source> </li> <li>Start Eclipse </li> <li>Load workspace with Openmeetings project (or refresh existing @@ -88,15 +83,11 @@ <ul> <li>Select Arguments tab </li> <li>Add the following code to the VM section - <div class="xmlcode"> - -javaagent:${workspace_loc:Openmeetings}/build/lib/om/openjpa-bundle-2.2.2.jar - -Dom.home=${workspace_loc:Openmeetings}/src/main/webapp - -Dbackups.dir=${workspace_loc:Openmeetings}/build/lib/junit/backups - </div> + <source>-javaagent:${workspace_loc:Openmeetings}/build/lib/om/openjpa-bundle-2.3.0.jar -Dom.home=${workspace_loc:Openmeetings}/openmeetings-web/src/main/webapp/ -Dbackups.dir=${workspace_loc:Openmeetings}/build/lib/junit/backups</source> </li> <li>To avoid temporary files being created in OM root, modify "Working Directory" as follows - <div class="xmlcode">${workspace_loc:Openmeetings}/build/junit</div> + <source>${workspace_loc:Openmeetings}/build/junit</source> </li> </ul> <p> @@ -119,4 +110,4 @@ </body> -</document> \ No newline at end of file +</document> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/JVMPerformanceTuning.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/JVMPerformanceTuning.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/JVMPerformanceTuning.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/JVMPerformanceTuning.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>Performance Tuning</title> <author email="[email protected]"> @@ -30,28 +31,22 @@ JVM. It is called red5-highperf.sh. It is recommended to use that script for production and high-load scenarios. </p> - <div class="xmlcode"> - #!/bin/bash - <br /> - <br /> - if [ -z "$RED5_HOME" ]; then export RED5_HOME=.; fi - <br /> - <br /> - # Previous option set - <br /> - export JAVA_OPTS="-Xrs -Xms512M -Xmx1024M -Xss128K -XX:NewSize=256m - -XX:SurvivorRatio=16 -XX:MinHeapFreeRatio=20 - -XX:+ExplicitGCInvokesConcurrent -Djava.net.preferIPv4Stack=true - -Xverify:none" - <br /> - <br /> - # start Red5 - <br /> - echo "Setting Hi Performance Options" - <br /> - exec $RED5_HOME/red5.sh >> $RED5_HOME/log/jvm.stdout 2>&1 & - <br /> - </div> + <source> +<![CDATA[ +#!/bin/bash + +if [ -z "$RED5_HOME" ]; then export RED5_HOME=.; fi + +# Previous option set +export JAVA_OPTS="-Xrs -Xms512M -Xmx1024M -Xss128K -XX:NewSize=256m \ + -XX:SurvivorRatio=16 -XX:MinHeapFreeRatio=20 -XX:+ExplicitGCInvokesConcurrent \ + -Djava.net.preferIPv4Stack=true -Xverify:none" + +# start Red5 +echo "Setting Hi Performance Options" +exec $RED5_HOME/red5.sh >> $RED5_HOME/log/jvm.stdout 2>&1 & +]]> + </source> <p>You have to exclude the "-XX:+UseConcMarkSweepGC" param from the default red5-highperf.sh to make it functional! However if you are a Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/JiraPlugin.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/JiraPlugin.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/JiraPlugin.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/JiraPlugin.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>Jira Plugin</title> <author email="[email protected]"> @@ -28,32 +28,27 @@ Current Development Snapshots for testing can be downloaded from: <a href="https://svn.apache.org/repos/asf/openmeetings/branches/jira-plugin/target/openmeetings-1.0-SNAPSHOT.jar";>here</a> . - </p> + </p> </section> - + <section name="Features"> <p>The plugin contains the following features: </p> <ul> <li>Create videoconference rooms through Jira: </li> <li> <ol> - <li>Integrated with Jira issues </li> + <li>Integrated with Jira issues </li> <li>Configurable room type </li> </ol> </li> - </ul> - </section> - - <section name="Demo video"> - <p>The demo video of Jira plugin show you the plugin in action </p> - <object style="height: 390px; width: 640px"> - <param name="movie" value="http://www.youtube.com/v/xBdYj-OZvlc?version=3&feature=player_detailpage"/> - <param name="allowFullScreen" value="true"/> - <param name="allowScriptAccess" value="always"/> - <embed src="http://www.youtube.com/v/xBdYj-OZvlc?version=3&feature=player_detailpage"; type="application/x-shockwave-flash" allowfullscreen="true" allowScriptAccess="always" width="640" height="360"/> - </object> + </ul> + </section> + + <section name="Demo video"> + <p>The demo video of Jira plugin show you the plugin in action </p> + <iframe width="640" height="390" src="http://www.youtube.com/embed/xBdYj-OZvlc"; 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/JoomlaPlugin.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/JoomlaPlugin.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/JoomlaPlugin.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/JoomlaPlugin.xml Fri Nov 13 01:24:41 2015 @@ -12,18 +12,18 @@ 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>Joomla Plugin</title> - <author email="[email protected]"> - OpenMeetings Team - </author> + <author email="[email protected]">OpenMeetings Team</author> </properties> <body> <section name="OpenMeetings Plugin for Joomla"> <p> Plugin for Joomla currently is not open source. - Please contact <a href="commercial-support.html" target="_BLANK" rel="nofollow">Commercial Support</a> to get it. + Please contact <a href="commercial-support.html" target="_blank" rel="nofollow">Commercial Support</a> to get it. </p> </section> <section name="Features"> @@ -47,22 +47,12 @@ <section name="Demo video"> <div> <b>OpenMeetings Joomla Plugin Installation</b><br/> - <object style="height: 360px; width: 640px"> - <param name="movie" value="http://www.youtube.com/v/jt8ejgtHavc?version=3&feature=player_detailpage"/> - <param name="allowFullScreen" value="true"/> - <param name="allowScriptAccess" value="always"/> - <embed src="http://www.youtube.com/v/jt8ejgtHavc?version=3&feature=player_detailpage"; type="application/x-shockwave-flash" allowfullscreen="true" allowScriptAccess="always" width="640" height="360"/> - </object> + <iframe width="640" height="360" src="https://www.youtube.com/embed/jt8ejgtHavc?feature=player_embedded"; frameborder="0" allowfullscreen=""></iframe> </div> <br/> <div> <b>OpenMeetings Integration with Joomla</b><br/> - <object style="height: 360px; width: 640px"> - <param name="movie" value="http://www.youtube.com/v/H61N0pfLusA?version=3&feature=player_detailpage"/> - <param name="allowFullScreen" value="true"/> - <param name="allowScriptAccess" value="always"/> - <embed src="http://www.youtube.com/v/H61N0pfLusA?version=3&feature=player_detailpage"; type="application/x-shockwave-flash" allowfullscreen="true" allowScriptAccess="always" width="640" height="360"/> - </object> + <iframe width="640" height="360" src="https://www.youtube.com/embed/H61N0pfLusA?feature=player_embedded"; frameborder="0" allowfullscreen=""></iframe> </div> </section> </body> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/LanguageEditor.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/LanguageEditor.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/LanguageEditor.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/LanguageEditor.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>Language Editor</title> <author email="[email protected]"> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/LdapAndADS.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/LdapAndADS.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/LdapAndADS.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/LdapAndADS.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]"> @@ -25,30 +26,30 @@ <section name="Ubuntu Installation"> <div> Run the commands - <blockquote> - <i> - sudo apt-get install slapd ldap-utils - </i> - </blockquote> + <source> +<![CDATA[ +sudo apt-get install slapd ldap-utils +]]> + </source> </div> <div> Modify file <tt>/etc/ldap/ldap.conf</tt> add highlighted attributes: - <blockquote> - <i> - #<br /> - # LDAP Defaults<br /> - #<br /> - # See ldap.conf(5) for details<br /> - # This file should be world readable but not world writable.<br /> - <b>BASE dc=unixmen,dc=com<br /> - URI ldap://192.168.1.200</b><br /> - #SIZELIMIT 12<br /> - #TIMELIMIT 15<br /> - #DEREF never<br /> - # TLS certificates (needed for GnuTLS)<br /> - TLS_CACERT /etc/ssl/certs/ca-certificates.crt<br /> - </i> - </blockquote> + <source> +<![CDATA[ +# +# LDAP Defaults +# +# See ldap.conf(5) for details +# This file should be world readable but not world writable. +BASE dc=unixmen,dc=com +URI ldap://192.168.1.200 +#SIZELIMIT 12 +#TIMELIMIT 15 +#DEREF never +# TLS certificates (needed for GnuTLS) +TLS_CACERT /etc/ssl/certs/ca-certificates.crt +]]> + </source> </div> <div> Run the Configuration assistant: <tt>sudo dpkg-reconfigure slapd</tt> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/MSSQLConfig.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/MSSQLConfig.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/MSSQLConfig.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/MSSQLConfig.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>MSSQL Configuration</title> - <author email="[email protected]"> - Apache OpenMeetings Documentation Team - </author> + <author email="[email protected]">Apache OpenMeetings Documentation Team</author> </properties> <body> @@ -48,7 +47,7 @@ <ul> <li> You need to download the JDBC driver from Microsoft - <a href="http://www.microsoft.com/en-us/download/details.aspx?displaylang=en&id=11774"; target="_BLANK" + <a href="http://www.microsoft.com/en-us/download/details.aspx?displaylang=en&id=11774"; target="_blank" rel="nofollow">http://www.microsoft.com/en-us/download/details.aspx?displaylang=en&id=11774</a> Unarchive appropriate file from it (sqljdbc.jar or sqljdbc4.jar) and place it into: <tt>$red5/webapps/openmeetings/WEB-INF/lib/</tt> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ManualTesting.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ManualTesting.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ManualTesting.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ManualTesting.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>Manual Testing</title> <author email="[email protected]"> @@ -274,7 +274,7 @@ <li>Phone and SMS switch: if set and turned on, sms messages should pass </li> <li>Change a status â non-active user cannot login </li> <li>Change user role and re-login </li> - <li>Change user group - user has an access only to the rooms belong to his organization </li> + <li>Change user group - user has an access only to the rooms belong to his group </li> <li>Change community settings and check </li> </ol> </li> @@ -287,10 +287,10 @@ </ol> </li> <li> - Organizations + Groups <ol> - <li>Add/remove/edit/search an organization </li> - <li>Add/remove a user from the user list of selected organization </li> + <li>Add/remove/edit/search an group </li> + <li>Add/remove a user from the user list of selected group </li> </ol> </li> <li> @@ -364,7 +364,7 @@ <li> <b>Site integration tests</b> <ol> - <li>Enter OpenMeetings room from Mooddle site </li> + <li>Enter OpenMeetings room from Moodle site </li> <li>Check that recordings link are shown on the Moodle site </li> <li>Enter OpenMeetings room from Joomla site </li> <li>Check that recordings link are shown on the Joomla site </li> @@ -440,11 +440,11 @@ <li>Check that A's screen looks correctly for users B and C and sound is OK in the room</li> <li>Stop screen sharing by user A after 5 minutes</li> <li>Repeat steps 2.1.1-2.1.7 3 times</li> - <li>Repeat steps 2.1.1-2.1.7 one more time, but choose âVery high qualityâ on the step 2.1.5</li> - <li>Repeat steps 2.1.1-2.1.7 one more time, but choose âMedium qualityâ on the step 2.1.5</li> - <li>Repeat steps 2.1.1-2.1.7 one more time, but choose âLow qualityâ on the step 2.1.5</li> + <li>Repeat steps 2.1.1-2.1.7 one more time, but choose "Very high quality" on the step 2.1.5</li> + <li>Repeat steps 2.1.1-2.1.7 one more time, but choose "Medium quality" on the step 2.1.5</li> + <li>Repeat steps 2.1.1-2.1.7 one more time, but choose "Low quality" on the step 2.1.5</li> <li>Repeat steps 2.1.1-2.1.7 one more time, but choose some random height and width on the step 2.1.5</li> - <li>Repeat steps 2.1.1-2.1.7 one more time, but turn the âNotify on disconnectâ switch on the step 2.1.5</li> + <li>Repeat steps 2.1.1-2.1.7 one more time, but turn the "Notify on disconnect" switch on the step 2.1.5</li> </ol> </li> <li> @@ -457,11 +457,11 @@ <li>Start recording session by user A, choose High quality</li> <li>Stop recording session by user A after 5 minutes</li> <li>Repeat steps 2.2.1-2.2.6 3 times</li> - <li>Repeat steps 2.2.1-2.2.6 one more time, but choose âVery high qualityâ on the step 2.2.5</li> - <li>Repeat steps 2.2.1-2.2.6 one more time, but choose âMedium qualityâ on the step 2.2.5</li> - <li>Repeat steps 2.2.1-2.2.6 one more time, but choose âLow qualityâ on the step 2.2.5</li> + <li>Repeat steps 2.2.1-2.2.6 one more time, but choose "Very high quality" on the step 2.2.5</li> + <li>Repeat steps 2.2.1-2.2.6 one more time, but choose "Medium quality" on the step 2.2.5</li> + <li>Repeat steps 2.2.1-2.2.6 one more time, but choose "Low quality" on the step 2.2.5</li> <li>Repeat steps 2.2.1-2.2.6 one more time, but choose some random height and width on the step 2.2.5</li> - <li>Repeat steps 2.2.1-2.2.6 one more time, but turn the âNotify on disconnectâ switch on the step 2.2.5</li> + <li>Repeat steps 2.2.1-2.2.6 one more time, but turn the "Notify on disconnect" switch on the step 2.2.5</li> <li>Go to the A's recordings list and check that all the recordings are there, processed without errors and work as expected</li> </ol> </li> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/MoodlePlugin.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/MoodlePlugin.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/MoodlePlugin.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/MoodlePlugin.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>Moodle Plugin</title> <author email="[email protected]"> @@ -26,17 +27,8 @@ <section name="Moodle Plugin for OpenMeetings"> <p> You can get the latest Version of the Plugin for Moodle from the - <a href="downloads.html">downloads</a> - . - <br/> - You can find the OpenMeetings Plugin also in the - <a href="http://moodle.org/plugins/view.php?plugin=mod_openmeetings"; - target="_BLANK" rel="nofollow">Moodle Plugin database</a> - . - <br/> - A demo version of the Moodle plugin is available at - <a href="http://moodle.openmeetings.de"; target="_BLANK" rel="nofollow">moodle.openmeetings.de - </a> + <a href="https://moodle.org/plugins/view.php?plugin=mod_openmeetings"; + target="_blank" rel="nofollow">Moodle Plugin database</a> . </p> </section> @@ -48,10 +40,7 @@ The folder structure is:<br/> $MOODLE_HOME/mod/openmeetings/*.php <br /> - Then you visit the admin interface of Moodle, for example - <a href="http://$your_moodle_host/$MOODLE_WWW_ROOT/admin"; target="_BLANK" - rel="nofollow">http://$your_moodle_host/$MOODLE_WWW_ROOT/admin</a> - <br/> + Then you visit the admin interface of Moodle, for example <u>http://$your_moodle_host/$MOODLE_WWW_ROOT/admin</u><br/> Moodle will detect that there is a new plugin and will show the plugin installation screen: </p> <a class="fancybox-buttons" href="images/moodle_install_plugin.png"> @@ -80,6 +69,10 @@ </a> </section> + <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/pPgv7zkPXAk"; 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/MySQLConfig.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/MySQLConfig.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/MySQLConfig.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/MySQLConfig.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>MySQL Configuration</title> <author email="[email protected]"> @@ -47,7 +48,7 @@ <ul> <li> You need to download the JConnector from mysql - <a href="http://www.mysql.com/downloads/connector/j/"; target="_BLANK" + <a href="http://www.mysql.com/downloads/connector/j/"; target="_blank" rel="nofollow">http://www.mysql.com/downloads/connector/j/</a> and place it into: <tt>$red5/webapps/openmeetings/WEB-INF/lib/</tt> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Navigation.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Navigation.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Navigation.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/Navigation.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>Change main navigation</title> <author email="[email protected]"> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/OpenOfficeConverter.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/OpenOfficeConverter.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/OpenOfficeConverter.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/OpenOfficeConverter.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>OpenOffice converter for OpenMeetings</title> <author email="[email protected]"> @@ -42,7 +43,7 @@ <p> Installation of JODConverter means: You donwload the ZIP binary from their - <a href="http://code.google.com/p/jodconverter/"; target="_BLANK" + <a href="http://code.google.com/p/jodconverter/"; target="_blank" rel="nofollow">website</a> and then configure in Apache OpenMeetings Administration > Configuration (or during installation) the config key Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/OracleConfig.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/OracleConfig.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/OracleConfig.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/OracleConfig.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>IBM DB2 Configuration</title> <author email="[email protected]"> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/PortSettings.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/PortSettings.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/PortSettings.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/PortSettings.xml Fri Nov 13 01:24:41 2015 @@ -12,32 +12,26 @@ 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>Port settings</title> - <author email="[email protected]"> - OpenMeetings Team - </author> + <author email="[email protected]">OpenMeetings Team</author> </properties> <body> - <section name="Default Configuration"> - <ul> <li>Port 5080: HTTP (For example for file upload and download) </li> <li>Port 1935: RTMP (Flash Stream and Remoting/RPC) </li> - <li>Port 8088: RTMP over HTTP-Tunneling (rtmpT) </li> </ul> <p>Additionally red5 uses some ports internally. However those ports are not in use by OpenMeetings by default. </p> - </section> <section name="Configure alternative ports"> - <p>You need to change two files: </p> <ul> <li>Server-Side configuration: $RED5_HOME/conf/red5.properties, you @@ -48,9 +42,7 @@ browser cache after changing the file. </li> <li> - <blockquote>Every server side configuration has a client side - representative - </blockquote> + <tt>Every server side configuration has a client side representative</tt> </li> </ul> <p></p> @@ -74,36 +66,21 @@ <td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> rtmpport </td> </tr> </table> - </section> <section name="Preventing Firewall issues"> - - <p>A common way of bypassing the firewall is to change HTTP port to - 80 and rtmpT to 443. - </p> + <p>A common way of bypassing the firewall is to change HTTP port to 80</p> <p>A short description about the connection mechanism: The application first tries connecting to rtmp 3 times, because rtmp is the protocol that is less performance hungry. If that fails the application will fallback to rtmpT. </p> - <p>Most firewalls do allow traffic on port 443 and they normally do - not analyse the packets, because 443 is normally SSL encrypted, so - the firewall should not be able to read the packets at all. - </p> - </section> <section name="OpenMeetings over SSL"> - <p> - You can run OpenMeetings completely over SSL. See - <a href="RTMPSAndHTTPS.html">RTMPSAndHTTPS</a> - . + You can run OpenMeetings completely over SSL. See <a href="RTMPSAndHTTPS.html">RTMPSAndHTTPS</a>. </p> - </section> - </body> - -</document> \ No newline at end of file +</document> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/PostgresConfig.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/PostgresConfig.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/PostgresConfig.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/PostgresConfig.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>PostgreSQL Configuration</title> <author email="[email protected]"> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.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>Using OpenMeetings with RTMPS and HTTPS</title> <author email="[email protected]"> @@ -64,57 +65,54 @@ <ol> <li> Create a new keystore and key, use the same password for both:<br/> - (copied from - <a - href="http://trac.red5.org/wiki/Documentation/Tutorials/Red5DeveloperTips/SSLTLS%29:"; - rel="nofollow">http://trac.red5.org/wiki/Documentation/Tutorials/Red5DeveloperTips/SSLTLS):</a> - <div class="xmlcode"> - keytool -keysize 2048 -genkey -alias red5 -keyalg RSA -keystore red5/conf/keystore<br/> - Enter keystore password:<br/> - Re-enter new password:<br/> - What is your first and last name?<br/> - [Unknown]: <your hostname, e.g demo.openmeetings.de><br/> - What is the name of your organizational unit?<br/> - [Unknown]: Dev<br/> - What is the name of your organization?<br/> - [Unknown]: OpenMeetings<br/> - What is the name of your City or Locality?<br/> - [Unknown]: Henderson<br/> - What is the name of your State or Province?<br/> - [Unknown]: Nevada<br/> - What is the two-letter country code for this unit?<br/> - [Unknown]: US<br/> - Is CN=demo.openmeetings.de, OU=Dev, O=OpenMeetings, L=Henderson, ST=Nevada, C=US correct?<br/> - [no]: yes<br/> - Enter key password for <red5><br/> - </div> + <source> +<![CDATA[ +keytool -keysize 2048 -genkey -alias red5 -keyalg RSA -keystore red5/conf/keystore +Enter keystore password: +Re-enter new password: +What is your first and last name? +[Unknown]: <your hostname, e.g demo.openmeetings.de> +What is the name of your organizational unit? +[Unknown]: Dev +What is the name of your organization? +[Unknown]: OpenMeetings +What is the name of your City or Locality? +[Unknown]: Henderson +What is the name of your State or Province? +[Unknown]: Nevada +What is the two-letter country code for this unit? +[Unknown]: US +Is CN=demo.openmeetings.de, OU=Dev, O=OpenMeetings, L=Henderson, ST=Nevada, C=US correct? +[no]: yes +Enter key password for <red5> +]]> + </source> </li> - <li>Generate a CSR: keytool -certreq -keyalg RSA -alias red5 -file - red5.csr -keystore red5/conf/keystore + <li>Generate a CSR: <source><![CDATA[keytool -certreq -keyalg RSA -alias red5 -file red5.csr -keystore red5/conf/keystore]]></source> </li> <li>Submit CSR to your CA of choice and receive a signed certificate </li> <li>Import your chosen CA's root certificate into the keystore (may need to download it from their site - make sure to get the root CA and - not the intermediate one): keytool -import -alias root -keystore - red5/conf/keystore - -trustcacerts -file root.crt (note: you may receive a warning that - the certificate already exists in the system wide keystore - import + not the intermediate one): + <source><![CDATA[keytool -import -alias root -keystore red5/conf/keystore -trustcacerts -file root.crt]]></source> + (note: you may receive a warning that the certificate already exists in the system wide keystore - import anyway) </li> <li>Import the intermediate certificate(s) you normally receive with the certificate: - keytool -import -alias intermed -keystore red5/conf/keystore -trustcacerts - -file intermediate.crt + <source><![CDATA[keytool -import -alias intermed -keystore red5/conf/keystore -trustcacerts -file intermediate.crt]]></source> + </li> + <li>Import the certificate you received: + <source><![CDATA[keytool -import -alias red5 -keystore red5/conf/keystore -trustcacerts -file demo.openmeetings.de.crt]]></source> </li> - <li>Import the certificate you received: keytool -import -alias red5 - -keystore red5/conf/keystore -trustcacerts -file - demo.openmeetings.de.crt - </li> - <li> - Create additional certificate as described above. - Add this certificate to the following keystores: <tt>red5/conf/keystore.screen</tt> and <tt>red5/conf/keystore</tt>. + <li>Please NOTE according to this <a href="http://javarevisited.blogspot.com/2012/09/difference-between-truststore-vs-keyStore-Java-SSL.html";>http://javarevisited.blogspot.com/2012/09/difference-between-truststore-vs-keyStore-Java-SSL.html</a> + guide you can split keystore and truststore (OPTIONAL you might just copy keystore to truststore) + </li> + <li>Create additional certificate as described above. + Add this certificate to the following keystores: <tt>red5/conf/keystore.screen</tt> and <tt>red5/conf/keystore</tt>. (This step is required to be able to use + screen-sharing web application, you can copy "main" keystore while testing) </li> </ol> @@ -127,24 +125,21 @@ Uncomment <tt><!-- RTMPS --></tt> section in <tt>red5/conf/red5-core.xml</tt> </li> - <li> - Edit <tt>red5/conf/red5.properties</tt> and set - <tt>rtmps.port=5443</tt> - and - <tt>rtmps.keystorepass=password</tt> - (password = password you set on your new - keystore) + <li> Default RTMPS port is 8443, you can change it by editing <tt>red5/conf/red5.properties</tt> and change the port here: <tt>rtmps.port=8443</tt><br/> + Please set <tt>rtmps.keystorepass=password</tt> and <tt>rtmps.truststorepass=password</tt> + (password = password you set on your new keystore(s))<br/> + Additionally you need to set <tt>rtmps.screen.keystorepass=screenpassword</tt> (screenpassword = password you set on your keystore for screen-sharing application) </li> <li> - Edit red5/webapps/openmeetings/public/config.xml and set - <tt><rtmpsslport>5443</rtmpsslport></tt> - , - <tt><useSSL>yes</useSSL></tt> - and + Edit <tt>red5/webapps/openmeetings/public/config.xml</tt> and set<br/> + <tt><rtmpsslport>8443</rtmpsslport></tt>,<br/> + <tt><useSSL>yes</useSSL></tt> and<br/> <tt><proxyType>best</proxyType></tt> </li> - + <li>Please NOTE https port set in <tt>red5/conf/red5.properties</tt> should be in sync with the one set in + <tt>red5/webapps/openmeetings/public/config.xml</tt> + </li> <li>Restart red5 and try to connect - your connection should now be made via RTMPS (close port 1935 to be sure) </li> @@ -168,25 +163,29 @@ UNComment <tt>Tomcat with SSL enabled</tt> section </li> <li> - Edit red5/webapps/openmeetings/public/config.xml and set + Edit <tt>red5/webapps/openmeetings/public/config.xml</tt> and set <tt><protocol>https</protocol></tt> </li> <li> - Edit red5/webapps/openmeetings/public/config.xml and set - <tt>red5httpport</tt> to <tt>https</tt> port + Edit <tt>red5/webapps/openmeetings/public/config.xml</tt> and set + <tt><red5httpport>5443</red5httpport></tt> port </li> - <li>In webapps/openmeetings/WEB-INF/conf/axis2.xml add (below the existing http transportReceiver (around line 225)) - <div class="xmlcode"><transportReceiver name="https" class="org.apache.axis2.transport.http.AxisServletListener"><br/> -     <parameter name="port">443</parameter><br/> -</transportReceiver></div> + <li>In <tt>webapps/openmeetings/WEB-INF/conf/axis2.xml</tt> add (below the existing http transportReceiver (around line 225)) + <source> +<![CDATA[ +<transportReceiver name="https" class="org.apache.axis2.transport.http.AxisServletListener"> + <parameter name="port">5443</parameter> +</transportReceiver> +]]> + </source> + </li> + <li>Please NOTE https port set in <tt>red5/conf/red5.properties</tt> should be in sync with the one set + in <tt>red5/webapps/openmeetings/public/config.xml</tt> and <tt>webapps/openmeetings/WEB-INF/conf/axis2.xml</tt> </li> - <li>Edit red5/conf/red5.properties and set <tt>https.port=443</tt> </li> <li> Restart red5 and try to connect to - <a href="https://your.server"; rel="nofollow">https://your.server</a> - - you should be redirected to the OpenMeetings - app and all access should be via HTTPS or RTMPS (close port 5080 to - be sure). + <u>https://your.server:5443</u> - you should be redirected to the OpenMeetings + app and all access should be via HTTPS or RTMPS (close port 5080 to be sure). </li> </ol> @@ -203,4 +202,3 @@ </body> </document> - Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RecommendedHardwareList.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RecommendedHardwareList.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RecommendedHardwareList.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RecommendedHardwareList.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]"> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RedminePlugin.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RedminePlugin.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RedminePlugin.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RedminePlugin.xml Fri Nov 13 01:24:41 2015 @@ -12,12 +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>Redmine Plugin</title> - <author email="[email protected]"> - OpenMeetings Team - </author> + <author email="[email protected]">OpenMeetings Team</author> </properties> <body> <section name="OpenMeetings Plugin for Redmine"> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ReleaseGuide.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>Release Guide</title> <author email="[email protected]"> @@ -30,17 +31,20 @@ <div> <p>To build a binary release of OpenMeetings you need: </p> <ul> - <li>Sun JDK6</li> + <li>Sun 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" + <a href="http://subversion.apache.org/packages.html"; target="_blank" rel="nofollow">http://subversion.apache.org/packages.html</a> </li> <li>A text editor</li> <li>You need to be online! The build process actively downloads needed libraries and dependencies. </li> + <li>Valid certficate to be able to enter <a href="https://securesigning.websecurity.symantec.com/csportal/";>https://securesigning.websecurity.symantec.com/csportal/</a> + Please ask INFRA in case you need one. + </li> </ul> </div> @@ -75,8 +79,7 @@ <br /> Add the fingerprint string (something like "BF13 CF11 F9C9 0CBE 4413 09AB 0055 16BF 93A3 0395") to your profile at - <a href="http://id.apche-org"; target="_blank" rel="nofollow">id.apche-org - </a> + <a href="https://id.apache.org/"; target="_blank" rel="nofollow">https://id.apache.org/</a> <br /> Wait for 6-8 hours, the server will search for a public key based on your fingerprint, if success it will create a file with your @@ -111,89 +114,85 @@ Example: </p> - <div class="xmlcode"> - svn copy -r1453158 https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp \<br/> - https://svn.apache.org/repos/asf/openmeetings/tags/2.1RC1 \<br/> - -m "Release candidate 1" - </div> + <source> +svn copy -r1453158 https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp \ + https://svn.apache.org/repos/asf/openmeetings/tags/2.1RC1 \ + -m "Release candidate 1" + </source> <p>Get the source from your TAG: </p> - <div class="xmlcode"> - svn checkout https://svn.apache.org/repos/asf/openmeetings/tags/$BRANCHORTAG/<br /> - $BRANCHORTAG should be replaced with your new TAG - </div> + <source>svn checkout https://svn.apache.org/repos/asf/openmeetings/tags/$BRANCHORTAG/</source> + <p>$BRANCHORTAG should be replaced with your new TAG</p> <p>Edit the file build.properties change</p> - <div class="xmlcode"> - project.status=SNAPSHOT - </div> + <source>project.status=SNAPSHOT</source> <p>to</p> - <div class="xmlcode"> - project.status=RELEASE - </div> + <source>project.status=RELEASE</source> <p>Run the command: </p> - <div class="xmlcode"> - ant dist-release - </div> + <source>ant dist-release</source> <p>Test building the source on windows and OSx or Linux</p> <p>Test running the binary's</p> - <p>Create MD5 checksums</p> - <div class="xmlcode"> - #On OSX you might use this command to make a MD5 checksum and store it to a file<br /> - md5 -r apache-openmeetings-XXX-src.zip >apache-openmeetings-XXX-src.zip.md5 - </div> - <div class="xmlcode"> - #To create MD5 hashes On Ubuntu:<br /> - for f in `ls -1 *.tar.gz *.zip`; do md5sum $f > $f.md5; done<br/> - <br/> - #To check MD5 hashes On Ubuntu:<br /> - for f in `ls -1 *.tar.gz *.zip`; do md5sum -c $f.md5; done - </div> + <p>Create sha256sum checksums</p> + <source> +#On OSX you might use this command to make a MD5 checksum and store it to a file +shasum -a 256 -r apache-openmeetings-XXX-src.zip >apache-openmeetings-XXX-src.zip.md5 + </source> + <source> +<![CDATA[ +#To create MD5 hashes On Ubuntu: +for f in `ls -1 *.tar.gz *.zip`; do sha256sum $f > $f.sha; done + +#To check MD5 hashes On Ubuntu: +for f in `ls -1 *.tar.gz *.zip`; do sha256sum -c $f.sha; done +]]> + </source> <p> Create signatures with the your KEY for every file, the KEY must be available at:<br /> - <a href="http://www.apache.org/dist/incubator/openmeetings/KEYS";> - http://www.apache.org/dist/incubator/openmeetings/KEYS + <a href="https://svn.apache.org/repos/asf/openmeetings/project/KEYS";> + https://svn.apache.org/repos/asf/openmeetings/project/KEYS </a> </p> - <div class="xmlcode"> - #To create signatures On Ubuntu:<br /> - for f in `ls -1 *.tar.gz *.zip`; do gpg --armor --output $f.asc --detach-sig $f; done<br/> - <br/> - #To check signatures On Ubuntu:<br /> - for f in `ls -1 *.tar.gz *.zip`; do gpg --verify $f.asc; done - </div> + <source> +<![CDATA[ +#To create signatures On Ubuntu: +for f in `ls -1 *.tar.gz *.zip`; do gpg --armor --output $f.asc --detach-sig $f; done + +#To check signatures On Ubuntu: +for f in `ls -1 *.tar.gz *.zip`; do gpg --verify $f.asc; done +]]> + </source> <p> Commit artifacts you have created with KEYS file to the <tt>https://dist.apache.org/repos/dist/dev/openmeetings/</tt> Proposed file structure for "Release Candidate 1" of 2.1 will be: </p> - <div class="xmlcode"> - 2.1<br /> - 2.1/rc1<br /> - 2.1/rc1/src<br /> - 2.1/rc1/src/apache-openmeetings-2.1.0-src.zip<br /> - 2.1/rc1/src/apache-openmeetings-2.1.0-src.tar.gz<br /> - 2.1/rc1/src/apache-openmeetings-2.1.0-src.zip.md5<br /> - 2.1/rc1/src/apache-openmeetings-2.1.0-src.zip.asc<br /> - 2.1/rc1/src/apache-openmeetings-2.1.0-src.tar.gz.md5<br /> - 2.1/rc1/src/apache-openmeetings-2.1.0-src.tar.gz.asc<br /> - 2.1/rc1/bin<br /> - 2.1/rc1/bin/apache-openmeetings-2.1.0.zip<br /> - 2.1/rc1/bin/apache-openmeetings-2.1.0.tar.gz<br /> - 2.1/rc1/bin/apache-openmeetings-2.1.0.zip.md5<br /> - 2.1/rc1/bin/apache-openmeetings-2.1.0.zip.asc<br /> - 2.1/rc1/bin/apache-openmeetings-2.1.0.tar.gz.md5<br /> - 2.1/rc1/bin/apache-openmeetings-2.1.0.tar.gz.asc<br /> - 2.1/rc1/CHANGELOG<br /> - 2.1/rc1/KEYS<br /> - </div> + <source> +2.1 +2.1/rc1 +2.1/rc1/src +2.1/rc1/src/apache-openmeetings-2.1.0-src.zip +2.1/rc1/src/apache-openmeetings-2.1.0-src.tar.gz +2.1/rc1/src/apache-openmeetings-2.1.0-src.zip.md5 +2.1/rc1/src/apache-openmeetings-2.1.0-src.zip.asc +2.1/rc1/src/apache-openmeetings-2.1.0-src.tar.gz.md5 +2.1/rc1/src/apache-openmeetings-2.1.0-src.tar.gz.asc +2.1/rc1/bin +2.1/rc1/bin/apache-openmeetings-2.1.0.zip +2.1/rc1/bin/apache-openmeetings-2.1.0.tar.gz +2.1/rc1/bin/apache-openmeetings-2.1.0.zip.md5 +2.1/rc1/bin/apache-openmeetings-2.1.0.zip.asc +2.1/rc1/bin/apache-openmeetings-2.1.0.tar.gz.md5 +2.1/rc1/bin/apache-openmeetings-2.1.0.tar.gz.asc +2.1/rc1/CHANGELOG +2.1/rc1/KEYS + </source> </subsection> <subsection name="Step2 - VOTE and RESULT emails"> <p> - Send a "VOTE" to the developer mailing list including links to release artefacts.<br /> + Send a "VOTE" to the developer mailing list including links to release artifacts.<br /> A VOTE always contains two parts:<br /> Send an email to the developer mailing list with the subject line:<br /> [VOTE] Apache OpenMeetings x.xx release<br /> @@ -220,13 +219,34 @@ </p> </subsection> - <subsection name="Step3 - Distribute and announce"> + <subsection name="Step3 - Sign web start application"> + <p>If VOTEs positive: Sign screen sharing web application and re-pack the release</p> + <ul> + <li>Go to the folder you check out: https://svn.apache.org/repos/asf/openmeetings/tags/$BRANCHORTAG/</li> + <li>Run following command: <tt>ant repackWebStartJars</tt></li> + <li>Check any jar in <tt>dist/red5/webapps/openmeetings/screensharing/</tt>: Its META-INF/MANIFEST.MF file should NOT contain <tt>SHA1-Digest</tt> entries for classes</li> + <li>Go to <a href="https://securesigning.websecurity.symantec.com/csportal/";>https://securesigning.websecurity.symantec.com/csportal/</a></li> + <li>Select "Signing Sets"</li> + <li>Select "Add signing set"</li> + <li>Enter "Signing set name" (must include "Apache Openmeetings" and version) for ex. "Apache Openmeetings 3.0.4-RELEASE"</li> + <li>Enter "Version" for ex. "3.0.4-RELEASE"</li> + <li>Select "Java Signing" as "Signing service"</li> + <li>Select "Upload files" and add all <b>jar</b> files from <tt>dist/red5/webapps/openmeetings/screensharing/</tt></li> + <li>Select "Sign now"</li> + <li>Select "Type of signing" -> "Production"</li> + <li>Select "Sign"</li> + <li>Select "Download set"</li> + <li>Open binary artifacts of OM created on previous step (both <b>tar.gz</b> and <b>zip</b>)</li> + <li>Replace jar files inside artifacts <tt>webapps/openmeetings/screenshare</tt> with the signed ones</li> + <li>Re-create artifact signatures</li> + </ul> + <p>NOTE: "Type of signing" can be selected as "Test" to check everything works as expected</p> + + </subsection> + + <subsection name="Step4 - Distribute and announce"> <p>If VOTEs positive: Upload the release </p> - <div class="xmlcode"> - svn mv https://dist.apache.org/repos/dist/dev/openmeetings/2.1/rc3 \<br/> - https://dist.apache.org/repos/dist/release/openmeetings/2.1 \<br/> - -m "RC3 is released as 2.1" - </div> + <p>Upload Artifacts with signatures created on the previous steps to https://dist.apache.org/repos/dist/release/openmeetings/CURRENT_VERSION</p> <p> Wait 24 hours (until all Apache mirrors have synced the packages) and send an announcement to the mailing list + blog and any other @@ -238,6 +258,9 @@ [ANNOUNCE] Apache OpenMeetings x.xx released </p> <p> + Update release section of DOAP file <tt>openmeetings-server/src/site/xdoc/doap.rdf</tt> + </p> + <p> Add a section to <a href="downloads.html">downloads</a> website.<br /> Make sure that the binary packages are linked using the mirror URL as base path ( <b>not</b> http://www.apache.org/dist):<br /> @@ -249,9 +272,6 @@ Old releases should be deleted from <tt>https://dist.apache.org/repos/dist/release/openmeetings/</tt> </p> </subsection> - </section> - </body> - -</document> \ No newline at end of file +</document> Modified: openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RestAPISample.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RestAPISample.xml?rev=1714149&r1=1714148&r2=1714149&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RestAPISample.xml (original) +++ openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/RestAPISample.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]"> @@ -34,52 +35,49 @@ <p>For example for the method getSession in the UserService, you would use this URL via REST: </p> - <p>Sample URL: </p><a href="http://demo.openmeetings.de/openmeetings/services/UserService/getSession";>http://demo.openmeetings.de/openmeetings/services/UserService/getSession</a> + <p>Sample URL: </p><a href="https://demo-openmeetings.apache.org/openmeetings/services/UserService/getSession";>https://demo-openmeetings.apache.org/openmeetings/services/UserService/getSession</a> <p>Result: </p> - <div class="xmlcode"> - <ns:getSessionResponse/><br/> - <ns:return type="org.apache.openmeetings.hibernate.beans.basic.Sessiondata"/><br/> - <div style="margin-left:20px"> - <ax219:id>156971</ax219:id/><br/> - <ax219:language_id xsi:nil="true"//><br/> - <ax219:organization_id xsi:nil="true"//><br/> - <ax219:refresh_time>2011-07-03T14:40:44.000Z</ax219:refresh_time/><br/> - <ax219:sessionXml xsi:nil="true"//><br/> - <ax219:session_id>26584705202d7c1de6cc8e7e28890e3d</ax219:session_id/><br/> - <ax219:starttermin_time>2011-07-03T14:40:44.000Z</ax219:starttermin_time/><br/> - <ax219:storePermanent xsi:nil="true"//><br/> - <ax219:user_id xsi:nil="true"//><br/> - </div> - </ns:return/><br/> - </ns:getSessionResponse/><br/> - </div> + <source> +<![CDATA[ +<ns:getSessionResponse> + <ns:return type="org.apache.openmeetings.hibernate.beans.basic.Sessiondata"> + <ax219:id>156971</ax219:id> + <ax219:language_id xsi:nil="true"/> + <ax219:organization_id xsi:nil="true"/> + <ax219:refresh_time>2011-07-03T14:40:44.000Z</ax219:refresh_time> + <ax219:sessionXml xsi:nil="true"/> + <ax219:session_id>26584705202d7c1de6cc8e7e28890e3d</ax219:session_id> + <ax219:starttermin_time>2011-07-03T14:40:44.000Z</ax219:starttermin_time> + <ax219:storePermanent xsi:nil="true"/> + <ax219:user_id xsi:nil="true"/> + </ns:return> +</ns:getSessionResponse> +]]> + </source> <p>To login a user the call to auth would be:</p> - <p>Sample URL: </p><a href="http://demo.openmeetings.de/openmeetings/services/UserService/loginUser?SID=26584705202d7c1de6cc8e7e28890e3d&username=hans&userpass=test";>http://demo.openmeetings.de/openmeetings/services/UserService/loginUser?SID=26584705202d7c1de6cc8e7e28890e3d&username=han&userpass=test</a> + <p>Sample URL: </p><a href="https://demo-openmeetings.apache.org/openmeetings/services/UserService/loginUser?SID=26584705202d7c1de6cc8e7e28890e3d&username=hans&userpass=test";>https://demo-openmeetings.apache.org/openmeetings/services/UserService/loginUser?SID=26584705202d7c1de6cc8e7e28890e3d&username=han&userpass=test</a> <p>Result: </p> - <div class="xmlcode"> - <ns:loginUserResponse/><br/> - <div style="margin-left:20px"> - <ns:return>-11</ns:return/><br/> - </div> - </ns:loginUserResponse/><br/> - </div> + <source> +<![CDATA[ +<ns:loginUserResponse> + <ns:return>-11</ns:return> +</ns:loginUserResponse> +]]> + </source> <p>=> It does return -10, which is the error id cause we will not write down a SOAP login to our public server in this wiki. However the correct way to check this error would be to invoke the call to get the localized error message. So we invoke the method to get the error via REST:</p> - <p>Sample URL: </p><a href="http://demo.openmeetings.de/openmeetings/services/UserService/getErrorByCode?SID=26584705202d7c1de6cc8e7e28890e3d&errorid=-10&language_id=1";>http://demo.openmeetings.de/openmeetings/services/UserService/getErrorByCode?SID=26584705202d7c1de6cc8e7e28890e3d&errorid=-10&language_id=1</a> + <p>Sample URL: </p><a href="https://demo-openmeetings.apache.org/openmeetings/services/UserService/getErrorByCode?SID=26584705202d7c1de6cc8e7e28890e3d&errorid=-10&language_id=1";>https://demo-openmeetings.apache.org/openmeetings/services/UserService/getErrorByCode?SID=26584705202d7c1de6cc8e7e28890e3d&errorid=-10&language_id=1</a> <p>Result:</p> - <div class="xmlcode"> - <ns:getErrorByCodeResponse/><br/> - <ns:return type="org.apache.openmeetings.db.dto.basic.ErrorResult"/><br/> - <div style="margin-left:20px"> - <ax218:errmessage>Username not found</ax218:errmessage/><br/> - <ax218:errorId>-10</ax218:errorId/><br/> - <ax218:errortype>Error</ax218:errortype/><br/> - </div> - </ns:return/><br/> - </ns:getErrorByCodeResponse/><br/> - </div> + <source> +<![CDATA[ +<ns:getErrorByCodeResponse> + <ns:return type="org.apache.openmeetings.db.dto.basic.ErrorResult"> + <ax218:errmessage>Username not found</ax218:errmessage> + <ax218:errorId>-10</ax218:errorId> + <ax218:errortype>Error</ax218:errortype> + </ns:return> +</ns:getErrorByCodeResponse> +]]> + </source> </section> - - - </body> -</document> \ No newline at end of file +</document>
