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

diff --git a/client/Maestro/Sources/NexioRESTSource.cs b/client/Maestro/Sources/NexioRESTSource.cs
index 2bed6e4395d34ec43b2073f631a52e6753c3178f..d57f3bb517281b7d061749d185ddd247094a2060 100644 (file)
--- a/client/Maestro/Sources/NexioRESTSource.cs
+++ b/client/Maestro/Sources/NexioRESTSource.cs
@@ -224,8 +224,8 @@ namespace Maestro.Sources {
                 item.ID = token[ID].ToString();\r
                 item.Name = token[LONGNAMEID].ToString() + MXFEXT;\r
                 item.Agency = token[EXTAGENCY]?.ToString();\r
-                item.Created = DateTime.Parse(token[RECORDDATE]?.ToString());\r
-                item.Modified = DateTime.Parse(token[MODIFIED]?.ToString());\r
+                //item.Created = token.Value<DateTime>(RECORDDATE);\r
+                item.Modified = token.Value<DateTime>(MODIFIED);\r
                 int d = token.Value<int>(DURATION);\r
                 item.Duration = new Timecode(d).ToString();\r
             }\r

diff --git a/server/-configuration/run-mediacube-server.launch b/server/-configuration/run-mediacube-server.launch
index fd9c1e1d54aa38211dd278212d0bdaab03d80285..cae3cc97645e70d18ac0ba33ab49c8a1e4c58aa2 100644 (file)
--- a/server/-configuration/run-mediacube-server.launch
+++ b/server/-configuration/run-mediacube-server.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="-Dorg.eclipse.equinox.http.jetty.http.port=8080&#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.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.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/user/jobengine/server/steps&quot;&#13;&#10;-Djobengine.transcoder.source=c:\_Movie\hires\&#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;-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_v4.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Dnexio.host=10.10.1.55&#13;&#10;-Dnexio.useMOSGateway=true"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.http.jetty.http.port=8080&#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/user/jobengine/server/steps&quot;&#13;&#10;-Djobengine.transcoder.source=c:\_Movie\hires\&#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;-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_v4.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;-Dnexio.useMOSGateway=true&#13;&#10;-Dnexio.host=10.10.1.55"/>\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.auth0.java-jwt@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.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,com.google.guava@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.el.javax.el@default:default,commons-logging@default:default,javassist@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.servlet.jsp-api@default:default,javax.validation.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.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@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.jasper.glassfish@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.jdt.core.compiler.batch@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jsp@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,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.jvnet.mimepull@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.reflections@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r

diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product
index d0b99b7e06e4346ad7983743381d10d63bad5316..02a525951170efba74eecd32274f3d9247146994 100644 (file)
--- a/server/-product/mediacube.product
+++ b/server/-product/mediacube.product
@@ -48,6 +48,10 @@
 -Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC.zenium\r
 \r
 #Nexio\r
+-Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;\r
+-Djobengine.nexio.db.user=sa\r
+-Djobengine.nexio.db.password=resolve\r
+-Dnexio.useMOSGateway=true\r
 -Dnexio.host=10.10.1.55\r
       </vmArgsLin>\r
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts\r

