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 18:12:34 UTC
[1/4] openmeetings git commit: TOC changes are rolled back,
reflow version is bumped
Repository: openmeetings
Updated Branches:
refs/heads/master 41c19764b -> 508ad0055
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/a0eee61f
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/a0eee61f
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/a0eee61f
Branch: refs/heads/master
Commit: a0eee61faf9401e2840570ee28b3d8e254f682d7
Parents: e109c0e
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Tue Dec 5 21:10:54 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Dec 7 22:27: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/a0eee61f/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/a0eee61f/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 dc3a34b..2131b8f 100644
--- a/openmeetings-server/src/site/xdoc/index.xml
+++ b/openmeetings-server/src/site/xdoc/index.xml
@@ -160,7 +160,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/a0eee61f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2cdbb2e..2790078 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>
[3/4] openmeetings git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/openmeetings
Posted by so...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/openmeetings
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/52fc7189
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/52fc7189
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/52fc7189
Branch: refs/heads/master
Commit: 52fc71899f485dd99e7cf3167c1a9df35c9fa8e5
Parents: b1d44a0 41c1976
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sat Dec 9 01:12:15 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sat Dec 9 01:12:15 2017 +0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/4] 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/b1d44a0e
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/b1d44a0e
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/b1d44a0e
Branch: refs/heads/master
Commit: b1d44a0e283c97230bc84d1b973c011d36340608
Parents: a0eee61
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 22:28:16 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/b1d44a0e/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/b1d44a0e/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/b1d44a0e/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/b1d44a0e/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>
[4/4] openmeetings git commit: [OPENMEETINGS-1777] mysql version is
updated, some javadoc errors are fixed
Posted by so...@apache.org.
[OPENMEETINGS-1777] mysql version is updated, some javadoc errors are fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/508ad005
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/508ad005
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/508ad005
Branch: refs/heads/master
Commit: 508ad0055cf2bdd8306e8c890ff5110b79bdc905
Parents: 52fc718
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sat Dec 9 01:11:12 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sat Dec 9 01:12:28 2017 +0700
----------------------------------------------------------------------
.../core/converter/DocumentConverter.java | 4 ++
.../core/converter/ImageConverter.java | 2 +
.../record/listener/async/BaseStreamWriter.java | 3 +-
.../core/ldap/LdapLoginManagement.java | 5 +++
.../openmeetings/core/remote/MobileService.java | 1 +
.../openmeetings/core/util/IClientUtil.java | 2 +-
.../openmeetings/db/dao/IDataProviderDao.java | 3 +-
.../db/dao/basic/ConfigurationDao.java | 15 +++++---
.../db/dao/calendar/AppointmentDao.java | 8 +++-
.../db/dao/calendar/MeetingMemberDao.java | 3 ++
.../openmeetings/db/dao/file/FileItemDao.java | 16 +++++---
.../db/dao/server/ISessionManager.java | 34 ++++++++---------
.../db/dao/server/SessiondataDao.java | 12 +++---
.../db/dao/user/UserContactDao.java | 4 +-
.../openmeetings/db/dao/user/UserDao.java | 40 ++++++++++----------
.../openmeetings/db/dto/room/InvitationDTO.java | 2 +-
.../db/entity/record/Recording.java | 6 +--
.../db/entity/record/RecordingMetaData.java | 3 +-
.../db/entity/room/RoomPollAnswer.java | 6 +--
.../db/entity/server/RemoteSessionObject.java | 14 +++----
.../openmeetings/db/util/FormatHelper.java | 3 ++
.../openmeetings/db/util/TimezoneUtil.java | 6 ++-
.../apache/openmeetings/util/ImportHelper.java | 3 +-
.../openmeetings/util/mail/IcalHandler.java | 20 +++++++++-
openmeetings-web/pom.xml | 2 +-
25 files changed, 133 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java
index 3fc14d4..dcdcc14 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java
@@ -90,6 +90,10 @@ public class DocumentConverter {
/**
* Generates PDF using JOD Library (external library)
+ *
+ * @param in - file to convert
+ * @param out - file to write result
+ * @return - result of the conversion as {@link ProcessResult}
*/
public ProcessResult doJodConvert(File in, File out) {
try {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
index 6d4d2df..0cee85c 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
@@ -168,7 +168,9 @@ public class ImageConverter extends BaseConverter {
/**
* Converts PDF document to the series of images
*
+ * @param f - {@link FileItem} object to write number of pages and size
* @param pdf - input PDF document
+ * @param logs - logs of the conversion
* @return - result of conversion
* @throws IOException in case IO exception occurred
*/
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java
index d58ae1a..537ebc5 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java
@@ -163,11 +163,12 @@ public abstract class BaseStreamWriter implements Runnable {
/**
* Write the actual packet data to the disk and do calculate any needed additional information
*
- * @param streampacket
+ * @param streampacket - received packet
*/
public abstract void packetReceived(CachedEvent streampacket);
protected abstract void internalCloseStream();
+
/**
* called when the stream is finished written on the disk
*/
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
index 9d70692..be64e94 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
@@ -164,6 +164,11 @@ public class LdapLoginManagement {
*
* Connection Data is retrieved from ConfigurationFile
*
+ * @param _login - user login
+ * @param passwd - user password
+ * @param domainId - user domain id
+ * @return - {@link User} with this credentials or <code>null</code>
+ * @throws OmException - in case of any error
*/
public User login(String _login, String passwd, Long domainId) throws OmException {
log.debug("LdapLoginmanagement.doLdapLogin");
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
index 34c57bf..ef36015 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
@@ -348,6 +348,7 @@ public class MobileService {
*
* @param sid - sid
* @param userId - redundant userId
+ * @return {@link Map} with publiSid and broadcastId
*/
public Map<String, Object> roomConnect(String sid, Long userId) {
// publicSid is changed on mobile room connect
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/IClientUtil.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/IClientUtil.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/IClientUtil.java
index 590ebfa..c2c6136 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/IClientUtil.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/IClientUtil.java
@@ -37,7 +37,7 @@ public class IClientUtil {
/**
* Id of {@link StreamClient} for this IConnection
*
- * @param conn
+ * @param client - {@link IClient} to get if from
* @return - Id of {@link StreamClient} for this IConnection, or <code>null</code>
*/
public static String getId(IClient client) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java
index d58f6be..ca09b88 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java
@@ -27,7 +27,7 @@ import org.apache.openmeetings.db.entity.IDataProviderEntity;
*
* @author solomax, swagner
*
- * @param <T>
+ * @param <T> entity type for this provider
*/
public interface IDataProviderDao<T extends IDataProviderEntity> {
/**
@@ -80,6 +80,7 @@ public interface IDataProviderDao<T extends IDataProviderEntity> {
*
* @param entity - entity to be updated
* @param userId - user performed update
+ * @return - updated entity
*/
T update(T entity, Long userId);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
index c5e4345..27bc446 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
@@ -109,11 +109,14 @@ import org.springframework.transaction.annotation.Transactional;
import com.github.openjson.JSONObject;
/**
- * Insert/update/Delete on {@link Configuration}<br/>
- * <br/>
- * It provides basic mechanism to get a Conf Key:<br/>
- * {@link #getConfValue(String, Class, String)} <br/>
- * <br/>
+ * Insert/update/Delete on {@link Configuration}
+ *
+ * It provides basic mechanism to get a Conf Key:
+ * {@link #getBool(String, boolean)}
+ * {@link #getLong(String, Long)}
+ * {@link #getInt(String, int)}
+ * {@link #getString(String, String)}
+ *
* <b> {@link #get(String)} is deprecated!</b>
*
* @author swagner
@@ -142,7 +145,7 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> {
/**
* Retrieves Configuration regardless of its deleted status
*
- * @param key
+ * @param key - key of the {@link Configuration} to get
* @return correspondent {@link Configuration} or null
*/
public Configuration forceGet(String key) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
index adae9fb..2b905e4 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
@@ -31,6 +31,7 @@ import java.util.Set;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
@@ -249,14 +250,17 @@ public class AppointmentDao {
}
/**
- * Bulk Deletes the Appointments related the the calId.<br/>
+ * Bulk Deletes the Appointments related the the calId.
* Note: Does not automatically, commit, but gets cascaded in the function which calls it.
* If there is a need to commit during this function, use <code>em.flush()</code> and <code>em.clear()</code>
*
* @param calId Calendar Id of the Calendar Id to which the Appointments belong to.
* @return Returns <code>-1</code> if the there was an error executing the query,
* otherwise returns the number of updated rows.
- * @see Query#executeUpdate()
+ * as described here {@link Query#executeUpdate()}
+ *
+ * @param calId - id of the calendar
+ * @return - number of deleted items
*/
public int deletebyCalendar(Long calId) {
return em.createNamedQuery("deleteAppointmentsbyCalendar", Appointment.class)
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java
index bb3ab4d..4fe4f0c 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java
@@ -60,6 +60,9 @@ public class MeetingMemberDao {
/**
* Updating MeetingMember
+ *
+ * @param meetingMember - entity to update
+ * @return - updated entity
*/
// -------------------------------------------------------------------------------
public MeetingMember update(MeetingMember meetingMember) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java
index 2245232..e831a8b 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java
@@ -128,8 +128,10 @@ public class FileItemDao extends BaseFileItemDao {
}
/**
- * @param id
- * @param name
+ * @param id - id of file item to rename
+ * @param name - new name
+ *
+ * @return renamed item
*/
public FileItem rename(Long id, String name) {
log.debug("rename started");
@@ -158,10 +160,12 @@ public class FileItemDao extends BaseFileItemDao {
}
/**
- * @param id
- * @param parentId
- * @param isOwner
- * @param roomId
+ * @param id - id of file item to move
+ * @param parentId - id of parent item
+ * @param ownerId - id of item owner
+ * @param roomId - id of room
+ *
+ * @return moved item
*/
public FileItem move(long id, long parentId, long ownerId, long roomId) {
log.debug(".move() started");
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java
index e92e95f..eaec577 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java
@@ -38,30 +38,29 @@ public interface ISessionManager {
/**
* loads the server into the client (only if database cache is used)
*
- * @return
+ * @return - list of all clients
*/
Collection<StreamClient> list();
/**
* Get a client by its UID
*
- * @param uid
- * @return
+ * @param uid - uid of the client to get
+ * @return - client with giver uid
*/
StreamClient get(String uid);
/**
* Updates {@link StreamClient} in the cache
*
- * @param rcm
- * @return updated client
+ * @param rcm - client to update
*/
void update(IClient rcm);
/**
* Remove a client from the session store
*
- * @param uid
+ * @param uid - uid of the client to remove
* @return true if client was removed
*/
boolean remove(String uid);
@@ -71,40 +70,41 @@ public interface ISessionManager {
* needed cause it is invoked internally AFTER the current user has been
* already removed from the ClientList to see if the Room is empty again and
* the PollList can be removed
- * @param roomId
- * @return
+ *
+ * @param roomId - id of the room
+ * @return - list of all clients in the room
*/
List<StreamClient> listByRoom(Long roomId);
/**
* returns number of users performing recording
*
- * @param roomId
- * @return
+ * @param roomId - id of the room
+ * @return - number of recording clients (MUST be 0 or 1)
*/
long getRecordingCount(Long roomId);
/**
* returns a number of current users publishing screensharing
*
- * @param roomId
- * @return
+ * @param roomId - id of the room
+ * @return - number of publishing clients (MUST be 0 or 1)
*/
long getPublishingCount(Long roomId);
/**
* returns a number of users performing screen-sharing
*
- * @param roomId
- * @return MUST return 0 or 1
+ * @param roomId - id of the room
+ * @return - number of sharing clients (MUST be 0 or 1)
*/
long getSharingCount(Long roomId);
/**
* returns number of users sending A/V streams to server
*
- * @param roomId
- * @return
+ * @param roomId - id of the room
+ * @return - number of broadcasting clients
*/
long getBroadcastingCount(Long roomId);
@@ -118,7 +118,7 @@ public interface ISessionManager {
/**
* Get a list of rooms with users on particular cluster node.
*
- * @param server
+ * @param serverId - id of the server
* @return a set, a roomId can be only one time in this list
*/
Set<Long> getActiveRoomIds(String serverId);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
index 6e65377..e7c800d 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
@@ -117,8 +117,8 @@ public class SessiondataDao {
/**
*
- * @param sid
- * @return
+ * @param sid - sid of {@link Sessiondata} to check
+ * @return - {@link Sessiondata} for given sid or new {@link Sessiondata}
*/
public Sessiondata check(String sid) {
Sessiondata sd = find(sid);
@@ -131,8 +131,8 @@ public class SessiondataDao {
/**
*
- * @param refreshed
- * @return
+ * @param refreshed - date to compare session update time with
+ * @return - the list of all expired session data
*/
private List<Sessiondata> getSessionToDelete(Date refreshed) {
try {
@@ -147,7 +147,7 @@ public class SessiondataDao {
/**
*
- * @param timeout
+ * @param timeout - timeout in millis to check expired sessions
*/
public void clearSessionTable(long timeout) {
try {
@@ -166,7 +166,7 @@ public class SessiondataDao {
}
/**
- * @param roomId
+ * @param roomId - room to clear sessions
*/
public void clearSessionByRoomId(Long roomId) {
try {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
index 0dda168..bac4307 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
@@ -62,14 +62,14 @@ public class UserContactDao {
}
/**
- * @param id
+ * @param id - id of item to delete
*/
public void delete(Long id) {
em.createNamedQuery("deleteUserContact").setParameter("id", id).executeUpdate();
}
/**
- * @param ownerId
+ * @param ownerId - id of owner
* @return rowcount of update
*/
public Integer deleteAllUserContacts(Long ownerId) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
index 647c840..c092bd9 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
@@ -340,11 +340,11 @@ public class UserDao implements IGroupAdminDataProviderDao<User> {
/**
* check for duplicates
*
- * @param login
- * @param type
- * @param domainId
- * @param id
- * @return
+ * @param login - login to check
+ * @param type - user {@link Type} to check
+ * @param domainId - domain to check
+ * @param id - id of current user to allow self update
+ * @return <code>true</code> in case login is allowed
*/
public boolean checkLogin(String login, Type type, Long domainId, Long id) {
User u = getByLogin(login, type, domainId);
@@ -354,11 +354,11 @@ public class UserDao implements IGroupAdminDataProviderDao<User> {
/**
* Checks if a mail is already taken by someone else
*
- * @param email
- * @param type
- * @param domainId
- * @param id
- * @return
+ * @param email - email to check
+ * @param type - user {@link Type} to check
+ * @param domainId - domain to check
+ * @param id - id of current user to allow self update
+ * @return <code>true</code> in case email is allowed
*/
public boolean checkEmail(String email, Type type, Long domainId, Long id) {
log.debug("checkEmail: email = {}, id = {}", email, id);
@@ -410,8 +410,8 @@ public class UserDao implements IGroupAdminDataProviderDao<User> {
}
/**
- * @param search
- * @return
+ * @param search - term to search
+ * @return - number of matching user
*/
public Long selectMaxFromUsersWithSearch(String search) {
try {
@@ -419,7 +419,7 @@ public class UserDao implements IGroupAdminDataProviderDao<User> {
TypedQuery<Long> query = em.createNamedQuery("selectMaxFromUsersWithSearch", Long.class);
query.setParameter("search", StringUtils.lowerCase(search));
List<Long> ll = query.getResultList();
- log.info("selectMaxFromUsers" + ll.get(0));
+ log.info("selectMaxFromUsers {}", ll.get(0));
return ll.get(0);
} catch (Exception ex2) {
log.error("[selectMaxFromUsers] ", ex2);
@@ -430,9 +430,9 @@ public class UserDao implements IGroupAdminDataProviderDao<User> {
/**
* Returns true if the password is correct
*
- * @param userId
- * @param password
- * @return
+ * @param userId - id of the user to check
+ * @param password - password to check
+ * @return <code>true</code> if entered password is correct
*/
public boolean verifyPassword(Long userId, String password) {
List<String> l = em.createNamedQuery("getPassword", String.class)
@@ -496,8 +496,8 @@ public class UserDao implements IGroupAdminDataProviderDao<User> {
}
/**
- * @param hash
- * @return
+ * @param hash - activation hash
+ * @return user with this hash
*/
public User getByActivationHash(String hash) {
return getSingle(em.createQuery("SELECT u FROM User as u WHERE u.activatehash = :activatehash AND u.deleted = false", User.class)
@@ -579,8 +579,8 @@ public class UserDao implements IGroupAdminDataProviderDao<User> {
/**
* login logic
*
- * @param userOrEmail: login or email of the user being tested
- * @param userpass: password of the user being tested
+ * @param userOrEmail - login or email of the user being tested
+ * @param userpass - password of the user being tested
* @return User object in case of successful login
* @throws OmException in case of any issue
*/
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java
index b320784..320c028 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java
@@ -166,7 +166,7 @@ public class InvitationDTO implements Serializable {
/**
* Method to set valid to date-time in format YYYY-MM-dd HH:mm:ss
*
- * @param validFrom
+ * @param validTo
* date-time in format YYYY-MM-dd HH:mm:ss
*/
public void setValidTo(String validTo) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
index ef4ea7f..2600a05 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
@@ -45,16 +45,16 @@ import org.simpleframework.xml.ElementList;
import org.simpleframework.xml.Root;
/**
- * An item in the file explorer in the recording section. Can be either:<br/>
+ * An item in the file explorer in the recording section. Can be either:
* <ul>
* <li>a conference recording</li>
* <li>a interview recording</li>
* <li>a folder</li>
* </ul>
*
- * Recorded files are situated in: webapps/openmeetings/streams/hibernate.<br/>
+ * Recorded files are situated in: webapps/openmeetings/streams/hibernate.
* The raw recorded files are situated in:
- * webapps/openmeetings/streams/$ROOM_ID.<br/>
+ * webapps/openmeetings/streams/$ROOM_ID.
*
* @author sebawagner
*
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java
index 7839386..b3cc956 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java
@@ -44,7 +44,7 @@ import org.simpleframework.xml.Root;
* contains meta data about each stream, for example if it is a screen sharing or
* audio/video stream. There is also a {@link Status} value
* {@link #streamStatus}, as long as this variable is not set
- * to {@link Status.STOPPED}, the recording process will not proceed and start to convert all
+ * to {@link Status#STOPPED}, the recording process will not proceed and start to convert all
* input sources to a single recording file.
*
* @author sebawagner
@@ -119,7 +119,6 @@ public class RecordingMetaData extends HistoricalEntity {
/**
* this is only STOPPED when the asynchronous stream writer's have completed to write packets to the file.
- * @see BaseStreamWriter#closeStream()
*/
@Column(name = "stream_status")
@Enumerated(EnumType.STRING)
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
index d8011ac..be298be 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
@@ -131,15 +131,15 @@ public class RoomPollAnswer implements IDataProviderEntity {
}
/**
- * @return the votedClient
+ * @return the voted {@link User}
*/
public User getVotedUser() {
return votedUser;
}
/**
- * @param votedClient
- * the votedClient to set
+ * @param votedUser
+ * the voted {@link User} to set
*/
public void setVotedUser(User votedUser) {
this.votedUser = votedUser;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java
index af6a9ff..4cef503 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java
@@ -65,13 +65,13 @@ public class RemoteSessionObject {
}
/**
- * @param username
- * @param firstname
- * @param lastname
- * @param pictureUrl
- * @param email
- * @param externalUserId
- * @param externalUserType
+ * @param username - username
+ * @param firstname - first name
+ * @param lastname - last name
+ * @param pictureUrl - picture url
+ * @param email - email
+ * @param externalUserId - external user id
+ * @param externalUserType - external user type
*
* 06.09.2009 17:05:48
* sebastianwagner
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java
index 3a98027..420a4ea 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java
@@ -60,6 +60,9 @@ public class FormatHelper {
* http://www.iana.org/assignments/language-subtag-registry, as well as
* Sindhi (sd) and Uyghur (ug). The presence of other subtags of the
* language code, e.g. regions like EG (Egypt), is ignored.
+ *
+ * @param languageString - locale string
+ * @return <code>true</code> in case passed locale is right-to-left
*/
public static boolean isRtlLanguage(String languageString) {
return languageString != null && RtlLocalesRe.matcher(languageString).find();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java
index 08a0476..7e5169f 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java
@@ -42,10 +42,12 @@ public class TimezoneUtil {
}
/**
- * Returns the timezone based on the user profile, if not return the timezone from the server
+ * Returns the timezone based on the user profile, if not return the timezone
+ * from the server
*
* @param user
- * @return
+ * to get timezone for
+ * @return {@link TimeZone} of given user
*/
public static TimeZone getTimeZone(User user) {
return getTimeZone(user == null ? null : user.getTimeZoneId());
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java
index d5488c1..13fc997 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java
@@ -35,7 +35,8 @@ public class ImportHelper {
* returns a list of all timezones as a {@link Map}
*
* @param tzList
- * @return
+ * - timezones to put to resulting {@link Map}
+ * @return {@link Map} with passed time zones as key and value
*/
public static Map<String, String> getAllTimeZones(String ... tzList) {
Map<String, String> result = new LinkedHashMap<>();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
index 2564e7f..5f6596f 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
@@ -79,8 +79,7 @@ public class IcalHandler {
* Constructor
*
* @param method
- * (@see IcalHandler Constants)
- * @throws Exception
+ * (@see IcalHandler) constants
*/
public IcalHandler(Method method) {
log.debug("Icalhandler method type : " + method);
@@ -170,6 +169,14 @@ public class IcalHandler {
/**
* Use this function to build a valid record for the AttendeeList for
* addMeetings Generate a Attendee
+ *
+ * @param emailAdress
+ * - email of attendee
+ * @param displayName
+ * - name of attendee
+ * @param chair
+ * - is this organizer
+ * @return attendee data as {@link Map}
*/
public Map<String, String> getAttendeeData(String emailAdress, String displayName, boolean chair) {
Map<String, String> oneRecord = new HashMap<>();
@@ -182,6 +189,11 @@ public class IcalHandler {
/**
* Write iCal to File
+ *
+ * @param _filerPath
+ * - path to '*.ics' file
+ * @throws Exception
+ * - in case of error during writing to the file
*/
public void writeDataToFile(String _filerPath) throws Exception {
String filerPath = _filerPath.endsWith(".ics") ? _filerPath
@@ -195,6 +207,10 @@ public class IcalHandler {
/**
* Get IcalBody as ByteArray
+ *
+ * @return - calendar in ICS format as byte[]
+ * @throws Exception
+ * - in case of error during writing to byte array
*/
public byte[] getIcalAsByteArray() throws Exception {
ByteArrayOutputStream bout = new ByteArrayOutputStream();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/508ad005/openmeetings-web/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 6e82f53..8ac81b3 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -30,7 +30,7 @@
<name>Openmeetings Web</name>
<description>Module for all Wicket based UI OpenMeetings components</description>
<properties>
- <mysql.version>5.1.44</mysql.version>
+ <mysql.version>5.1.45</mysql.version>
<mssql.version>6.2.1.jre8</mssql.version>
<old-backups.dir>${project.build.directory}/test-data</old-backups.dir>
<site.basedir>${project.parent.basedir}</site.basedir>