// You can specify all the values or you can default the Revision and Build Numbers \r
// by using the '*' as shown below:\r
\r
-[assembly: AssemblyVersion("2.0.6.9")]\r
+[assembly: AssemblyVersion("2.0.7.0")]\r
\r
//\r
// In order to sign your assembly you must specify a key to use. Refer to the \r
[assembly: AssemblyDelaySign(false)]\r
[assembly: AssemblyKeyFile("")]\r
[assembly: AssemblyKeyName("")]\r
-[assembly: AssemblyFileVersion("2.0.6.9")]\r
+[assembly: AssemblyFileVersion("2.0.7.0")]\r
\r
"$type": "UNCSource",\r
"filter": "avi,wav,mxf",\r
"local": {\r
- "address": "file://10.10.1.100/BRAAVOS/READY",\r
+ "address": "file://10.10.1.100/BRAAVOS/PLAYOUT/Video",\r
"userName": "mediacube",\r
"password": "Dn8t4gfHcK98o8hyPgLDhr5SgSji4JCxsfpMJsODikUp3nXgrM0UNCi45lLAK8ZOnmEneO44P9qpJ4QDqhctN6MxZodjJgdZTyoZKmSa+ECzEzLr/wPYNgxVaXrVotEy",\r
"timeout": 1000\r
<None Include="Configuration\-configuration-editor.json">\r
<CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
</None>\r
- <None Include="Configuration\configuration-nle.json">\r
+ <None Include="Configuration\-configuration-nle.json">\r
<CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
</None>\r
- <None Include="Configuration\-configuration-playout-ingest.json">\r
+ <None Include="Configuration\configuration-playout-ingest.json">\r
<CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
</None>\r
<None Include="Configuration\-configuration-tqc-check.json">\r
<None Include="Configuration\-configuration-sxs.json">\r
<CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
</None>\r
- <None Include="Configuration\configuration-studio.json">\r
+ <None Include="Configuration\-configuration-studio.json">\r
<CopyToOutputDirectory>Always</CopyToOutputDirectory>\r
</None>\r
</ItemGroup>\r
// You can specify all the values or you can default the Build and Revision Numbers\r
// by using the '*' as shown below:\r
// [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("2.0.6.9")]\r
-[assembly: AssemblyFileVersion("2.0.6.9")]\r
+[assembly: AssemblyVersion("2.0.7.0")]\r
+[assembly: AssemblyFileVersion("2.0.7.0")]\r
}\r
\r
public Timecode(int frames, float frameRate) {\r
- this.frameRate = frameRate; \r
- Set(frames);\r
+ this.frameRate = frameRate;\r
+ //Set(frames);\r
+ startFrame = frames; \r
+ currentFrame = frames;\r
}\r
\r
public Timecode(Timecode tc) {\r
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;user.commons.log4j2&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;user.jobengine.executors&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;user.jobengine.osgi.commons&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;user.jobengine.osgi.db&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;user.jobengine.osgi.server&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkcharts.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/classes&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/commons-codec-1.10.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/commons-fileupload-1.2.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/commons-io-1.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/commons-logging-1.1.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zcommon.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zel.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zhtml.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_bsh.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_commons-collections.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_elinez.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_eplotz.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_Filters.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_flashchart.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_gmapsz.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jackson-annotations.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jackson-core.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jackson-databind.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jasperreports.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_javassist.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jcommon.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jfreechart.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jsp.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_monitor.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_psz.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_sapphire.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_shchart.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_silvertail.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_timelinez.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_timeplotz.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_zuljsp.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkbind.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkex_r.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkmax.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkplus.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zml.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zsoup.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zul.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zuti.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zweb.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;user.jobengine.osgi.services&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;user.tsm.client&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> </sourceContainers> </sourceLookupDirector> "/>\r
<booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE" value="false"/>\r
<mapAttribute key="org.eclipse.jdt.launching.CONNECT_MAP">\r
-<mapEntry key="hostname" value="10.10.1.29"/>\r
+<mapEntry key="hostname" value="10.10.1.28"/>\r
<mapEntry key="port" value="8888"/>\r
</mapAttribute>\r
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="user.jobengine.osgi.server"/>\r
"parameters": [ {"name": "itemID", "value": 1, "type": "java.lang.Long"} ]\r
},\r
{\r
- "active": true,\r
+ "active": false,\r
"name" : "Teszt folyamat",\r
"template": "fake-noparams.xml",\r
"executeimmediate": false,\r
<launcherArgs>\r
<programArgs>-consoleLog -console 5555\r
</programArgs>\r
- <vmArgs>-Xms512m\r
--Xmx1024m\r
--Dfile.encoding=UTF-8\r
--agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888\r
--Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory\r
-\r
-#System\r
--Djetty.home=/opt/mediacube/configuration/jetty\r
--Dlog4j.configurationFile=/opt/mediacube/configuration/log4j2.xml\r
--Djobengine.jobsteps.root=/opt/mediacube/configuration/executors\r
--Djobengine.jobtemplates.root=/opt/mediacube/configuration/jobtemplates\r
--Djobengine.jobscheduling.config=/opt/mediacube/configuration/scheduledjobs.json\r
-\r
--Dorg.eclipse.epp.logging.aeri.skipReports=true \r
--Declipse.ignoreApp=true \r
--Dosgi.noShutdown=true\r
--Djobengine.loglevel=INFO\r
+ <vmArgs>-Xms512m
+-Xmx1024m
+-Dfile.encoding=UTF-8
+-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888
+-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory
+
+#System
+-Djetty.home=/opt/mediacube/configuration/jetty
+-Dlog4j.configurationFile=/opt/mediacube/configuration/log4j2.xml
+-Djobengine.jobsteps.root=/opt/mediacube/configuration/executors
+-Djobengine.jobtemplates.root=/opt/mediacube/configuration/jobtemplates
+-Djobengine.jobscheduling.config=/opt/mediacube/configuration/scheduledjobs.json
+
+-Dorg.eclipse.epp.logging.aeri.skipReports=true
+-Declipse.ignoreApp=true
+-Dosgi.noShutdown=true
+-Djobengine.loglevel=INFO
-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\r
</vmArgs>\r
<vmArgsLin>#Database
private void copy(RundownArchive rundownArchive) throws Exception {\r
for (StoryArchive storyArchive : rundownArchive.getStoryArchives()) {\r
for (FileArchive fileArchive : storyArchive.getFileArchives()) {\r
- copyFile(fileArchive, rundownArchive, storyArchive);\r
+ try {\r
+ copyFile(fileArchive, rundownArchive, storyArchive);\r
+ } catch (Exception e) {\r
+ logger.error(getMarker(), "A '{}' clip archiválása sikertelen. A rendszer üzenete: {}", fileArchive.getFileName(), e.getMessage());\r
+ }\r
}\r
}\r
}\r
\r
private void copyFile(FileArchive fileArchive, RundownArchive rundownArchive, StoryArchive storyArchive) throws Exception {\r
- String fileName = fileArchive.getFileName();\r
- //TODO file existance\r
- // targetFtp = ((FtpDirectoryLister) RemoteFileHandler.createLister(targetUri)).connect();\r
- // int version = 1;\r
- // while (true) {\r
- // targetFtp.listNames(arg0)\r
- // }\r
- //\r
- // if (targetUri != null)\r
- // targetUri.cleanUp();\r
+ String origFileName = fileArchive.getFileName();\r
+ String fileName = String.format("%s-%s", origFileName, rundownArchive.getItemHouseId());\r
String videoFileName = fileName + MXFEXT;\r
\r
- transferFile(videoFileName);\r
+ transferFile(origFileName + MXFEXT, videoFileName);\r
BasicDBObject metadata = createMetadata(rundownArchive, storyArchive, fileArchive);\r
transferMetadata(videoFileName, metadata);\r
- //targetFtp.changeToParentDirectory();\r
- createSourceKillDateFile(rundownArchive, fileName);\r
-\r
+ createSourceKillDateFile(rundownArchive, origFileName);\r
}\r
\r
private BasicDBObject createMetadata(RundownArchive rundownArchive, StoryArchive storyArchive, FileArchive fileArchive) {\r
}\r
\r
private void createSourceKillDateFile(RundownArchive rundownArchive, String fileName) throws Exception {\r
- //sourceFtp = ((FtpDirectoryLister) RemoteFileHandler.createLister(sourceUri)).connect();\r
+ logger.info("Create killdate/agency for {}", fileName);\r
OutputStream outStream = null;\r
try {\r
- sourceFtp.enterLocalActiveMode();\r
+ sourceFtp = ((FtpDirectoryLister) sourceUri.getLister()).connect();\r
Calendar killDate = CalendarUtils.createCalendar(rundownArchive.getScheduleDate());\r
killDate.add(Calendar.DAY_OF_YEAR, nexioKillDateDays);\r
byte[] killDateFile = EscortFiles.createNEXIOKillDateFile(fileName, killDate.getTime(), null, nexioAgency);\r
} finally {\r
if (outStream != null)\r
outStream.close();\r
- // if (sourceUri != null)\r
- // sourceUri.cleanUp();\r
+ sourceUri.cleanUp();\r
}\r
}\r
\r
return null;\r
}\r
\r
- sourceFtp = ((FtpDirectoryLister) sourceUri.getLister()).connect();\r
- targetFtp = ((FtpDirectoryLister) targetUri.getLister()).connect();\r
processRundowns(rundowns);\r
- if (sourceUri != null)\r
- sourceUri.cleanUp();\r
- if (targetUri != null)\r
- targetUri.cleanUp();\r
return null;\r
}\r
\r
+ // private String getVersionedFileName(String fileName, String extension) throws Exception {\r
+ // String result = fileName;\r
+ // try {\r
+ // targetFtp = ((FtpDirectoryLister) targetUri.getLister()).connect();\r
+ // FTPFile[] listFiles = targetFtp.listFiles();\r
+ // List<String> fileNames = new ArrayList<>();\r
+ // for (FTPFile ftpFile : listFiles) {\r
+ // fileNames.add(ftpFile.getName());\r
+ // }\r
+ // while (fileNames.contains(result + extension)) {\r
+ //\r
+ // }\r
+ //\r
+ // } catch (Exception e) {\r
+ // logger.catching(e);\r
+ // throw e;\r
+ // } finally {\r
+ // targetUri.cleanUp();\r
+ // }\r
+ // return result;\r
+ // }\r
+\r
private FileArchive processMosObject(BasicDBObject rundown, BasicDBObject story, BasicDBObject mosObject) throws Exception {\r
String mosID = mosObject.getString(IOctopusAPI.OBJ_ID);\r
if (MetadataTypeDetector.GuessMetadataType(mosID) != MetadataType.OCTOPUSPLACEHOLDER) {\r
}\r
\r
private void processRundowns(List<DBObject> rundowns) {\r
- db.getCollection(ARCHIVEDRUNDOWNS).drop();\r
+\r
+ //TODO kiveni publikálás előtt\r
+ //db.getCollection(ARCHIVEDRUNDOWNS).drop();\r
List<BasicDBObject> archivedRundowns = queryArchivedRundowns();\r
\r
int index = 1;\r
sourceUri.setPortNumber(nexioPort);\r
sourceUri.setUserName(nexioUserName);\r
sourceUri.setPassword(nexioPassword);\r
+ if (sourceUri == null) {\r
+ logger.error(getMarker(), "A forrás nem elérhető.");\r
+ throw new NullPointerException("Internal error, missing 'sourceUri'.");\r
+ }\r
\r
check(archiveFtp, "archiveFtp");\r
check(archiveUserName, "archiveUserName");\r
targetUri = manager.createStoreUri(new URI(archiveFtp));\r
targetUri.setUserName(archiveUserName);\r
targetUri.setPassword(archivePassword);\r
+ if (targetUri == null) {\r
+ logger.error(getMarker(), "A cél nem elérhető.");\r
+ throw new NullPointerException("Internal error, missing 'targetUri'.");\r
+ }\r
\r
}\r
\r
- private void transferFile(String fileName) throws Exception {\r
+ private void transferFile(String sourceFileName, String targetFileName) throws Exception {\r
int reply = 0;\r
- // sourceFtp = ((FtpDirectoryLister) RemoteFileHandler.createLister(sourceUri)).connect();\r
- // targetFtp = ((FtpDirectoryLister) RemoteFileHandler.createLister(targetUri)).connect();\r
- // if (sourceUri != null)\r
- // sourceUri.cleanUp();\r
- // if (targetUri != null)\r
- // targetUri.cleanUp();\r
-\r
- if (!targetFtp.enterRemotePassiveMode())\r
- throw new Exception("!PASV");\r
+ logger.info("Transfer clip {}", sourceFileName);\r
+ try {\r
+ sourceFtp = ((FtpDirectoryLister) sourceUri.getLister()).connect();\r
+ targetFtp = ((FtpDirectoryLister) targetUri.getLister()).connect();\r
+ if (!targetFtp.enterRemotePassiveMode())\r
+ throw new Exception("!PASV");\r
\r
- reply = sourceFtp.port(InetAddress.getByName(targetFtp.getPassiveHost()), targetFtp.getPassivePort());\r
- if (!FTPReply.isPositiveCompletion(reply))\r
- throw new Exception("!PORT");\r
+ reply = sourceFtp.port(InetAddress.getByName(targetFtp.getPassiveHost()), targetFtp.getPassivePort());\r
+ if (!FTPReply.isPositiveCompletion(reply))\r
+ throw new Exception("PORT parancs válasza: " + sourceFtp.getReplyString());\r
\r
- if (!sourceFtp.setFileType(FTP.BINARY_FILE_TYPE))\r
- throw new Exception("!SOURCE TYPE");\r
+ if (!sourceFtp.setFileType(FTP.BINARY_FILE_TYPE))\r
+ throw new Exception("!SOURCE TYPE");\r
\r
- sourceFtp.retr(fileName);\r
+ reply = sourceFtp.retr(sourceFileName);\r
+ if (!FTPReply.isPositivePreliminary(reply))\r
+ throw new Exception("RETR parancs válasza: " + sourceFtp.getReplyString());\r
\r
- if (!targetFtp.setFileType(FTP.BINARY_FILE_TYPE))\r
- throw new Exception("!TARGET TYPE");\r
+ if (!targetFtp.setFileType(FTP.BINARY_FILE_TYPE))\r
+ throw new Exception("!TARGET TYPE");\r
\r
- targetFtp.stor(fileName);\r
+ reply = targetFtp.stor(targetFileName);\r
+ if (!FTPReply.isPositivePreliminary(reply))\r
+ throw new Exception("STOR parancs válasza: " + sourceFtp.getReplyString());\r
\r
- while (true) {\r
- reply = sourceFtp.stat();\r
- if (!FTPReply.isPositiveCompletion(reply))\r
- throw new Exception("!STAT");\r
+ while (true) {\r
+ reply = sourceFtp.stat();\r
+ if (!FTPReply.isPositiveCompletion(reply))\r
+ throw new Exception("STAT parancs válasza: " + sourceFtp.getReplyString());\r
\r
- //String replyText = sourceFtp.getReplyString();\r
- //logger.info("Status: {}", replyText);\r
- if (reply == 226) {\r
- break;\r
+ logger.info("Status: {}", sourceFtp.getReplyString());\r
+ if (reply == 226) {\r
+ break;\r
+ }\r
+ Thread.sleep(1000);\r
}\r
- Thread.sleep(100);\r
+ } catch (Exception e) {\r
+ logger.catching(e);\r
+ throw e;\r
+ } finally {\r
+ sourceUri.cleanUp();\r
+ targetUri.cleanUp();\r
}\r
\r
- // if (sourceUri != null)\r
- // sourceUri.cleanUp();\r
- // if (targetUri != null)\r
- // targetUri.cleanUp();\r
-\r
}\r
\r
private void transferMetadata(String fileName, BasicDBObject metadata) throws Exception {\r
+ logger.info("Transfer metadata {}", fileName);\r
OutputStream outStream = null;\r
- if (targetUri != null)\r
- targetUri.cleanUp();\r
- targetFtp = ((FtpDirectoryLister) targetUri.getLister()).connect();\r
try {\r
+ targetFtp = ((FtpDirectoryLister) targetUri.getLister()).connect();\r
if (!targetFtp.changeWorkingDirectory(EscortFiles.STATUSFOLDER)) {\r
targetFtp.makeDirectory(EscortFiles.STATUSFOLDER);\r
if (!targetFtp.changeWorkingDirectory(EscortFiles.STATUSFOLDER))\r
}\r
outStream.write(metadata.toString().getBytes(UTF_8));\r
outStream.flush();\r
- targetFtp.changeToParentDirectory();\r
+ //targetFtp.changeToParentDirectory();\r
} catch (Exception e) {\r
logger.catching(e);\r
throw e;\r
} finally {\r
if (outStream != null)\r
outStream.close();\r
- // if (targetUri != null)\r
- // targetUri.cleanUp();\r
+ targetUri.cleanUp();\r
}\r
}\r
\r
import java.util.HashSet;\r
import java.util.List;\r
import java.util.Map;\r
+import java.util.Set;\r
import java.util.concurrent.ConcurrentHashMap;\r
\r
import javax.swing.event.EventListenerList;\r
return concatParentsToStoryFolder(parent, newName);\r
}\r
\r
+ private void deleteDiff(Set<Long> oldIDs, Set<Long> newIDs, String collectionName) {\r
+ if (oldIDs == null || oldIDs.size() == 0)\r
+ return;\r
+ if (newIDs != null && newIDs.size() > 0)\r
+ oldIDs.removeAll(newIDs);\r
+ DBCollection collection = db.getCollection(collectionName);\r
+ for (long id : oldIDs) {\r
+ logger.info("Deleting {} from {}", id, collectionName);\r
+ collection.remove(new BasicDBObject(IOctopusAPI.ID, id));\r
+ }\r
+ }\r
+\r
private void deleteOrphanRundowns() {\r
try {\r
DBCollection collection = db.getCollection(RUNDOWN_COLLECTION);\r
processRundowns(rundowns);\r
processStoryFolders(storyFolders);\r
\r
+ deleteDiff(currentRundowns.keySet(), storyRundowns.keySet(), RUNDOWN_COLLECTION);\r
+ deleteDiff(currentFolder.keySet(), storyStoryFolders.keySet(), RUNDOWN_COLLECTION);\r
+ deleteDiff(currentStories.keySet(), storyIDs, RUNDOWN_COLLECTION);\r
// deleteOrphanRundowns();\r
// deleteOrphanStoryFolders();\r
// deleteOrphanStories();\r
@ECHO OFF\r
\r
SET REMOTE_HOST=10.10.1.29\r
-SET REMOTE_LOCATION=/opt/mediacube/configuration/executors\r
+SET REMOTE_LOCATION=/opt/test-mediacube/configuration/executors\r
SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4\r
SET REMOTE_SERVER_ADDRESS=scp://root:password@%REMOTE_HOST%\r
SET LOCAL_STEPS_LOCATION=bin/user/jobengine/server/steps\r
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>\r
</listAttribute>\r
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/user.jobengine.executors/deploy-steps-to-bsh-bkup.bat}"/>\r
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/user.jobengine.executors/test-deploy-steps-to-bsh-bkup.bat}"/>\r
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/user.jobengine.executors}"/>\r
</launchConfiguration>\r
--- /dev/null
+@ECHO OFF\r
+\r
+SET REMOTE_HOST=10.10.1.28\r
+SET REMOTE_LOCATION=/opt/test-mediacube/configuration/executors\r
+SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4\r
+SET REMOTE_SERVER_ADDRESS=scp://root:password@%REMOTE_HOST%\r
+SET LOCAL_STEPS_LOCATION=bin/user/jobengine/server/steps\r
+SET LOCAL_CONFIG_LOCATION=config\r
+ \r
+ ECHO *** Begin deploy steps to server %REMOTE_HOST% ***\r
+ ECHO --- Deploying\r
+ \r
+ WinSCP.com /command ^\r
+ "open %REMOTE_SERVER_ADDRESS% -hostkey=""%REMOTE_SERVER_HOSTKEY%"" -timeout=60" ^\r
+ "cd %REMOTE_LOCATION%" ^\r
+ "lcd %LOCAL_STEPS_LOCATION%" ^\r
+ "synchronize remote" ^\r
+ "lcd ..\" ^\r
+ "lcd ..\" ^\r
+ "lcd ..\" ^\r
+ "lcd ..\" ^\r
+ "lcd ..\" ^\r
+ "lcd %LOCAL_CONFIG_LOCATION%" ^\r
+ "synchronize remote -filemask=config.xml" ^\r
+ "cd .." ^\r
+ "synchronize remote -filemask=scheduledjobs.json" ^\r
+ "exit"\r
+ \r
+ ECHO *** Completed ***\r
+@ECHO ON\r
+\r
+ \r
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">\r
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
+<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>\r
+</listAttribute>\r
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/user.jobengine.executors/test-deploy-steps-to-bsh-main.bat}"/>\r
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/user.jobengine.executors}"/>\r
+</launchConfiguration>\r
return getMediaFiles() == null ? 0 : getMediaFiles().size();
}
+ public String getMediaFilesName() {
+ return (getMediaFiles() == null || getMediaFiles().size() == 0) ? "" : getMediaFiles().get(0).getHouseId();
+ }
+
public byte[] getPoster() {
return poster;
}
<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.9</label>\r
+ <label style="color:#e3e3e3;font-size:20px;font-weight:bold">MediaCube </label><label style="color:#e3e3e3;font-size:10px;font-weight:bold">2.2</label> \r
</div>\r
</west>\r
<center border="0">\r
<listhead sizable="true">\r
<listheader label="ID" hflex="1" align="left" />\r
<listheader label="Cím" hflex="6" align="left" />\r
+ <listheader label="Fájlnév" hflex="6" align="left" />\r
<listheader label="Kópiák" hflex="1" align="left" />\r
</listhead>\r
<template name="model">\r
<listitem>\r
<listcell label="@load(each.houseId)" />\r
<listcell label="@load(each.title)" />\r
+ <listcell label="@load(each.mediaFilesName)" />\r
<listcell label="@load(each.mediaFilesCount)" />\r
</listitem>\r
</template>\r
@Consumes({ MediaType.APPLICATION_JSON })
@Produces({ MediaType.APPLICATION_JSON })
public Response getRundowns(@PathParam("scheduledDate") String scheduledDate) {
- logger.info("Entry {}", scheduledDate);
+ logger.trace("Entry {}", scheduledDate);
Response result = null;
try {
Date calendar = null;
}
@GET
- @Path("/storyFoldersByPlaceHolderID/{id}")
+ @Path("/storyFoldersByParentStoryID/{id}")
@Consumes({ MediaType.APPLICATION_JSON })
@Produces({ MediaType.APPLICATION_JSON })
- public Response getStoryFoldersByPlaceHolderID(@PathParam(ID) String id) {
+ public Response getStoryFoldersByParentStoryID(@PathParam(ID) String id) {
logger.trace("Entry");
Response result = null;
try {
- List<DBObject> storyFolders = octopusService.getStoryFoldersByPlaceHolderID(id);
+ List<DBObject> storyFolders = octopusService.getStoryFoldersByParentStoryID(id);
result = Response.ok(storyFolders).build();
} catch (Exception e) {
result = createErrorResponse(e);
}
@GET
- @Path("/storyFoldersByParentStoryID/{id}")
+ @Path("/storyFoldersByPlaceHolderID/{id}")
@Consumes({ MediaType.APPLICATION_JSON })
@Produces({ MediaType.APPLICATION_JSON })
- public Response getStoryFoldersByParentStoryID(@PathParam(ID) String id) {
+ public Response getStoryFoldersByPlaceHolderID(@PathParam(ID) String id) {
logger.trace("Entry");
Response result = null;
try {
- List<DBObject> storyFolders = octopusService.getStoryFoldersByParentStoryID(id);
+ List<DBObject> storyFolders = octopusService.getStoryFoldersByPlaceHolderID(id);
result = Response.ok(storyFolders).build();
} catch (Exception e) {
result = createErrorResponse(e);
https://git.useribm.hu / mediacube.git / commitdiff