HTML 5 player video function

src/main/java/com/openkm/bean/Document.java

@@ -54,7 +54,6 @@ public class Document extends Node {
 	private LockInfo lockInfo;
 	private boolean signed;
 	private boolean convertibleToPdf;
-	private boolean convertibleToSwf;
 	private String cipherName;
 
 	public LockInfo getLockInfo() {
@@ -137,14 +136,6 @@ public void setConvertibleToPdf(boolean convertibleToPdf) {
 		this.convertibleToPdf = convertibleToPdf;
 	}
 
-	public boolean isConvertibleToSwf() {
-		return convertibleToSwf;
-	}
-
-	public void setConvertibleToSwf(boolean convertibleToSwf) {
-		this.convertibleToSwf = convertibleToSwf;
-	}
-
 	public void setCipherName(String cipherName) {
 		this.cipherName = cipherName;
 	}
@@ -182,7 +173,6 @@ public String toString() {
 		sb.append(", subscriptors=").append(subscriptors);
 		sb.append(", uuid=").append(uuid);
 		sb.append(", convertibleToPdf=").append(convertibleToPdf);
-		sb.append(", convertibleToSwf=").append(convertibleToSwf);
 		sb.append(", cipherName=").append(cipherName);
 		sb.append(", notes=").append(notes);
 		sb.append(", language=").append(language);

src/main/java/com/openkm/core/Config.java

@@ -102,7 +102,6 @@ public class Config {
 	public static String REPOSITORY_CACHE_DIRNAME = "cache";
 	public static String REPOSITORY_CACHE_DXF;
 	public static String REPOSITORY_CACHE_PDF;
-	public static String REPOSITORY_CACHE_SWF;
 
 	// Experimental features
 	public static final String PROPERTY_PLUGIN_DEBUG = "plugin.debug";
@@ -221,7 +220,6 @@ public class Config {
 	public static final String PROPERTY_SYSTEM_OPENOFFICE_PROGRAM = "system.openoffice.program";
 	public static final String PROPERTY_SYSTEM_OPENOFFICE_DICTIONARY = "system.openoffice.dictionary";
 	public static final String PROPERTY_SYSTEM_IMAGEMAGICK_CONVERT = "system.imagemagick.convert";
-	public static final String PROPERTY_SYSTEM_SWFTOOLS_PDF2SWF = "system.swftools.pdf2swf";
 	public static final String PROPERTY_SYSTEM_GHOSTSCRIPT = "system.ghostscript";
 	public static final String PROPERTY_SYSTEM_DWG2DXF = "system.dwg2dxf";
 	public static final String PROPERTY_SYSTEM_ANTIVIR = "system.antivir";
@@ -486,7 +484,6 @@ public class Config {
 	public static String SYSTEM_OPENOFFICE_PROGRAM = "";
 	public static String SYSTEM_OPENOFFICE_DICTIONARY = "";
 	public static String SYSTEM_IMAGEMAGICK_CONVERT = "";
-	public static String SYSTEM_SWFTOOLS_PDF2SWF = "";
 	public static String SYSTEM_GHOSTSCRIPT = "";
 	public static String SYSTEM_DWG2DXF = "";
 	public static String SYSTEM_ANTIVIR = "";
@@ -732,8 +729,6 @@ public static Properties load(ServletContext sc) {
 			values.put("repository.cache.dxf", REPOSITORY_CACHE_DXF);
 			REPOSITORY_CACHE_PDF = REPOSITORY_CACHE_HOME + File.separator + "pdf";
 			values.put("repository.cache.pdf", REPOSITORY_CACHE_PDF);
-			REPOSITORY_CACHE_SWF = REPOSITORY_CACHE_HOME + File.separator + "swf";
-			values.put("repository.cache.swf", REPOSITORY_CACHE_SWF);
 			values.put(PROPERTY_HIBERNATE_SEARCH_INDEX_HOME, HIBERNATE_SEARCH_INDEX_HOME);
 			values.put(PROPERTY_REPOSITORY_DATASTORE_BACKEND, REPOSITORY_DATASTORE_BACKEND);
 			values.put(PROPERTY_REPOSITORY_DATASTORE_HOME, REPOSITORY_DATASTORE_HOME);
@@ -967,8 +962,6 @@ public static void reload(ServletContext sc, Properties cfg) {
 			values.put(PROPERTY_SYSTEM_PDF_FORCE_OCR, Boolean.toString(SYSTEM_PDF_FORCE_OCR));
 			SYSTEM_IMAGEMAGICK_CONVERT = ConfigDAO.getString(PROPERTY_SYSTEM_IMAGEMAGICK_CONVERT, cfg.getProperty(PROPERTY_SYSTEM_IMAGEMAGICK_CONVERT, EnvironmentDetector.detectImagemagickConvert()));
 			values.put(PROPERTY_SYSTEM_IMAGEMAGICK_CONVERT, SYSTEM_IMAGEMAGICK_CONVERT);
-			SYSTEM_SWFTOOLS_PDF2SWF = ConfigDAO.getString(PROPERTY_SYSTEM_SWFTOOLS_PDF2SWF, cfg.getProperty(PROPERTY_SYSTEM_SWFTOOLS_PDF2SWF, EnvironmentDetector.detectSwftoolsPdf2Swf()));
-			values.put(PROPERTY_SYSTEM_SWFTOOLS_PDF2SWF, SYSTEM_SWFTOOLS_PDF2SWF);
 			SYSTEM_GHOSTSCRIPT = ConfigDAO.getString(PROPERTY_SYSTEM_GHOSTSCRIPT, cfg.getProperty(PROPERTY_SYSTEM_GHOSTSCRIPT, EnvironmentDetector.detectGhostscript()));
 			values.put(PROPERTY_SYSTEM_GHOSTSCRIPT, SYSTEM_GHOSTSCRIPT);
 			SYSTEM_DWG2DXF = ConfigDAO.getString(PROPERTY_SYSTEM_DWG2DXF, cfg.getProperty(PROPERTY_SYSTEM_DWG2DXF, ""));

src/main/java/com/openkm/core/MimeTypeConfig.java

@@ -34,6 +34,8 @@ public class MimeTypeConfig {
 
 	// MIME types => NOTE Keep on sync with default.sql
 	public final static String MIME_UNDEFINED = "application/octet-stream";
+
+	// application
 	public final static String MIME_RTF = "application/rtf";
 	public final static String MIME_PDF = "application/pdf";
 	public final static String MIME_ZIP = "application/zip";
@@ -48,6 +50,9 @@ public class MimeTypeConfig {
 	public final static String MIME_OO_SPREADSHEET = "application/vnd.oasis.opendocument.spreadsheet";
 	public final static String MIME_OO_PRESENTATION = "application/vnd.oasis.opendocument.presentation";
 	public final static String MIME_SWF = "application/x-shockwave-flash";
+	public final static String MIME_JAR = "application/x-java-archive";
+
+	// Image
 	public final static String MIME_DXF = "image/vnd.dxf";
 	public final static String MIME_DWG = "image/vnd.dwg";
 	public final static String MIME_TIFF = "image/tiff";
@@ -57,28 +62,44 @@ public class MimeTypeConfig {
 	public final static String MIME_BMP = "image/bmp";
 	public final static String MIME_PSD = "image/x-psd";
 	public final static String MIME_ICO = "image/x-ico";
+	public final static String MIME_PBM = "image/pbm";
+	public final static String MIME_SVG = "image/svg+xml";
+
+	// Video
+	public final static String MIME_MP3 = "audio/mpeg";
+	public final static String MIME_WAV = "audio/x-wav";
+	public final static String MIME_MP4 = "video/mp4";
+	public final static String MIME_MPEG = "video/mpeg";
+	public final static String MIME_FLV = "video/x-flv";
+	public final static String MIME_WMV = "video/x-ms-wmv";
+	public final static String MIME_AVI = "video/x-msvideo";
+
+	// Text
 	public final static String MIME_HTML = "text/html";
 	public final static String MIME_TEXT = "text/plain";
 	public final static String MIME_XML = "text/xml";
 	public final static String MIME_CSV = "text/csv";
+	public final static String MIME_CSS = "text/css";
+
+	// Language
 	public final static String MIME_SQL = "text/x-sql";
 	public final static String MIME_JAVA = "text/x-java";
-	public final static String MIME_JAR = "application/x-java-archive";
-	public final static String MIME_SH = "application/x-shellscript";
-	public final static String MIME_BSH = "application/x-bsh";
-	public final static String MIME_PHP = "application/x-php";
 	public final static String MIME_SCALA = "text/x-scala";
 	public final static String MIME_PYTHON = "text/x-python";
-	public final static String MIME_PERL = "application/x-perl";
-	public final static String MIME_JAVASCRIPT = "application/javascript";
 	public final static String MIME_GROOVY = "text/x-groovy";
 	public final static String MIME_DIFF = "text/x-diff";
 	public final static String MIME_PASCAL = "text/x-pascal";
-	public final static String MIME_CSS = "text/css";
 	public final static String MIME_CSHARP = "text/x-csharp";
 	public final static String MIME_CPP = "text/x-c++";
-	public final static String MIME_AS3 = "application/x-font-truetype";
 	public final static String MIME_APPLESCRIPT = "text/applescript";
+	public final static String MIME_SH = "application/x-shellscript";
+	public final static String MIME_BSH = "application/x-bsh";
+	public final static String MIME_PHP = "application/x-php";
+	public final static String MIME_PERL = "application/x-perl";
+	public final static String MIME_JAVASCRIPT = "application/javascript";
+	public final static String MIME_AS3 = "application/x-font-truetype";
+
+	// Mail
 	public final static String MIME_EML = "message/rfc822";
 
 	//public final static String MIME_VB = "";

src/main/java/com/openkm/dao/bean/AutomationRule.java

@@ -51,7 +51,6 @@ public class AutomationRule implements Serializable {
 	public static final String EVENT_TEXT_EXTRACTOR = "text_extractor";
 
 	public static final String EVENT_CONVERSION_PDF = "convert_pdf";
-	public static final String EVENT_CONVERSION_SWF = "convert_swf";
 
 	public static final String EVENT_PROPERTY_GROUP_ADD = "prop_group_add";
 	public static final String EVENT_PROPERTY_GROUP_SET = "prop_group_set";
@@ -81,13 +80,12 @@ public class AutomationRule implements Serializable {
 			put(AutomationRule.EVENT_TEXT_EXTRACTOR, "Text extraction");
 
 			put(AutomationRule.EVENT_CONVERSION_PDF, "Convert to PDF");
-			put(AutomationRule.EVENT_CONVERSION_SWF, "Convert to SWF");
 
 			put(AutomationRule.EVENT_USER_LOGIN, "User login");
 			put(AutomationRule.EVENT_USER_LOGOUT, "User logout");
 		}
 	};
-	
+
 	@Id
 	@Column(name = "ARL_ID")
 	@GeneratedValue(strategy = GenerationType.AUTO)

src/main/java/com/openkm/frontend/client/bean/GWTConverterStatus.java

@@ -32,8 +32,6 @@ public class GWTConverterStatus implements IsSerializable {
 	public static final int STATUS_LOADING = 1;
 	public static final int STATUS_CONVERTING_TO_PDF = 2;
 	public static final int STATUS_CONVERTING_TO_PDF_FINISHED = 3;
-	public static final int STATUS_CONVERTING_TO_SWF = 4;
-	public static final int STATUS_CONVERTING_TO_SWF_FINISHED = 5;
 	public static final int STATUS_SENDING_FILE = 6;
 
 	private int status = STATUS_LOADING;

src/main/java/com/openkm/frontend/client/extension/widget/preview/PreviewExtension.java

@@ -23,18 +23,21 @@
 
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Widget;
+import com.openkm.frontend.client.bean.GWTDocument;
 
 /**
  * TabDocumentExtension
  *
  * @author jllort
  */
 public abstract class PreviewExtension extends Composite implements HasPreviewExtension {
-	public abstract void createViewer(String url, int width, int height);
+	public abstract void createViewer(GWTDocument doc, String url, int width, int height);
 
 	public abstract Widget getWidget();
 
 	public abstract void setVisible(boolean visible);
 
 	public abstract void resizeViewer(int width, int height);
-}
+
+	public abstract boolean isPreviewAvailable(String mimeType);
+}

src/main/java/com/openkm/frontend/client/util/ConversionStatus.java

@@ -61,12 +61,6 @@ public void onSuccess(GWTConverterStatus result) {
 							case GWTConverterStatus.STATUS_CONVERTING_TO_PDF_FINISHED:
 								Main.get().mainPanel.bottomPanel.setStatus(Main.i18n("status.converter.topdf.finished"));
 								break;
-							case GWTConverterStatus.STATUS_CONVERTING_TO_SWF:
-								Main.get().mainPanel.bottomPanel.setStatus(Main.i18n("status.converter.toswf"));
-								break;
-							case GWTConverterStatus.STATUS_CONVERTING_TO_SWF_FINISHED:
-								Main.get().mainPanel.bottomPanel.setStatus(Main.i18n("status.converter.toswf.finished"));
-								break;
 							case GWTConverterStatus.STATUS_SENDING_FILE:
 								Main.get().mainPanel.bottomPanel.setStatus(Main.i18n("status.converter.sending.file"));
 								break;
@@ -99,4 +93,4 @@ public void run() {
 
 		refreshStatus.schedule(REFRESH_STATUS_DELAY);
 	}
-}
+}

src/main/java/com/openkm/frontend/client/util/Util.java

@@ -574,83 +574,13 @@ public static native String getUserAgent() /*-{
       }
     }-*/;
 
-	public static native void removeMediaPlayer() /*-{
-      $wnd.swfobject.removeSWF("jsmediaplayer");
-    }-*/;
-
-	public static native void createMediaPlayer(String mediaUrl, String mediaProvider, String width, String height) /*-{
-      $wnd.swfobject.embedSWF("../js/mediaplayer/player.swf", "mediaplayercontainer", width, height, "9.0.0", "../js/mediaplayer/expressinstall.swf", {
-        file: mediaUrl,
-        provider: mediaProvider,
-        autostart: "true",
-        width: width,
-        height: height
-      }, {allowscriptaccess: "always", allowfullscreen: "true"}, {id: "jsmediaplayer", name: "jsmediaplayer"});
-    }-*/;
-
-	public static native void resizeMediaPlayer(String width, String height) /*-{
-      obj = $wnd.swfobject.getObjectById('jsmediaplayer');
-      obj.width = width;
-      obj.height = height;
-    }-*/;
-
-	public static native void createSwfViewer(String swfUrl, String width, String height) /*-{
-      $wnd.swfobject.embedSWF(swfUrl, "swfviewercontainer", width, height, "9.0.0", "../js/mediaplayer/expressinstall.swf", {
-        width: width,
-        height: height
-      }, {}, {id: "jswfviewer", name: "jswfviewer"});
-    }-*/;
-
-	public static native void resizeSwfViewer(String width, String height) /*-{
-      obj = $wnd.swfobject.getObjectById('jswfviewer');
-      obj.width = width;
-      obj.height = height;
-    }-*/;
-
-	public static native void createPDFViewerFlexPaper(String pdfUrl, String width, String height) /*-{
-      fpViewer = "../js/flexpaper/FlexPaperViewer.swf";
-      pdfUrl = encodeURIComponent(pdfUrl);
-      $wnd.swfobject.embedSWF(fpViewer, "pdfviewercontainer", width, height, "10.0.0", "playerProductInstall.swf",
-        {
-          SwfFile: pdfUrl,
-          Scale: 0.6,
-          ZoomTransition: "easeOut",
-          ZoomTime: 0.5,
-          ZoomInterval: 0.1,
-          FitPageOnLoad: false,
-          FitWidthOnLoad: true,
-          FullScreenAsMaxWindow: false,
-          ProgressiveLoading: true,
-          ViewModeToolsVisible: true,
-          ZoomToolsVisible: true,
-          FullScreenVisible: true,
-          NavToolsVisible: true,
-          CursorToolsVisible: true,
-          SearchToolsVisible: true,
-          localeChain: "en_US"
-        },
-        {
-          quality: "high",
-          bgcolor: "#ffffff",
-          allowscriptaccess: "sameDomain",
-          allowfullscreen: "true"
-        },
-        {
-          id: "FlexPaperViewer",
-          name: "FlexPaperViewer"
-        });
-    }-*/;
-
-	public static native void resizePDFViewerFlexPaper(String width, String height) /*-{
-      obj = $wnd.swfobject.getObjectById('FlexPaperViewer');
-      obj.width = width;
-      obj.height = height;
-    }-*/;
-
 	public static native void resizeEmbededPDF(String width, String height, String pdfId) /*-{
-      obj = $wnd.document.getElementById(pdfId);
-      obj.width = width;
-      obj.height = height;
+		obj = $wnd.document.getElementById(pdfId);
+		// Take in consideration if object exists
+		if (obj != null) {
+			obj.width = width;
+			obj.height = height;
+		}
     }-*/;
 
 	public static native void copyToClipboard(String text) /*-{

src/main/java/com/openkm/frontend/client/widget/properties/EmbeddedPreview.java

@@ -64,7 +64,7 @@ public EmbeddedPreview() {
 	 * show
 	 */
 	public void showEmbedded(String url) {
-		iframe.setUrl(Main.CONTEXT + "/preview/pdfjs/web/viewer.html?" + url);
+		iframe.setUrl(Main.CONTEXT + "/Preview?" + url);
 	}
 
 	/**