[jira] [Resolved] (OPENMEETINGS-1679) User session being dropped if RTPMT is being used

2017-08-10 Thread Maxim Solodovnik (JIRA) 

 [ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1679?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Maxim Solodovnik resolved OPENMEETINGS-1679.

Resolution: Fixed

> User session being dropped if RTPMT is being used
> -
>
> Key: OPENMEETINGS-1679
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1679
> Project: Openmeetings
>  Issue Type: Bug
>  Components: BuildsAndReleases
>Affects Versions: 3.3.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
>Priority: Blocker
> Fix For: 3.3.1, 4.0.0
>
>
> User session being dropped if RTPMT is being used
> Steps:
> # set up vanilla OM 3.3.0
> # change RTMP port to be 11935 in config.xml
> # start OM
> # enter any room
> # (if necessary perform several reloads)
> Result: multiple NPEs in weird places, debug shows all Session variables are 
> empty



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

[jira] [Commented] (OPENMEETINGS-1679) User session being dropped if RTPMT is being used

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

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

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

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

[OPENMEETINGS-1679] added _ensureApplication method which doesn't drop the 
session


> User session being dropped if RTPMT is being used
> -
>
> Key: OPENMEETINGS-1679
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1679
> Project: Openmeetings
>  Issue Type: Bug
>  Components: BuildsAndReleases
>Affects Versions: 3.3.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
>Priority: Blocker
> Fix For: 3.3.1, 4.0.0
>
>
> User session being dropped if RTPMT is being used
> Steps:
> # set up vanilla OM 3.3.0
> # change RTMP port to be 11935 in config.xml
> # start OM
> # enter any room
> # (if necessary perform several reloads)
> Result: multiple NPEs in weird places, debug shows all Session variables are 
> empty



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-1679] added _ensureApplication method which doesn't drop the session

2017-08-10 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master f864a8c61 -> 68e54afc4


[OPENMEETINGS-1679] added _ensureApplication method which doesn't drop the 
session


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

Branch: refs/heads/master
Commit: 68e54afc4ac24b7d54fb7fb6b12f00ae148608ae
Parents: f864a8c
Author: Maxim Solodovnik 
Authored: Fri Aug 11 12:10:53 2017 +0700
Committer: Maxim Solodovnik 
Committed: Fri Aug 11 12:12:50 2017 +0700

--
 .../java/org/apache/openmeetings/db/dao/label/LabelDao.java   | 6 +++---
 .../org/apache/openmeetings/db/util/ApplicationHelper.java| 7 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/68e54afc/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
--
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
index 64ab2b2..5bb02e4 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
@@ -18,7 +18,7 @@
  */
 package org.apache.openmeetings.db.dao.label;
 
-import static 
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
+import static 
org.apache.openmeetings.db.util.ApplicationHelper._ensureApplication;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 
 import java.io.File;
@@ -103,11 +103,11 @@ public class LabelDao implements 
IDataProviderDao{
}
 
public static String getString(long fieldValuesId, long langId) {
-   return ensureApplication(langId).getOmString(fieldValuesId, 
langId);
+   return _ensureApplication(langId).getOmString(fieldValuesId, 
langId);
}
 
public static String getString(String key, long langId) {
-   return ensureApplication(langId).getOmString(key, langId);
+   return _ensureApplication(langId).getOmString(key, langId);
}
 
