[jira] [Commented] (OPENMEETINGS-1929) Code need to be enhanced
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1929?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16608037#comment-16608037 ] ASF subversion and git services commented on OPENMEETINGS-1929: --- Commit d3e532e2c824a296d761c846b4c867c1e6f5e3e2 in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=d3e532e ] [OPENMEETINGS-1929] method to get the list of all external files is added > Code need to be enhanced > > > Key: OPENMEETINGS-1929 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1929 > Project: Openmeetings > Issue Type: Improvement > Components: BuildsAndReleases, SOAP/REST API >Affects Versions: 4.0.5 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.6 > > > Code need to be enhanced > # pictureuri -> pictureUri > # ability to set user picture via REST/SOAP > # ability to retrieve the list of files for external type > # -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1929] method to get the list of all external files is added
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new d3e532e [OPENMEETINGS-1929] method to get the list of all external
files is added
d3e532e is described below
commit d3e532e2c824a296d761c846b4c867c1e6f5e3e2
Author: Maxim Solodovnik
AuthorDate: Sat Sep 8 19:32:37 2018 +0700
[OPENMEETINGS-1929] method to get the list of all external files is added
---
.../openmeetings/db/dao/file/FileItemDao.java | 8
.../openmeetings/db/entity/file/FileItem.java | 3 ++-
.../web/room/sidebar/UploadDialog.java | 1 +
.../openmeetings/webservice/FileWebService.java| 23 ++
.../webservice/RecordingWebService.java| 2 +-
5 files changed, 35 insertions(+), 2 deletions(-)
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 5bd0f42..b779fac 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
@@ -119,6 +119,14 @@ public class FileItemDao extends BaseFileItemDao {
return em.createNamedQuery("getAllFiles",
FileItem.class).getResultList();
}
+ public List getExternal(String externalType) {
+ log.debug("get external started");
+
+ return em.createNamedQuery("getFileAllExternal", FileItem.class)
+ .setParameter("externalType", externalType)
+ .getResultList();
+ }
+
public void delete(String externalId, String externalType) {
log.debug("delete started");
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
index 3d286f6..069cad8 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
@@ -37,7 +37,8 @@ import org.simpleframework.xml.Root;
+ "AND f.parentId = :parentId ORDER BY f.type ASC,
f.name ")
, @NamedQuery(name = "getFilesFilteredByParent", query = "SELECT f FROM
FileItem f WHERE f.deleted = false "
+ "AND f.parentId = :parentId AND f.type IN :filter
ORDER BY f.type ASC, f.name ")
- , @NamedQuery(name = "getFileExternal", query = "SELECT f FROM FileItem
f WHERE f.externalId = :externalId AND f.externalType LIKE :externalType")
+ , @NamedQuery(name = "getFileExternal", query = "SELECT f FROM FileItem
f WHERE f.deleted = false AND f.externalId = :externalId AND f.externalType
LIKE :externalType")
+ , @NamedQuery(name = "getFileAllExternal", query = "SELECT f FROM
FileItem f WHERE f.deleted = false AND f.externalType LIKE :externalType")
, @NamedQuery(name = "getFileByGroup", query = "SELECT f FROM FileItem
f WHERE f.deleted = false AND f.ownerId IS NULL "
+ "AND f.groupId = :groupId AND f.parentId IS NULL "
+ "ORDER BY f.type ASC, f.name")
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
index a35aac8..886bdae 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
@@ -190,6 +190,7 @@ public class UploadDialog extends
AbstractFormDialog {
FileItem f = new FileItem();
f.setSize(fu.getSize());
f.setName(fu.getClientFileName());
+
f.setExternalType(room.getRoom().getExternalType());
BaseFileItem parent =
roomFiles.getLastSelected();
if (parent == null || !(parent instanceof
FileItem)) {
f.setOwnerId(getUserId());
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 c9fe464..7e93d89 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
@@ -173,6 +173,29 @@ public class FileWebService extends BaseWebService {
}
[jira] [Commented] (OPENMEETINGS-1929) Code need to be enhanced
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1929?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16608036#comment-16608036 ] ASF subversion and git services commented on OPENMEETINGS-1929: --- Commit 9653af91045cf6d8f8a3c8ccaec27dcad82c98c4 in openmeetings's branch refs/heads/4.0.x from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=9653af9 ] [OPENMEETINGS-1929] method to get the list of all external files is added > Code need to be enhanced > > > Key: OPENMEETINGS-1929 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1929 > Project: Openmeetings > Issue Type: Improvement > Components: BuildsAndReleases, SOAP/REST API >Affects Versions: 4.0.5 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.6 > > > Code need to be enhanced > # pictureuri -> pictureUri > # ability to set user picture via REST/SOAP > # ability to retrieve the list of files for external type > # -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1929] method to get the list of all external files is added
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 9653af9 [OPENMEETINGS-1929] method to get the list of all external
files is added
new 3fe938f Merge branch '4.0.x' of github.com:apache/openmeetings into
4.0.x
9653af9 is described below
commit 9653af91045cf6d8f8a3c8ccaec27dcad82c98c4
Author: Maxim Solodovnik
AuthorDate: Sat Sep 8 19:32:37 2018 +0700
[OPENMEETINGS-1929] method to get the list of all external files is added
---
.../openmeetings/db/dao/file/FileItemDao.java | 8
.../openmeetings/db/entity/file/FileItem.java | 3 ++-
.../web/room/sidebar/UploadDialog.java | 1 +
.../openmeetings/webservice/FileWebService.java| 23 ++
.../webservice/RecordingWebService.java| 2 +-
5 files changed, 35 insertions(+), 2 deletions(-)
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 e831a8b..b4afec9 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
@@ -121,6 +121,14 @@ public class FileItemDao extends BaseFileItemDao {
return em.createNamedQuery("getAllFiles",
FileItem.class).getResultList();
}
+ public List getExternal(String externalType) {
+ log.debug("get external started");
+
+ return em.createNamedQuery("getFileAllExternal", FileItem.class)
+ .setParameter("externalType", externalType)
+ .getResultList();
+ }
+
public void delete(String externalId, String externalType) {
log.debug("delete started");
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
index 3d286f6..069cad8 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
@@ -37,7 +37,8 @@ import org.simpleframework.xml.Root;
+ "AND f.parentId = :parentId ORDER BY f.type ASC,
f.name ")
, @NamedQuery(name = "getFilesFilteredByParent", query = "SELECT f FROM
FileItem f WHERE f.deleted = false "
+ "AND f.parentId = :parentId AND f.type IN :filter
ORDER BY f.type ASC, f.name ")
- , @NamedQuery(name = "getFileExternal", query = "SELECT f FROM FileItem
f WHERE f.externalId = :externalId AND f.externalType LIKE :externalType")
+ , @NamedQuery(name = "getFileExternal", query = "SELECT f FROM FileItem
f WHERE f.deleted = false AND f.externalId = :externalId AND f.externalType
LIKE :externalType")
+ , @NamedQuery(name = "getFileAllExternal", query = "SELECT f FROM
FileItem f WHERE f.deleted = false AND f.externalType LIKE :externalType")
, @NamedQuery(name = "getFileByGroup", query = "SELECT f FROM FileItem
f WHERE f.deleted = false AND f.ownerId IS NULL "
+ "AND f.groupId = :groupId AND f.parentId IS NULL "
+ "ORDER BY f.type ASC, f.name")
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
index 26db937..3678c06 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
@@ -187,6 +187,7 @@ public class UploadDialog extends
AbstractFormDialog {
FileItem f = new FileItem();
f.setSize(fu.getSize());
f.setName(fu.getClientFileName());
+
f.setExternalType(room.getRoom().getExternalType());
BaseFileItem parent =
roomFiles.getLastSelected();
if (parent == null || !(parent instanceof
FileItem)) {
f.setOwnerId(getUserId());
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 6a4d668..37768d7 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
@@ -
[jira] [Updated] (OPENMEETINGS-1929) Code need to be enhanced
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1929?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik updated OPENMEETINGS-1929: --- Description: Code need to be enhanced # pictureuri -> pictureUri # ability to set user picture via REST/SOAP # ability to retrieve the list of files for external type # was: Code need to be enhanced # pictureuri -> pictureUri # ability to set user picture via REST/SOAP > Code need to be enhanced > > > Key: OPENMEETINGS-1929 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1929 > Project: Openmeetings > Issue Type: Improvement > Components: BuildsAndReleases, SOAP/REST API >Affects Versions: 4.0.5 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.6 > > > Code need to be enhanced > # pictureuri -> pictureUri > # ability to set user picture via REST/SOAP > # ability to retrieve the list of files for external type > # -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1929) Code need to be enhanced
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1929?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16608021#comment-16608021 ] ASF subversion and git services commented on OPENMEETINGS-1929: --- Commit 2bef405367cd138db616fe8ce7ff0ad975be3e94 in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=2bef405 ] [OPENMEETINGS-1929] pictureUri can be set via SOAP/REST API > Code need to be enhanced > > > Key: OPENMEETINGS-1929 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1929 > Project: Openmeetings > Issue Type: Improvement > Components: BuildsAndReleases, SOAP/REST API >Affects Versions: 4.0.5 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.6 > > > Code need to be enhanced > # pictureuri -> pictureUri > # ability to set user picture via REST/SOAP -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1929] pictureUri can be set via SOAP/REST API
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 2bef405 [OPENMEETINGS-1929] pictureUri can be set via SOAP/REST API
2bef405 is described below
commit 2bef405367cd138db616fe8ce7ff0ad975be3e94
Author: Maxim Solodovnik
AuthorDate: Sat Sep 8 18:34:18 2018 +0700
[OPENMEETINGS-1929] pictureUri can be set via SOAP/REST API
---
.../apache/openmeetings/core/converter/ImageConverter.java | 4 ++--
.../org/apache/openmeetings/core/ldap/LdapLoginManager.java | 6 +++---
.../java/org/apache/openmeetings/db/dao/user/UserDao.java| 4 ++--
.../java/org/apache/openmeetings/db/dto/user/UserDTO.java| 12
.../java/org/apache/openmeetings/db/entity/user/User.java| 12 ++--
.../main/java/org/apache/openmeetings/cli/CleanupHelper.java | 2 +-
.../java/org/apache/openmeetings/web/app/UserManager.java| 2 +-
.../java/org/apache/openmeetings/web/app/WebSession.java | 4 ++--
.../org/apache/openmeetings/web/user/rooms/RoomsPanel.java | 2 +-
.../openmeetings/web/util/ProfileImageResourceReference.java | 4 ++--
.../org/apache/openmeetings/webservice/TestUserService.java | 2 +-
11 files changed, 33 insertions(+), 21 deletions(-)
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 d0c27db..24cb01a 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
@@ -105,10 +105,10 @@ public class ImageConverter extends BaseConverter {
file.delete();
}
- String pictureuri = destinationFile.getName();
+ String img = destinationFile.getName();
User us = userDao.get(userId);
us.setUpdated(new Date());
- us.setPictureuri(pictureuri);
+ us.setPictureUri(img);
userDao.update(us, userId);
return returnMap;
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
index 1ccdfbd..917b996 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
@@ -370,9 +370,9 @@ public class LdapLoginManager {
u.getAddress().setCountry(validateCountry(getStringAttr(config, entry,
CONFIGKEY_LDAP_KEY_COUNTRY, LDAP_KEY_COUNTRY)));
u.getAddress().setTown(getStringAttr(config, entry,
CONFIGKEY_LDAP_KEY_TOWN, LDAP_KEY_TOWN));
u.getAddress().setPhone(getStringAttr(config, entry,
CONFIGKEY_LDAP_KEY_PHONE, LDAP_KEY_PHONE));
- u.setPictureuri(getStringAttr(config, entry,
CONFIGKEY_LDAP_KEY_PICTURE, ""));
- if (Strings.isEmpty(u.getPictureuri()) &&
!Strings.isEmpty(options.pictureUri)) {
- u.setPictureuri(options.pictureUri);
+ u.setPictureUri(getStringAttr(config, entry,
CONFIGKEY_LDAP_KEY_PICTURE, ""));
+ if (Strings.isEmpty(u.getPictureUri()) &&
!Strings.isEmpty(options.pictureUri)) {
+ u.setPictureUri(options.pictureUri);
}
String tz = getStringAttr(config, entry,
LdapOptions.CONFIGKEY_LDAP_TIMEZONE_NAME, LDAP_KEY_TIMEZONE);
if (tz == null) {
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 be8fa16..7d303bd 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
@@ -357,8 +357,8 @@ public class UserDao implements
IGroupAdminDataProviderDao {
u.setGroupUsers(new ArrayList<>());
u.setRights(new HashSet<>());
u.setTimeZoneId(getDefaultTimezone());
- File pic =
OmFileHelper.getUserProfilePicture(u.getId(), u.getPictureuri(), null);
- u.setPictureuri(null);
+ File pic =
OmFileHelper.getUserProfilePicture(u.getId(), u.getPictureUri(), null);
+ u.setPictureUri(null);
ICrypt crypt = CryptProvider.get();
try {
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1929] pictureUri can be set via SOAP/REST API
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 5090918 [OPENMEETINGS-1929] pictureUri can be set via SOAP/REST API
5090918 is described below
commit 50909184876b2bb355d837577d876c10c1622f2e
Author: Maxim Solodovnik
AuthorDate: Sat Sep 8 18:34:18 2018 +0700
[OPENMEETINGS-1929] pictureUri can be set via SOAP/REST API
---
.../apache/openmeetings/core/converter/ImageConverter.java | 4 ++--
.../org/apache/openmeetings/core/ldap/LdapLoginManager.java | 6 +++---
.../java/org/apache/openmeetings/db/dao/user/UserDao.java| 4 ++--
.../java/org/apache/openmeetings/db/dto/user/UserDTO.java| 12
.../java/org/apache/openmeetings/db/entity/user/User.java| 12 ++--
.../main/java/org/apache/openmeetings/cli/CleanupHelper.java | 2 +-
.../java/org/apache/openmeetings/web/app/UserManager.java| 2 +-
.../java/org/apache/openmeetings/web/app/WebSession.java | 4 ++--
.../org/apache/openmeetings/web/user/rooms/RoomsPanel.java | 2 +-
.../openmeetings/web/util/ProfileImageResourceReference.java | 4 ++--
.../org/apache/openmeetings/webservice/TestUserService.java | 2 +-
11 files changed, 33 insertions(+), 21 deletions(-)
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 d45a1e3..cefda06 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
@@ -106,10 +106,10 @@ public class ImageConverter extends BaseConverter {
file.delete();
}
- String pictureuri = destinationFile.getName();
+ String img = destinationFile.getName();
User us = userDao.get(userId);
us.setUpdated(new Date());
- us.setPictureuri(pictureuri);
+ us.setPictureUri(img);
userDao.update(us, userId);
return returnMap;
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
index f75d025..9b6dca2 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
@@ -371,9 +371,9 @@ public class LdapLoginManager {
u.getAddress().setCountry(validateCountry(getStringAttr(config, entry,
CONFIGKEY_LDAP_KEY_COUNTRY, LDAP_KEY_COUNTRY)));
u.getAddress().setTown(getStringAttr(config, entry,
CONFIGKEY_LDAP_KEY_TOWN, LDAP_KEY_TOWN));
u.getAddress().setPhone(getStringAttr(config, entry,
CONFIGKEY_LDAP_KEY_PHONE, LDAP_KEY_PHONE));
- u.setPictureuri(getStringAttr(config, entry,
CONFIGKEY_LDAP_KEY_PICTURE, ""));
- if (Strings.isEmpty(u.getPictureuri()) &&
!Strings.isEmpty(options.pictureUri)) {
- u.setPictureuri(options.pictureUri);
+ u.setPictureUri(getStringAttr(config, entry,
CONFIGKEY_LDAP_KEY_PICTURE, ""));
+ if (Strings.isEmpty(u.getPictureUri()) &&
!Strings.isEmpty(options.pictureUri)) {
+ u.setPictureUri(options.pictureUri);
}
String tz = getStringAttr(config, entry,
LdapOptions.CONFIGKEY_LDAP_TIMEZONE_NAME, LDAP_KEY_TIMEZONE);
if (tz == null) {
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 b03d503..f48b5f8 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
@@ -358,8 +358,8 @@ public class UserDao implements
IGroupAdminDataProviderDao {
u.setGroupUsers(new ArrayList<>());
u.setRights(new HashSet<>());
u.setTimeZoneId(getDefaultTimezone());
- File pic =
OmFileHelper.getUserProfilePicture(u.getId(), u.getPictureuri(), null);
- u.setPictureuri(null);
+ File pic =
OmFileHelper.getUserProfilePicture(u.getId(), u.getPictureUri(), null);
+ u.setPictureUri(null);
ICrypt crypt = CryptProvider.get();
try {
[jira] [Commented] (OPENMEETINGS-1929) Code need to be enhanced
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1929?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16608020#comment-16608020 ] ASF subversion and git services commented on OPENMEETINGS-1929: --- Commit 50909184876b2bb355d837577d876c10c1622f2e in openmeetings's branch refs/heads/4.0.x from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=5090918 ] [OPENMEETINGS-1929] pictureUri can be set via SOAP/REST API > Code need to be enhanced > > > Key: OPENMEETINGS-1929 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1929 > Project: Openmeetings > Issue Type: Improvement > Components: BuildsAndReleases, SOAP/REST API >Affects Versions: 4.0.5 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.6 > > > Code need to be enhanced > # pictureuri -> pictureUri > # ability to set user picture via REST/SOAP -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Created] (OPENMEETINGS-1929) Code need to be enhanced
Maxim Solodovnik created OPENMEETINGS-1929: -- Summary: Code need to be enhanced Key: OPENMEETINGS-1929 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1929 Project: Openmeetings Issue Type: Improvement Components: BuildsAndReleases, SOAP/REST API Affects Versions: 4.0.5 Reporter: Maxim Solodovnik Assignee: Maxim Solodovnik Fix For: 4.0.6 Code need to be enhanced # pictureuri -> pictureUri # ability to set user picture via REST/SOAP -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1928) Library versions need to be updated (4.0.6)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1928?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16608003#comment-16608003 ] ASF subversion and git services commented on OPENMEETINGS-1928: --- Commit ee03ef2d90b91a1c7b380963b905d3b88f84932b in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=ee03ef2 ] [OPENMEETINGS-1928] spring version is updated > Library versions need to be updated (4.0.6) > --- > > Key: OPENMEETINGS-1928 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1928 > Project: Openmeetings > Issue Type: Task > Components: BuildsAndReleases >Affects Versions: 4.0.6 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.6 > > > Library versions need to be updated -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1928] spring version is updated
This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch 4.0.x in repository https://gitbox.apache.org/repos/asf/openmeetings.git The following commit(s) were added to refs/heads/4.0.x by this push: new 5c18a1d [OPENMEETINGS-1928] spring version is updated 5c18a1d is described below commit 5c18a1d1fd5a014f0af7aeac01d5e3548d932f27 Author: Maxim Solodovnik AuthorDate: Sat Sep 8 17:24:41 2018 +0700 [OPENMEETINGS-1928] spring version is updated --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index afebc5c..bb7bc72 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 8.0.0 1.0.10-M9 1.0.10-M9 - 5.0.8.RELEASE + 5.0.9.RELEASE 2.0.19 9.0.11 3.0.1
[openmeetings] branch master updated: [OPENMEETINGS-1928] spring version is updated
This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git The following commit(s) were added to refs/heads/master by this push: new ee03ef2 [OPENMEETINGS-1928] spring version is updated ee03ef2 is described below commit ee03ef2d90b91a1c7b380963b905d3b88f84932b Author: Maxim Solodovnik AuthorDate: Sat Sep 8 17:24:41 2018 +0700 [OPENMEETINGS-1928] spring version is updated --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7ac1b0c..2a9c407 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 8.0.0 8.0.0 1.0.10-M9 - 5.0.8.RELEASE + 5.0.9.RELEASE 2.0.19 9.0.11 3.0.1
[jira] [Commented] (OPENMEETINGS-1928) Library versions need to be updated (4.0.6)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1928?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16608002#comment-16608002 ] ASF subversion and git services commented on OPENMEETINGS-1928: --- Commit 5c18a1d1fd5a014f0af7aeac01d5e3548d932f27 in openmeetings's branch refs/heads/4.0.x from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=5c18a1d ] [OPENMEETINGS-1928] spring version is updated > Library versions need to be updated (4.0.6) > --- > > Key: OPENMEETINGS-1928 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1928 > Project: Openmeetings > Issue Type: Task > Components: BuildsAndReleases >Affects Versions: 4.0.6 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.6 > > > Library versions need to be updated -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Created] (OPENMEETINGS-1928) Library versions need to be updated (4.0.6)
Maxim Solodovnik created OPENMEETINGS-1928: -- Summary: Library versions need to be updated (4.0.6) Key: OPENMEETINGS-1928 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1928 Project: Openmeetings Issue Type: Task Components: BuildsAndReleases Affects Versions: 4.0.6 Reporter: Maxim Solodovnik Assignee: Maxim Solodovnik Fix For: 4.0.6 Library versions need to be updated -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1649) HTML5 video need to be implemented
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1649?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16607998#comment-16607998 ] ASF subversion and git services commented on OPENMEETINGS-1649: --- Commit 9329b8c36de6d9db562a736952f72d6b4bd49648 in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=9329b8c ] [OPENMEETINGS-1649] initial refactoring > HTML5 video need to be implemented > -- > > Key: OPENMEETINGS-1649 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1649 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Room >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 5.0.0 > > > Flex video in room should be replaced with HTML5 video -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1649] initial refactoring
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 9329b8c [OPENMEETINGS-1649] initial refactoring
9329b8c is described below
commit 9329b8c36de6d9db562a736952f72d6b4bd49648
Author: Maxim Solodovnik
AuthorDate: Sat Sep 8 17:18:24 2018 +0700
[OPENMEETINGS-1649] initial refactoring
---
.../core/remote/{IKUser.java => IKStream.java} |2 +-
.../org/apache/openmeetings/core/remote/KRoom.java | 35 +-
.../core/remote/{KUser.java => KStream.java} | 48 +-
.../remote/{KTestUser.java => KTestStream.java}|6 +-
.../openmeetings/core/remote/KurentoHandler.java | 113 ++-
.../openmeetings/core/remote/MobileService.java| 37 +-
.../core/remote/ScopeApplicationAdapter.java | 1032
.../core/service/RecordingService.java |6 -
.../openmeetings/core/util/WebSocketHelper.java|6 +-
.../openmeetings/db/dao/server/SessiondataDao.java | 31 -
.../openmeetings/db/entity/basic/Client.java | 122 +--
.../apache/openmeetings/db/entity/room/Room.java | 12 -
.../openmeetings/db/entity/room/StreamClient.java | 408
.../db/manager/IStreamClientManager.java | 112 ---
.../apache/openmeetings/db/util/RoomHelper.java| 45 -
.../web/admin/connection/ConnectionsPanel.java | 15 +-
.../apache/openmeetings/web/app/Application.java |3 -
.../openmeetings/web/app/StreamClientManager.java | 293 --
.../openmeetings/web/room/RoomBroadcaster.java | 66 --
.../apache/openmeetings/web/room/RoomPanel.java| 22 +-
.../web/room/menu/StartSharingButton.java |7 +-
.../org/apache/openmeetings/web/room/raw-room.js |3 +
.../openmeetings/web/room/raw-video-manager.js | 37 +-
.../apache/openmeetings/web/room/raw-video-util.js |6 +-
.../org/apache/openmeetings/web/room/raw-video.js |1 +
.../openmeetings/web/room/sidebar/RoomSidebar.java | 76 +-
.../sidebar/icon/activity/RoomActivityIcon.java|5 +-
.../webapp/WEB-INF/classes/applicationContext.xml |2 +-
28 files changed, 276 insertions(+), 2275 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/IKUser.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/IKStream.java
similarity index 96%
rename from
openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/IKUser.java
rename to
openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/IKStream.java
index 516af37..0f685f2 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/IKUser.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/IKStream.java
@@ -18,6 +18,6 @@
*/
package org.apache.openmeetings.core.remote;
-public interface IKUser {
+public interface IKStream {
void release();
}
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
index 360733c..c3a43cd 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
@@ -32,6 +32,8 @@ import java.util.concurrent.ConcurrentHashMap;
import javax.annotation.PreDestroy;
+import org.apache.openmeetings.db.entity.basic.Client;
+import org.apache.openmeetings.db.entity.basic.Client.StreamDesc;
import org.kurento.client.Continuation;
import org.kurento.client.MediaPipeline;
import org.slf4j.Logger;
@@ -46,7 +48,7 @@ import com.github.openjson.JSONObject;
public class KRoom implements Closeable {
private final static Logger log = LoggerFactory.getLogger(KRoom.class);
- private final Map participants = new
ConcurrentHashMap<>();
+ private final Map participants = new
ConcurrentHashMap<>();
private final MediaPipeline pipeline;
private final Long roomId;
@@ -60,21 +62,21 @@ public class KRoom implements Closeable {
log.info("ROOM {} has been created", roomId);
}
- public KUser addUser(final KurentoHandler h, String uid) {
- log.info("ROOM {}: adding participant {}", roomId, uid);
- final KUser u = new KUser(h, uid, this.roomId, this.pipeline);
+ public KStream addStream(final KurentoHandler h, StreamDesc sd) {
+ log.info("ROOM {}: adding participant {}", roomId, sd.getUid());
+ final KStream u = new KStream(h, sd.getSid(), sd.getUid(),
this.roomId, this.pipeline);
participants.put(u.getUid(), u);
h.usersByUid.put(u.getUid(), u);
return u;
}
- public KUser join(final KurentoHandler h, String uid) {
-
