[jira] [Commented] (OPENMEETINGS-1571) 3.2.1 - Library versions should be updated
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1571?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15875546#comment-15875546 ] ASF subversion and git services commented on OPENMEETINGS-1571: --- Commit 1783840 from [~solomax] in branch 'application/branches/3.2.x' [ https://svn.apache.org/r1783840 ] [OPENMEETINGS-1571] red5, spring and tomcat versions are updated > 3.2.1 - Library versions should be updated > -- > > Key: OPENMEETINGS-1571 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1571 > Project: Openmeetings > Issue Type: Improvement > Components: BuildsAndReleases >Affects Versions: 3.2.1 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 3.2.1 > > > Library versions should be keep up to date (continuous task) -- This message was sent by Atlassian JIRA (v6.3.15#6346)
[jira] [Commented] (OPENMEETINGS-980) Library versions should be updated
[ https://issues.apache.org/jira/browse/OPENMEETINGS-980?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15875547#comment-15875547 ] ASF subversion and git services commented on OPENMEETINGS-980: -- Commit 1783841 from [~solomax] in branch 'application/trunk' [ https://svn.apache.org/r1783841 ] [OPENMEETINGS-980] red5, spring and tomcat versions are updated > 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)
svn commit: r1783840 - in /openmeetings/application/branches/3.2.x: LICENSE openmeetings-server/pom.xml openmeetings-server/src/main/assembly/components/all.xml openmeetings-server/src/main/assembly/c
Author: solomax Date: Tue Feb 21 07:52:15 2017 New Revision: 1783840 URL: http://svn.apache.org/viewvc?rev=1783840=rev Log: [OPENMEETINGS-1571] red5, spring and tomcat versions are updated Modified: openmeetings/application/branches/3.2.x/LICENSE openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml openmeetings/application/branches/3.2.x/openmeetings-server/src/main/assembly/components/all.xml openmeetings/application/branches/3.2.x/openmeetings-server/src/main/assembly/conf/jee-container.xml openmeetings/application/branches/3.2.x/pom.xml Modified: openmeetings/application/branches/3.2.x/LICENSE URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/LICENSE?rev=1783840=1783839=1783840=diff == --- openmeetings/application/branches/3.2.x/LICENSE (original) +++ openmeetings/application/branches/3.2.x/LICENSE Tue Feb 21 07:52:15 2017 @@ -298,8 +298,8 @@ webapps/openmeetings/WEB-INF/lib/geronim webapps/openmeetings/WEB-INF/lib/groovy-all-2.3.2.jar webapps/openmeetings/WEB-INF/lib/gson-2.2.4.jar webapps/openmeetings/WEB-INF/lib/guava-18.0.jar -webapps/openmeetings/WEB-INF/lib/httpclient-4.5.2.jar -webapps/openmeetings/WEB-INF/lib/httpcore-4.4.4.jar +webapps/openmeetings/WEB-INF/lib/httpclient-*.jar +webapps/openmeetings/WEB-INF/lib/httpcore-*.jar webapps/openmeetings/WEB-INF/lib/jettison-1.3.8.jar webapps/openmeetings/WEB-INF/lib/joda-time-2.9.4.jar webapps/openmeetings/WEB-INF/lib/jodconverter-core-3.0.1-om.jar Modified: openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml?rev=1783840=1783839=1783840=diff == --- openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-server/pom.xml Tue Feb 21 07:52:15 2017 @@ -117,7 +117,7 @@ prepare-red5-server - red5-server/red5-server-1.0.8-RELEASE.tar.gz + red5-server/red5-server-1.0.9-M2.tar.gz Modified: openmeetings/application/branches/3.2.x/openmeetings-server/src/main/assembly/components/all.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/src/main/assembly/components/all.xml?rev=1783840=1783839=1783840=diff == --- openmeetings/application/branches/3.2.x/openmeetings-server/src/main/assembly/components/all.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-server/src/main/assembly/components/all.xml Tue Feb 21 07:52:15 2017 @@ -32,6 +32,7 @@ webapps/root/demos/** webapps/root/index.html lib/commons-io*.jar + plugins/websocket*.jar *.sh conf/jee-container.xml @@ -107,6 +108,7 @@ WEB-INF/lib/commons-codec* WEB-INF/lib/commons-collections-* WEB-INF/lib/commons-lang3* + WEB-INF/lib/jcl-over-slf4j* Modified: openmeetings/application/branches/3.2.x/openmeetings-server/src/main/assembly/conf/jee-container.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/src/main/assembly/conf/jee-container.xml?rev=1783840=1783839=1783840=diff == --- openmeetings/application/branches/3.2.x/openmeetings-server/src/main/assembly/conf/jee-container.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-server/src/main/assembly/conf/jee-container.xml Tue Feb 21 07:52:15 2017 @@ -96,7 +96,6 @@ - Modified: openmeetings/application/branches/3.2.x/pom.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/pom.xml?rev=1783840=1783839=1783840=diff == ---
svn commit: r1783841 - in /openmeetings/application/trunk: LICENSE openmeetings-server/pom.xml openmeetings-server/src/main/assembly/components/all.xml openmeetings-server/src/main/assembly/conf/jee-c
Author: solomax Date: Tue Feb 21 07:52:33 2017 New Revision: 1783841 URL: http://svn.apache.org/viewvc?rev=1783841=rev Log: [OPENMEETINGS-980] red5, spring and tomcat versions are updated Modified: openmeetings/application/trunk/LICENSE openmeetings/application/trunk/openmeetings-server/pom.xml openmeetings/application/trunk/openmeetings-server/src/main/assembly/components/all.xml openmeetings/application/trunk/openmeetings-server/src/main/assembly/conf/jee-container.xml openmeetings/application/trunk/pom.xml Modified: openmeetings/application/trunk/LICENSE URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/LICENSE?rev=1783841=1783840=1783841=diff == --- openmeetings/application/trunk/LICENSE (original) +++ openmeetings/application/trunk/LICENSE Tue Feb 21 07:52:33 2017 @@ -298,8 +298,8 @@ webapps/openmeetings/WEB-INF/lib/geronim webapps/openmeetings/WEB-INF/lib/groovy-all-2.3.2.jar webapps/openmeetings/WEB-INF/lib/gson-2.2.4.jar webapps/openmeetings/WEB-INF/lib/guava-18.0.jar -webapps/openmeetings/WEB-INF/lib/httpclient-4.5.2.jar -webapps/openmeetings/WEB-INF/lib/httpcore-4.4.4.jar +webapps/openmeetings/WEB-INF/lib/httpclient-*.jar +webapps/openmeetings/WEB-INF/lib/httpcore-*.jar webapps/openmeetings/WEB-INF/lib/jettison-1.3.8.jar webapps/openmeetings/WEB-INF/lib/joda-time-2.9.4.jar webapps/openmeetings/WEB-INF/lib/jodconverter-core-3.0.1-om.jar Modified: openmeetings/application/trunk/openmeetings-server/pom.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/pom.xml?rev=1783841=1783840=1783841=diff == --- openmeetings/application/trunk/openmeetings-server/pom.xml (original) +++ openmeetings/application/trunk/openmeetings-server/pom.xml Tue Feb 21 07:52:33 2017 @@ -117,7 +117,7 @@ prepare-red5-server - red5-server/red5-server-1.0.8-RELEASE.tar.gz + red5-server/red5-server-1.0.9-M2.tar.gz Modified: openmeetings/application/trunk/openmeetings-server/src/main/assembly/components/all.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/main/assembly/components/all.xml?rev=1783841=1783840=1783841=diff == --- openmeetings/application/trunk/openmeetings-server/src/main/assembly/components/all.xml (original) +++ openmeetings/application/trunk/openmeetings-server/src/main/assembly/components/all.xml Tue Feb 21 07:52:33 2017 @@ -32,6 +32,7 @@ webapps/root/demos/** webapps/root/index.html lib/commons-io*.jar + plugins/websocket*.jar *.sh conf/jee-container.xml @@ -107,6 +108,7 @@ WEB-INF/lib/commons-codec* WEB-INF/lib/commons-collections-* WEB-INF/lib/commons-lang3* + WEB-INF/lib/jcl-over-slf4j* Modified: openmeetings/application/trunk/openmeetings-server/src/main/assembly/conf/jee-container.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/main/assembly/conf/jee-container.xml?rev=1783841=1783840=1783841=diff == --- openmeetings/application/trunk/openmeetings-server/src/main/assembly/conf/jee-container.xml (original) +++ openmeetings/application/trunk/openmeetings-server/src/main/assembly/conf/jee-container.xml Tue Feb 21 07:52:33 2017 @@ -96,7 +96,6 @@ - Modified: openmeetings/application/trunk/pom.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/pom.xml?rev=1783841=1783840=1783841=diff == --- openmeetings/application/trunk/pom.xml (original) +++ openmeetings/application/trunk/pom.xml Tue Feb 21 07:52:33 2017 @@ -43,11 +43,11 @@ 8.0.0-M4 8.0.0-M4 8.0.0-M4 -
svn commit: r1783839 - in /openmeetings/application: branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ trunk/openmeetings-web/src/main/java/org/apache/openmeetings/w
Author: solomax
Date: Tue Feb 21 07:50:05 2017
New Revision: 1783839
URL: http://svn.apache.org/viewvc?rev=1783839=rev
Log:
[OPENMEETINGS-1572] chat is made resizable
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java?rev=1783839=1783838=1783839=diff
==
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
Tue Feb 21 07:50:05 2017
@@ -120,8 +120,8 @@ public class Chat extends Panel {
public static CharSequence getReinit() {
StringBuilder sb = new StringBuilder("chatReinit(");
- sb.append('\'').append(ID_ALL).append('\'')
-
.append(',').append('\'').append(ID_ROOM_PREFIX).append('\'');
+ sb.append('\'').append(Application.getString(1494)).append('\'')
+
.append(',').append('\'').append(Application.getString(406)).append('\'');
return sb.append("); ");
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js?rev=1783839=1783838=1783839=diff
==
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
Tue Feb 21 07:50:05 2017
@@ -59,6 +59,17 @@ function chatReinit(_allPrefix, _roomPre
$("#" + panelId).remove();
chatTabs.tabs("refresh");
});
+ $('#chatPanel').resizable({
+ handles: "n, w"
+ , disabled: chatClosed()
+ , alsoResize: "#chat, #chat .ui-tabs .ui-tabs-panel.messageArea"
+ , minHeight: 195
+ , minWidth: 260
+ , stop: function(event, ui) {
+ $('#chatPanel').css({'top': '', 'left': ''});
+ openedHeight = ui.size.height + "px";
+ }
+ });
}
function chatClosed() {
return $('#chatPanel').height() < 24;
@@ -68,6 +79,7 @@ function openChat() {
$('#chat .control.block
.ui-icon').removeClass('ui-icon-caret-1-n').addClass('ui-icon-caret-1-s');
$('#chat .control.block').removeClass('ui-state-highlight');
$('#chatPanel, #chat').animate({height: openedHeight}, 1000);
+ $('#chatPanel').resizable("option", "disabled", false);
}
}
function closeChat() {
@@ -75,6 +87,7 @@ function closeChat() {
$('#chat .control.block
.ui-icon').removeClass('ui-icon-caret-1-s').addClass('ui-icon-caret-1-n');
$('#chatPanel').animate({height: closedHeight}, 1000);
$('#chatPanel, #chat').animate({height: closedHeight}, 1000);
+ $('#chatPanel').resizable("option", "disabled", true);
}
}
function toggleChat() {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java?rev=1783839=1783838=1783839=diff
==
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
Tue Feb 21 07:50:05 2017
@@ -120,8 +120,8 @@ public class Chat extends Panel {
public static CharSequence getReinit() {
StringBuilder sb = new StringBuilder("chatReinit(");
- sb.append('\'').append(ID_ALL).append('\'')
-
[jira] [Resolved] (OPENMEETINGS-1572) Chat should be made resizable
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1572?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik resolved OPENMEETINGS-1572. Resolution: Fixed > Chat should be made resizable > - > > Key: OPENMEETINGS-1572 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1572 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Chat >Affects Versions: 3.2.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 3.2.1, 4.0.0 > > > Ability to resize chat using mouse should added -- This message was sent by Atlassian JIRA (v6.3.15#6346)
[jira] [Commented] (OPENMEETINGS-1558) Room public drive should be accessible to all users in read-only mode
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1558?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15875538#comment-15875538 ] ASF subversion and git services commented on OPENMEETINGS-1558: --- Commit 1783838 from [~solomax] in branch 'application/branches/3.2.x' [ https://svn.apache.org/r1783838 ] [OPENMEETINGS-1558] file upload should be disabled > Room public drive should be accessible to all users in read-only mode > - > > Key: OPENMEETINGS-1558 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1558 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/Room >Affects Versions: 3.2.0 >Reporter: Sergey >Assignee: Maxim Solodovnik >Priority: Minor > Fix For: 3.2.1, 4.0.0 > > Attachments: Безымянный.png > > > Please add the feature to set file access in the room for all users (not only > for the administrator and moderator) by default. Screenshot not The > screenshot shows that there is no access to the files tab -- This message was sent by Atlassian JIRA (v6.3.15#6346)
svn commit: r1783838 - in /openmeetings/application: branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java trunk/openmeetings-web/src/main/java/org/a
Author: solomax
Date: Tue Feb 21 07:48:49 2017
New Revision: 1783838
URL: http://svn.apache.org/viewvc?rev=1783838=rev
Log:
[OPENMEETINGS-1558] file upload should be disabled
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java?rev=1783838=1783837=1783838=diff
==
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
Tue Feb 21 07:48:49 2017
@@ -248,6 +248,7 @@ public abstract class FileTreePanel exte
tp.refreshRoots(!readOnly);
createDir.setEnabled(!readOnly);
createDir.add(AttributeModifier.replace("class", new
StringBuilder(CREATE_DIR_CLASS).append(readOnly ? DISABLED_CLASS : "")));
+ upload.setEnabled(!readOnly);
upload.add(AttributeModifier.replace("class", new
StringBuilder(UPLOAD_CLASS).append(readOnly ? DISABLED_CLASS : "")));
trashBorder.add(AttributeModifier.replace("class", new
StringBuilder(TRASH_CLASS).append(readOnly ? DISABLED_CLASS : "")));
if (handler != null) {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java?rev=1783838=1783837=1783838=diff
==
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
Tue Feb 21 07:48:49 2017
@@ -248,6 +248,7 @@ public abstract class FileTreePanel exte
tp.refreshRoots(!readOnly);
createDir.setEnabled(!readOnly);
createDir.add(AttributeModifier.replace("class", new
StringBuilder(CREATE_DIR_CLASS).append(readOnly ? DISABLED_CLASS : "")));
+ upload.setEnabled(!readOnly);
upload.add(AttributeModifier.replace("class", new
StringBuilder(UPLOAD_CLASS).append(readOnly ? DISABLED_CLASS : "")));
trashBorder.add(AttributeModifier.replace("class", new
StringBuilder(TRASH_CLASS).append(readOnly ? DISABLED_CLASS : "")));
if (handler != null) {
[jira] [Created] (OPENMEETINGS-1572) Chat should be made resizable
Maxim Solodovnik created OPENMEETINGS-1572: -- Summary: Chat should be made resizable Key: OPENMEETINGS-1572 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1572 Project: Openmeetings Issue Type: Bug Components: HTML5/Chat Affects Versions: 3.2.0 Reporter: Maxim Solodovnik Assignee: Maxim Solodovnik Fix For: 3.2.1, 4.0.0 Ability to resize chat using mouse should added -- This message was sent by Atlassian JIRA (v6.3.15#6346)
[jira] [Created] (OPENMEETINGS-1571) 3.2.1 - Library versions should be updated
Maxim Solodovnik created OPENMEETINGS-1571: -- Summary: 3.2.1 - Library versions should be updated Key: OPENMEETINGS-1571 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1571 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)
[jira] [Commented] (OPENMEETINGS-1553) Chat messages in mobile client are broken
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15875394#comment-15875394 ] ASF subversion and git services commented on OPENMEETINGS-1553: --- Commit 1783827 from [~solomax] in branch 'application/branches/3.1.x' [ https://svn.apache.org/r1783827 ] [OPENMEETINGS-1553] mobile client seems to work as expected > Chat messages in mobile client are broken > - > > Key: OPENMEETINGS-1553 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1553 > Project: Openmeetings > Issue Type: Bug > Components: Mobile client >Affects Versions: 3.2.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 3.1.6, 3.2.1, 4.0.0 > > > Chat messages in mobile client are broken due to refactoring of chat messages > and drop of chat service -- This message was sent by Atlassian JIRA (v6.3.15#6346)
svn commit: r1783827 - /openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
Author: solomax
Date: Tue Feb 21 05:40:05 2017
New Revision: 1783827
URL: http://svn.apache.org/viewvc?rev=1783827=rev
Log:
[OPENMEETINGS-1553] mobile client seems to work as expected
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1783827=1783826=1783827=diff
==
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
Tue Feb 21 05:40:05 2017
@@ -18,18 +18,17 @@
*/
package org.apache.openmeetings.core.remote;
+import static org.apache.openmeetings.util.LocaleHelper.getCountryName;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FRONTEND_REGISTER_KEY;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_OAUTH_REGISTER_KEY;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SOAP_REGISTER_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import static org.apache.openmeetings.util.LocaleHelper.getCountryName;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
-import java.util.Hashtable;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -82,27 +81,27 @@ public class MobileService {
private static void add(Map m, String key, Object v) {
m.put(key, v == null ? "" : v);
}
-
+
public Map checkServer() {
- Map result = new Hashtable<>();
+ Map result = new HashMap<>();
result.put("allowSelfRegister",
"1".equals(cfgDao.getConfValue(CONFIG_FRONTEND_REGISTER_KEY, String.class,
"0")));
result.put("allowSoapRegister",
"1".equals(cfgDao.getConfValue(CONFIG_SOAP_REGISTER_KEY, String.class, "0")));
result.put("allowOauthRegister",
"1".equals(cfgDao.getConfValue(CONFIG_OAUTH_REGISTER_KEY, String.class, "0")));
return result;
}
-
+
public Map getStates() {
- Map result = new Hashtable<>();
+ Map result = new HashMap<>();
for (String code : Locale.getISOCountries()) {
result.put(code, getCountryName(code));
}
return result;
}
-
+
public String[] getTimezones() {
return TimeZone.getAvailableIDs();
}
-
+
public Map loginGoogle(Map umap) {
Map result = getResult();
try {
@@ -115,7 +114,7 @@ public class MobileService {
}
return result;
}
-
+
public Map registerUser(Map umap) {
Map result = getResult();
try {
@@ -134,7 +133,7 @@ public class MobileService {
String tzId = umap.get("tzId");
String country = umap.get("stateId");
Long langId = Long.valueOf(umap.get("langId"));
-
+
//FIXME TODO unify with Register dialog
String hash = UUID.randomUUID().toString();
@@ -167,7 +166,7 @@ public class MobileService {
}
return result;
}
-
+
public Map loginUser(String login, String password) {
Map result = getResult();
try {
@@ -180,13 +179,13 @@ public class MobileService {
}
return result;
}
-
+
private static Map getResult() {
- Map result = new Hashtable<>();
+ Map result = new HashMap<>();
result.put("status", -1);
return result;
}
-
+
private Map login(User u, Map result) {
if (u != null) {
Sessiondata sd = sessionDao.create();
@@ -212,7 +211,7 @@ public class
[jira] [Updated] (OPENMEETINGS-1553) Chat messages in mobile client are broken
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1553?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik updated OPENMEETINGS-1553: --- Fix Version/s: 3.1.6 > Chat messages in mobile client are broken > - > > Key: OPENMEETINGS-1553 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1553 > Project: Openmeetings > Issue Type: Bug > Components: Mobile client >Affects Versions: 3.2.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 3.1.6, 3.2.1, 4.0.0 > > > Chat messages in mobile client are broken due to refactoring of chat messages > and drop of chat service -- This message was sent by Atlassian JIRA (v6.3.15#6346)
[jira] [Resolved] (OPENMEETINGS-1558) Room public drive should be accessible to all users in read-only mode
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1558?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik resolved OPENMEETINGS-1558. Resolution: Fixed Should be fixed Please check using latest build (471+) > Room public drive should be accessible to all users in read-only mode > - > > Key: OPENMEETINGS-1558 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1558 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/Room >Affects Versions: 3.2.0 >Reporter: Sergey >Assignee: Maxim Solodovnik >Priority: Minor > Fix For: 3.2.1, 4.0.0 > > Attachments: Безымянный.png > > > Please add the feature to set file access in the room for all users (not only > for the administrator and moderator) by default. Screenshot not The > screenshot shows that there is no access to the files tab -- This message was sent by Atlassian JIRA (v6.3.15#6346)
svn commit: r1783824 - in /openmeetings/application: branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ branches/3.2.x/openmeetings-web/src/main/java/org/apache/ope
Author: solomax
Date: Tue Feb 21 03:30:19 2017
New Revision: 1783824
URL: http://svn.apache.org/viewvc?rev=1783824=rev
Log:
[OPENMEETINGS-1558] room public drive is accessible to all users
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FolderPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html?rev=1783824=1783823=1783824=diff
==
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
Tue Feb 21 03:30:19 2017
@@ -38,10 +38,10 @@
-
-
+
+
-
+
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java?rev=1783824=1783823=1783824=diff
==
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
Tue Feb 21 03:30:19 2017
@@ -43,6 +43,7 @@ import org.apache.openmeetings.web.commo
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
import
org.apache.openmeetings.web.common.ConfirmableAjaxBorder.ConfirmableBorderDialog;
import org.apache.openmeetings.web.util.AjaxDownload;
+import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -66,6 +67,13 @@ import com.googlecode.wicket.jquery.ui.w
public abstract class FileTreePanel extends Panel {
private static final long serialVersionUID = 1L;
+ private final static String ALIGN_LEFT_CLASS = " align-left";
+ private final static String ALIGN_RIGHT_CLASS = " align-right";
+ private final static String BASE_CLASS = " om-icon big clickable";
+ private final static String UPLOAD_CLASS = "add" + BASE_CLASS +
ALIGN_LEFT_CLASS;
+ private final static String CREATE_DIR_CLASS = "folder-create" +
BASE_CLASS + ALIGN_LEFT_CLASS;
+ private final static String TRASH_CLASS = "trash" + BASE_CLASS +
ALIGN_RIGHT_CLASS;
+ private final static String DISABLED_CLASS = " disabled";
final WebMarkupContainer trees = new
WebMarkupContainer("tree-container");
private final
[jira] [Commented] (OPENMEETINGS-1558) Room public drive should be accessible to all users in read-only mode
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1558?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15875307#comment-15875307 ] ASF subversion and git services commented on OPENMEETINGS-1558: --- Commit 1783824 from [~solomax] in branch 'application/branches/3.2.x' [ https://svn.apache.org/r1783824 ] [OPENMEETINGS-1558] room public drive is accessible to all users > Room public drive should be accessible to all users in read-only mode > - > > Key: OPENMEETINGS-1558 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1558 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/Room >Affects Versions: 3.2.0 >Reporter: Sergey >Assignee: Maxim Solodovnik >Priority: Minor > Fix For: 3.2.1, 4.0.0 > > Attachments: Безымянный.png > > > Please add the feature to set file access in the room for all users (not only > for the administrator and moderator) by default. Screenshot not The > screenshot shows that there is no access to the files tab -- This message was sent by Atlassian JIRA (v6.3.15#6346)
[jira] [Resolved] (OPENMEETINGS-1570) Room video file conversion not always successful
[
https://issues.apache.org/jira/browse/OPENMEETINGS-1570?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Maxim Solodovnik resolved OPENMEETINGS-1570.
Resolution: Fixed
> Room video file conversion not always successful
>
>
> Key: OPENMEETINGS-1570
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1570
> Project: Openmeetings
> Issue Type: Bug
> Components: Converters, HTML5/Room
>Affects Versions: 3.2.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 3.2.1
>
>
> Room video file conversion not always successful, with following error:
> {code}
> ERROR 02-20 14:35:12.774 o.a.o.u.p.ConverterProcessResultList:63
> [http-nio-0.0.0.0-5090-exec-4] - Duplicate key in jobslist
> {code}
> Video files uploaded to room are not being cleaned up
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (OPENMEETINGS-1570) Room video file conversion not always successful
[
https://issues.apache.org/jira/browse/OPENMEETINGS-1570?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15874719#comment-15874719
]
ASF subversion and git services commented on OPENMEETINGS-1570:
---
Commit 1783779 from [~solomax] in branch 'application/branches/3.2.x'
[ https://svn.apache.org/r1783779 ]
[OPENMEETINGS-1570] room video conversion should be fixed, room clean-up is
added
> Room video file conversion not always successful
>
>
> Key: OPENMEETINGS-1570
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1570
> Project: Openmeetings
> Issue Type: Bug
> Components: Converters, HTML5/Room
>Affects Versions: 3.2.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 3.2.1
>
>
> Room video file conversion not always successful, with following error:
> {code}
> ERROR 02-20 14:35:12.774 o.a.o.u.p.ConverterProcessResultList:63
> [http-nio-0.0.0.0-5090-exec-4] - Duplicate key in jobslist
> {code}
> Video files uploaded to room are not being cleaned up
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
svn commit: r1783779 - in /openmeetings/application: branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/ branches/3.2.x/openmeetings-core/src/main/java/org/apache/op
Author: solomax
Date: Mon Feb 20 15:43:49 2017
New Revision: 1783779
URL: http://svn.apache.org/viewvc?rev=1783779=rev
Log:
[OPENMEETINGS-1570] room video conversion should be fixed, room clean-up is
added
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java?rev=1783779=1783778=1783779=diff
==
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
Mon Feb 20 15:43:49 2017
@@ -60,14 +60,14 @@ public class FileProcessor {
//FIXME TODO this method need to be refactored to throw exceptions
public ConverterProcessResultList processFile(Long userId,
FileExplorerItem f, InputStream is) throws Exception {
ConverterProcessResultList returnError = new
ConverterProcessResultList();
-
+
// Generate a random string to prevent any problems with
// foreign characters and duplicates
String hash = UUID.randomUUID().toString();
String ext = getFileExt(f.getName());
log.debug("file extension: " + ext);
- StoredFile storedFile = new StoredFile(hash, ext);
+ StoredFile storedFile = new StoredFile(hash, ext);
// Check variable to see if this file is a presentation
// check if this is a a file that can be converted by
@@ -109,7 +109,7 @@ public class FileProcessor {
}
FileUtils.copyInputStreamToFile(is, file);
-
+
log.debug("canBeConverted: " + canBeConverted);
if (canBeConverted || isPdf) {
// convert to pdf, thumbs, swf and xml-description
@@ -125,18 +125,18 @@ public class FileProcessor {
returnError.addItem("processThumb", processThumb);
} else if (isVideo) {
List returnList =
flvExplorerConverter.convertToMP4(f, ext);
-
+
int i = 0;
for (ConverterProcessResult returnMap : returnList) {
- returnError.addItem("processFLV " + i,
returnMap);
+ returnError.addItem("processVideo " + i++,
returnMap);
}
}
-
+
// has to happen at the end, otherwise it will be overwritten
//cause the variable is new initialized
returnError.setCompleteName(file.getName());
returnError.setFileItemId(f.getId());
-
+
return returnError;
}
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
URL:
[jira] [Created] (OPENMEETINGS-1570) Room video file conversion not always successful
Maxim Solodovnik created OPENMEETINGS-1570:
--
Summary: Room video file conversion not always successful
Key: OPENMEETINGS-1570
URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1570
Project: Openmeetings
Issue Type: Bug
Components: Converters, HTML5/Room
Affects Versions: 3.2.0
Reporter: Maxim Solodovnik
Assignee: Maxim Solodovnik
Fix For: 3.2.1
Room video file conversion not always successful, with following error:
{code}
ERROR 02-20 14:35:12.774 o.a.o.u.p.ConverterProcessResultList:63
[http-nio-0.0.0.0-5090-exec-4] - Duplicate key in jobslist
{code}
Video files uploaded to room are not being cleaned up
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Updated] (OPENMEETINGS-1569) .../streams/hibernate folder is not cleaned
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1569?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik updated OPENMEETINGS-1569: --- Component/s: HTML5/Dashboard HTML5/Admin > .../streams/hibernate folder is not cleaned > --- > > Key: OPENMEETINGS-1569 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1569 > Project: Openmeetings > Issue Type: Bug > Components: Audio/Video, HTML5/Admin, HTML5/Dashboard >Affects Versions: 3.2.0 > Environment: OM-3.2.0 + Centos7 >Reporter: nikolay >Assignee: Maxim Solodovnik > Fix For: 3.2.1, 4.0.0 > > > The mp4- and jpg- files recorder by OM are not deleted from > .../streams/hibernate folder. > These files were created during the recording of the conference and were > deleted via web-interface in OM later as unneeded ones anymore. > After executing of [Admin functions->Show cleanup report->Cleanup] or the > [./admin.sh -f --cleanup] command the recorded files still present in > .../streams/hibernate folder. > The files uploaded (not recorded) into a room are deleted correctly. > Experimented with the formats avi,flv,mp4.mp3,ogg. > Nikolay -- This message was sent by Atlassian JIRA (v6.3.15#6346)
[jira] [Resolved] (OPENMEETINGS-1569) .../streams/hibernate folder is not cleaned
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1569?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik resolved OPENMEETINGS-1569. Resolution: Fixed Fix Version/s: 4.0.0 3.2.1 > .../streams/hibernate folder is not cleaned > --- > > Key: OPENMEETINGS-1569 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1569 > Project: Openmeetings > Issue Type: Bug > Components: Audio/Video, HTML5/Admin, HTML5/Dashboard >Affects Versions: 3.2.0 > Environment: OM-3.2.0 + Centos7 >Reporter: nikolay >Assignee: Maxim Solodovnik > Fix For: 3.2.1, 4.0.0 > > > The mp4- and jpg- files recorder by OM are not deleted from > .../streams/hibernate folder. > These files were created during the recording of the conference and were > deleted via web-interface in OM later as unneeded ones anymore. > After executing of [Admin functions->Show cleanup report->Cleanup] or the > [./admin.sh -f --cleanup] command the recorded files still present in > .../streams/hibernate folder. > The files uploaded (not recorded) into a room are deleted correctly. > Experimented with the formats avi,flv,mp4.mp3,ogg. > Nikolay -- This message was sent by Atlassian JIRA (v6.3.15#6346)
[jira] [Commented] (OPENMEETINGS-1569) .../streams/hibernate folder is not cleaned
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1569?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15874290#comment-15874290 ] ASF subversion and git services commented on OPENMEETINGS-1569: --- Commit 1783732 from [~solomax] in branch 'application/branches/3.2.x' [ https://svn.apache.org/r1783732 ] [OPENMEETINGS-1569] recordings clean-up should work as expected > .../streams/hibernate folder is not cleaned > --- > > Key: OPENMEETINGS-1569 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1569 > Project: Openmeetings > Issue Type: Bug > Components: Audio/Video >Affects Versions: 3.2.0 > Environment: OM-3.2.0 + Centos7 >Reporter: nikolay >Assignee: Maxim Solodovnik > > The mp4- and jpg- files recorder by OM are not deleted from > .../streams/hibernate folder. > These files were created during the recording of the conference and were > deleted via web-interface in OM later as unneeded ones anymore. > After executing of [Admin functions->Show cleanup report->Cleanup] or the > [./admin.sh -f --cleanup] command the recorded files still present in > .../streams/hibernate folder. > The files uploaded (not recorded) into a room are deleted correctly. > Experimented with the formats avi,flv,mp4.mp3,ogg. > Nikolay -- This message was sent by Atlassian JIRA (v6.3.15#6346)
svn commit: r1783732 - in /openmeetings/application: branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli
Author: solomax
Date: Mon Feb 20 09:58:01 2017
New Revision: 1783732
URL: http://svn.apache.org/viewvc?rev=1783732=rev
Log:
[OPENMEETINGS-1569] recordings clean-up should work as expected
Modified:
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java?rev=1783732=1783731=1783732=diff
==
---
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
Mon Feb 20 09:58:01 2017
@@ -75,7 +75,7 @@ import org.springframework.web.context.W
public class Admin {
private static final Logger log =
Red5LoggerFactory.getLogger(Admin.class);
-
+
private boolean verbose = false;
private InstallationConfig cfg = null;
private Options opts = null;
@@ -86,7 +86,7 @@ public class Admin {
cfg = new InstallationConfig();
opts = buildOptions();
}
-
+
private Options buildOptions() {
Options options = new Options();
OptionGroup group = new OptionGroup()
@@ -96,7 +96,7 @@ public class Admin {
.addOption(new OmOption("i", 3, "i", "install", false,
"Fill DB table, and make OM usable"))
.addOption(new OmOption("l", 3, "l", "LDAP", false,
"Import LDAP users into DB"))
.addOption(new OmOption("f", 4, "f", "files", false,
"File operations - statictics/cleanup"));
- group.setRequired(true);
+ group.setRequired(true);
options.addOptionGroup(group);
//general
options.addOption(new OmOption(null, "v", "verbose", false,
"verbose error messages"));
@@ -134,7 +134,7 @@ public class Admin {
options.addOption(new OmOption("l", null, "print-only", false,
"Print users found instead of importing", true));
return options;
}
-
+
private enum Command {
install
, backup
@@ -143,7 +143,7 @@ public class Admin {
, ldap
, usage
}
-
+
private void usage() {
OmHelpFormatter formatter = new OmHelpFormatter();
formatter.setWidth(100);
@@ -152,11 +152,11 @@ public class Admin {
"\t./admin.sh -i -v -file
backup_31_07_2012_12_07_51.zip --drop\n" +
"\t./admin.sh -i -v -user admin -email
someem...@gmail.com -tz \"Asia/Tehran\" -group \"yourgroup\" --db-type mysql
--db-host localhost");
}
-
+
private void handleError(String msg, Exception e) {
handleError(msg, e, false);
}
-
+
private void handleError(String msg, Exception e, boolean printUsage) {
if (printUsage) {
usage();
@@ -168,7 +168,7 @@ public class Admin {
}
System.exit(1);
}
-
+
private WebApplicationContext getApplicationContext() {
if (ctx == null) {
Long lngId =
StringValue.valueOf(cfg.defaultLangId).toLong(1L);
@@ -182,13 +182,13 @@ public class Admin {
}
return ctx;
}
-
+
private void process(String[] args) {
String ctxName = System.getProperty("context", "openmeetings");
OpenmeetingsVariables.wicketApplicationName = ctxName;
File home = new File(System.getenv("RED5_HOME"));
OmFileHelper.setOmHome(new File(new File(home, "webapps"),
ctxName));
-
+
CommandLineParser parser = new DefaultParser();
try {
cmdl = parser.parse(opts, args);
@@ -266,18 +266,18 @@ public class Admin {
if (cmdl.hasOption("file")) {
File backup =
checkRestoreFile(file);
dropDB(connectionProperties);
-
+
[jira] [Created] (OPENMEETINGS-1569) .../streams/hibernate folder is not cleaned
nikolay created OPENMEETINGS-1569: - Summary: .../streams/hibernate folder is not cleaned Key: OPENMEETINGS-1569 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1569 Project: Openmeetings Issue Type: Bug Components: Audio/Video Affects Versions: 3.2.0 Environment: OM-3.2.0 + Centos7 Reporter: nikolay Assignee: Maxim Solodovnik The mp4- and jpg- files recorder by OM are not deleted from .../streams/hibernate folder. These files were created during the recording of the conference and were deleted via web-interface in OM later as unneeded ones anymore. After executing of [Admin functions->Show cleanup report->Cleanup] or the [./admin.sh -f --cleanup] command the recorded files still present in .../streams/hibernate folder. The files uploaded (not recorded) into a room are deleted correctly. Experimented with the formats avi,flv,mp4.mp3,ogg. Nikolay -- This message was sent by Atlassian JIRA (v6.3.15#6346)