diff --git a/server/user.jobengine.executors/config/scheduledjobs.json b/server/user.jobengine.executors/config/scheduledjobs.json
index 9578686786bfb55052e71fa8aab6039c258efd84..df57e52632881c35f208dababc37c0b3c079b09c 100644 (file)
--- a/server/user.jobengine.executors/config/scheduledjobs.json
+++ b/server/user.jobengine.executors/config/scheduledjobs.json
@@ -78,18 +78,8 @@
       ]\r
        },      \r
        {\r
-      "active": false,\r
-         "name" : "OCTOPUS adatok szinkronizálása",\r
-      "template": "sync-octopus.xml",\r
-      "executeimmediate": true,\r
-      "cronexpression": "0/20 * * * * ?",\r
-      "parameters": [\r
-       {"name": "forceFull", "value": false, "type": "java.lang.Boolean"}\r
-      ]\r
-       },      \r
-       {\r
       "active": true,\r
-         "name" : "OCTOPUS adatok teljes szinkronizálása",\r
+         "name" : "OCTOPUS adatok szinkronizálása",\r
       "template": "sync-octopus.xml",\r
       "executeimmediate": false,\r
       "cronexpression": "0/30 * * * * ?",\r

diff --git a/server/user.jobengine.osgi.commons/src/user/commons/nexio/NexioClipEventDispatcher.java b/server/user.jobengine.osgi.commons/src/user/commons/nexio/NexioClipEventDispatcher.java
index 86c3b18f44160c95f56a97d12284840c3ee2945f..007b6f6eac56140fce5703d4f50c2f84983c9413 100644 (file)
--- a/server/user.jobengine.osgi.commons/src/user/commons/nexio/NexioClipEventDispatcher.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/nexio/NexioClipEventDispatcher.java
@@ -287,14 +287,14 @@ public class NexioClipEventDispatcher implements ClipEventListener {
                }\r
 \r
                /*\r
-               \r
+\r
                                int c = connection.read(buffer, 0, 2);\r
                                //2 bytes hosszan az idokozben hozzaadott id-k szamossaga\r
                                if (c < 2) {\r
                                        throw new ProtocolException("c, 2, 2");\r
                                }\r
                                //MSB, LSB\r
-               \r
+\r
                                return nofIds;\r
                        */\r
                return ret;\r
@@ -351,11 +351,11 @@ public class NexioClipEventDispatcher implements ClipEventListener {
                String xid = clip.getString(LONGNAMEID);\r
                String id = clip.getString(ID);\r
 \r
-               BasicDBObject clipForXID = (BasicDBObject) collection.findOne(new BasicDBObject(LONGNAMEID, xid));\r
+               BasicDBObject clipForName = (BasicDBObject) collection.findOne(new BasicDBObject(LONGNAMEID, xid));\r
                BasicDBObject clipForID = (BasicDBObject) collection.findOne(new BasicDBObject(ID, id));\r
 \r
-               //rename-nel a clipForXID null lesz de a clipForID nem ezert nem kell create\r
-               if (clipForXID == null && clipForID == null) {\r
+               //rename-nel a clipForName null lesz de a clipForID nem ezert nem kell create\r
+               if (clipForName == null && clipForID == null) {\r
                        collection.save(clip);\r
                        onCreate(clip);\r
                } else {\r
@@ -364,8 +364,9 @@ public class NexioClipEventDispatcher implements ClipEventListener {
                                if (!clip.equals(clipForID)) {\r
                                        collection.save(clip);\r
                                        onUpdate(clip);\r
-                               } else\r
-                                       logger.warn("Not found {}, XID based clip is {}", id, clipForXID.toPrettyString(null));\r
+                               }\r
+                       } else {\r
+                               logger.error("Not found {}, XID based clip is {}", id, clipForName.toPrettyString(null));\r
                        }\r
                }\r
        }\r

diff --git a/server/user.jobengine.osgi.commons/src/user/commons/nexio/NexioDataMiner.java b/server/user.jobengine.osgi.commons/src/user/commons/nexio/NexioDataMiner.java
index b6c4a6b85d6a6651c20daf04a481b306d1b026fe..55d4dd28c8db3a35d1003132bb3c10f07881f2e0 100644 (file)
--- a/server/user.jobengine.osgi.commons/src/user/commons/nexio/NexioDataMiner.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/nexio/NexioDataMiner.java
@@ -279,7 +279,7 @@ public class NexioDataMiner implements Runnable, INexioChangeListener {
        }\r
 \r
        private void transferClips(Connection con, DBCollection collection) {\r
-               logger.info("Transfering clips from NEXIO MOS Gateway {}", con.toString());\r
+               logger.info("Transfering clips from NEXIO MOS Gateway");\r
                String querySQL = "SELECT cd.id, c.longnameid, c.recorddate, c.extagency, c.killdate, cd.modifiedtimestamp, cd.duration, cd.videoformat, cd.videobitrate FROM ClipsTbl c LEFT OUTER JOIN ClipsDomainsTbl cd ON (cd.longnameid = c.longnameid)";\r
                logger.debug("Executing statement: {}", querySQL);\r
                int count = 0;\r
@@ -293,7 +293,7 @@ public class NexioDataMiner implements Runnable, INexioChangeListener {
                                clip.put(VIDEOFORMAT, rs.getString(VIDEOFORMAT));\r
                                clip.put(DURATION, rs.getLong(DURATION));\r
                                clip.put(MODIFIEDTIMESTAMP, rs.getTimestamp(MODIFIEDTIMESTAMP));\r
-                               clip.put(RECORDDATE, rs.getTimestamp(RECORDDATE).getTime());\r
+                               clip.put(RECORDDATE, rs.getTimestamp(RECORDDATE));\r
                                clip.put(KILLDATE, rs.getTimestamp(KILLDATE));\r
                                collection.insert(clip);\r
                                count++;\r

diff --git a/server/user.jobengine.osgi.commons/src/user/commons/octopus/IOctopusAPI.java b/server/user.jobengine.osgi.commons/src/user/commons/octopus/IOctopusAPI.java
index d8a8baec3ee54817e67545f7eafb5c6f40f553bb..69d3e8d4afbfde6487f8d62835cededcc355fad0 100644 (file)
--- a/server/user.jobengine.osgi.commons/src/user/commons/octopus/IOctopusAPI.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/octopus/IOctopusAPI.java
@@ -12,7 +12,7 @@ public interface IOctopusAPI {
        static final String TIME_COLLECTION_NAME = "time";\r
        static final String LASTUPDATE_TIME = "lastUpdateTime";\r
        static final String NEXIO_MOS = "NEXIO.MOS";\r
-       static final String PARENT_STORY_ID = "ParentStoryId";\r
+       static final String PARENT_STORY_ID = "parentStoryId";\r
        static final String VALUE = "value";\r
        static final String CUSTOM_COLUMNS = "customColumns";\r
        static final String MOS_ID = "mosId";\r

diff --git a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java
index 87a3fcb0ce95e8c5c433ea8fb017dd3ccadad288..3f57fb48e91b20cb828012f54b4490d478567444 100644 (file)
--- a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java
@@ -885,7 +885,7 @@ public class OctopusDataMiner implements Runnable {
                        }\r
 \r
                        if (save) {\r
-                               logger.info("Saving {}", newItem.toPrettyString(null));\r
+                               logger.info("Saving to {} item {}", oldCollectionName, id);\r
                                oldCollection.save(newItem);\r
                        }\r
                }\r

diff --git a/server/user.jobengine.osgi.server/pages/index.zul b/server/user.jobengine.osgi.server/pages/index.zul
index 911d00823a5db88e9db660f48f51e0386e5ce8fd..853cce3935b4424ea1c727a63752acc6887f8988 100644 (file)
--- a/server/user.jobengine.osgi.server/pages/index.zul
+++ b/server/user.jobengine.osgi.server/pages/index.zul
@@ -57,7 +57,7 @@
                                                                <image src="/img/mediacube_logo_v2_50x50.png">\r
 <!--                                                           <custom-attributes org.zkoss.zul.image.preload="true" /> -->\r
                                                                </image>\r
-                                                               <label style="color:#e3e3e3;font-size:20px;font-weight:bold">MediaCube v2.1.5.3</label>\r
+                                                               <label style="color:#e3e3e3;font-size:20px;font-weight:bold">MediaCube v2.1.6</label>\r
                                                        </div>\r
                                                </west>\r
                                                <center border="0">\r