You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/05/28 12:46:53 UTC
svn commit: r1597968 [11/11] - in /openmeetings/trunk/singlewebapp: docs/
docs/js/ docs/webservices/
docs/webservices/org/apache/openmeetings/webservice/
docs/webservices/org/apache/openmeetings/webservice/class-use/
openmeetings-server/src/site/xdoc/
Modified: openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/CalendarWebService.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/CalendarWebService.html?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/CalendarWebService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/CalendarWebService.html Wed May 28 10:46:51 2014
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
-<!-- Generated by javadoc (version 1.7.0_55) on Tue May 27 16:04:33 NOVT 2014 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Wed May 28 14:00:47 NOVT 2014 -->
<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
<title>Uses of Class org.apache.openmeetings.webservice.CalendarWebService (Openmeetings Webservices 3.1.0-SNAPSHOT API)</title>
-<meta name="date" content="2014-05-27">
+<meta name="date" content="2014-05-28">
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
</head>
<body>
Modified: openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/FileWebService.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/FileWebService.html?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/FileWebService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/FileWebService.html Wed May 28 10:46:51 2014
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
-<!-- Generated by javadoc (version 1.7.0_55) on Tue May 27 16:04:33 NOVT 2014 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Wed May 28 14:00:47 NOVT 2014 -->
<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
<title>Uses of Class org.apache.openmeetings.webservice.FileWebService (Openmeetings Webservices 3.1.0-SNAPSHOT API)</title>
-<meta name="date" content="2014-05-27">
+<meta name="date" content="2014-05-28">
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
</head>
<body>
Modified: openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/JabberWebService.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/JabberWebService.html?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/JabberWebService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/JabberWebService.html Wed May 28 10:46:51 2014
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
-<!-- Generated by javadoc (version 1.7.0_55) on Tue May 27 16:04:33 NOVT 2014 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Wed May 28 14:00:47 NOVT 2014 -->
<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
<title>Uses of Class org.apache.openmeetings.webservice.JabberWebService (Openmeetings Webservices 3.1.0-SNAPSHOT API)</title>
-<meta name="date" content="2014-05-27">
+<meta name="date" content="2014-05-28">
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
</head>
<body>
Modified: openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/RoomWebService.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/RoomWebService.html?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/RoomWebService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/RoomWebService.html Wed May 28 10:46:51 2014
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
-<!-- Generated by javadoc (version 1.7.0_55) on Tue May 27 16:04:33 NOVT 2014 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Wed May 28 14:00:47 NOVT 2014 -->
<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
<title>Uses of Class org.apache.openmeetings.webservice.RoomWebService (Openmeetings Webservices 3.1.0-SNAPSHOT API)</title>
-<meta name="date" content="2014-05-27">
+<meta name="date" content="2014-05-28">
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
</head>
<body>
Modified: openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/ServerWebService.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/ServerWebService.html?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/ServerWebService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/ServerWebService.html Wed May 28 10:46:51 2014
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
-<!-- Generated by javadoc (version 1.7.0_55) on Tue May 27 16:04:33 NOVT 2014 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Wed May 28 14:00:47 NOVT 2014 -->
<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
<title>Uses of Class org.apache.openmeetings.webservice.ServerWebService (Openmeetings Webservices 3.1.0-SNAPSHOT API)</title>
-<meta name="date" content="2014-05-27">
+<meta name="date" content="2014-05-28">
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
</head>
<body>
Modified: openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/UserWebService.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/UserWebService.html?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/UserWebService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/class-use/UserWebService.html Wed May 28 10:46:51 2014
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
-<!-- Generated by javadoc (version 1.7.0_55) on Tue May 27 16:04:33 NOVT 2014 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Wed May 28 14:00:47 NOVT 2014 -->
<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
<title>Uses of Class org.apache.openmeetings.webservice.UserWebService (Openmeetings Webservices 3.1.0-SNAPSHOT API)</title>
-<meta name="date" content="2014-05-27">
+<meta name="date" content="2014-05-28">
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
</head>
<body>
Modified: openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/package-frame.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/package-frame.html?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/package-frame.html (original)
+++ openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/package-frame.html Wed May 28 10:46:51 2014
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
-<!-- Generated by javadoc (version 1.7.0_55) on Tue May 27 16:04:33 NOVT 2014 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Wed May 28 14:00:47 NOVT 2014 -->
<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
<title>org.apache.openmeetings.webservice (Openmeetings Webservices 3.1.0-SNAPSHOT API)</title>
-<meta name="date" content="2014-05-27">
+<meta name="date" content="2014-05-28">
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
</head>
<body>
Modified: openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/package-summary.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/package-summary.html?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/package-summary.html (original)
+++ openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/package-summary.html Wed May 28 10:46:51 2014
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
-<!-- Generated by javadoc (version 1.7.0_55) on Tue May 27 16:04:33 NOVT 2014 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Wed May 28 14:00:47 NOVT 2014 -->
<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
<title>org.apache.openmeetings.webservice (Openmeetings Webservices 3.1.0-SNAPSHOT API)</title>
-<meta name="date" content="2014-05-27">
+<meta name="date" content="2014-05-28">
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
</head>
<body>
Modified: openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/package-tree.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/package-tree.html?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/package-tree.html (original)
+++ openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/package-tree.html Wed May 28 10:46:51 2014
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
-<!-- Generated by javadoc (version 1.7.0_55) on Tue May 27 16:04:33 NOVT 2014 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Wed May 28 14:00:47 NOVT 2014 -->
<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
<title>org.apache.openmeetings.webservice Class Hierarchy (Openmeetings Webservices 3.1.0-SNAPSHOT API)</title>
-<meta name="date" content="2014-05-27">
+<meta name="date" content="2014-05-28">
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
</head>
<body>
@@ -68,7 +68,7 @@
<div class="contentContainer">
<h2 title="Class Hierarchy">Class Hierarchy</h2>
<ul>
-<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><span class="strong">Object</span></a>
+<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><span class="strong">Object</span></a>
<ul>
<li type="circle">org.apache.openmeetings.webservice.<a href="../../../../org/apache/openmeetings/webservice/CalendarWebService.html" title="class in org.apache.openmeetings.webservice"><span class="strong">CalendarWebService</span></a></li>
<li type="circle">org.apache.openmeetings.webservice.<a href="../../../../org/apache/openmeetings/webservice/FileWebService.html" title="class in org.apache.openmeetings.webservice"><span class="strong">FileWebService</span></a></li>
Modified: openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/package-use.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/package-use.html?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/package-use.html (original)
+++ openmeetings/trunk/singlewebapp/docs/webservices/org/apache/openmeetings/webservice/package-use.html Wed May 28 10:46:51 2014
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
-<!-- Generated by javadoc (version 1.7.0_55) on Tue May 27 16:04:33 NOVT 2014 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Wed May 28 14:00:47 NOVT 2014 -->
<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
<title>Uses of Package org.apache.openmeetings.webservice (Openmeetings Webservices 3.1.0-SNAPSHOT API)</title>
-<meta name="date" content="2014-05-27">
+<meta name="date" content="2014-05-28">
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
</head>
<body>
Modified: openmeetings/trunk/singlewebapp/docs/webservices/overview-tree.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/webservices/overview-tree.html?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/webservices/overview-tree.html (original)
+++ openmeetings/trunk/singlewebapp/docs/webservices/overview-tree.html Wed May 28 10:46:51 2014
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
-<!-- Generated by javadoc (version 1.7.0_55) on Tue May 27 16:04:33 NOVT 2014 -->
+<!-- Generated by javadoc (version 1.7.0_55) on Wed May 28 14:00:47 NOVT 2014 -->
<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
<title>Class Hierarchy (Openmeetings Webservices 3.1.0-SNAPSHOT API)</title>
-<meta name="date" content="2014-05-27">
+<meta name="date" content="2014-05-28">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
</head>
<body>
@@ -72,7 +72,7 @@
<div class="contentContainer">
<h2 title="Class Hierarchy">Class Hierarchy</h2>
<ul>
-<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><span class="strong">Object</span></a>
+<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><span class="strong">Object</span></a>
<ul>
<li type="circle">org.apache.openmeetings.webservice.<a href="org/apache/openmeetings/webservice/CalendarWebService.html" title="class in org.apache.openmeetings.webservice"><span class="strong">CalendarWebService</span></a></li>
<li type="circle">org.apache.openmeetings.webservice.<a href="org/apache/openmeetings/webservice/FileWebService.html" title="class in org.apache.openmeetings.webservice"><span class="strong">FileWebService</span></a></li>
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/Clustering.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/Clustering.xml?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/Clustering.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/Clustering.xml Wed May 28 10:46:51 2014
@@ -51,7 +51,7 @@
<li>Add users who can connect to the database remotely</li>
<li>Update <tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/META-INF/persistence.xml</tt>
set correct server address, login and password. Also add the following section:
- <div class="xmlcode"><property name="openjpa.RemoteCommitProvider" value="tcp(Addresses=10.1.1.1;10.1.1.2)" /></div>
+ <source><![CDATA[<property name="openjpa.RemoteCommitProvider" value="tcp(Addresses=10.1.1.1;10.1.1.2)" />]]></source>
Instead of the 10.1.1.1 and 10.1.1.2 set semicolon separated IPs of all nodes of the cluster.
</li>
</ul>
@@ -61,25 +61,23 @@
each node. You can do this using Samba or NFS, for example. For using NFS do the following:</p>
<ul>
<li>Install NFS to the data server. In the file <tt>/etc/exports</tt> add the following lines:
- <div class="xmlcode">
- /opt/red5/webapps/openmeetings/upload 10.1.1.2(rw,sync,no_subtree_check,no_root_squash)<br/>
- /opt/red5/webapps/openmeetings/streams 10.1.1.2(rw,sync,no_subtree_check,no_root_squash)
- </div>
+ <source>
+/opt/red5/webapps/openmeetings/upload 10.1.1.2(rw,sync,no_subtree_check,no_root_squash)
+/opt/red5/webapps/openmeetings/streams 10.1.1.2(rw,sync,no_subtree_check,no_root_squash)
+ </source>
Here 10.1.1.2 - is node ip for NFS remote access. Add these lines for all nodes except node with
folders.
</li>
<li>
Install NFS common tools to other nodes. In the file <tt>/etc/fstab</tt> do the following:
- <div class="xmlcode">
- 10.1.1.1:/opt/red5/webapps/openmeetings/upload/<br/>
- /opt/red5/webapps/openmeetings/upload nfs timeo=50,hard,intr<br/>
- 10.1.1.1:/opt/red5/webapps/openmeetings/streams/<br/>
- /opt/red5/webapps/openmeetings/streams nfs timeo=50,hard,intr
- </div>
+ <source>
+10.1.1.1:/opt/red5/webapps/openmeetings/upload/
+/opt/red5/webapps/openmeetings/upload nfs timeo=50,hard,intr
+10.1.1.1:/opt/red5/webapps/openmeetings/streams/
+/opt/red5/webapps/openmeetings/streams nfs timeo=50,hard,intr
+ </source>
Here 10.1.1.1 â data server ip. And run the command:
- <div class="xmlcode">
- mount -a
- </div>
+ <source>mount -a</source>
</li>
</ul>
</section>
@@ -88,10 +86,12 @@
<ul>
<li>
For each node uncomment line:
- <div class="xmlcode">
- <!-- Need to be uncommented and set to the real ID if in cluster mode--><br/>
- <property name="serverId" value="1" />
- </div>
+ <source>
+<![CDATA[
+<!-- Need to be uncommented and set to the real ID if in cluster mode-->
+<property name="serverId" value="1" />
+]]>
+ </source>
and input the unique value for each node.
</li>
<li>
@@ -107,16 +107,16 @@
<li>Go to the <tt>Administration -> Users</tt> and create Webservice user (only access via SOAP).</li>
<li>
Go to the <tt>Administration -> Servers</tt> and add all cluster nodes with the following settings:
- <div class="xmlcode">
- Server Name = node name;<br/>
- Active = check the checkbox. If the checkbox is checked it means node is active and you can use this node;<br/>
- Server Address = node ip;<br/>
- HTTP Port = 5080 - port for http part of Openmeetings;<br/>
- User (SOAP Access) = login of Webservice user from the previous step;<br/>
- Password = password of Webservise user;<br/>
- Webapp path = openmeetings - path where OM installed on this node, it would be better if this path will be the same for all nodes;<br/>
- Protocol = http.
- </div>
+ <source>
+Server Name = node name;
+Active = check the checkbox. If the checkbox is checked it means node is active and you can use this node;
+Server Address = node ip;
+HTTP Port = 5080 - port for http part of Openmeetings;
+User (SOAP Access) = login of Webservice user from the previous step;
+Password = password of Webservise user;
+Webapp path = openmeetings - path where OM installed on this node, it would be better if this path will be the same for all nodes;
+Protocol = http.
+ </source>
</li>
</ul>
<img src="images/cluster1.png" alt="" width="650" height="461" />
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml Wed May 28 10:46:51 2014
@@ -33,63 +33,58 @@
</ul>
<p>Some example commands:</p>
<p>MySQL (requires to place the MySQL JDBC driver into webapps/openmeetings/WEB-INF/lib before running the command):</p>
- <div>
- <div class="xmlcode">
-./admin.sh -i -v -tz Europe/Berlin -email your.email@gmail.com -group webbase -user admin --smtp-server localhost --db-type mysql --db-name openmeetings_db --email-auth-user noreply@webbase-design.de --password 123qweasd --system-email-address noreply@webbase-design.de --db-user root --db-host localhost --email-auth-pass 123qweasd<br/>
- </div>
- </div>
+ <source>./admin.sh -i -v -tz Europe/Berlin -email your.email@gmail.com -group webbase -user admin --smtp-server localhost \
+ --db-type mysql --db-name openmeetings_db --email-auth-user noreply@webbase-design.de --password 123qweasd \
+ --system-email-address noreply@webbase-design.de --db-user root --db-host localhost --email-auth-pass 123qweasd
+ </source>
<p>Derby (Not recommended for production environment):</p>
- <div>
- <div class="xmlcode">
-./admin.sh -i -v -tz Europe/Berlin -email seba.wagner@gmail.com -group webbase -user admin --smtp-server localhost --email-auth-user noreply@webbase-design.de --password 123qweasd --system-email-address noreply@webbase-design.de --email-auth-pass 123qweasd<br/>
- </div>
- </div>
+ <source>./admin.sh -i -v -tz Europe/Berlin -email seba.wagner@gmail.com -group webbase -user admin --smtp-server localhost \
+ --email-auth-user noreply@webbase-design.de --password 123qweasd --system-email-address noreply@webbase-design.de --email-auth-pass 123qweasd
+ </source>
</section>
<section name="Command reference">
- <div>
- <div class="xmlcode">
- -v,--verbose verbose error messages<br/>
---------------------------------------------------------------------------------------------------<br/>
- -h,--help prints this message<br/>
---------------------------------------------------------------------------------------------------<br/>
- -b,--backup Backups OM<br/>
-<span style="margin-left: 50px;">-file <arg> (optional) file used for backup/restore/install</span><br/>
-<span style="margin-left: 100px;">--exclude-files (optional) should backup exclude files [default: include]</span><br/>
---------------------------------------------------------------------------------------------------<br/>
- -r,--restore Restores OM<br/>
-<span style="margin-left: 50px;">-file <arg> file used for backup/restore/install</span><br/>
---------------------------------------------------------------------------------------------------<br/>
- -l,--languages Reimport All language files into DB<br/>
-<span style="margin-left: 50px;">-lang,--language <arg> (optional) Single language to be imported (id or name)</span><br/>
---------------------------------------------------------------------------------------------------<br/>
- -i,--install Fill DB table, and make OM usable<br/>
-<span style="margin-left: 50px;">-user <arg> Login name of the default user, minimum 4 characters (mutually exclusive with 'file')</span><br/>
-<span style="margin-left: 50px;">-group <arg> The name of the default user group (mutually exclusive with 'file')</span><br/>
-<span style="margin-left: 50px;">-email <arg> Email of the default user (mutually exclusive with 'file')</span><br/>
-<span style="margin-left: 50px;">-tz <arg> Default server time zone, and time zone for the selected user (mutually exclusive with 'file') file used for backup/restore/install</span><br/>
-<span style="margin-left: 100px;">--email-auth-pass <arg> (optional) Email auth password (anonymous connection will be used if not set)</span><br/>
-<span style="margin-left: 100px;">--db-host <arg> (optional) DNS name or IP address of database</span><br/>
-<span style="margin-left: 100px;">--drop (optional) Drop database before installation</span><br/>
-<span style="margin-left: 100px;">--db-user <arg> (optional) User with write access to the DB specified</span><br/>
-<span style="margin-left: 100px;">--system-email-address <arg> (optional) System e-mail address [default: noreply@openmeetings.apache.org]</span><br/>
-<span style="margin-left: 100px;">--password <arg> (optional) Password of the default user, minimum 4 characters (will be prompted if not set)</span><br/>
-<span style="margin-left: 100px;">--email-use-tls (optional) Is secure e-mail connection [default: no]</span><br/>
-<span style="margin-left: 100px;">--email-auth-user <arg> (optional) Email auth username (anonymous connection will be used if not set)</span><br/>
-<span style="margin-left: 100px;">--db-port <arg> (optional) Database port</span><br/>
-<span style="margin-left: 100px;">--smtp-port <arg> (optional) SMTP server for outgoing e-mails [default: 25]</span><br/>
-<span style="margin-left: 100px;">--db-name <arg> (optional) The name of Openmeetings database</span><br/>
-<span style="margin-left: 100px;">--disable-frontend-register (optional) Do not allow front end register [allowed by default]</span><br/>
-<span style="margin-left: 100px;">--db-type <arg> (optional) The type of the DB to be used</span><br/>
-<span style="margin-left: 100px;">--skip-default-rooms (optional) Do not create default rooms [created by default]</span><br/>
-<span style="margin-left: 100px;">--force (optional) Install without checking the existence of old data in the database.</span><br/>
-<span style="margin-left: 100px;">--smtp-server <arg> (optional) SMTP server for outgoing e-mails [default: localhost]</span><br/>
-<span style="margin-left: 100px;">--db-pass <arg> (optional) Password of the user with write access to the DB specified</span><br/>
---------------------------------------------------------------------------------------------------<br/>
- -f,--files File operations - statictics/cleanup<br/>
-<span style="margin-left: 100px;">--cleanup (optional) Should intermediate files be clean up</span><br/>
---------------------------------------------------------------------------------------------------<br/>
- </div>
- </div>
+<source><![CDATA[
+-v,--verbose verbose error messages
+--------------------------------------------------------------------------------------------------
+-h,--help prints this message
+--------------------------------------------------------------------------------------------------
+-b,--backup Backups OM
+ -file <arg> (optional) file used for backup/restore/install
+ --exclude-files (optional) should backup exclude files [default: include]
+--------------------------------------------------------------------------------------------------
+-r,--restore Restores OM
+ -file <arg> file used for backup/restore/install
+--------------------------------------------------------------------------------------------------
+-l,--languages Reimport All language files into DB
+ -lang,--language <arg> (optional) Single language to be imported (id or name)
+--------------------------------------------------------------------------------------------------
+-i,--install Fill DB table, and make OM usable
+ -user <arg> Login name of the default user, minimum 4 characters (mutually exclusive with 'file')
+ -group <arg> The name of the default user group (mutually exclusive with 'file')
+ -email <arg> Email of the default user (mutually exclusive with 'file')
+ -tz <arg> Default server time zone, and time zone for the selected user (mutually exclusive with 'file') file used for backup/restore/install
+ --email-auth-pass <arg> (optional) Email auth password (anonymous connection will be used if not set)
+ --db-host <arg> (optional) DNS name or IP address of database
+ --drop (optional) Drop database before installation
+ --db-user <arg> (optional) User with write access to the DB specified
+ --system-email-address <arg> (optional) System e-mail address [default: noreply@openmeetings.apache.org]
+ --password <arg> (optional) Password of the default user, minimum 4 characters (will be prompted if not set)
+ --email-use-tls (optional) Is secure e-mail connection [default: no]
+ --email-auth-user <arg> (optional) Email auth username (anonymous connection will be used if not set)
+ --db-port <arg> (optional) Database port
+ --smtp-port <arg> (optional) SMTP server for outgoing e-mails [default: 25]
+ --db-name <arg> (optional) The name of Openmeetings database
+ --disable-frontend-register (optional) Do not allow front end register [allowed by default]
+ --db-type <arg> (optional) The type of the DB to be used
+ --skip-default-rooms (optional) Do not create default rooms [created by default]
+ --force (optional) Install without checking the existence of old data in the database.
+ --smtp-server <arg> (optional) SMTP server for outgoing e-mails [default: localhost]
+ --db-pass <arg> (optional) Password of the user with write access to the DB specified
+--------------------------------------------------------------------------------------------------
+-f,--files File operations - statictics/cleanup
+ --cleanup (optional) Should intermediate files be clean up
+--------------------------------------------------------------------------------------------------
+]]></source>
</section>
</body>
</document>
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/CustomCryptMechanism.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/CustomCryptMechanism.xml?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/CustomCryptMechanism.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/CustomCryptMechanism.xml Wed May 28 10:46:51 2014
@@ -53,31 +53,31 @@
<br />
Example of an Implementation:
</p>
- <div class="xmlcode">
- package org.xmlcrm.utils.crypt;
-
- import java.security.NoSuchAlgorithmException;
-
- public class MD5Implementation extends CryptStringAdapter implements CryptString {
-
- @Override
- public String createPassPhrase(String userGivenPass) {
- String passPhrase = null;
- try {
- passPhrase = MD5.do_checksum(userGivenPass);
- } catch (NoSuchAlgorithmException e) {
- e.printStackTrace();
- }
- return passPhrase;
- }
-
- @Override
- public Boolean verifyPassword(String passGiven, String passwdFromDb) {
- return (passwdFromDb.equals(createPassPhrase(passGiven)));
- }
-
- }
- </div>
+ <source>
+<![CDATA[
+package org.xmlcrm.utils.crypt;
+
+import java.security.NoSuchAlgorithmException;
+
+public class MD5Implementation extends CryptStringAdapter implements CryptString {
+ @Override
+ public String createPassPhrase(String userGivenPass) {
+ String passPhrase = null;
+ try {
+ passPhrase = MD5.do_checksum(userGivenPass);
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ }
+ return passPhrase;
+ }
+
+ @Override
+ public Boolean verifyPassword(String passGiven, String passwdFromDb) {
+ return (passwdFromDb.equals(createPassPhrase(passGiven)));
+ }
+}
+]]>
+ </source>
<p>To add your own Encryption-Class you need to add your class to the
OpenMeetings-Webapp (make it available to the webapp-classpath) and
use your custom-class-name instead of
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/GetVersionInfo.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/GetVersionInfo.xml?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/GetVersionInfo.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/GetVersionInfo.xml Wed May 28 10:46:51 2014
@@ -34,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,
@@ -55,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/trunk/singlewebapp/openmeetings-server/src/site/xdoc/IBMDB2Config.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/IBMDB2Config.xml?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/IBMDB2Config.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/IBMDB2Config.xml Wed May 28 10:46:51 2014
@@ -41,11 +41,7 @@
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 again and delete
the file $red5/webapps/openmeetings/conf/install.xml and then run
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/JUnitTesting.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/JUnitTesting.xml?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/JUnitTesting.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/JUnitTesting.xml Wed May 28 10:46:51 2014
@@ -42,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>
@@ -57,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
@@ -89,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}/openmeetings-web/src/main/webapp/
- -Dbackups.dir=${workspace_loc:Openmeetings}/build/lib/junit/backups
- </div>
+ <source>-javaagent:${workspace_loc:Openmeetings}/build/lib/om/openjpa-bundle-2.2.2.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>
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/JVMPerformanceTuning.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/JVMPerformanceTuning.xml?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/JVMPerformanceTuning.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/JVMPerformanceTuning.xml Wed May 28 10:46:51 2014
@@ -31,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/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml Wed May 28 10:46:51 2014
@@ -69,26 +69,28 @@
<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
@@ -177,9 +179,13 @@
<tt>red5httpport</tt> to <tt>https</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>
+ <source>
+<![CDATA[
+<transportReceiver name="https" class="org.apache.axis2.transport.http.AxisServletListener">
+ <parameter name="port">443</parameter>
+</transportReceiver>
+]]>
+ </source>
</li>
<li>Edit red5/conf/red5.properties and set <tt>https.port=443</tt> </li>
<li>
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/ReleaseGuide.xml?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/ReleaseGuide.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/ReleaseGuide.xml Wed May 28 10:46:51 2014
@@ -112,84 +112,80 @@
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>
+ <source>
+#On OSX you might use this command to make a MD5 checksum and store it to a file
+md5 -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 md5sum $f > $f.md5; done
+
+#To check MD5 hashes On Ubuntu:
+for f in `ls -1 *.tar.gz *.zip`; do md5sum -c $f.md5; 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>
</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">
@@ -223,11 +219,11 @@
<subsection name="Step3 - 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>
+ <source>
+svn mv https://dist.apache.org/repos/dist/dev/openmeetings/2.1/rc3 \
+ https://dist.apache.org/repos/dist/release/openmeetings/2.1 \
+ -m "RC3 is released as 2.1"
+ </source>
<p>
Wait 24 hours (until all Apache mirrors have synced the packages)
and send an announcement to the mailing list + blog and any other
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RestAPISample.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RestAPISample.xml?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RestAPISample.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RestAPISample.xml Wed May 28 10:46:51 2014
@@ -37,50 +37,47 @@
</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>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>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>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>
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RestrictedAccess.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RestrictedAccess.xml?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RestrictedAccess.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RestrictedAccess.xml Wed May 28 10:46:51 2014
@@ -31,9 +31,7 @@
</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="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties"
@@ -48,14 +46,16 @@
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:
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/TimeZoneHandling.xml Wed May 28 10:46:51 2014
@@ -65,29 +65,22 @@
<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>
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/WebappNamePath.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/WebappNamePath.xml?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/WebappNamePath.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/WebappNamePath.xml Wed May 28 10:46:51 2014
@@ -147,14 +147,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>
@@ -170,13 +169,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/trunk/singlewebapp/openmeetings-server/src/site/xdoc/installation.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/installation.xml?rev=1597968&r1=1597967&r2=1597968&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/installation.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/installation.xml Wed May 28 10:46:51 2014
@@ -312,11 +312,7 @@
<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>