date:20170510

openmeetings git commit: no jira: code clean-up

2017-05-10 Thread solomax

Repository: openmeetings
Updated Branches:
  refs/heads/master 91d5f0826 -> c202ac99b


no jira: code clean-up


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/c202ac99
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/c202ac99
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/c202ac99

Branch: refs/heads/master
Commit: c202ac99bf353c116349d5fea05fe0a369bce224
Parents: 91d5f08
Author: Maxim Solodovnik 
Authored: Thu May 11 10:11:49 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu May 11 10:12:29 2017 +0700

--
 .../db/dao/basic/ConfigurationDao.java  | 21 
 .../db/entity/basic/Configuration.java  |  2 +-
 .../openmeetings/backup/BackupExport.java   |  2 +-
 3 files changed, 2 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c202ac99/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 d9451be..3e054a0 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
@@ -142,27 +142,6 @@ public class ConfigurationDao implements 
IDataProviderDao {
}
}
 
-   public List getConfigurations(int start, int max, String 
orderby, boolean asc) {
-   try {
-
-   String query = "SELECT c FROM Configuration c LEFT JOIN 
FETCH c.user WHERE c.deleted = false ORDER BY " + orderby;
-
-   if (asc) {
-   query += " ASC";
-   } else {
-   query += " DESC";
-   }
-
-   TypedQuery q = em.createQuery(query, 
Configuration.class);
-   q.setFirstResult(start);
-   q.setMaxResults(max);
-   return q.getResultList();
-   } catch (Exception ex2) {
-   log.error("[getConfigurations]", ex2);
-   }
-   return null;
-   }
-
/**
 */