private static File getLangFile() {

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/68e54afc/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
--
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
index c509be4..a4415bb 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
@@ -80,7 +80,7 @@ public class ApplicationHelper {
return ensureApplication(-1L);
}
 
-   public static IApplication ensureApplication(Long langId) {
+   public static IApplication _ensureApplication(Long langId) {
IApplication a = null;
if (Application.exists()) {
a = (IApplication)Application.get();
@@ -112,6 +112,11 @@ public class ApplicationHelper {
}
a = 
(IApplication)Application.get(wicketApplicationName);
}
+   return a;
+   }
+
+   public static IApplication ensureApplication(Long langId) {
+   IApplication a = _ensureApplication(langId);
if (ThreadContext.getRequestCycle() == null) {
ServletWebRequest req = new ServletWebRequest(new 
MockHttpServletRequest((Application)a, new 
MockHttpSession(a.getServletContext()), a.getServletContext()), "");
RequestCycleContext rctx = new RequestCycleContext(req, 
new MockWebResponse(), a.getRootRequestMapper(), 
a.getExceptionMapperProvider().get());

[jira] [Commented] (OPENMEETINGS-1679) User session being dropped if RTPMT is being used

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

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

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

Commit 11930f98629d3c12c6500b3607ba21da47e90941 in openmeetings's branch 
refs/heads/3.3.x from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=11930f9 ]

[OPENMEETINGS-1679] added _ensureApplication method which doesn't drop the 
session


> User session being dropped if RTPMT is being used
> -
>
> Key: OPENMEETINGS-1679
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1679
> Project: Openmeetings
>  Issue Type: Bug
>  Components: BuildsAndReleases
>Affects Versions: 3.3.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
>Priority: Blocker
> Fix For: 3.3.1, 4.0.0
>
>
> User session being dropped if RTPMT is being used
> Steps:
> # set up vanilla OM 3.3.0
> # change RTMP port to be 11935 in config.xml
> # start OM
> # enter any room
> # (if necessary perform several reloads)
> Result: multiple NPEs in weird places, debug shows all Session variables are 
> empty



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-1679] added _ensureApplication method which doesn't drop the session

2017-08-10 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/3.3.x 48303032d -> 11930f986


[OPENMEETINGS-1679] added _ensureApplication method which doesn't drop the 
session


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

Branch: refs/heads/3.3.x
Commit: 11930f98629d3c12c6500b3607ba21da47e90941
Parents: 4830303
Author: Maxim Solodovnik 
Authored: Fri Aug 11 12:10:53 2017 +0700
Committer: Maxim Solodovnik 
Committed: Fri Aug 11 12:10:53 2017 +0700

--
 .../java/org/apache/openmeetings/db/dao/label/LabelDao.java   | 6 +++---
 .../org/apache/openmeetings/db/util/ApplicationHelper.java| 7 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/11930f98/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
--
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
index 64ab2b2..5bb02e4 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
@@ -18,7 +18,7 @@
  */
 package org.apache.openmeetings.db.dao.label;
 
-import static 
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
+import static 
org.apache.openmeetings.db.util.ApplicationHelper._ensureApplication;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 
 import java.io.File;
@@ -103,11 +103,11 @@ public class LabelDao implements 
IDataProviderDao{
}
 
public static String getString(long fieldValuesId, long langId) {
-   return ensureApplication(langId).getOmString(fieldValuesId, 
langId);
+   return _ensureApplication(langId).getOmString(fieldValuesId, 
langId);
}
 
public static String getString(String key, long langId) {
-   return ensureApplication(langId).getOmString(key, langId);
+   return _ensureApplication(langId).getOmString(key, langId);
}
 
private static File getLangFile() {

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/11930f98/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
--
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
index c509be4..a4415bb 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
@@ -80,7 +80,7 @@ public class ApplicationHelper {
return ensureApplication(-1L);
}
 
-   public static IApplication ensureApplication(Long langId) {
+   public static IApplication _ensureApplication(Long langId) {
IApplication a = null;
if (Application.exists()) {
a = (IApplication)Application.get();
@@ -112,6 +112,11 @@ public class ApplicationHelper {
}
a = 
(IApplication)Application.get(wicketApplicationName);
}
+   return a;
+   }
+
+   public static IApplication ensureApplication(Long langId) {
+   IApplication a = _ensureApplication(langId);
if (ThreadContext.getRequestCycle() == null) {
ServletWebRequest req = new ServletWebRequest(new 
MockHttpServletRequest((Application)a, new 
MockHttpSession(a.getServletContext()), a.getServletContext()), "");
RequestCycleContext rctx = new RequestCycleContext(req, 
new MockWebResponse(), a.getRootRequestMapper(), 
a.getExceptionMapperProvider().get());

[jira] [Created] (OPENMEETINGS-1679) User session being dropped if RTPMT is being used

2017-08-10 Thread Maxim Solodovnik (JIRA) 
Maxim Solodovnik created OPENMEETINGS-1679:
--

 Summary: User session being dropped if RTPMT is being used
 Key: OPENMEETINGS-1679
 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1679
 Project: Openmeetings
  Issue Type: Bug
  Components: BuildsAndReleases
Affects Versions: 3.3.0
Reporter: Maxim Solodovnik
Assignee: Maxim Solodovnik
Priority: Blocker
 Fix For: 3.3.1, 4.0.0


User session being dropped if RTPMT is being used

Steps:
# set up vanilla OM 3.3.0
# change RTMP port to be 11935 in config.xml
# start OM
# enter any room
# (if necessary perform several reloads)
Result: multiple NPEs in weird places, debug shows all Session variables are 
empty



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

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

2017-08-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=16122750#comment-16122750
 ] 

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

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

[OPENMEETINGS-980] red5 version is 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.4.14#64029)

openmeetings git commit: [OPENMEETINGS-980] red5 version is updated

2017-08-10 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master 791832d52 -> f864a8c61


[OPENMEETINGS-980] red5 version is updated


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

Branch: refs/heads/master
Commit: f864a8c61036270cfd33de95a7cecd8ed40816d8
Parents: 791832d
Author: Maxim Solodovnik 
Authored: Fri Aug 11 10:00:55 2017 +0700
Committer: Maxim Solodovnik 
Committed: Fri Aug 11 10:01:15 2017 +0700

--
 openmeetings-server/pom.xml | 2 +-
 pom.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f864a8c6/openmeetings-server/pom.xml
--
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index 5e7785e..6d40ecd 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -118,7 +118,7 @@
prepare-red5-server


-   
red5-server/red5-server-1.0.10-M3.tar.gz 
+   
red5-server/red5-server-1.0.10-M4.tar.gz 




http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f864a8c6/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e34da7f..e799a0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,8 +43,8 @@
8.0.0-SNAPSHOT
8.0.0-SNAPSHOT
8.0.0-SNAPSHOT
-   1.0.10-M3
-   1.0.10-M3
+   1.0.10-M4
+   1.0.10-M4
4.3.10.RELEASE
2.0.16
8.5.16

openmeetings git commit: [OPENMEETINGS-980] red5 version is updated

2017-08-10 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/3.3.x ac44e49ce -> 48303032d


[OPENMEETINGS-980] red5 version is updated


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

Branch: refs/heads/3.3.x
Commit: 48303032dedb97cf03d59b21d1829c91d94e535c
Parents: ac44e49
Author: Maxim Solodovnik 
Authored: Fri Aug 11 10:00:55 2017 +0700
Committer: Maxim Solodovnik 
Committed: Fri Aug 11 10:00:55 2017 +0700

--
 openmeetings-server/pom.xml | 2 +-
 pom.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/48303032/openmeetings-server/pom.xml
--
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index 76f97af..b4e7699 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -118,7 +118,7 @@
prepare-red5-server


-   
red5-server/red5-server-1.0.10-M3.tar.gz 
+   
red5-server/red5-server-1.0.10-M4.tar.gz 




http://git-wip-us.apache.org/repos/asf/openmeetings/blob/48303032/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 22fb15d..25d8b4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,8 +43,8 @@
8.0.0-M6
8.0.0-M6
8.0.0-SNAPSHOT
-   1.0.10-M3
-   1.0.10-M3
+   1.0.10-M4
+   1.0.10-M4
4.3.10.RELEASE
2.0.16
8.5.16

[jira] [Updated] (OPENMEETINGS-1644) Missing Video options

2017-08-10 Thread Maxim Solodovnik (JIRA) 

 [ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1644?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Maxim Solodovnik updated OPENMEETINGS-1644:
---
Description: 
 * Mute
 * Refresh
 * Exclusive audio
 * Align video windows
 * Microphone status (room option)
 * Microphone level (for current user)
 * User speaks indicator
 * Align video windows by key

  was:
 * Mute
 * Refresh
 * Exclusive audio
 * Align video windows
 * Microphone status (room option)
 * Microphone level (for current user)
 * User speaks indicator


> Missing Video options
> -
>
> Key: OPENMEETINGS-1644
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1644
> Project: Openmeetings
>  Issue Type: Bug
>  Components: Audio/Video, HTML5/Room
>Affects Versions: 4.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
>
>  * Mute
>  * Refresh
>  * Exclusive audio
>  * Align video windows
>  * Microphone status (room option)
>  * Microphone level (for current user)
>  * User speaks indicator
>  * Align video windows by key



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

[jira] [Resolved] (OPENMEETINGS-427) ExportPDF

2017-08-10 Thread Maxim Solodovnik (JIRA) 

 [ 
https://issues.apache.org/jira/browse/OPENMEETINGS-427?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Maxim Solodovnik resolved OPENMEETINGS-427.
---
Resolution: Fixed

> ExportPDF
> -
>
> Key: OPENMEETINGS-427
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-427
> Project: Openmeetings
>  Issue Type: Improvement
>  Components: HTML5/WhiteBoard, Import/Export
>Reporter: Allemand Sylvain
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
> Attachments: OPENMEETINGS-427-ExportPDF.patch
>
>
> Hello, 
> I worked on implementation of a new functionality : the export of a PDF file 
> with the corresponding painted objects (annotations). 
> I found a starting solution in the ExportToImage.java file.
> The current only permits exporting painted objects in SVG format. 
> To implement Export PDF, my approach was :
> get painted objects corresponding to each page of the PDF file
> convert per slide all objects in one SVG file.
> Convert resulting SVG files to PDF files (with Batik Rasterizer library : Fop 
> and Avalon library were needed by Batik Rasterizer). Each SVG file is cropped 
> according to the original current PDF page size (by this way, PDF document 
> with multi-size pages is possible).
> If none objects are painted on a slide, I create a blank PDF page (because 
> the overlay function needs two document with same amount of page and same 
> page sizes). 
> Merge all PDF files in one. 
> Overlay this PDF file in the original PDF file.
> Send the result file to explorer and delete temporary files (and delete 
> result file in the end).
> The resulting PDF is more or less the same size than the original PDF file 
> (only depending on the number of painted objects)
> Enjoy the result
> i got some problems : 
> i try to get the swfzoom value. I create an accessor but i have  an error on 
> execution (Null Exception). I can't get this value, so for the moment, i stay 
> with a value of 72 dpi. (this value is very important for the convert 
> function SVG to PDF.
> I also comment the cropping of orginal PDF file to keep orginal page size for 
> the original document.
>  (poly2bitmap option in GenerateSWF.java).



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

[jira] [Commented] (OPENMEETINGS-427) ExportPDF

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

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

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

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

[OPENMEETINGS-427] zoom in export is fixed


> ExportPDF
> -
>
> Key: OPENMEETINGS-427
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-427
> Project: Openmeetings
>  Issue Type: Improvement
>  Components: HTML5/WhiteBoard, Import/Export
>Reporter: Allemand Sylvain
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
> Attachments: OPENMEETINGS-427-ExportPDF.patch
>
>
> Hello, 
> I worked on implementation of a new functionality : the export of a PDF file 
> with the corresponding painted objects (annotations). 
> I found a starting solution in the ExportToImage.java file.
> The current only permits exporting painted objects in SVG format. 
> To implement Export PDF, my approach was :
> get painted objects corresponding to each page of the PDF file
> convert per slide all objects in one SVG file.
> Convert resulting SVG files to PDF files (with Batik Rasterizer library : Fop 
> and Avalon library were needed by Batik Rasterizer). Each SVG file is cropped 
> according to the original current PDF page size (by this way, PDF document 
> with multi-size pages is possible).
> If none objects are painted on a slide, I create a blank PDF page (because 
> the overlay function needs two document with same amount of page and same 
> page sizes). 
> Merge all PDF files in one. 
> Overlay this PDF file in the original PDF file.
> Send the result file to explorer and delete temporary files (and delete 
> result file in the end).
> The resulting PDF is more or less the same size than the original PDF file 
> (only depending on the number of painted objects)
> Enjoy the result
> i got some problems : 
> i try to get the swfzoom value. I create an accessor but i have  an error on 
> execution (Null Exception). I can't get this value, so for the moment, i stay 
> with a value of 72 dpi. (this value is very important for the convert 
> function SVG to PDF.
> I also comment the cropping of orginal PDF file to keep orginal page size for 
> the original document.
>  (poly2bitmap option in GenerateSWF.java).



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-427] zoom in export is fixed

2017-08-10 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master e6e1e83da -> 791832d52


[OPENMEETINGS-427] zoom in export is fixed


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

Branch: refs/heads/master
Commit: 791832d5292d346d322a22572cd2fedc3a69c632
Parents: e6e1e83
Author: Maxim Solodovnik 
Authored: Thu Aug 10 23:43:10 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Aug 10 23:43:10 2017 +0700

--
 .../org/apache/openmeetings/web/room/wb/wb.js   | 73 +++-
 1 file changed, 40 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/791832d5/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js
--
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js
index 61789f8..a104e0f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js
@@ -748,46 +748,46 @@ var Wb = function() {
case NONE:
_updateZoomPanel();
z.find('.zoom-out').click(function() {
-   wb.zoom -= .2;
-   wb.zoomMode = 'zoom';
+   zoom -= .2;
+   zoomMode = 'zoom';
_setSize();
wbAction('setSize', JSON.stringify({
wbId: wb.id
-   , zoom: wb.zoom
-   , zoomMode: wb.zoomMode
+   , zoom: zoom
+   , zoomMode: zoomMode
}));
});
z.find('.zoom-in').click(function() {
-   wb.zoom += .2;
-   wb.zoomMode = 'zoom';
+   zoom += .2;
+   zoomMode = 'zoom';
_setSize();
wbAction('setSize', JSON.stringify({
wbId: wb.id
-   , zoom: wb.zoom
-   , zoomMode: wb.zoomMode
+   , zoom: zoom
+   , zoomMode: zoomMode
}));
});
z.find('.zoom').change(function() {
var zzz = $(this).val();
-   wb.zoomMode = 'zoom';
+   zoomMode = 'zoom';
if (isNaN(zzz)) {
switch (zzz) {
case 'fullFit':
case 'pageWidth':
-   wb.zoomMode = 
zzz;
+   zoomMode = zzz;
break;
case 'custom':
-   wb.zoom = 1. * 
$(this).data('custom-val');
+   zoom = 1. * 
$(this).data('custom-val');
break;
}
} else {
-   wb.zoom = 1. * zzz;
+   zoom = 1. * zzz;
}
_setSize();
wbAction('setSize', JSON.stringify({
wbId: wb.id
-   , zoom: wb.zoom
-

[jira] [Commented] (OPENMEETINGS-427) ExportPDF

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

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

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

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

[OPENMEETINGS-427] export to PDF is implemented


> ExportPDF
> -
>
> Key: OPENMEETINGS-427
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-427
> Project: Openmeetings
>  Issue Type: Improvement
>  Components: HTML5/WhiteBoard, Import/Export
>Reporter: Allemand Sylvain
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
> Attachments: OPENMEETINGS-427-ExportPDF.patch
>
>
> Hello, 
> I worked on implementation of a new functionality : the export of a PDF file 
> with the corresponding painted objects (annotations). 
> I found a starting solution in the ExportToImage.java file.
> The current only permits exporting painted objects in SVG format. 
> To implement Export PDF, my approach was :
> get painted objects corresponding to each page of the PDF file
> convert per slide all objects in one SVG file.
> Convert resulting SVG files to PDF files (with Batik Rasterizer library : Fop 
> and Avalon library were needed by Batik Rasterizer). Each SVG file is cropped 
> according to the original current PDF page size (by this way, PDF document 
> with multi-size pages is possible).
> If none objects are painted on a slide, I create a blank PDF page (because 
> the overlay function needs two document with same amount of page and same 
> page sizes). 
> Merge all PDF files in one. 
> Overlay this PDF file in the original PDF file.
> Send the result file to explorer and delete temporary files (and delete 
> result file in the end).
> The resulting PDF is more or less the same size than the original PDF file 
> (only depending on the number of painted objects)
> Enjoy the result
> i got some problems : 
> i try to get the swfzoom value. I create an accessor but i have  an error on 
> execution (Null Exception). I can't get this value, so for the moment, i stay 
> with a value of 72 dpi. (this value is very important for the convert 
> function SVG to PDF.
> I also comment the cropping of orginal PDF file to keep orginal page size for 
> the original document.
>  (poly2bitmap option in GenerateSWF.java).



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-427] export to PDF is implemented

2017-08-10 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master fbe9e48f3 -> e6e1e83da


[OPENMEETINGS-427] export to PDF is implemented


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

Branch: refs/heads/master
Commit: e6e1e83dad57aec284d6d02dfdf4531fc0cd0dd9
Parents: fbe9e48
Author: Maxim Solodovnik 
Authored: Thu Aug 10 23:06:57 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Aug 10 23:06:57 2017 +0700

--
 .../apache/openmeetings/web/room/RoomPanel.java | 48 
 .../web/room/menu/RoomMenuPanel.java|  8 ++--
 .../openmeetings/web/room/wb/WbPanel.java   | 33 --
 openmeetings-web/src/main/webapp/css/wb.css |  2 +-
 4 files changed, 72 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6e1e83d/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
--
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index b540ce0..7fd3115 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -29,7 +29,11 @@ import static 
org.apache.openmeetings.web.app.Application.update;
 import static org.apache.openmeetings.web.app.WebSession.getDateFormat;
 import static org.apache.openmeetings.web.app.WebSession.getUserId;
 import static org.apache.openmeetings.web.room.wb.WbPanel.WB_JS_REFERENCE;
+import static org.apache.wicket.util.time.Duration.NONE;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Calendar;
 import java.util.List;
 import java.util.Map.Entry;
@@ -74,6 +78,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
 import 
org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
 import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
 import org.apache.wicket.event.IEvent;
+import org.apache.wicket.extensions.ajax.AjaxDownload;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
@@ -81,6 +86,10 @@ import org.apache.wicket.markup.head.PriorityHeaderItem;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.protocol.ws.api.event.WebSocketPushPayload;
 import org.apache.wicket.request.resource.JavaScriptResourceReference;
+import org.apache.wicket.request.resource.ResourceStreamResource;
+import org.apache.wicket.util.resource.AbstractResourceStream;
+import org.apache.wicket.util.resource.IResourceStream;
+import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
 import org.apache.wicket.util.string.Strings;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
@@ -149,6 +158,44 @@ public class RoomPanel extends BasePanel {
private final WbPanel wb;
private String sharingUser = null;
private String recordingUser = null;
+   private byte[] pdfWb;
+   private final AjaxDownload download = new AjaxDownload(new 
ResourceStreamResource() {
+   private static final long serialVersionUID = 1L;
+
+   {
+   setCacheDuration(NONE);
+   setFileName("whiteboard.pdf");
+   }
+
+   @Override
+   protected IResourceStream getResourceStream(Attributes 
attributes) {
+   return new AbstractResourceStream() {
+   private static final long serialVersionUID = 1L;
+
+   @Override
+   public InputStream getInputStream() throws 
ResourceStreamNotFoundException {
+   return new ByteArrayInputStream(pdfWb);
+   }
+
+   @Override
+   public void close() throws IOException {
+   }
+   };
+   }
+   }) {
+   private static final long serialVersionUID = 1L;
+
+   @Override
+   protected void onDownloadCompleted(AjaxRequestTarget target) {
+   super.onDownloadCompleted(target);
+   pdfWb = null;
+   }

[jira] [Commented] (OPENMEETINGS-427) ExportPDF

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

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

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

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

[OPENMEETINGS-427] initial commit


> ExportPDF
> -
>
> Key: OPENMEETINGS-427
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-427
> Project: Openmeetings
>  Issue Type: Improvement
>  Components: HTML5/WhiteBoard, Import/Export
>Reporter: Allemand Sylvain
>Assignee: Maxim Solodovnik
> Fix For: 4.0.0
>
> Attachments: OPENMEETINGS-427-ExportPDF.patch
>
>
> Hello, 
> I worked on implementation of a new functionality : the export of a PDF file 
> with the corresponding painted objects (annotations). 
> I found a starting solution in the ExportToImage.java file.
> The current only permits exporting painted objects in SVG format. 
> To implement Export PDF, my approach was :
> get painted objects corresponding to each page of the PDF file
> convert per slide all objects in one SVG file.
> Convert resulting SVG files to PDF files (with Batik Rasterizer library : Fop 
> and Avalon library were needed by Batik Rasterizer). Each SVG file is cropped 
> according to the original current PDF page size (by this way, PDF document 
> with multi-size pages is possible).
> If none objects are painted on a slide, I create a blank PDF page (because 
> the overlay function needs two document with same amount of page and same 
> page sizes). 
> Merge all PDF files in one. 
> Overlay this PDF file in the original PDF file.
> Send the result file to explorer and delete temporary files (and delete 
> result file in the end).
> The resulting PDF is more or less the same size than the original PDF file 
> (only depending on the number of painted objects)
> Enjoy the result
> i got some problems : 
> i try to get the swfzoom value. I create an accessor but i have  an error on 
> execution (Null Exception). I can't get this value, so for the moment, i stay 
> with a value of 72 dpi. (this value is very important for the convert 
> function SVG to PDF.
> I also comment the cropping of orginal PDF file to keep orginal page size for 
> the original document.
>  (poly2bitmap option in GenerateSWF.java).



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

openmeetings git commit: [OPENMEETINGS-427] initial commit

2017-08-10 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master f273d8c4c -> fbe9e48f3


[OPENMEETINGS-427] initial commit


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

Branch: refs/heads/master
Commit: fbe9e48f34a78eecc9a3e1a174bbf4497e6fb01b
Parents: f273d8c
Author: Maxim Solodovnik 
Authored: Thu Aug 10 19:54:33 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Aug 10 19:54:33 2017 +0700

--
 openmeetings-web/pom.xml| 12 +++
 .../web/room/menu/RoomMenuPanel.java| 17 --
 .../openmeetings/web/room/wb/WbAction.java  |  1 +
 .../openmeetings/web/room/wb/WbPanel.java   | 35 
 .../org/apache/openmeetings/web/room/wb/wb.js   | 27 +++
 5 files changed, 83 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fbe9e48f/openmeetings-web/pom.xml
--
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index c087139..feedeb9 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -33,6 +33,7 @@
5.1.43

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



@@ -603,5 +604,16 @@
${derby.version}
test

+   
+   org.apache.pdfbox
+   pdfbox
+   ${pdfbox.version}
+   
+   
+   org.apache.pdfbox
+   pdfbox-tools
+   
+   
+   

 

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fbe9e48f/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
--
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index 5a37991..5792d78 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -18,6 +18,9 @@
  */
 package org.apache.openmeetings.web.room.menu;
 
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PDF;
+import static org.apache.openmeetings.util.OmFileHelper.JPG_MIME_TYPE;
+import static org.apache.openmeetings.util.OmFileHelper.PNG_MIME_TYPE;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_BASE_URL;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY;
 import static org.apache.openmeetings.web.app.Application.exitRoom;
@@ -270,7 +273,7 @@ public class RoomMenuPanel extends Panel {
 
@Override
public void onClick(AjaxRequestTarget target) {
-   
target.appendJavaScript("WbArea.download('png');");
+   
target.appendJavaScript(String.format("WbArea.download('%s');", PNG_MIME_TYPE));
}
});
actionsMenu.getItems().add(new 
RoomMenuItem(Application.getString("download.jpg"), 
Application.getString("download.jpg")) {
@@ -278,7 +281,15 @@ public class RoomMenuPanel extends Panel {
 
@Override
public void onClick(AjaxRequestTarget target) {
-   
target.appendJavaScript("WbArea.download('jpeg');");
+   
target.appendJavaScript(String.format("WbArea.download('%s');", JPG_MIME_TYPE));
+   }
+   });
+   actionsMenu.getItems().add(new 
RoomMenuItem(Application.getString("download.pdf"), 
Application.getString("download.pdf")) {
+   private static final long serialVersionUID = 1L;
+
+   @Override
+   public void onClick(AjaxRequestTarget target) {
+   
target.appendJavaScript(String.format("WbArea.download('%s');", EXTENSION_PDF));
}
});
//TODO seems need to be removed actionsMenu.getItems().add(new 
RoomMenuItem(Application.getString(1126),

openmeetings git commit: [OPENMEETINGS-980] mysql version is set to latest 5.x

2017-08-10 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master 0555aea1c -> f273d8c4c


[OPENMEETINGS-980] mysql version is set to latest 5.x


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

Branch: refs/heads/master
Commit: f273d8c4c83dbafbfe68857036d458fbbd9699f6
Parents: 0555aea
Author: Maxim Solodovnik 
Authored: Thu Aug 10 17:04:21 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Aug 10 17:04:42 2017 +0700

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


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f273d8c4/openmeetings-web/pom.xml
--
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 9c41b83..c087139 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

-   8.0.7-dmr
+   5.1.43

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

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

2017-08-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=16121383#comment-16121383
 ] 

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

Commit ac44e49cebf5346bb6cc1b7e29390ee9e98c4871 in openmeetings's branch 
refs/heads/3.3.x from [~solomax]
[ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=ac44e49 ]

[OPENMEETINGS-980] mysql version is set to latest 5.x


> 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.4.14#64029)

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

2017-08-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=16121384#comment-16121384
 ] 

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

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

[OPENMEETINGS-980] mysql version is set to latest 5.x


> 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.4.14#64029)

openmeetings git commit: [OPENMEETINGS-980] mysql version is set to latest 5.x

2017-08-10 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/3.3.x bfb1959ea -> ac44e49ce


[OPENMEETINGS-980] mysql version is set to latest 5.x


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

Branch: refs/heads/3.3.x
Commit: ac44e49cebf5346bb6cc1b7e29390ee9e98c4871
Parents: bfb1959
Author: Maxim Solodovnik 
Authored: Thu Aug 10 17:04:21 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Aug 10 17:04:21 2017 +0700

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


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ac44e49c/openmeetings-web/pom.xml
--
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index ead778b..742c37f 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

-   8.0.7-dmr
+   5.1.43

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

openmeetings git commit: no jira: minor fix on room enter by hash

2017-08-10 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master c6646f189 -> 0555aea1c


no jira: minor fix on room enter by hash


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

Branch: refs/heads/master
Commit: 0555aea1c37782fb3a8f299d3f9b34329f82a056
Parents: c6646f1
Author: Maxim Solodovnik 
Authored: Thu Aug 10 15:24:50 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Aug 10 15:25:09 2017 +0700

--
 .../src/main/java/org/apache/openmeetings/web/pages/HashPage.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0555aea1/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
--
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
index eba4438..188bfa2 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
@@ -77,11 +77,11 @@ public class HashPage extends BaseInitedPage implements 
IUpdatable {
}
 
private void createRoom(Long roomId) {
-   error = false;
getHeader().setVisible(false);
// need to re-fetch Room object to initialize all collections
Room room = getBean(RoomDao.class).get(roomId);
if (room != null && !room.isDeleted()) {
+   error = false;
rp = new RoomPanel(CHILD_ID, room);
mp = new MainPanel(PANEL_MAIN, rp);
replace(mp);

openmeetings git commit: no jira: minor fix on room enter by hash

2017-08-10 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/3.3.x fc9111d4b -> bfb1959ea


no jira: minor fix on room enter by hash


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

Branch: refs/heads/3.3.x
Commit: bfb1959ea615cafea274684da00a61b4bf6b3b93
Parents: fc9111d
Author: Maxim Solodovnik 
Authored: Thu Aug 10 15:24:50 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Aug 10 15:24:50 2017 +0700

--
 .../src/main/java/org/apache/openmeetings/web/pages/HashPage.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfb1959e/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
--
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
index 22e2aa6..0102415 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
@@ -73,11 +73,11 @@ public class HashPage extends BaseInitedPage implements 
IUpdatable {
}
 
private void createRoom(Long roomId) {
-   error = false;
getHeader().setVisible(false);
// need to re-fetch Room object to initialize all collections
Room room = getBean(RoomDao.class).get(roomId);
if (room != null && !room.isDeleted()) {
+   error = false;
rp = new RoomPanel(CHILD_ID, room);
mp = new MainPanel(PANEL_MAIN, rp);
replace(mp);

openmeetings git commit: no jira: minor fix on room enter by hash

2017-08-10 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/3.3.x c5944366d -> fc9111d4b


no jira: minor fix on room enter by hash


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

Branch: refs/heads/3.3.x
Commit: fc9111d4bb7b8e6ad37b03d7b2892e31e42beff6
Parents: c594436
Author: Maxim Solodovnik 
Authored: Thu Aug 10 15:08:25 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Aug 10 15:14:03 2017 +0700

--
 .../apache/openmeetings/web/pages/HashPage.java | 38 ++--
 1 file changed, 20 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fc9111d4/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
--
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
index 7c98592..22e2aa6 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
@@ -66,8 +66,27 @@ public class HashPage extends BaseInitedPage implements 
IUpdatable {
private boolean error = true;
private MainPanel mp = null;
private RoomPanel rp = null;
+   private final PageParameters p;
 
public HashPage(PageParameters p) {
+   this.p = p;
+   }
+
+   private void createRoom(Long roomId) {
+   error = false;
+   getHeader().setVisible(false);
+   // need to re-fetch Room object to initialize all collections
+   Room room = getBean(RoomDao.class).get(roomId);
+   if (room != null && !room.isDeleted()) {
+   rp = new RoomPanel(CHILD_ID, room);
+   mp = new MainPanel(PANEL_MAIN, rp);
+   replace(mp);
+   }
+   }
+
+   @Override
+   protected void onInitialize() {
+   super.onInitialize();
StringValue secure = p.get(HASH);
StringValue invitation = p.get(INVITATION_HASH);
 
@@ -95,7 +114,7 @@ public class HashPage extends BaseInitedPage implements 
IUpdatable {
error = false;
}
Room r = i.getRoom();
-   if (r != null) {
+   if (r != null && !r.isDeleted()) {
createRoom(r.getId());
if (i.isPasswordProtected() && rp != 
null) {
mp.getChat().setVisible(false);
@@ -124,23 +143,6 @@ public class HashPage extends BaseInitedPage implements 
IUpdatable {
}

add(recContainer.add(vi.setShowShare(false).setOutputMarkupPlaceholderTag(true),
vp.setOutputMarkupPlaceholderTag(true)), new 
InvitationPasswordDialog("i-pass", this));
-   }
-
-   private void createRoom(Long roomId) {
-   error = false;
-   getHeader().setVisible(false);
-   // need to re-fetch Room object to initialize all collections
-   Room room = getBean(RoomDao.class).get(roomId);
-   if (room != null) {
-   rp = new RoomPanel(CHILD_ID, room);
-   mp = new MainPanel(PANEL_MAIN, rp);
-   replace(mp);
-   }
-   }
-
-   @Override
-   protected void onInitialize() {
-   super.onInitialize();
remove(urlParametersReceivingBehavior);
add(new MessageDialog("access-denied", 
getString("invalid.hash"), getString(errorKey), DialogButtons.OK,
DialogIcon.ERROR) {

openmeetings git commit: no jira: minor fix on room enter by hash

2017-08-10 Thread solomax 
Repository: openmeetings
Updated Branches:
  refs/heads/master ea524d3af -> c6646f189


no jira: minor fix on room enter by hash


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

Branch: refs/heads/master
Commit: c6646f1893b27c1f0ae0ad684a3d068b0e6dfb60
Parents: ea524d3
Author: Maxim Solodovnik 
Authored: Thu Aug 10 15:08:25 2017 +0700
Committer: Maxim Solodovnik 
Committed: Thu Aug 10 15:08:25 2017 +0700

--
 .../main/java/org/apache/openmeetings/web/pages/HashPage.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c6646f18/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
--
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
index 8e4f8c6..eba4438 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
@@ -81,7 +81,7 @@ public class HashPage extends BaseInitedPage implements 
IUpdatable {
getHeader().setVisible(false);
// need to re-fetch Room object to initialize all collections
Room room = getBean(RoomDao.class).get(roomId);
-   if (room != null) {
+   if (room != null && !room.isDeleted()) {
rp = new RoomPanel(CHILD_ID, room);
mp = new MainPanel(PANEL_MAIN, rp);
replace(mp);
@@ -118,7 +118,7 @@ public class HashPage extends BaseInitedPage implements 
IUpdatable {
error = false;
}
Room r = i.getRoom();
-   if (r != null) {
+   if (r != null && !r.isDeleted()) {
createRoom(r.getId());
if (i.isPasswordProtected() && rp != 
null) {
mp.getChat().setVisible(false);