git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/-configuration/run-mediacube-server-user.launch b/server/-configuration/run-mediacube-server-user.launch
index 8fb202ba1ba8b4c388f39a773085fc4d4fb9c634..5192ce74db8bd6959be905ace1ab49f835bff751 100644 (file)
--- a/server/-configuration/run-mediacube-server-user.launch
+++ b/server/-configuration/run-mediacube-server-user.launch
@@ -19,7 +19,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/config&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.228.198.1:50000/mediaarc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=password&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:}/-configuration/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Dorg.eclipse.jetty.webapp.basetempdir=c:\temp\jetty&#13;&#10;-Djava.io.tmpdir=c:\temp\jetty&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.11/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=password&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;&#13;&#10;-Djobengine.nexio.db.user=sa&#13;&#10;-Djobengine.nexio.db.password=resolve&#13;&#10;-Djobengine.planair.db.url=jdbc:sqlserver://10.10.1.45;databaseName=PA_Echo;&#13;&#10;-Djobengine.planair.db.user=MAM&#13;&#10;-Djobengine.planair.db.password=Echotv.hu&#13;&#10;-Dnexio.host=192.168.0.12&#13;&#10;-Djobengine.nexio.name=testnexioclips&#13;&#10;-Dnexio.useMOSGateway=false&#13;&#10;-Dnexio.disable=true&#13;&#10;-Djobengine.octopus.rundowns.name=rundowns181026&#13;&#10;-Djobengine.octopus.storyfolders.name=storyfolders181026&#13;&#10;-Djobengine.octopus.stories.name=stories181026&#13;&#10;-Dmediacube.auth.location=&quot;${workspace_loc}/-configuration/mediacube-auth.properties&quot;&#13;&#10;-Djobengine.maestro.config=&quot;${workspace_loc}/-configuration/maestro.json&quot;&#13;&#10;-Djobengine.mediacube.config=&quot;${workspace_loc}/-configuration/mediacube.json&quot;"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/config&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.228.198.1:50000/mediaarc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=password&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:}/-configuration/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Dorg.eclipse.jetty.webapp.basetempdir=c:\temp\jetty&#13;&#10;-Djava.io.tmpdir=c:\temp\jetty&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.11/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=password&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;&#13;&#10;-Djobengine.nexio.db.user=sa&#13;&#10;-Djobengine.nexio.db.password=resolve&#13;&#10;-Djobengine.planair.db.url=jdbc:sqlserver://10.10.1.45;databaseName=PA_Echo;&#13;&#10;-Djobengine.planair.db.user=MAM&#13;&#10;-Djobengine.planair.db.password=Echotv.hu&#13;&#10;-Dnexio.host=192.168.0.12&#13;&#10;-Djobengine.nexio.name=testnexioclips&#13;&#10;-Dnexio.useMOSGateway=false&#13;&#10;-Dnexio.disable=true&#13;&#10;-Djobengine.octopus.rundowns.name=rundowns181026&#13;&#10;-Djobengine.octopus.storyfolders.name=storyfolders181026&#13;&#10;-Djobengine.octopus.stories.name=stories181026&#13;&#10;-Djobengine.maestro.config=&quot;${workspace_loc}/-configuration/maestro.json&quot;&#13;&#10;-Djobengine.mediacube.config=&quot;${workspace_loc}/-configuration/mediacube.json&quot;&#13;&#10;-Dgui.statistics.disable=true&#13;&#10;-Dgui.help.disable=true&#13;&#10;-Dgui.editor.disable=true"/>\r
 <stringAttribute key="pde.version" value="3.3"/>\r
 <booleanAttribute key="show_selected_only" value="false"/>\r
 <stringAttribute key="target_bundles" value="cglib@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,humble.video.noarch@default:default,humble.video.windows@default:default,javax.annotation-api@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.ws.rs-api@default:default,jcifs@default:default,joda-time@default:default,org.apache.aries.spifly.dynamic.bundle@default:default,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.logging.log4j.api@1:true,org.apache.logging.log4j.core@default:default,org.apache.logging.log4j.slf4j-impl@default:default,org.apache.servicemix.bundles.quartz@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.schemas@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jboss.resteasy.client@default:default,org.jboss.resteasy.jaxrs@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.junit@default:default,org.mybatis.mybatis@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r

diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/IMediaFinder.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/IMediaFinder.java
new file mode 100644 (file)
index 0000000..f98d480
--- /dev/null
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/IMediaFinder.java
@@ -0,0 +1,9 @@
+package user.jobengine.db;\r
+\r
+import java.util.List;\r
+\r
+public interface IMediaFinder {\r
+\r
+       SearchResult<ArchivedMedia> search(String criteria, List<String> searchFilters, String orderBy, boolean orderAscending, int fromResult, int toResult);\r
+\r
+}\r

diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
index 6d4ae6894298966003c2a23314cb0c7d750dcd13..809ff5cd8903ed54c877416aac3e184b65717244 100644 (file)
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
@@ -70,11 +70,18 @@ public class ItemManager extends MemoryCache implements IItemManager {
        String dbPassword = null;\r
 \r
        private SignalServer signalServer;\r
+       private MediaFinder finder;\r
 \r
        public ItemManager() {\r
                initializeItemManager(signalServer);\r
                connect();\r
-               // logger.info("ItemManager hasn't SignalServer reference.");\r
+\r
+               //TODO mediafinder lokalis valtozo helyett private field.\r
+               //System.getProperty("jobengine.mediafinder.external") == true\r
+               //System.getProperty("jobengine.mediafinder.external.url")\r
+\r
+               finder = new MediaFinder(this);\r
+\r
        }\r
 \r
        // public ItemManager(SignalServer signalServer) {\r
@@ -980,7 +987,6 @@ public class ItemManager extends MemoryCache implements IItemManager {
                        int toResult) {\r
                traceIn();\r
                SearchResult<ArchivedMedia> result = null;\r
-               MediaFinder finder = new MediaFinder(this);\r
                result = finder.search(criteria, searchFilters, orderBy, orderAscending, fromResult, toResult);\r
                traceOut();\r
                return result;\r

diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/LuceneMediaFinder.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/LuceneMediaFinder.java
new file mode 100644 (file)
index 0000000..3ff8c1b
--- /dev/null
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/LuceneMediaFinder.java
@@ -0,0 +1,14 @@
+package user.jobengine.db;\r
+\r
+import java.util.List;\r
+\r
+public class LuceneMediaFinder implements IMediaFinder {\r
+\r
+       @Override\r
+       public SearchResult<ArchivedMedia> search(String criteria, List<String> searchFilters, String orderBy, boolean orderAscending, int fromResult,\r
+                       int toResult) {\r
+               // TODO Auto-generated method stub\r
+               return null;\r
+       }\r
+\r
+}\r

diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFinder.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFinder.java
index 4f7fb5aefdb2339663dee2ea8c58ab77ba01529c..b756290b82fa56c1df5e77743e98261f6328bdc0 100644 (file)
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFinder.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFinder.java
@@ -12,7 +12,7 @@ import org.apache.logging.log4j.Logger;
 \r
 import sqlj.runtime.ref.DefaultContext;\r
 \r
-public class MediaFinder {\r
+public class MediaFinder implements IMediaFinder {\r
        private static final Logger logger = LogManager.getLogger();\r
        private ItemManager manager = null;\r
 \r
@@ -108,6 +108,7 @@ public class MediaFinder {
                return result;\r
        }\r
 \r
+       @Override\r
        public SearchResult<ArchivedMedia> search(String criteria, List<String> searchFilters, String orderBy, boolean orderAscending, int fromResult,\r
                        int toResult) {\r
                SearchResult<ArchivedMedia> result = new SearchResult<>();\r

diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index 0f4feb46df6035451b4fc47600510becdc88214e..ee183790457604ba65d9746d7811555fd522fdae 100644 (file)
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -35,10 +35,11 @@
                        if (src != null) {\r
                                player.src({type: 'video/mp4', src: src});\r
                        }else{\r
+                               //player.poster("/img/mediacube_logo_v2_50x50.png");\r
                                player.src({type: 'image/png', src: "/img/mediacube_logo_v2_50x50.png"});\r
                        }\r
                }       \r
-               \r
+               setSource(null);\r
                function pushTcIn() {\r
                        var current = player.currentTime();\r
                        console.log("pushTcIn", current);\r
@@ -290,7 +291,7 @@
                                <borderlayout height="100%" width="100%">\r
                                        <north border="none" size="60%" splittable="true" minsize="250" collapsible="true">\r
                                                <div align="center" height="100%" width="100%">\r
-                                                       <h:video id="myVideoDiv" class="video-js vjs-default-skin vjs-big-play-centered">\r
+                                                       <h:video id="myVideoDiv" class="video-js vjs-default-skin vjs-big-play-centered" style="width: 100%;height: 100%">\r
                                                        </h:video>\r
                                                        <div id="videoListener" onTcOut="@command('onTcOut')" onTcIn="@command('onTcIn')" />\r
 \r

diff --git a/server/user.jobengine.osgi.server/resources/i3-label_hu.properties b/server/user.jobengine.osgi.server/resources/i3-label_hu.properties
index 28800bf71b0e32a9ee758e1cf8ade031ea2ad67e..48988ce2d57e6517f831c37a2e5b5211c85aeb25 100644 (file)
--- a/server/user.jobengine.osgi.server/resources/i3-label_hu.properties
+++ b/server/user.jobengine.osgi.server/resources/i3-label_hu.properties
@@ -1,5 +1,5 @@
-version=2.4.4\r
-footer=2016-2018 © Copyright User Rendszerház Kft.\r
+version=2.4.5\r
+footer=2016-2019 © Copyright User Rendszerház Kft.\r
 \r
 login_info=Információ\r
 login_dialogtitle=Bejelentkezés\r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
index 6af45af219482356aa5a44a4c6c6537301edd80d..99dbdea93fd67693a52fc970b168735d93ba027f 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
@@ -64,7 +64,6 @@ public class SearchModel extends AsyncBaseModel {
        private static final String ARG = "arg";\r
        private static final String MEDIA_ID = "showMediaID";\r
        private static final Logger logger = LogManager.getLogger();\r
-       private static final String PAGES_MEDIAPLAYER = "/pages/mediaplayer.jsp?mediaurl=";\r
        private static MediaCubeConfig mediaCubeConfig = SessionUtil.getMediaCubeConfig();\r
        private List<TypeFilter> topTypeFilters;\r
        private List<TypeFilter> bottomTypeFilters;\r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/TypeFilter.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/TypeFilter.java
index 3bfd3b0d07164541eace4e8f722897fb61f37fdf..1ee78d3eb3b1e1d2b8a3a33eff2f2285535e57e6 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/TypeFilter.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/TypeFilter.java
@@ -16,7 +16,7 @@ public class TypeFilter {
        private boolean checked;\r
 \r
        public TypeFilter() {\r
-\r
+               checked = true;\r
        }\r
 \r
        TypeFilter(String name, String color, String icon) {\r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java
index 1e8ae0567b215a5796b35defac2d771e77a19272..d0ed1f04a839a6cebabfd84ce3a217348eff3f60 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java
@@ -50,10 +50,18 @@ public class SessionUtil {
        public static final String GUI_STAT_DISABLE = "gui.statistics.disable";\r
        public static final String GUI_HELP_DISABLE = "gui.help.disable";\r
        public static final String GUI_EDITOR_DISABLE = "gui.editor.disable";\r
-       private static MediaCubeConfig mediaCubeConfig = new MediaCubeConfig();\r
+       private static MediaCubeConfig mediaCubeConfig;\r
+\r
+       static {\r
+               try {\r
+                       mediaCubeConfig = JSONConfig.read("jobengine.mediacube.config", MediaCubeConfig.class);\r
+               } catch (Exception e) {\r
+                       logger.error("Critical error", e);\r
+               }\r
+       }\r
 \r
        public static boolean authenticate(String account, String password) {\r
-               Properties cfg = getConfiguration();\r
+               //Properties cfg = getConfiguration();\r
                // MediaCubeConfig mediaCubeConfig = getMediaCubeConfig();\r
                LocalUserHandler localUserHandler = new LocalUserHandler(account, password, mediaCubeConfig.getAuthentication());\r
                UserPrincipal userPrincipal = localUserHandler.getUserPrincipal();\r
@@ -247,15 +255,7 @@ public class SessionUtil {
        }\r
 \r
        public static boolean isAuthenticationEnabled() {\r
-               boolean result = false;\r
-               try {\r
-                       Properties cfg = getConfiguration();\r
-                       result = Boolean.parseBoolean(cfg.getProperty(AUTH_ENABLED, "false"));\r
-                       if (!result)\r
-                               setAttribute(USERPRINCIPAL, new UserPrincipal("anonymous", true, true, true));\r
-               } finally {\r
-               }\r
-               return result;\r
+               return mediaCubeConfig.getAuthentication().isAuthEnabled();\r
        }\r
 \r
        static public boolean isEditor() {\r