This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 2dbf90d [OPENMEETINGS-2055] load file to WB is fixed
2dbf90d is described below
commit 2dbf90dfca04a2a0b3cfa076b68bf9645ecbd464
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Wed May 29 11:22:17 2019 +0700
[OPENMEETINGS-2055] load file to WB is fixed
---
.../src/main/java/org/apache/openmeetings/util/OmFileHelper.java | 5 -----
.../org/apache/openmeetings/web/room/sidebar/UploadDialog.java | 3 +++
.../org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java | 7 +++++--
pom.xml | 2 +-
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
index 7868b49..34d9b69 100644
---
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
+++
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
@@ -110,11 +110,6 @@ public class OmFileHelper {
setOmHome(new File(home));
}
- public static File getRootDir() {
- // hack !!!!
- return getOmHome().getParentFile().getParentFile();
- }
-
public static File getOmHome() {
return OM_HOME;
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
index 9d378f6..c88948c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
@@ -53,6 +53,7 @@ import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.apache.wicket.markup.html.form.upload.FileUploadField;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.lang.Bytes;
@@ -248,9 +249,11 @@ public class UploadDialog extends
AbstractFormDialog<String> {
final Application app = Application.get();
final WebSession session = WebSession.get();
+ final RequestCycle rc = RequestCycle.get();
new Thread(() -> {
ThreadContext.setApplication(app);
ThreadContext.setSession(session);
+ ThreadContext.setRequestCycle(rc);
convertAll();
ThreadContext.detach();
}).start();
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
index 552d7e2..f2c271a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
@@ -33,6 +33,7 @@ import org.apache.openmeetings.web.room.RoomResourceReference;
import org.apache.openmeetings.web.user.record.Mp4RecordingResourceReference;
import org.apache.openmeetings.web.user.record.PngRecordingResourceReference;
import org.apache.wicket.request.cycle.RequestCycle;
+import
org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.resource.FileSystemResourceReference;
@@ -89,8 +90,10 @@ public class WbWebSocketHelper extends WebSocketHelper {
return getWbJson(wbId).put(PARAM_OBJ, o);
}
- private static CharSequence urlFor(final ResourceReference
resourceReference, PageParameters parameters) {
- return RequestCycle.get().urlFor(resourceReference, parameters);
+ private static CharSequence urlFor(final ResourceReference ref,
PageParameters params) {
+ RequestCycle rc = RequestCycle.get();
+ ResourceReferenceRequestHandler handler = new
ResourceReferenceRequestHandler(ref, params);
+ return
rc.getUrlRenderer().renderContextRelativeUrl(rc.mapUrlFor(handler).toString());
}
public static JSONObject addFileUrl(String ruid, JSONObject _file,
BaseFileItem fi, Client c) {
diff --git a/pom.xml b/pom.xml
index 9ca93ba..1e1f809 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,7 @@
<jetty.version>9.4.15.v20190215</jetty.version>
<license.excludedScopes>test</license.excludedScopes>
<bcprov-jdk15on.version>1.61</bcprov-jdk15on.version>
- <mockito.version>2.27.5</mockito.version>
+ <mockito.version>2.27.0</mockito.version>
<powermock.version>2.0.2</powermock.version>
<quartz.version>2.3.1</quartz.version>
<!-- Exclude all generated code -->
