You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/12/08 15:25:25 UTC
[1/7] openmeetings git commit: TOC changes are rolled back,
reflow version is bumped
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x 8810c49d2 -> 8d2664463
TOC changes are rolled back, reflow version is bumped
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/02111890
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/02111890
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/02111890
Branch: refs/heads/4.0.x
Commit: 02111890e38e3ae2ef0d36f5b8aa13fbc1b35f17
Parents: 6063c0f
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Tue Dec 5 21:10:54 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Tue Dec 5 21:10:54 2017 +0700
----------------------------------------------------------------------
openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml | 6 +++---
openmeetings-server/src/site/xdoc/index.xml | 2 +-
pom.xml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/02111890/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml b/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
index 34c77b1..66ce74e 100644
--- a/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
+++ b/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
@@ -38,7 +38,7 @@
</ul>
</section>
<section name="'Real' certificate">
- <h3>Prerequisites (real)</h3>
+ <h3>Prerequisites</h3>
<ul>
<li>You need OpenMeetings 1.9.x or later for this, OpenMeetings 1.8.x does not have those options.</li>
<li>Install OpenMeetings according to the install instructions and check that it runs without problems</li>
@@ -97,7 +97,7 @@ Enter key password for <red5>
</li>
</ol>
<h3>Create Keystore using existing key-pair</h3>
- <h4>Prerequisites (existing)</h4>
+ <h4>Prerequisites</h4>
<ul>
<li>Server key: red5.key</li>
<li>Signed CSR: red5.crt</li>
@@ -140,7 +140,7 @@ keytool -importkeystore -srcstorepass password -srckeystore red5.p12 -srcstorety
</ol>
</section>
<section name="Self-signed certificate">
- <h3>Prerequisites (self-signed)</h3>
+ <h3>Prerequisites</h3>
<ul>
<li>Create CA's root certificate: ca.crt</li>
<li>Create self-signed server certificate: red5.crt <tt>Common Name (CN) while creating certificate
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/02111890/openmeetings-server/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/index.xml b/openmeetings-server/src/site/xdoc/index.xml
index 4636ad5..7c19096 100644
--- a/openmeetings-server/src/site/xdoc/index.xml
+++ b/openmeetings-server/src/site/xdoc/index.xml
@@ -169,7 +169,7 @@
</div>
</div>
</subsection>
- <subsection name="Room File Explorer">
+ <subsection name="File Explorer">
<div class="row">
<div class="col-md-5">
<a href="images/file_smal.png" class="example-image-link"
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/02111890/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aa46a6c..29ee910 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
<checksum-maven-plugin.version>1.6</checksum-maven-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<license-maven-plugin.version>1.14</license-maven-plugin.version>
- <reflow-skin.version>1.3.3</reflow-skin.version>
+ <reflow-skin.version>1.3.4-SNAPSHOT</reflow-skin.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
[7/7] openmeetings git commit: Merge branch 'reflow-branch' into 4.0.x
Posted by so...@apache.org.
Merge branch 'reflow-branch' into 4.0.x
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/8d266446
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/8d266446
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/8d266446
Branch: refs/heads/4.0.x
Commit: 8d26644631b9679fd83efbe6b8fc91af64491825
Parents: 08ae2ae 194b2a2
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Dec 8 22:22:03 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Dec 8 22:22:03 2017 +0700
----------------------------------------------------------------------
openmeetings-server/src/site/resources/css/site.css | 3 ---
.../src/site/resources/js/anchor.min.js | 6 ++++++
openmeetings-server/src/site/resources/js/site.js | 10 ----------
openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml | 6 +++---
openmeetings-server/src/site/xdoc/index.xml | 2 +-
.../openmeetings/webservice/CalendarWebService.java | 15 ++++-----------
.../openmeetings/webservice/FileWebService.java | 6 ++++--
.../openmeetings/webservice/GroupWebService.java | 11 +++++------
.../openmeetings/webservice/RecordingWebService.java | 2 +-
.../openmeetings/webservice/RoomWebService.java | 1 +
pom.xml | 4 ++--
src/site/site.xml | 2 +-
12 files changed, 28 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8d266446/pom.xml
----------------------------------------------------------------------
[6/7] openmeetings git commit: Switched to the next dev version
Posted by so...@apache.org.
Switched to the next dev version
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/08ae2ae9
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/08ae2ae9
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/08ae2ae9
Branch: refs/heads/4.0.x
Commit: 08ae2ae90b50f66bbb541f366b0916e61d6a460f
Parents: 8810c49
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Dec 8 22:21:51 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Dec 8 22:21:51 2017 +0700
----------------------------------------------------------------------
openmeetings-core/pom.xml | 2 +-
openmeetings-db/pom.xml | 2 +-
openmeetings-flash/pom.xml | 2 +-
openmeetings-install/pom.xml | 2 +-
openmeetings-screenshare/pom.xml | 2 +-
openmeetings-server/pom.xml | 2 +-
openmeetings-service/pom.xml | 2 +-
openmeetings-util/pom.xml | 2 +-
openmeetings-web/pom.xml | 2 +-
openmeetings-webservice/pom.xml | 2 +-
pom.xml | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/08ae2ae9/openmeetings-core/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 87edfb8..a89bb5b 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-core</artifactId>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/08ae2ae9/openmeetings-db/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index c450e3d..46fc151 100644
--- a/openmeetings-db/pom.xml
+++ b/openmeetings-db/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-db</artifactId>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/08ae2ae9/openmeetings-flash/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-flash/pom.xml b/openmeetings-flash/pom.xml
index b65b292..37cc278 100644
--- a/openmeetings-flash/pom.xml
+++ b/openmeetings-flash/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-flash</artifactId>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/08ae2ae9/openmeetings-install/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-install/pom.xml b/openmeetings-install/pom.xml
index 71302b9..1d2e8e2 100644
--- a/openmeetings-install/pom.xml
+++ b/openmeetings-install/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-install</artifactId>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/08ae2ae9/openmeetings-screenshare/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-screenshare/pom.xml b/openmeetings-screenshare/pom.xml
index 0673f21..ee03225 100644
--- a/openmeetings-screenshare/pom.xml
+++ b/openmeetings-screenshare/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-screenshare</artifactId>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/08ae2ae9/openmeetings-server/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index d45ce8d..70c8bc0 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-server</artifactId>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/08ae2ae9/openmeetings-service/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-service/pom.xml b/openmeetings-service/pom.xml
index fbaaab5..f2d305b 100644
--- a/openmeetings-service/pom.xml
+++ b/openmeetings-service/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-service</artifactId>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/08ae2ae9/openmeetings-util/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml
index a639c2f..1a2fce6 100644
--- a/openmeetings-util/pom.xml
+++ b/openmeetings-util/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-util</artifactId>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/08ae2ae9/openmeetings-web/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index fdfd2bd..59d14f0 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-web</artifactId>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/08ae2ae9/openmeetings-webservice/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/pom.xml b/openmeetings-webservice/pom.xml
index ec102ec..3271a36 100644
--- a/openmeetings-webservice/pom.xml
+++ b/openmeetings-webservice/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openmeetings-webservice</artifactId>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/08ae2ae9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c44c85a..82ce3e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-parent</artifactId>
- <version>4.0.1-SNAPSHOT</version>
+ <version>4.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Openmeetings</name>
<description>Parent project for all OpenMeetings Maven modules. Required to hold general settings</description>
[2/7] openmeetings git commit: Merge branch '4.0.x' into reflow-branch
Posted by so...@apache.org.
Merge branch '4.0.x' into reflow-branch
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/26f627ee
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/26f627ee
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/26f627ee
Branch: refs/heads/4.0.x
Commit: 26f627eee4231eeeaec9319d8ae537f8acff0b43
Parents: 0211189 8810c49
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Dec 7 10:29:37 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Dec 7 10:29:37 2017 +0700
----------------------------------------------------------------------
CHANGELOG | 55 ++++++++++++++++++++
README | 16 ++++++
.../src/site/xdoc/NewsArchive.xml | 34 ++++++++++++
openmeetings-server/src/site/xdoc/downloads.xml | 38 +++++++-------
openmeetings-server/src/site/xdoc/index.xml | 37 +++++--------
.../web/room/sidebar/RoomClientPanel.html | 2 +-
.../openmeetings/web/user/chat/chat-base.js | 20 +++++--
openmeetings-web/src/main/webapp/css/chat.css | 2 +-
pom.xml | 2 +-
9 files changed, 157 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26f627ee/openmeetings-server/src/site/xdoc/index.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/26f627ee/pom.xml
----------------------------------------------------------------------
[4/7] openmeetings git commit: [OPENMEETINGS-1777] javadoc plugin
version is updated
Posted by so...@apache.org.
[OPENMEETINGS-1777] javadoc plugin version is updated
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/b90dce36
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/b90dce36
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/b90dce36
Branch: refs/heads/4.0.x
Commit: b90dce36cecccfe4a0b23c06efe27f354b4372cc
Parents: 442ddd7
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Dec 7 18:22:57 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Dec 7 18:45:59 2017 +0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b90dce36/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 531e421..a3d5ef2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<db>derby</db>
<jdk.version>1.8</jdk.version>
<!-- plugin versions -->
- <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
+ <maven-javadoc-plugin.version>3.0.0</maven-javadoc-plugin.version>
<maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
<maven-site-plugin.version>3.6</maven-site-plugin.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
[3/7] openmeetings git commit: [OPENMEETINGS-1777] custom TOC is
removed
Posted by so...@apache.org.
[OPENMEETINGS-1777] custom TOC is removed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/442ddd7b
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/442ddd7b
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/442ddd7b
Branch: refs/heads/4.0.x
Commit: 442ddd7ba5b7ed703253f022698c04922ee54cea
Parents: 26f627e
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Dec 7 18:45:11 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Dec 7 18:45:11 2017 +0700
----------------------------------------------------------------------
openmeetings-server/src/site/resources/css/site.css | 3 ---
openmeetings-server/src/site/resources/js/anchor.min.js | 6 ++++++
openmeetings-server/src/site/resources/js/site.js | 10 ----------
src/site/site.xml | 2 +-
4 files changed, 7 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/442ddd7b/openmeetings-server/src/site/resources/css/site.css
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/resources/css/site.css b/openmeetings-server/src/site/resources/css/site.css
index 627d34a..e043af9 100644
--- a/openmeetings-server/src/site/resources/css/site.css
+++ b/openmeetings-server/src/site/resources/css/site.css
@@ -13,9 +13,6 @@ iframe {
.alignnone.img-responsive {
display: inline-block;
}
-#toc-sidebar {
- position: absolute;
-}
/* Call for logo, need to be removed*/
.powered-preview {
background-repeat: no-repeat;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/442ddd7b/openmeetings-server/src/site/resources/js/anchor.min.js
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/resources/js/anchor.min.js b/openmeetings-server/src/site/resources/js/anchor.min.js
new file mode 100644
index 0000000..ee4e3b3
--- /dev/null
+++ b/openmeetings-server/src/site/resources/js/anchor.min.js
@@ -0,0 +1,6 @@
+/**
+ * AnchorJS - v4.1.0 - 2017-09-20
+ * https://github.com/bryanbraun/anchorjs
+ * Copyright (c) 2017 Bryan Braun; Licensed MIT
+ */
+!function(A,e){"use strict";"function"==typeof define&&define.amd?define([],e):"object"==typeof module&&module.exports?module.exports=e():(A.AnchorJS=e(),A.anchors=new A.AnchorJS)}(this,function(){"use strict";return function(A){function e(A){A.icon=A.hasOwnProperty("icon")?A.icon:"",A.visible=A.hasOwnProperty("visible")?A.visible:"hover",A.placement=A.hasOwnProperty("placement")?A.placement:"right",A.ariaLabel=A.hasOwnProperty("ariaLabel")?A.ariaLabel:"Anchor",A.class=A.hasOwnProperty("class")?A.class:"",A.truncate=A.hasOwnProperty("truncate")?Math.floor(A.truncate):64}function t(A){var e;if("string"==typeof A||A instanceof String)e=[].slice.call(document.querySelectorAll(A));else{if(!(Array.isArray(A)||A instanceof NodeList))throw new Error("The selector provided to AnchorJS was invalid.");e=[].slice.call(A)}return e}function i(){if(null===document.head.querySelector("style.anchorjs")){var A,e=document.createElement("style");e.className="anchorjs",e.appendChild(document.createT
extNode("")),void 0===(A=document.head.querySelector('[rel="stylesheet"], style'))?document.head.appendChild(e):document.head.insertBefore(e,A),e.sheet.insertRule(" .anchorjs-link { opacity: 0; text-decoration: none; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; }",e.sheet.cssRules.length),e.sheet.insertRule(" *:hover > .anchorjs-link, .anchorjs-link:focus { opacity: 1; }",e.sheet.cssRules.length),e.sheet.insertRule(" [data-anchorjs-icon]::after { content: attr(data-anchorjs-icon); }",e.sheet.cssRules.length),e.sheet.insertRule(' @font-face { font-family: "anchorjs-icons"; src: url(data:n/a;base64,AAEAAAALAIAAAwAwT1MvMg8yG2cAAAE4AAAAYGNtYXDp3gC3AAABpAAAAExnYXNwAAAAEAAAA9wAAAAIZ2x5ZlQCcfwAAAH4AAABCGhlYWQHFvHyAAAAvAAAADZoaGVhBnACFwAAAPQAAAAkaG10eASAADEAAAGYAAAADGxvY2EACACEAAAB8AAAAAhtYXhwAAYAVwAAARgAAAAgbmFtZQGOH9cAAAMAAAAAunBvc3QAAwAAAAADvAAAACAAAQAAAAEAAHzE2p9fDzz1AAkEAAAAAADRecUWAAAAANQA6R8AAAAAAoACwAAAAAgAAgAAAAAAAAABAAADwP/AAAACgAAA/9MC
rQABAAAAAAAAAAAAAAAAAAAAAwABAAAAAwBVAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAMCQAGQAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAg//0DwP/AAEADwABAAAAAAQAAAAAAAAAAAAAAIAAAAAAAAAIAAAACgAAxAAAAAwAAAAMAAAAcAAEAAwAAABwAAwABAAAAHAAEADAAAAAIAAgAAgAAACDpy//9//8AAAAg6cv//f///+EWNwADAAEAAAAAAAAAAAAAAAAACACEAAEAAAAAAAAAAAAAAAAxAAACAAQARAKAAsAAKwBUAAABIiYnJjQ3NzY2MzIWFxYUBwcGIicmNDc3NjQnJiYjIgYHBwYUFxYUBwYGIwciJicmNDc3NjIXFhQHBwYUFxYWMzI2Nzc2NCcmNDc2MhcWFAcHBgYjARQGDAUtLXoWOR8fORYtLTgKGwoKCjgaGg0gEhIgDXoaGgkJBQwHdR85Fi0tOAobCgoKOBoaDSASEiANehoaCQkKGwotLXoWOR8BMwUFLYEuehYXFxYugC44CQkKGwo4GkoaDQ0NDXoaShoKGwoFBe8XFi6ALjgJCQobCjgaShoNDQ0NehpKGgobCgoKLYEuehYXAAAADACWAAEAAAAAAAEACAAAAAEAAAAAAAIAAwAIAAEAAAAAAAMACAAAAAEAAAAAAAQACAAAAAEAAAAAAAUAAQALAAEAAAAAAAYACAAAAAMAAQQJAAEAEAAMAAMAAQQJAAIABgAcAAMAAQQJAAMAEAAMAAMAAQQJAAQAEAAMAAMAAQQJAAUAAgAiAAMAAQQJAAYAEAAMYW5jaG9yanM0MDBAAGEAbgBjAGgAbwByAGoAcwA0ADAAMABAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAH//wAP) format("truetyp
e"); }',e.sheet.cssRules.length)}}this.options=A||{},this.elements=[],e(this.options),this.isTouchDevice=function(){return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)},this.add=function(A){var n,o,s,a,r,c,h,l,u,d,f,p=[];if(e(this.options),"touch"===(f=this.options.visible)&&(f=this.isTouchDevice()?"always":"hover"),A||(A="h2, h3, h4, h5, h6"),0===(n=t(A)).length)return this;for(i(),o=document.querySelectorAll("[id]"),s=[].map.call(o,function(A){return A.id}),r=0;r<n.length;r++)if(this.hasAnchorJSLink(n[r]))p.push(r);else{if(n[r].hasAttribute("id"))a=n[r].getAttribute("id");else if(n[r].hasAttribute("data-anchor-id"))a=n[r].getAttribute("data-anchor-id");else{u=l=this.urlify(n[r].textContent),h=0;do{void 0!==c&&(u=l+"-"+h),c=s.indexOf(u),h+=1}while(-1!==c);c=void 0,s.push(u),n[r].setAttribute("id",u),a=u}a.replace(/-/g," "),(d=document.createElement("a")).className="anchorjs-link "+this.options.class,d.href="#"+a,d.setAttribute("aria-label",thi
s.options.ariaLabel),d.setAttribute("data-anchorjs-icon",this.options.icon),"always"===f&&(d.style.opacity="1"),""===this.options.icon&&(d.style.font="1em/1 anchorjs-icons","left"===this.options.placement&&(d.style.lineHeight="inherit")),"left"===this.options.placement?(d.style.position="absolute",d.style.marginLeft="-1em",d.style.paddingRight="0.5em",n[r].insertBefore(d,n[r].firstChild)):(d.style.paddingLeft="0.375em",n[r].appendChild(d))}for(r=0;r<p.length;r++)n.splice(p[r]-r,1);return this.elements=this.elements.concat(n),this},this.remove=function(A){for(var e,i,n=t(A),o=0;o<n.length;o++)(i=n[o].querySelector(".anchorjs-link"))&&(-1!==(e=this.elements.indexOf(n[o]))&&this.elements.splice(e,1),n[o].removeChild(i));return this},this.removeAll=function(){this.remove(this.elements)},this.urlify=function(A){var t=/[& +$,:;=?@"#{}|^~[`%!'<>\]\.\/\(\)\*\\]/g;return this.options.truncate||e(this.options),A.trim().replace(/\'/gi,"").replace(t,"-").replace(/-{2,}/g,"-").substring(0,thi
s.options.truncate).replace(/^-+|-+$/gm,"").toLowerCase()},this.hasAnchorJSLink=function(A){var e=A.firstChild&&(" "+A.firstChild.className+" ").indexOf(" anchorjs-link ")>-1,t=A.lastChild&&(" "+A.lastChild.className+" ").indexOf(" anchorjs-link ")>-1;return e||t||!1}}});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/442ddd7b/openmeetings-server/src/site/resources/js/site.js
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/resources/js/site.js b/openmeetings-server/src/site/resources/js/site.js
index 0791c1f..88fcece 100644
--- a/openmeetings-server/src/site/resources/js/site.js
+++ b/openmeetings-server/src/site/resources/js/site.js
@@ -23,14 +23,4 @@ $(document).ready(function() {
for (var i = 0; i < topics.length; ++i) {
$('ul.nav li a[title="' + topics[i] + '"').append(' <span class="label label-success">New</span>')
}
- var toc = $('#toc-sidebar'), row = toc.parents('.row');
- $(document).on('scroll', function() {
- if (!toc.is(":visible")) {
- return;
- }
- var tv = Math.min(Math.max(0, 60 + $(document).scrollTop() - row.position().top)
- , row.height() - toc.height() - 20);
- //console.log("top -> " + tv);
- toc.css('top', tv + "px");
- });
})
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/442ddd7b/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index d6d2cb4..ca58d00 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -70,7 +70,7 @@
<column>Community</column>
<column>Development</column>
</bottomNav>
- <toc>sidebar</toc>
+ <toc type="fixed">sidebar</toc>
<skinAttribution>false</skinAttribution>
<endContent>
<script type="text/javascript" src="$resourcePath/js/site.js"></script>
[5/7] openmeetings git commit: [OPENMEETINGS-1777] javadocs are fixed
Posted by so...@apache.org.
[OPENMEETINGS-1777] javadocs are fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/194b2a2b
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/194b2a2b
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/194b2a2b
Branch: refs/heads/4.0.x
Commit: 194b2a2b2ba43602797a09dc0f2a45a5ddb37361
Parents: b90dce3
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Dec 7 19:40:08 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Dec 7 19:41:04 2017 +0700
----------------------------------------------------------------------
.../openmeetings/webservice/CalendarWebService.java | 15 ++++-----------
.../openmeetings/webservice/FileWebService.java | 6 ++++--
.../openmeetings/webservice/GroupWebService.java | 11 +++++------
.../openmeetings/webservice/RecordingWebService.java | 2 +-
.../openmeetings/webservice/RoomWebService.java | 1 +
5 files changed, 15 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/194b2a2b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
index 9bcfbac..1703043 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
@@ -82,7 +82,6 @@ public class CalendarWebService extends BaseWebService {
* end time
*
* @return - list of appointments in range
- * @throws {@link ServiceException} in case of any error
*/
@GET
@Path("/{start}/{end}")
@@ -111,7 +110,6 @@ public class CalendarWebService extends BaseWebService {
* end time
*
* @return - list of appointments in range
- * @throws {@link ServiceException} in case of any error
*/
@GET
@Path("/{userid}/{start}/{end}")
@@ -135,7 +133,6 @@ public class CalendarWebService extends BaseWebService {
* @param sid
* The SID of the User. This SID must be marked as Loggedin
* @return - next Calendar event
- * @throws {@link ServiceException} in case of any error
*/
@GET
@Path("/next")
@@ -155,7 +152,6 @@ public class CalendarWebService extends BaseWebService {
* the userId the calendar events should be loaded
*
* @return - next Calendar event
- * @throws {@link ServiceException} in case of any error
*/
@GET
@Path("/next/{userid}")
@@ -171,9 +167,10 @@ public class CalendarWebService extends BaseWebService {
* Load a calendar event by its room id
*
* @param sid
+ * The SID of the User. This SID must be marked as Loggedin
* @param roomid
+ * id of appointment special room
* @return - calendar event by its room id
- * @throws {@link ServiceException} in case of any error
*/
@GET
@Path("/room/{roomid}")
@@ -193,7 +190,6 @@ public class CalendarWebService extends BaseWebService {
* the search string
*
* @return - calendar event list
- * @throws {@link ServiceException} in case of any error
*/
@GET
@Path("/title/{title}")
@@ -210,7 +206,6 @@ public class CalendarWebService extends BaseWebService {
* calendar event
*
* @return - appointment saved
- * @throws {@link ServiceException} in case of any error
*/
@WebMethod
@POST
@@ -249,7 +244,7 @@ public class CalendarWebService extends BaseWebService {
* delete a calendar event
*
* If the given sid is from an Administrator or Web-Service user, the user
- * can delete any appointment.<br/>
+ * can delete any appointment.
* If the sid is assigned to a regular user, he can only delete appointments
* where he is also the owner/creator of the appointment
*
@@ -257,9 +252,7 @@ public class CalendarWebService extends BaseWebService {
* an authenticated SID
* @param id
* the id to delete
- * @return {@link ServiceResult} of type SUCCESS
- *
- * @throws {@link ServiceException} in case of any error
+ * @return {@link ServiceResult} with result type
*/
@DELETE
@Path("/{id}")
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/194b2a2b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
index e77b17f..d5e038d 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
@@ -79,7 +79,7 @@ public class FileWebService extends BaseWebService {
* The SID of the User. This SID must be marked as logged in
* @param id
* the id of the file or folder
- * @return - id of the file deleted, error code otherwise
+ * @return {@link ServiceResult} with result type
*/
@DELETE
@Path("/{id}")
@@ -111,7 +111,7 @@ public class FileWebService extends BaseWebService {
* the od of the file or folder
* @param externalType
* the externalType
- * @return - null
+ * @return {@link ServiceResult} with result type
*/
@DELETE
@Path("/{externaltype}/{externalid}")
@@ -275,6 +275,8 @@ public class FileWebService extends BaseWebService {
* SID The SID of the User. This SID must be marked as logged in
* @param id
* current file or folder id to be moved
+ * @param roomId
+ * room this file need to be moved
* @param parentId
* new parent folder id
* @return - resulting file object
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/194b2a2b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
index 7224854..e7a7a03 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
@@ -83,7 +83,7 @@ public class GroupWebService extends BaseWebService {
* The SID from getSession
* @param name
* the name of the group
- * @return the new id of the group or -1 in case an error happened
+ * @return {@link ServiceResult} with result type, and id of the group added
*/
@POST
@Path("/")
@@ -119,7 +119,7 @@ public class GroupWebService extends BaseWebService {
* the user id
* @param id
* the group id
- * @return - id of the user added, or error id in case of the error
+ * @return {@link ServiceResult} with result type, and id of the user added, or error id in case of the error as text
*/
@POST
@Path("/{id}/users/{userid}")
@@ -150,7 +150,7 @@ public class GroupWebService extends BaseWebService {
* the user id
* @param id
* the group id
- * @return - id of the user added, or error id in case of the error
+ * @return {@link ServiceResult} with result type, and id of the user added, or error id in case of the error as text
*/
@DELETE
@Path("/{id}/users/{userid}")
@@ -183,7 +183,7 @@ public class GroupWebService extends BaseWebService {
* @param id - Id of group that the room is being paired with
* @param roomid - Id of room to be added
*
- * @return Id of the relation created, null or -1 in case of the error
+ * @return {@link ServiceResult} with result type
*/
@POST
@Path("/{id}/rooms/add/{roomId}")
@@ -265,8 +265,7 @@ public class GroupWebService extends BaseWebService {
* The SID of the User. This SID must be marked as Loggedin
* @param id
* the id of the group
- *
- * @throws {@link ServiceException} in case of any error
+ * @return {@link ServiceResult} with result type
*/
@WebMethod
@DELETE
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/194b2a2b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
index 74f1dfe..d429143 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
@@ -70,7 +70,7 @@ public class RecordingWebService extends BaseWebService {
* @param id
* the id of the recording
*
- * @throws {@link ServiceException} in case of any error
+ * @return {@link ServiceResult} with result type
*/
@DELETE
@Path("/{id}")
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/194b2a2b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
index 898cfb8..dbbcbfc 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
@@ -84,6 +84,7 @@ public class RoomWebService extends BaseWebService {
* @param sid
* The SID of the User. This SID must be marked as Loggedin
* @param type
+ * Type of public rooms need to be retrieved
* @return - list of public rooms
*/
@WebMethod