You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/09/08 17:58:28 UTC
openmeetings git commit: [OPENMEETINGS-1641] video poster is fixed
Repository: openmeetings
Updated Branches:
refs/heads/master 658f93073 -> 49d0cf36e
[OPENMEETINGS-1641] video poster is fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/49d0cf36
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/49d0cf36
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/49d0cf36
Branch: refs/heads/master
Commit: 49d0cf36efc6b95ab3324af6d6bd378a50f7af13
Parents: 658f930
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sat Sep 9 00:58:20 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sat Sep 9 00:58:20 2017 +0700
----------------------------------------------------------------------
.../src/main/assembly/components/all.xml | 10 +++++++++-
.../org/apache/openmeetings/web/app/Application.java | 2 ++
.../openmeetings/web/room/RoomResourceReference.java | 14 +++-----------
.../openmeetings/web/room/wb/WbWebSocketHelper.java | 3 ++-
.../web/util/FileItemResourceReference.java | 2 +-
5 files changed, 17 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/49d0cf36/openmeetings-server/src/main/assembly/components/all.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/main/assembly/components/all.xml b/openmeetings-server/src/main/assembly/components/all.xml
index dbe2970..d4a7f24 100644
--- a/openmeetings-server/src/main/assembly/components/all.xml
+++ b/openmeetings-server/src/main/assembly/components/all.xml
@@ -30,8 +30,9 @@
<exclude>webapps/oflaDemo/**</exclude>
<exclude>webapps/chat/**</exclude>
<exclude>webapps/root/demos/**</exclude>
- <exclude>webapps/root/index.html</exclude>
<exclude>webapps/root/crossdomain.xml</exclude>
+ <exclude>webapps/root/favicon.ico</exclude>
+ <exclude>webapps/root/index.html</exclude>
<exclude>lib/commons-io*.jar</exclude>
<exclude>plugins/websocket*.jar</exclude>
<exclude>*.sh</exclude>
@@ -92,6 +93,13 @@
</includes>
</fileSet>
<fileSet>
+ <directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}/public</directory><!-- FIXME should be implemented differently -->
+ <outputDirectory>${root.webapp}</outputDirectory>
+ <includes>
+ <include>favicon.ico</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}</directory><!-- FIXME should be implemented differently -->
<outputDirectory>${om.webapp}</outputDirectory>
<excludes>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/49d0cf36/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 4606133..3097138 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -82,6 +82,7 @@ import org.apache.openmeetings.web.pages.NotInitedPage;
import org.apache.openmeetings.web.pages.ResetPage;
import org.apache.openmeetings.web.pages.auth.SignInPage;
import org.apache.openmeetings.web.pages.install.InstallWizardPage;
+import org.apache.openmeetings.web.room.RoomPreviewResourceReference;
import org.apache.openmeetings.web.room.RoomResourceReference;
import org.apache.openmeetings.web.room.wb.WbWebSocketHelper;
import org.apache.openmeetings.web.user.dashboard.MyRoomsWidgetDescriptor;
@@ -281,6 +282,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica
mountResource("/recordings/mp4/${id}", new Mp4RecordingResourceReference());
mountResource("/recordings/jpg/${id}", new JpgRecordingResourceReference()); //should be in sync with VideoPlayer
mountResource("/room/file/${id}", new RoomResourceReference());
+ mountResource("/room/preview/${id}", new RoomPreviewResourceReference());
mountResource("/profile/${id}", new ProfileImageResourceReference());
mountResource("/group/${id}", new GroupLogoResourceReference());
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/49d0cf36/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
index b549580..6e03180 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
@@ -48,8 +48,7 @@ import com.github.openjson.JSONObject;
public class RoomResourceReference extends FileItemResourceReference<FileExplorerItem> {
private static final long serialVersionUID = 1L;
- public static final String DEFAULT_NAME = "wb-room-file";
- private boolean preview = false;
+ private static final String DEFAULT_NAME = "wb-room-file";
public RoomResourceReference() {
super(DEFAULT_NAME);
@@ -73,7 +72,7 @@ public class RoomResourceReference extends FileItemResourceReference<FileExplore
mime = PNG_MIME_TYPE;
break;
case Video:
- mime = preview ? JPG_MIME_TYPE : MP4_MIME_TYPE;
+ mime = MP4_MIME_TYPE;
break;
default:
throw new RuntimeException("Not supported");
@@ -85,8 +84,6 @@ public class RoomResourceReference extends FileItemResourceReference<FileExplore
protected FileExplorerItem getFileItem(Attributes attr) {
PageParameters params = attr.getParameters();
StringValue _id = params.get("id");
- StringValue _preview = params.get("preview");
- preview = _preview.toBoolean(false);
String uid = params.get("uid").toString();
Long id = null;
try {
@@ -131,11 +128,6 @@ public class RoomResourceReference extends FileItemResourceReference<FileExplore
protected File getFile(FileExplorerItem f, Attributes attr) {
String ext = null;
switch (f.getType()) {
- case Video:
- if (preview) {
- ext = EXTENSION_JPG;
- }
- break;
case Presentation:
ext = attr.getParameters().get("slide").toString();
break;
@@ -146,6 +138,6 @@ public class RoomResourceReference extends FileItemResourceReference<FileExplore
@Override
protected String getFileName(FileExplorerItem f) {
- return f.getFileName(preview ? EXTENSION_JPG : null);
+ return f.getFileName(null);
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/49d0cf36/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
----------------------------------------------------------------------
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 d65e626..f6fcde2 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
@@ -25,6 +25,7 @@ import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.util.NullStringer;
import org.apache.openmeetings.util.ws.IClusterWsMessage;
+import org.apache.openmeetings.web.room.RoomPreviewResourceReference;
import org.apache.openmeetings.web.room.RoomResourceReference;
import org.apache.openmeetings.web.user.record.JpgRecordingResourceReference;
import org.apache.openmeetings.web.user.record.Mp4RecordingResourceReference;
@@ -98,7 +99,7 @@ public class WbWebSocketHelper extends WebSocketHelper {
case Video:
ref = new RoomResourceReference();
file.put("_src", urlFor(ref, pp));
- file.put("_poster", urlFor(ref, new PageParameters(pp).add("preview", true)));
+ file.put("_poster", urlFor(new RoomPreviewResourceReference(), pp));
break;
case Recording:
ref = new Mp4RecordingResourceReference();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/49d0cf36/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
index 680159d..11328e2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
@@ -35,7 +35,7 @@ import org.slf4j.Logger;
public abstract class FileItemResourceReference<T extends FileItem> extends FileSystemResourceReference {
private static final long serialVersionUID = 1L;
- private static final Logger log = getLogger(FileItemResourceReference.class, webAppRootKey);
+ protected static final Logger log = getLogger(FileItemResourceReference.class, webAppRootKey);
public FileItemResourceReference(String name) {
super(name);