git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Thu, 12 Apr 2018 14:33:43 +0000 (14:33 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Thu, 12 Apr 2018 14:33:43 +0000 (14:33 +0000)
17 files changed:
server/-configuration/debug-mediacube-main-8888.launch [new file with mode: 0644]
server/-configuration/scheduledjobs.json
server/-configuration/test-debug-mediacube-bkup-9999.launch [moved from server/-configuration/debug-mediacube-bkup-9999.launch with 100% similarity]
server/-configuration/test-debug-mediacube-main-9999.launch [moved from server/-configuration/debug-mediacube-main-9999.launch with 100% similarity]
server/user.jobengine.executors/deploy-steps-to-bsh-bkup2.launch [new file with mode: 0644]
server/user.jobengine.executors/deploy-steps-to-bsh-main.bat [new file with mode: 0644]
server/user.jobengine.executors/deploy-steps-to-bsh-main.launch [new file with mode: 0644]
server/user.jobengine.executors/jobtemplates/archive-ondemand.xml
server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveListBuilderStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveMaterialSubmitStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/ImportStatisticsStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataTransformStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeSELENIOStep.java
server/user.jobengine.osgi.server/WEB-INF/web.xml
server/user.jobengine.osgi.server/WEB-INF/zk.xml
server/user.jobengine.osgi.server/src/user/jobengine/zk/model/NewsHistoryModel.java

diff --git a/server/-configuration/debug-mediacube-main-8888.launch b/server/-configuration/debug-mediacube-main-8888.launch
new file mode 100644 (file)
index 0000000..e7463db
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<launchConfiguration type="org.eclipse.jdt.launching.remoteJavaApplication">\r
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">\r
+<listEntry value="/user.jobengine.osgi.server"/>\r
+</listAttribute>\r
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">\r
+<listEntry value="4"/>\r
+</listAttribute>\r
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>\r
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;user.commons.log4j2&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;user.jobengine.executors&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;user.jobengine.osgi.commons&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;user.jobengine.osgi.db&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;user.jobengine.osgi.server&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkcharts.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/classes&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/commons-codec-1.10.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/commons-fileupload-1.2.1.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/commons-io-1.4.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/commons-logging-1.1.1.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zcommon.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zel.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zhtml.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_bsh.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_commons-collections.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_elinez.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_eplotz.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_Filters.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_flashchart.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_gmapsz.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jackson-annotations.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jackson-core.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jackson-databind.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jasperreports.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_javassist.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jcommon.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jfreechart.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jsp.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_monitor.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_psz.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_sapphire.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_shchart.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_silvertail.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_timelinez.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_timeplotz.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_zuljsp.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkbind.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkex_r.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkmax.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkplus.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zml.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zsoup.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zul.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zuti.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zweb.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;user.jobengine.osgi.services&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;user.tsm.client&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>\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.27"/>\r
+<mapEntry key="port" value="8888"/>\r
+</mapAttribute>\r
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="user.jobengine.osgi.server"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.VM_CONNECTOR_ID" value="org.eclipse.jdt.launching.socketAttachConnector"/>\r
+</launchConfiguration>\r
index bf3faacbe298dfdeeec333154db50a0900846c4f..b2954182981ee0acf31092ec8f6ba9cbb4cbda47 100644 (file)
       "executeimmediate": false,\r
          "name" : "Teszt folyamat",\r
       "template": "fake.xml",\r
-      "cronexpression": "0 40 22 * * ?",\r
+      "cronexpression": "0 46-50/1 * * * ?",\r
       "parameters": [ {"name": "itemID", "value": 1, "type": "java.lang.Long"} ]\r
        },\r
        {\r
diff --git a/server/user.jobengine.executors/deploy-steps-to-bsh-bkup2.launch b/server/user.jobengine.executors/deploy-steps-to-bsh-bkup2.launch
new file mode 100644 (file)
index 0000000..7e5b62e
--- /dev/null
@@ -0,0 +1,8 @@
+<?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/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
diff --git a/server/user.jobengine.executors/deploy-steps-to-bsh-main.bat b/server/user.jobengine.executors/deploy-steps-to-bsh-main.bat
new file mode 100644 (file)
index 0000000..69a77ed
--- /dev/null
@@ -0,0 +1,30 @@
+@ECHO OFF\r
+\r
+SET REMOTE_HOST=10.10.1.28\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
+\r
+SET LOCAL_STEPS_LOCATION=bin/user\r
+SET REMOTE_STEPS_LOCATION=/opt/mediacube/configuration/executors/user\r
+\r
+SET LOCAL_TEMPLATES_LOCATION=jobtemplates\r
+SET REMOTE_TEMPLATES_LOCATION=/opt/mediacube/configuration/jobtemplates\r
\r
+       ECHO *** Deploy steps to server %REMOTE_HOST% ***\r
+       WinSCP.com /command ^\r
+       "open %REMOTE_SERVER_ADDRESS% -hostkey=""%REMOTE_SERVER_HOSTKEY%"" -timeout=60" ^\r
+       "lcd %LOCAL_STEPS_LOCATION%" ^\r
+       "cd %REMOTE_STEPS_LOCATION%" ^\r
+       "synchronize remote" ^\r
+       "exit"\r
+\r
+       ECHO *** Deploy templates to server %REMOTE_HOST% ***\r
+       WinSCP.com /command ^\r
+       "open %REMOTE_SERVER_ADDRESS% -hostkey=""%REMOTE_SERVER_HOSTKEY%"" -timeout=60" ^\r
+       "lcd %LOCAL_TEMPLATES_LOCATION%" ^\r
+       "cd %REMOTE_TEMPLATES_LOCATION%" ^\r
+       "synchronize remote" ^\r
+       "exit"\r
+\r
+@ECHO ON\r
\ No newline at end of file
diff --git a/server/user.jobengine.executors/deploy-steps-to-bsh-main.launch b/server/user.jobengine.executors/deploy-steps-to-bsh-main.launch
new file mode 100644 (file)
index 0000000..b0f17cc
--- /dev/null
@@ -0,0 +1,8 @@
+<?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/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
index fe104fc4f4d4b3802342341210a391af8f241a21..4a12203b3e8853ea08bf3c777fe6561f87d5cb07 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<jobtemplate name="Felhasználói archiválás">\r
+<jobtemplate name="Felhasználói archiválás" multiInstance="true">\r
        <declarations>\r
                <parameters>\r
                        <parameter name="sourcePath" type="java.lang.String" />\r
@@ -7,6 +7,7 @@
                        <parameter name="transcoderTargetPath" type="java.lang.String" />\r
                        <parameter name="webPath" type="java.lang.String" />\r
                        <parameter name="killDateDays" type="java.lang.Integer" />\r
+                       <parameter name="limit" type="java.lang.Integer" />\r
                </parameters>\r
                <variables>\r
                        <variable name="archiveList" type="java.util.ArrayList" />\r
@@ -18,6 +19,9 @@
                                <input>\r
                                        <parameter name="sourcePath" />\r
                                </input>\r
+                               <input>\r
+                                       <parameter name="limit" />\r
+                               </input>\r
                        </inputs>\r
                        <outputs>\r
                                <output>\r
index 545e8cc0edccb9771788d6bd096b4942ba7ac504..18563521a21a431716f6f5fec59b7b5f90d7e12f 100644 (file)
@@ -12,6 +12,7 @@ import java.util.List;
 import org.apache.commons.lang.StringUtils;\r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
+import org.apache.logging.log4j.Marker;\r
 \r
 import com.ibm.nosql.json.JSONUtil;\r
 import com.ibm.nosql.json.api.BasicDBObject;\r
@@ -43,6 +44,7 @@ public class ArchiveListBuilderStep extends JobStep {
        public static final String MEDIA_DESCRIPTION = "mediaDescription";\r
        public static final String MEDIA_TYPE = "mediaType";\r
        private static final String DURATION = "duration";\r
+       private Marker marker;\r
 \r
        private ArchiveItem createArchiveItem(Path jsonFilePath, Path mediaFilePath, Path catchedFilePath) {\r
                ArchiveItem result = null;\r
@@ -81,14 +83,26 @@ public class ArchiveListBuilderStep extends JobStep {
        }\r
 \r
        @StepEntry\r
-       public Object[] execute(String sourcePath, IJobEngine jobEngine, IJobRuntime jobRuntime) {\r
+       public Object[] execute(String sourcePath, int limit, IJobEngine jobEngine, IJobRuntime jobRuntime) {\r
+               marker = jobRuntime.getMarker();\r
                List<ArchiveItem> archiveList = new ArrayList<ArchiveItem>();\r
                DirectoryStream<Path> directoryStream = null;\r
+               int counter = 0;\r
                try {\r
-                       Files.newDirectoryStream(Paths.get(sourcePath)).forEach(p -> processPathItem(p, archiveList));\r
+                       DirectoryStream<Path> stream = Files.newDirectoryStream(Paths.get(sourcePath));\r
+                       for (Path p : stream) {\r
+                               boolean processed = processPathItem(p, archiveList, limit);\r
+                               if (processed) {\r
+                                       counter++;\r
+                                       if (limit > 0 && counter == limit) {\r
+                                               logger.info(marker, "A folyamat elérte a beállított {} limitet.", limit);\r
+                                               break;\r
+                                       }\r
+                               }\r
+                       }\r
                } catch (Exception e) {\r
                        logger.catching(e);\r
-                       logger.error(getMarker(), "Az '{}' mappa elérése sikertelen. A rendszer hibaüzenete: {}", e.getMessage());\r
+                       logger.error(marker, "Az '{}' mappa elérése sikertelen. A rendszer hibaüzenete: {}", e.getMessage());\r
                } finally {\r
                        if (directoryStream != null) {\r
                                try {\r
@@ -97,7 +111,7 @@ public class ArchiveListBuilderStep extends JobStep {
                                }\r
                        }\r
                }\r
-               logger.info(getMarker(), "Az archiváló folyamat {} új anyagot érzékelt.", archiveList == null ? 0 : archiveList.size());\r
+               logger.info(marker, "Az archiváló folyamat {} új anyagot érzékelt.", archiveList == null ? 0 : archiveList.size());\r
 \r
                return new Object[] { archiveList };\r
        }\r
@@ -109,12 +123,12 @@ public class ArchiveListBuilderStep extends JobStep {
                return result;\r
        }\r
 \r
-       private void processPathItem(Path mediaFilePath, final List<ArchiveItem> archiveList) {\r
+       private boolean processPathItem(Path mediaFilePath, final List<ArchiveItem> archiveList, int limit) {\r
                File mediaFile = mediaFilePath.toFile();\r
 \r
                if (mediaFile.isDirectory() || !mediaFile.getName().toLowerCase().endsWith(MXFEXT.toLowerCase())\r
                                || mediaFile.getName().toLowerCase().endsWith(WAVEXT.toLowerCase())) {\r
-                       return;\r
+                       return false;\r
                }\r
 \r
                Path dotStorePath = Paths.get(mediaFilePath.getParent().toString(), STATUSFOLDER);\r
@@ -122,43 +136,44 @@ public class ArchiveListBuilderStep extends JobStep {
                File catchedFile = catchedFilePath.toFile();\r
                if (catchedFile.exists()) {\r
                        logger.warn("{} file is already catched.", mediaFile.getName());\r
-                       return;\r
+                       return false;\r
                }\r
 \r
                Path jsonFilePath = Paths.get(dotStorePath.toString(), mediaFile.getName() + JSONEXT);\r
                File jsonFile = jsonFilePath.toFile();\r
                if (!jsonFile.exists()) {\r
                        logger.warn("{} has no json metadata.", mediaFile.getName());\r
-                       return;\r
+                       return false;\r
                }\r
 \r
                ArchiveItem archiveItem = createArchiveItem(jsonFilePath, mediaFilePath, catchedFilePath);\r
 \r
                if (archiveItem == null) {\r
                        logger.warn("{} has no metadata specified.", mediaFile.getName());\r
-                       return;\r
+                       return false;\r
                }\r
 \r
                if (StringUtils.isBlank(archiveItem.getItemHouseId())) {\r
                        logger.warn("{} has no Item HouseID specified in metadata.", mediaFile.getName());\r
-                       return;\r
+                       return false;\r
                }\r
 \r
                if (StringUtils.isBlank(archiveItem.getItemTitle())) {\r
                        logger.warn("{} has no Item Title specified in metadata.", mediaFile.getName());\r
-                       return;\r
+                       return false;\r
                }\r
 \r
                if (StringUtils.isBlank(archiveItem.getMediaHouseId())) {\r
                        logger.warn("{} has no Media HouseID specified in metadata.", mediaFile.getName());\r
-                       return;\r
+                       return false;\r
                }\r
 \r
                if (StringUtils.isBlank(archiveItem.getMediaTitle())) {\r
                        logger.warn("{} has no Media Title specified in metadata.", mediaFile.getName());\r
-                       return;\r
+                       return false;\r
                }\r
                archiveList.add(archiveItem);\r
                createCatchedFile(catchedFilePath);\r
+               return true;\r
        }\r
 }\r
index 31e22db3156061d53b74e03e6c918bd4b7f90aa1..9c0265c3bd2c4db124bb03ea13146f4458843e4f 100644 (file)
@@ -1,19 +1,16 @@
 package user.jobengine.server.steps;\r
 \r
+import java.io.File;\r
 import java.util.ArrayList;\r
 \r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
+import org.apache.logging.log4j.Marker;\r
 \r
 import user.commons.ListUtils;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
 \r
-/**\r
- * Elinditja minden mediara az archivalo folyamatot.\r
- *\r
- * @author robi\r
- */\r
 public class ArchiveMaterialSubmitStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r
        private static final String JOBTEMPLATE = "archive-material.xml";\r
@@ -23,25 +20,29 @@ public class ArchiveMaterialSubmitStep extends JobStep {
        private static final String ARCHIVE = "Archiválás";\r
        private static final String GLOBAL_SOURCE_PATH = "globalSourcePath";\r
        private static final String ARCHIVE_ITEM = "archiveItem";\r
+       private Marker marker;\r
 \r
        @StepEntry\r
        public Object[] execute(String globalSourcePath, ArrayList<ArchiveItem> archiveList, String transcoderTargetPath, String webPath, int killDateDays,\r
-                       IJobEngine jobEngine, IJobRuntime jobRuntime) {\r
-               try {\r
-                       for (ArchiveItem archiveItem : archiveList) {\r
+                       IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
+               marker = jobRuntime.getMarker();\r
+               if (jobRuntime.forkPrepare()) {\r
+                       for (int i = 0; i < archiveList.size(); i++) {\r
+                               ArchiveItem archiveItem = archiveList.get(i);\r
                                try {\r
-                                       IJobRuntime runtime = jobEngine.submit(JOBTEMPLATE, ARCHIVE, ListUtils.asMap(ARCHIVE_ITEM, archiveItem, GLOBAL_SOURCE_PATH,\r
-                                                       globalSourcePath, TRANSCODER_TARGET_PATH, transcoderTargetPath, WEB_PATH, webPath, KILL_DATE_DAYS, killDateDays));\r
-\r
+                                       jobEngine.submit(jobRuntime, null, JOBTEMPLATE, ARCHIVE, ListUtils.asMap(ARCHIVE_ITEM, archiveItem, GLOBAL_SOURCE_PATH, globalSourcePath,\r
+                                                       TRANSCODER_TARGET_PATH, transcoderTargetPath, WEB_PATH, webPath, KILL_DATE_DAYS, killDateDays));\r
+                                       setProgress((i + 1) * 100 / archiveList.size());\r
                                } catch (Exception e) {\r
-                                       if (archiveItem != null)\r
-                                               archiveItem.removeCatchedFile();\r
-                                       throw e;\r
+                                       logger.catching(e);\r
+                                       String fileName = new File(archiveItem.getMediaFile()).getName();\r
+                                       logger.error(marker, "Az '{}' állomány archiválási kísérlete sikertelen. A rendszer üzenete: {}", fileName, e.getMessage());\r
+                                       if (!archiveItem.removeCatchedFile())\r
+                                               logger.error(marker, "Az '{}' állomány .catched jelző állománya nem törölhető.", fileName);\r
                                }\r
                        }\r
-               } catch (Exception e) {\r
-                       logger.catching(e);\r
                }\r
+               jobRuntime.forkWaitComplete();\r
                return null;\r
        }\r
 \r
index ce863149302827dfc262015b5fdcc473640bcf55..ad00be9a05d174db833a85cfef72ca47ba1b5ab0 100644 (file)
@@ -6,6 +6,7 @@ import java.util.Date;
 import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Map;\r
+import java.util.TimeZone;\r
 \r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
@@ -88,6 +89,7 @@ public class ImportStatisticsStep extends JobStep {
                createAPI(jobRuntime);\r
 \r
                Calendar scheduledDate = CalendarUtils.createZeroCalendar(Calendar.getInstance());\r
+               scheduledDate.setTimeZone(TimeZone.getTimeZone("Europe/Budapest"));\r
                scheduledDate.add(Calendar.DAY_OF_YEAR, -1 * daysBeforeNow);\r
                List<DBObject> rundowns = octopusAPI.getRundowns(scheduledDate.getTime());\r
                if (rundowns == null)\r
index 9f40d80d3018ede59aceb3641699c299fc4cd8ff..46a4274302c62d910825d6acd34da56e5540d437 100644 (file)
@@ -12,6 +12,7 @@ import java.util.Set;
 \r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
+import org.apache.logging.log4j.Marker;\r
 \r
 import user.jobengine.db.Item;\r
 import user.jobengine.db.ItemManager;\r
@@ -31,6 +32,7 @@ public class MetadataTransformStep extends JobStep {
        private static final String ITEM_MANAGER_IS_NULL = "ItemManager is null";\r
        public static final String DEFAULT_MEDIATYPE = "Generic";\r
        private ItemManager itemManager;\r
+       private Marker marker;\r
 \r
        private void checkDuplicates(ArchiveItem archiveItem, String sourceFileName) throws Exception {\r
                if (itemManager.isMediaFileExists(sourceFileName)) {\r
@@ -57,7 +59,7 @@ public class MetadataTransformStep extends JobStep {
                                Files.move(sourcePath, Paths.get(conflictPath.toString(), sourceFileName + (new Date()).getTime()));\r
                        } catch (Exception e1) {\r
                                logger.catching(e1);\r
-                               logger.error(getMarker(), "Hiba az állomány {} mappába másolásakor. A rendszer üzenete: {}", CONFLICT, e1.getMessage());\r
+                               logger.error(marker, "Hiba az '{}' állomány mappába másolásakor. A rendszer üzenete: {}", CONFLICT, e1.getMessage());\r
                        }\r
                        throw new Exception("Az '" + sourceFileName + "' állomány már megtalálható az archívumban, archiválása nem lehetséges.");\r
                }\r
@@ -73,6 +75,7 @@ public class MetadataTransformStep extends JobStep {
 \r
        @StepEntry\r
        public Object[] execute(ArchiveItem archiveItem, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
+               marker = jobRuntime.getMarker();\r
                Media mediaCubeMedia = null;\r
                itemManager = (ItemManager) jobEngine.getItemManager();\r
                if (itemManager == null)\r
@@ -88,8 +91,11 @@ public class MetadataTransformStep extends JobStep {
                        itemManager.mergeItemStructure(mediaCubeItem);\r
                } catch (Exception e) {\r
                        logger.catching(e);\r
+                       String fileName = new File(archiveItem.getMediaFile()).getName();\r
+                       logger.error(marker, "Az '{}' állomány nem archiválható, mert a metaadat transzformáció sikertelen. A rendszer üzenete: {}", fileName,\r
+                                       e.getMessage());\r
                        if (!archiveItem.removeCatchedFile())\r
-                               logger.error(getMarker(), "A {} állomány .catched jelző állománya nem törölhető.", new File(archiveItem.getMediaFile()).getName());\r
+                               logger.error(marker, "Az '{}' állomány .catched jelző állománya nem törölhető.", fileName);\r
                        throw e;\r
                } finally {\r
                        jobRuntime.incrementProgress(100);\r
index c2b093bc3fac5ea8b18d12f4ddba25e069b7f2cf..0b540ed7a9976fa956525d8a637fbe0316c653a0 100644 (file)
@@ -7,6 +7,7 @@ import java.util.Date;
 \r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
+import org.apache.logging.log4j.Marker;\r
 import org.apache.logging.log4j.message.Message;\r
 import org.apache.logging.log4j.message.ParameterizedMessage;\r
 \r
@@ -33,13 +34,11 @@ public class TSMBackupStep extends JobStep {
        private Store tsmStore;\r
        private StoreUri targetUri;\r
        private FileType fileType;\r
-\r
-       //      @Override\r
-       //      public String getDescription() {\r
-       //      }\r
+       private Marker marker;\r
 \r
        @StepEntry\r
        public Object[] execute(ArchiveItem archiveItem, Media mediaCubeMedia, int killDateDays, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
+               marker = jobRuntime.getMarker();\r
                File sourceMediaFile = new File(archiveItem.getMediaFile());\r
                String sourceFileName = sourceMediaFile.getName();\r
                String details = String.format("%s (%d bytes)", sourceFileName, sourceMediaFile.length());\r
@@ -67,16 +66,16 @@ public class TSMBackupStep extends JobStep {
                        RemoteFile remoteFile = sourceUri.transferFrom(targetUri, sourceFileName, sourceFileName);\r
 \r
                        saveMetadata(mediaCubeMedia, sourceFileName);\r
-                       logger.info(getMarker(), "Az '{}' állomány archiválása sikeres.", sourceFileName);\r
+                       logger.info(marker, "Az '{}' állomány archiválása sikeres.", sourceFileName);\r
 \r
                        if (killDateDays > 0)\r
-                               EscortFiles.createUNCKillDate(sourceMediaFile.getParent(), sourceFileName, killDateDays, getMarker());\r
+                               EscortFiles.createUNCKillDate(sourceMediaFile.getParent(), sourceFileName, killDateDays, marker);\r
                } catch (Exception e) {\r
                        logger.catching(e);\r
                        Message m = new ParameterizedMessage("Az '{}' állomány archiválása sikertelen. A rendszer hibaüzenete: {}", details, e.getMessage());\r
-                       logger.error(getMarker(), m);\r
+                       logger.error(marker, m);\r
                        if (!archiveItem.removeCatchedFile())\r
-                               logger.error(getMarker(),\r
+                               logger.error(marker,\r
                                                "Az '{}' állomány .catched jelző állománya nem törölhető. Az újabb archiválási kísérlethez annak kézi eltávolítása szükséges!",\r
                                                sourceMediaFile.getName());\r
                        throw new Exception(m.getFormattedMessage());\r
@@ -95,44 +94,44 @@ public class TSMBackupStep extends JobStep {
 \r
        private void setAndCheck(ArchiveItem archiveItem, Media mediaCubeMedia, IJobEngine jobEngine) throws JobEngineException, IOException {\r
                if (jobEngine == null) {\r
-                       logger.error(getMarker(), "Az folyamatkezelő réteg nem elérhető.");\r
+                       logger.error(marker, "Az folyamatkezelő réteg nem elérhető.");\r
                        throw new NullPointerException("Internal error, missing JobEngine reference.");\r
                }\r
                manager = jobEngine.getItemManager();\r
                if (manager == null) {\r
-                       logger.error(getMarker(), "Az adatbáziskezelő réteg nem elérhető.");\r
+                       logger.error(marker, "Az adatbáziskezelő réteg nem elérhető.");\r
                        throw new NullPointerException("Internal error, missing ItemManager reference.");\r
                }\r
                if (archiveItem == null) {\r
-                       logger.error(getMarker(), "A folyamat 'archiveItem' bemeneti paramétere üres.");\r
+                       logger.error(marker, "A folyamat 'archiveItem' bemeneti paramétere üres.");\r
                        throw new NullPointerException("System is not configured properly, missing 'archiveItem' input parameter.");\r
                }\r
                sourceMediaFile = new File(archiveItem.getMediaFile());\r
                if (sourceMediaFile == null) {\r
-                       logger.error(getMarker(), "A folyamat 'archiveItem' bemeneti paraméter 'mediaFile' értéke üres.");\r
+                       logger.error(marker, "A folyamat 'archiveItem' bemeneti paraméter 'mediaFile' értéke üres.");\r
                        throw new NullPointerException("System is not configured properly, missing 'mediaFile' value in 'archiveItem' input parameter.");\r
                }\r
                if (!sourceMediaFile.exists()) {\r
-                       logger.error(getMarker(), "Az {} állomány nem létezik vagy nem érhető el.", sourceMediaFile.getName());\r
+                       logger.error(marker, "Az {} állomány nem létezik vagy nem érhető el.", sourceMediaFile.getName());\r
                        throw new IOException(String.format("Input file {} not exists or unreachable.", sourceMediaFile.getName()));\r
                }\r
                tsmStore = manager.getSystemStore(false);\r
                if (tsmStore == null) {\r
-                       logger.error(getMarker(), "A TSM rendszer beállítás nem elérhető.");\r
+                       logger.error(marker, "A TSM rendszer beállítás nem elérhető.");\r
                        throw new NullPointerException("System is not configured properly, missing TSM Store.");\r
                }\r
                targetUri = tsmStore.getSourceStoreUri(RemoteStoreProtocol.TSM);\r
                if (targetUri == null) {\r
-                       logger.error(getMarker(), "A TSM rendszer beállítás paraméterei nem elérhetőek.");\r
+                       logger.error(marker, "A TSM rendszer beállítás paraméterei nem elérhetőek.");\r
                        throw new NullPointerException("System is not configured properly, missing TSM StoreUri.");\r
                }\r
                fileType = manager.getFileType("High-res");\r
                if (fileType == null) {\r
-                       logger.error(getMarker(), "Adatbázis bejegyzés hiba, a 'High-res' FileType nem található.");\r
+                       logger.error(marker, "Adatbázis bejegyzés hiba, a 'High-res' FileType nem található.");\r
                        throw new NullPointerException("System is not configured properly, missing 'High-res' FileType.");\r
                }\r
                if (mediaCubeMedia == null) {\r
-                       logger.error(getMarker(), "A folyamat 'mediaCubeMedia' bemeneti paramétere üres.");\r
+                       logger.error(marker, "A folyamat 'mediaCubeMedia' bemeneti paramétere üres.");\r
                        throw new NullPointerException("System is not configured properly, 'mediaCubeMedia' input parameter missing.");\r
                }\r
 \r
index c548e980b9d3c1d335d62c6e0be872a1dcf99955..5e90b8a9b0d2676525f57d6fb6a7dcb7dcbd9e4d 100644 (file)
@@ -2,6 +2,7 @@ package user.jobengine.server.steps;
 \r
 import java.io.File;\r
 import java.io.IOException;\r
+import java.net.MalformedURLException;\r
 import java.net.URL;\r
 import java.nio.file.Files;\r
 import java.nio.file.Path;\r
@@ -15,6 +16,7 @@ import javax.xml.namespace.QName;
 import org.apache.commons.lang.StringUtils;\r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
+import org.apache.logging.log4j.Marker;\r
 import org.apache.logging.log4j.message.Message;\r
 import org.apache.logging.log4j.message.ParameterizedMessage;\r
 \r
@@ -52,24 +54,7 @@ public class TranscodeSELENIOStep extends JobStep {
        private FileType fileType;\r
        private String transcoderTargetPath;\r
        private String webPath;\r
-\r
-       public TranscodeSELENIOStep() throws Exception {\r
-               try {\r
-                       address = System.getProperty("jobengine.selenio.address");\r
-                       if (StringUtils.isBlank(address))\r
-                               throw new NullPointerException("System is not configured properly, 'jobengine.selenio.address' startup parameter missing.");\r
-\r
-                       projectFilePath = System.getProperty("jobengine.selenio.projectfilepath");\r
-                       if (StringUtils.isBlank(projectFilePath))\r
-                               throw new NullPointerException("System is not configured properly, 'jobengine.selenio.projectfilepath' startup parameter missing.");\r
-                       TranscodeMgrWSService service = new TranscodeMgrWSService(new URL(address),\r
-                                       new QName("http://ws.server.mediamanager.digitalrapids.ca/", "TranscodeMgrWSService"));\r
-                       transcoder = service.getTranscodeMgrWSPort();\r
-               } catch (Exception e) {\r
-                       logger.catching(e);\r
-                       throw e;\r
-               }\r
-       }\r
+       private Marker marker;\r
 \r
        private TranscodeRequest buildTranscodeRequest(String projectFilePath, String sourceFilePath) throws java.lang.Exception {\r
                Clip clip = new Clip();\r
@@ -106,31 +91,16 @@ public class TranscodeSELENIOStep extends JobStep {
        @StepEntry\r
        public Object[] execute(String globalSourcePath, ArchiveItem archiveItem, Media mediaCubeMedia, String transcoderTargetPath, String webPath,\r
                        IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
+               marker = jobRuntime.getMarker();\r
+               String sourceFileName = null;\r
 \r
-               if (StringUtils.isBlank(globalSourcePath))\r
-                       throw new NullPointerException("System is not configured properly, 'globalInputFolder' parameter missing.");\r
-               manager = jobEngine.getItemManager();\r
-\r
-               store = manager.getSystemStore(true);\r
-               if (store == null)\r
-                       throw new NullPointerException("System is not configured properly, low-res system store definition missing.");\r
-\r
-               fileType = manager.getFileType(LOWRES_FILETYPE);\r
-               if (fileType == null)\r
-                       throw new NullPointerException("System is not configured properly, low-res file type definition missing.");\r
-\r
-               if (StringUtils.isBlank(transcoderTargetPath))\r
-                       throw new NullPointerException("System is not configured properly, 'transcoderTargetPath' parameter missing.");\r
-               this.transcoderTargetPath = transcoderTargetPath;\r
+               try {\r
+                       setAndCheck(globalSourcePath, transcoderTargetPath, webPath, jobEngine);\r
 \r
-               if (StringUtils.isBlank(webPath))\r
-                       throw new NullPointerException("System is not configured properly, 'webPath' parameter missing.");\r
-               this.webPath = webPath;\r
+                       File sourceMediaFile = new File(archiveItem.getMediaFile());\r
+                       sourceFileName = sourceMediaFile.getName();\r
+                       String details = String.format("%s (%d bytes)", sourceFileName, sourceMediaFile.length());\r
 \r
-               File sourceMediaFile = new File(archiveItem.getMediaFile());\r
-               String sourceFileName = sourceMediaFile.getName();\r
-               String details = String.format("%s (%d bytes)", sourceFileName, sourceMediaFile.length());\r
-               try {\r
                        Path inputPath = Paths.get(globalSourcePath, sourceFileName);\r
                        String sourceFilePath = inputPath.toString();\r
                        TranscodeRequest transcodeRequest = buildTranscodeRequest(projectFilePath, sourceFilePath);\r
@@ -146,8 +116,8 @@ public class TranscodeSELENIOStep extends JobStep {
                        processState(transcodeTask, jobEngine, mediaCubeMedia);\r
                } catch (Exception e) {\r
                        logger.catching(e);\r
-                       Message m = new ParameterizedMessage("Az '{}' állomány átkódolása sikertelen. A rendszer hibaüzenete: {}", details, e.getMessage());\r
-                       logger.error(getMarker(), m);\r
+                       Message m = new ParameterizedMessage("Az '{}' állomány átkódolása sikertelen. A rendszer hibaüzenete: {}", sourceFileName, e.getMessage());\r
+                       logger.error(marker, m);\r
                        throw new Exception(m.getFormattedMessage());\r
                }\r
                return null;\r
@@ -197,7 +167,7 @@ public class TranscodeSELENIOStep extends JobStep {
                        }\r
                } catch (IOException e) {\r
                        logger.catching(e);\r
-                       logger.error(getMarker(), "A {} állomány mozgatása a {} mappába nem sikerült.", outFile, webPath);\r
+                       logger.error(marker, "Az '{}' állomány mozgatása a '{}' mappába nem sikerült.", outFile, webPath);\r
                }\r
        }\r
 \r
@@ -214,4 +184,37 @@ public class TranscodeSELENIOStep extends JobStep {
                }\r
        }\r
 \r
+       private void setAndCheck(String globalSourcePath, String transcoderTargetPath, String webPath, IJobEngine jobEngine) throws MalformedURLException {\r
+               address = System.getProperty("jobengine.selenio.address");\r
+               if (StringUtils.isBlank(address))\r
+                       throw new NullPointerException("System is not configured properly, 'jobengine.selenio.address' startup parameter missing.");\r
+\r
+               projectFilePath = System.getProperty("jobengine.selenio.projectfilepath");\r
+               if (StringUtils.isBlank(projectFilePath))\r
+                       throw new NullPointerException("System is not configured properly, 'jobengine.selenio.projectfilepath' startup parameter missing.");\r
+               TranscodeMgrWSService service = new TranscodeMgrWSService(new URL(address),\r
+                               new QName("http://ws.server.mediamanager.digitalrapids.ca/", "TranscodeMgrWSService"));\r
+               transcoder = service.getTranscodeMgrWSPort();\r
+\r
+               if (StringUtils.isBlank(globalSourcePath))\r
+                       throw new NullPointerException("System is not configured properly, 'globalInputFolder' parameter missing.");\r
+               manager = jobEngine.getItemManager();\r
+\r
+               store = manager.getSystemStore(true);\r
+               if (store == null)\r
+                       throw new NullPointerException("System is not configured properly, low-res system store definition missing.");\r
+\r
+               fileType = manager.getFileType(LOWRES_FILETYPE);\r
+               if (fileType == null)\r
+                       throw new NullPointerException("System is not configured properly, low-res file type definition missing.");\r
+\r
+               if (StringUtils.isBlank(transcoderTargetPath))\r
+                       throw new NullPointerException("System is not configured properly, 'transcoderTargetPath' parameter missing.");\r
+               this.transcoderTargetPath = transcoderTargetPath;\r
+\r
+               if (StringUtils.isBlank(webPath))\r
+                       throw new NullPointerException("System is not configured properly, 'webPath' parameter missing.");\r
+               this.webPath = webPath;\r
+       }\r
+\r
 }\r
index 2aa75113c3e95f71d012289d1db855caece5c8af..e34f10d5cf83ba185d91eec19dbae4b848f3e5de 100644 (file)
@@ -5,8 +5,8 @@
 \r
        <!-- ZK -->\r
        <servlet>\r
-               <description>ZK loader for ZUML pages</description>\r
                <servlet-name>zkLoader</servlet-name>\r
+               <description>ZK loader for ZUML pages</description>\r
                <servlet-class>org.zkoss.zk.ui.http.DHtmlLayoutServlet</servlet-class>\r
                <init-param>\r
                        <param-name>update-uri</param-name>\r
@@ -16,8 +16,8 @@
        </servlet>\r
 \r
        <servlet>\r
-               <description>The asynchronous update engine for ZK</description>\r
                <servlet-name>auEngine</servlet-name>\r
+               <description>The asynchronous update engine for ZK</description>\r
                <servlet-class>org.zkoss.zk.au.http.DHtmlUpdateServlet</servlet-class>\r
        </servlet>\r
 \r
@@ -47,9 +47,9 @@
            <url-pattern>/test</url-pattern>\r
        </servlet-mapping>\r
 \r
-<!--   <session-config> -->\r
-<!--           <session-timeout>120</session-timeout> -->\r
-<!--   </session-config> -->\r
+       <session-config>\r
+               <session-timeout>15</session-timeout>\r
+       </session-config>\r
        <welcome-file-list>\r
                <welcome-file>index.html</welcome-file>\r
                <welcome-file>index.htm</welcome-file>\r
index e5ac6a4dde3dedc6823fc7f4e393c78a516dcba4..ae2934e9305ad6aae54e5e6f62680df6b1e8f9ea 100644 (file)
@@ -10,7 +10,7 @@
            <timeout-message>Lejárt a munkamenet, kérem töltse be újra az alkalmazást.</timeout-message>\r
            <!-- timeout-uri>/timeout.zul</timeout-uri -->\r
            <automatic-timeout/>\r
-           <session-timeout>900</session-timeout>\r
+<!--       <session-timeout>900</session-timeout> -->\r
        </session-config>\r
 \r
        <system-config>\r
index 241029fba1cc0ef38686461da2fbb46965c13c08..a9fc4e081d0062d31e512689b1e3e477213f95f1 100644 (file)
@@ -58,6 +58,7 @@ public class NewsHistoryModel {
                Selectors.wireComponents(view, this, false);\r
                Calendar calendar = CalendarUtils.createZeroCalendar();\r
                calendar.add(Calendar.DAY_OF_YEAR, -1);\r
+               //calendar.setTimeZone(TimeZone.getTimeZone("Europe/Budapest"));\r
                setSelectedDate(calendar.getTime());\r
        }\r
 \r
@@ -154,8 +155,10 @@ public class NewsHistoryModel {
                initChart(typeChartSumDuration);\r
                initChart(planChart);\r
 \r
-               Calendar scheduledDate = CalendarUtils.createZeroCalendar(selectedDate);\r
-               BasicDBObject dateFilter = new BasicDBObject("dateTime", scheduledDate.getTime());\r
+               //              Calendar scheduledDate = CalendarUtils.createZeroCalendar(selectedDate);\r
+               //              scheduledDate.setTimeZone(TimeZone.getTimeZone("Europe/Budapest"));\r
+\r
+               BasicDBObject dateFilter = new BasicDBObject("dateTime", selectedDate);\r
                BasicDBObject dailyData = (BasicDBObject) collection.findOne(dateFilter);\r
                if (dailyData == null) {\r
                        return;\r