public Configuration add(String key, String value, Long userId, String 
comment) {

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c202ac99/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
--
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
index 5319d04..6abd61c 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
@@ -46,7 +46,7 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "getConfigurationsByKeys", query = "SELECT c 
FROM Configuration c "
+ "WHERE c.key IN :keys and c.deleted = false"),
@NamedQuery(name = "getNondeletedConfiguration", query = 
"SELECT c FROM Configuration c  "
-   + "LEFT JOIN FETCH c.user WHERE c.deleted = 
false"),
+   + "LEFT JOIN FETCH c.user WHERE c.deleted = 
false ORDER BY c.id ASC"),
@NamedQuery(name = "getConfigurationById", query = "SELECT c 
FROM Configuration c "
+ "LEFT JOIN FETCH c.user WHERE c.id = :id and 
c.deleted = false"),
@NamedQuery(name = "countConfigurations", query = "SELECT 
COUNT(c) FROM Configuration c WHERE c.deleted = false")

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c202ac99/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
--
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
index 7522528..a18586b 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
+++ 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
@@ -360,7 +360,7 @@ public class BackupExport {
 *

openmeetings git commit: no jira: code clean-up

2017-05-10 Thread solomax

Repository: openmeetings
Updated Branches:
  refs/heads/3.2.x 7dde5a9df -> 56ed9869a


no jira: code clean-up


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/56ed9869
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/56ed9869
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/56ed9869

Branch: refs/heads/3.2.x
Commit: 56ed9869aac4f02d249973eab76aa9c89149e4af
Parents: 7dde5a9
Author: Maxim Solodovnik 
Authored: Thu May 11 10:11:49 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu May 11 10:11:49 2017 +0700

--
 .../db/dao/basic/ConfigurationDao.java  | 21 
 .../db/entity/basic/Configuration.java  |  2 +-
 .../openmeetings/backup/BackupExport.java   |  2 +-
 3 files changed, 2 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56ed9869/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 d9451be..3e054a0 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
@@ -142,27 +142,6 @@ public class ConfigurationDao implements 
IDataProviderDao {
}
}
 
-   public List getConfigurations(int start, int max, String 
orderby, boolean asc) {
-   try {
-
-   String query = "SELECT c FROM Configuration c LEFT JOIN 
FETCH c.user WHERE c.deleted = false ORDER BY " + orderby;
-
-   if (asc) {
-   query += " ASC";
-   } else {
-   query += " DESC";
-   }
-
-   TypedQuery q = em.createQuery(query, 
Configuration.class);
-   q.setFirstResult(start);
-   q.setMaxResults(max);
-   return q.getResultList();
-   } catch (Exception ex2) {
-   log.error("[getConfigurations]", ex2);
-   }
-   return null;
-   }
-
/**
 */
public Configuration add(String key, String value, Long userId, String 
comment) {

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56ed9869/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
--
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
index 5319d04..6abd61c 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
@@ -46,7 +46,7 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "getConfigurationsByKeys", query = "SELECT c 
FROM Configuration c "
+ "WHERE c.key IN :keys and c.deleted = false"),
@NamedQuery(name = "getNondeletedConfiguration", query = 
"SELECT c FROM Configuration c  "
-   + "LEFT JOIN FETCH c.user WHERE c.deleted = 
false"),
+   + "LEFT JOIN FETCH c.user WHERE c.deleted = 
false ORDER BY c.id ASC"),
@NamedQuery(name = "getConfigurationById", query = "SELECT c 
FROM Configuration c "
+ "LEFT JOIN FETCH c.user WHERE c.id = :id and 
c.deleted = false"),
@NamedQuery(name = "countConfigurations", query = "SELECT 
COUNT(c) FROM Configuration c WHERE c.deleted = false")

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56ed9869/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
--
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
index 7522528..a18586b 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
+++ 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
@@ -360,7 +360,7 @@ public class BackupExport {
 *

openmeetings git commit: no jira: User name should be escaped in chat message JSON

2017-05-10 Thread solomax

Repository: openmeetings
Updated Branches:
  refs/heads/master e036b7d00 -> 91d5f0826


no jira: User name should be escaped in chat message JSON


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/91d5f082
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/91d5f082
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/91d5f082

Branch: refs/heads/master
Commit: 91d5f08262702646b5565390290e13bc284647b1
Parents: e036b7d
Author: Maxim Solodovnik 
Authored: Wed May 10 23:48:04 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu May 11 00:00:24 2017 +0700

--
 .../apache/openmeetings/core/util/WebSocketHelper.java| 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/91d5f082/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
--
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
index 3994551..3421f16 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
@@ -18,6 +18,7 @@
  */
 package org.apache.openmeetings.core.util;
 
+import static org.apache.commons.lang3.StringEscapeUtils.escapeHtml4;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 
 import java.io.IOException;
@@ -28,6 +29,7 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.time.FastDateFormat;
 import org.apache.openmeetings.IApplication;
 import org.apache.openmeetings.db.entity.basic.ChatMessage;
@@ -73,12 +75,16 @@ public class WebSocketHelper {
sendRoom(m.getRoomId(), (t, c) -> t.sendMessage(m), null);
}
 
+   private static String getName(User u) {
+   return escapeHtml4(String.format("%s %s", u.getFirstname(), 
u.getLastname()));
+   }
+
private static JSONObject setScope(JSONObject o, ChatMessage m, long 
curUserId) {
String scope, scopeName = null;
if (m.getToUser() != null) {
User u = curUserId == m.getToUser().getId() ? 
m.getFromUser() : m.getToUser();
scope = ID_USER_PREFIX + u.getId();
-   scopeName = String.format("%s %s", u.getFirstname(), 
u.getLastname());
+   scopeName = getName(u);
} else if (m.getToRoom() != null) {
scope = ID_ROOM_PREFIX + m.getToRoom().getId();
o.put("needModeration", m.isNeedModeration());
@@ -95,7 +101,7 @@ public class WebSocketHelper {
smsg = smsg == null ? smsg : " " + 
smsg.replaceAll("", " ") + " ";
JSONObject from = new JSONObject()
.put("id", m.getFromUser().getId())
-   .put("name", 
m.getFromUser().getFirstname() + " " + m.getFromUser().getLastname());
+   .put("name", getName(m.getFromUser()));
if (uFmt != null) {
uFmt.accept(from, m.getFromUser());
}

openmeetings git commit: no jira: User name should be escaped in chat message JSON

2017-05-10 Thread solomax

Repository: openmeetings
Updated Branches:
  refs/heads/3.2.x 0033bb925 -> 7dde5a9df


no jira: User name should be escaped in chat message JSON


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/7dde5a9d
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/7dde5a9d
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/7dde5a9d

Branch: refs/heads/3.2.x
Commit: 7dde5a9df6e0a44553353f0ed9377a745f315c17
Parents: 0033bb9
Author: Maxim Solodovnik 
Authored: Wed May 10 23:48:04 2017 +0700
Committer: Maxim Solodovnik 
Committed: Wed May 10 23:48:04 2017 +0700

--
 .../apache/openmeetings/core/util/WebSocketHelper.java| 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7dde5a9d/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
--
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
index 3994551..3421f16 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
@@ -18,6 +18,7 @@
  */
 package org.apache.openmeetings.core.util;
 
+import static org.apache.commons.lang3.StringEscapeUtils.escapeHtml4;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 
 import java.io.IOException;
@@ -28,6 +29,7 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.time.FastDateFormat;
 import org.apache.openmeetings.IApplication;
 import org.apache.openmeetings.db.entity.basic.ChatMessage;
@@ -73,12 +75,16 @@ public class WebSocketHelper {
sendRoom(m.getRoomId(), (t, c) -> t.sendMessage(m), null);
}
 
+   private static String getName(User u) {
+   return escapeHtml4(String.format("%s %s", u.getFirstname(), 
u.getLastname()));
+   }
+
private static JSONObject setScope(JSONObject o, ChatMessage m, long 
curUserId) {
String scope, scopeName = null;
if (m.getToUser() != null) {
User u = curUserId == m.getToUser().getId() ? 
m.getFromUser() : m.getToUser();
scope = ID_USER_PREFIX + u.getId();
-   scopeName = String.format("%s %s", u.getFirstname(), 
u.getLastname());
+   scopeName = getName(u);
} else if (m.getToRoom() != null) {
scope = ID_ROOM_PREFIX + m.getToRoom().getId();
o.put("needModeration", m.isNeedModeration());
@@ -95,7 +101,7 @@ public class WebSocketHelper {
smsg = smsg == null ? smsg : " " + 
smsg.replaceAll("", " ") + " ";
JSONObject from = new JSONObject()
.put("id", m.getFromUser().getId())
-   .put("name", 
m.getFromUser().getFirstname() + " " + m.getFromUser().getLastname());
+   .put("name", getName(m.getFromUser()));
if (uFmt != null) {
uFmt.accept(from, m.getFromUser());
}

openmeetings git commit: no jira: code cleanup

2017-05-10 Thread solomax

Repository: openmeetings
Updated Branches:
  refs/heads/master 34ccd7c04 -> e036b7d00


no jira: code cleanup


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/e036b7d0
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/e036b7d0
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/e036b7d0

Branch: refs/heads/master
Commit: e036b7d0091293312d6cbd0e58b6fc18654fe5f7
Parents: 34ccd7c
Author: Maxim Solodovnik 
Authored: Wed May 10 20:56:00 2017 +0700
Committer: Maxim Solodovnik 
Committed: Wed May 10 20:56:00 2017 +0700

--
 .../main/java/org/apache/openmeetings/db/util/LocaleHelper.java| 2 +-
 openmeetings-screenshare/pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e036b7d0/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java
--
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java
index 2b5b9e7..43bb513 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java
@@ -67,7 +67,7 @@ public class LocaleHelper {
}
locale = builder.build();
} catch (Exception e) {
-   log.error("Unexpected Error whilw constructing locale 
for the user", e.getMessage());
+   log.error("Unexpected Error while constructing locale 
for the user", e.getMessage());
}
return locale;
}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e036b7d0/openmeetings-screenshare/pom.xml
--
diff --git a/openmeetings-screenshare/pom.xml b/openmeetings-screenshare/pom.xml
index b36f33f..c5f9601 100644
--- a/openmeetings-screenshare/pom.xml
+++ b/openmeetings-screenshare/pom.xml
@@ -158,7 +158,7 @@


true

true
-   
org.apache.openmeetings.screen.webstart.CoreScreenShare
+   
org.apache.openmeetings.screenshare.Core




${project.name}

[jira] [Created] (OPENMEETINGS-1647) Camera streams are not being recorded

2017-05-10 Thread Maxim Solodovnik (JIRA)

Maxim Solodovnik created OPENMEETINGS-1647:
--

 Summary: Camera streams are not being recorded
 Key: OPENMEETINGS-1647
 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1647
 Project: Openmeetings
  Issue Type: Bug
  Components: HTML5/Recordings, HTML5/Room
Affects Versions: 4.0.0
Reporter: Maxim Solodovnik
Assignee: Maxim Solodovnik
 Fix For: 4.0.0


Camera streams are not being recorded

1) go to room
2) start Audio/Video stream
3) start Screen-sharing web application
4) start recording
5) Check ./webapps/openmeetings/streams/ folder
Result: there is no stream from camera
Expected result: streams from camera(s) and web-application should be recorded



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)

[jira] [Commented] (OPENMEETINGS-980) Library versions should be updated

2017-05-10 Thread ASF subversion and git services (JIRA)


[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-980?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16004438#comment-16004438
 ] 

ASF subversion and git services commented on OPENMEETINGS-980:
--

Commit 34ccd7c04903f4e1233c5c82593e6576406aae48 in openmeetings's branch 
refs/heads/master from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=34ccd7c ]

[OPENMEETINGS-980] mysql driver is updated to the latest version


> Library versions should be updated
> --
>
> Key: OPENMEETINGS-980
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-980
> Project: Openmeetings
>  Issue Type: Improvement
>  Components: BuildsAndReleases
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
>
> Library versions should be keep up to date (continuous task)



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)

openmeetings git commit: [OPENMEETINGS-980] mysql driver is updated to the latest version

2017-05-10 Thread solomax

Repository: openmeetings
Updated Branches:
  refs/heads/master a0db37bf1 -> 34ccd7c04


[OPENMEETINGS-980] mysql driver is updated to the latest version


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/34ccd7c0
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/34ccd7c0
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/34ccd7c0

Branch: refs/heads/master
Commit: 34ccd7c04903f4e1233c5c82593e6576406aae48
Parents: a0db37b
Author: Maxim Solodovnik 
Authored: Wed May 10 17:15:43 2017 +0700
Committer: Maxim Solodovnik 
Committed: Wed May 10 17:15:43 2017 +0700

--
 openmeetings-web/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/34ccd7c0/openmeetings-web/pom.xml
--
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 0434bbd..b064a88 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -30,7 +30,7 @@
Openmeetings Web
Module for all Wicket based UI OpenMeetings 
components

-   5.1.39
+   5.1.42

${project.build.directory}/test-data
${project.parent.basedir}

openmeetings git commit: no jira: code clean-up

openmeetings git commit: no jira: code clean-up

openmeetings git commit: no jira: User name should be escaped in chat message JSON

openmeetings git commit: no jira: User name should be escaped in chat message JSON

openmeetings git commit: no jira: code cleanup

[jira] [Created] (OPENMEETINGS-1647) Camera streams are not being recorded

[jira] [Commented] (OPENMEETINGS-980) Library versions should be updated

openmeetings git commit: [OPENMEETINGS-980] mysql driver is updated to the latest version

8 matches

Site Navigation

Mail list logo

Footer information