git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorvasary.daniel <TFS\vasary.daniel>
Fri, 26 Feb 2021 13:33:36 +0000 (13:33 +0000)
committervasary.daniel <TFS\vasary.daniel>
Fri, 26 Feb 2021 13:33:36 +0000 (13:33 +0000)
49 files changed:
server/-configuration/build-mediacube-dependencies.launch
server/-configuration/build-mediacube-modules.launch
server/-configuration/run-mediacube-server-mv.launch
server/-dependencies/libs/org.apache.felix.gogo.command_0.10.0.v201209301215.jar [deleted file]
server/-dependencies/libs/org.eclipse.equinox.launcher_1.3.200.v20160318-1642.jar [deleted file]
server/-dependencies/pom.xml
server/-modules/pom.xml
server/-product/production/AMC/configuration/config.ini
server/-product/production/HIRTV/configuration/config.ini
server/-product/production/HIRTV/jobs/executors.yaml [new file with mode: 0644]
server/-product/production/HIRTV/mediacube.bat
server/-product/production/HIRTV/settings/jetty/keystore [deleted file]
server/-product/production/HIRTV/settings/test-jetty/jetty-deployer.xml [deleted file]
server/-product/production/HIRTV/settings/test-jetty/jetty-http-redirect.xml [deleted file]
server/-product/production/HIRTV/settings/test-jetty/keystore [deleted file]
server/-product/production/MEDIAVIVANTIS/configuration/config.ini
server/-product/production/MEDIAVIVANTIS/jobs/dsm.opt [new file with mode: 0644]
server/-product/production/MEDIAVIVANTIS/jobs/executors.xml
server/-product/production/MEDIAVIVANTIS/jobs/schedules.json
server/-product/production/MEDIAVIVANTIS/jobs/steps/ArchiveMaterialSubmitStep.java
server/-product/production/MEDIAVIVANTIS/jobs/steps/CancelableStep.java
server/-product/production/MEDIAVIVANTIS/jobs/steps/TestForkCancelableStep.java [deleted file]
server/-product/production/MEDIAVIVANTIS/jobs/templates/template1.yaml [new file with mode: 0644]
server/-product/production/MEDIAVIVANTIS/jobs/templates/test-fork-cancelable.xml [deleted file]
server/-product/production/MEDIAVIVANTIS/settings/application.yaml
server/-product/production/MEDIAVIVANTIS/settings/jetty/http.xml [deleted file]
server/-product/production/MEDIAVIVANTIS/settings/log4j2.xml
server/-product/production/MEDIAVIVANTIS/settings/maestro.json [deleted file]
server/-product/production/MEDIAVIVANTIS/settings/maestro.yaml [new file with mode: 0644]
server/-product/production/MEDIAVIVANTIS/settings/mediacube.json [deleted file]
server/-product/production/MEDIAVIVANTIS/settings/mediacube.yaml [new file with mode: 0644]
server/hu.user.mediacube.executors.tests/jobs/executors.yaml [new file with mode: 0644]
server/hu.user.mediacube.executors.tests/jobs/template1.yaml [new file with mode: 0644]
server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java
server/hu.user.mediacube.indexer/.project
server/hu.user.mediacube.indexer/pom.xml
server/user.jobengine.osgi.commons/src/user/commons/configuration/IConfiguration.java
server/user.jobengine.osgi.commons/src/user/commons/configuration/SystemConfiguration.java
server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java
server/user.jobengine.osgi.server/src/user/jobengine/server/ast/data/JobTemplateData.java [new file with mode: 0644]
server/user.jobengine.osgi.server/src/user/jobengine/server/ast/data/JobTemplateParameter.java [new file with mode: 0644]
server/user.jobengine.osgi.server/src/user/jobengine/server/ast/data/JobTemplateVariable.java [new file with mode: 0644]
server/user.mediacube.gui/WEB-INF/zk.xml
server/user.mediacube.gui/css/video-js.css
server/user.mediacube.gui/js/searchitems.js
server/user.mediacube.gui/pages/searchitems.zul
server/user.mediacube.gui/resources/i3-label_hu.properties
server/user.mediacube.gui/src/user/jobengine/zk/model/SearchModel.java
server/user.mediacube.gui/src/user/jobengine/zk/util/SessionUtil.java

index 849b528e14d9bedd5172bd79c9aa7c859c394835..63a14eba98a9104f3faa89342f448ea8101a1f03 100644 (file)
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
 <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">\r
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>\r
-<stringAttribute key="M2_GOALS" value="clean package p2:site"/>\r
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>\r
-<booleanAttribute key="M2_OFFLINE" value="false"/>\r
-<stringAttribute key="M2_PROFILES" value=""/>\r
-<listAttribute key="M2_PROPERTIES"/>\r
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>\r
-<booleanAttribute key="M2_SKIP_TESTS" value="false"/>\r
-<intAttribute key="M2_THREADS" value="1"/>\r
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>\r
-<stringAttribute key="M2_USER_SETTINGS" value=""/>\r
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>\r
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
-</listAttribute>\r
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}/-dependencies"/>\r
+    <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>\r
+    <stringAttribute key="M2_GOALS" value="clean package p2:site"/>\r
+    <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>\r
+    <booleanAttribute key="M2_OFFLINE" value="false"/>\r
+    <stringAttribute key="M2_PROFILES" value=""/>\r
+    <listAttribute key="M2_PROPERTIES"/>\r
+    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>\r
+    <booleanAttribute key="M2_SKIP_TESTS" value="false"/>\r
+    <intAttribute key="M2_THREADS" value="1"/>\r
+    <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>\r
+    <stringAttribute key="M2_USER_SETTINGS" value=""/>\r
+    <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>\r
+    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
+        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
+    </listAttribute>\r
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}/-dependencies"/>\r
 </launchConfiguration>\r
index 11dc88b6a0cf0d153aa8bac68f8657c225fe82f8..b2984da77bf8a2f128715b98eac98d279e42edb4 100644 (file)
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
 <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">\r
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>\r
-<stringAttribute key="M2_GOALS" value="clean install"/>\r
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>\r
-<booleanAttribute key="M2_OFFLINE" value="false"/>\r
-<stringAttribute key="M2_PROFILES" value=""/>\r
-<listAttribute key="M2_PROPERTIES"/>\r
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>\r
-<booleanAttribute key="M2_SKIP_TESTS" value="false"/>\r
-<intAttribute key="M2_THREADS" value="1"/>\r
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>\r
-<stringAttribute key="M2_USER_SETTINGS" value=""/>\r
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>\r
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
-</listAttribute>\r
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/-modules}"/>\r
+    <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>\r
+    <stringAttribute key="M2_GOALS" value="clean install"/>\r
+    <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>\r
+    <booleanAttribute key="M2_OFFLINE" value="false"/>\r
+    <stringAttribute key="M2_PROFILES" value=""/>\r
+    <listAttribute key="M2_PROPERTIES"/>\r
+    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>\r
+    <booleanAttribute key="M2_SKIP_TESTS" value="false"/>\r
+    <intAttribute key="M2_THREADS" value="1"/>\r
+    <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>\r
+    <stringAttribute key="M2_USER_SETTINGS" value=""/>\r
+    <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>\r
+    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
+        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
+    </listAttribute>\r
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>\r
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>\r
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>\r
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/-modules}"/>\r
 </launchConfiguration>\r
index 213a562e97f239e6092f1c9219a0f583d8c6252a..47941dff40f1b27db6a91a337b243d418fd880d1 100644 (file)
@@ -20,7 +20,7 @@
     <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dlog4j.configurationFile=settings/log4j2.xml&#13;&#10;-Djetty.home=settings/jetty&#13;&#10;-Djetty.etc.config.urls=jetty.xml,jetty-ssl.xml,jetty-ssl-context.xml,jetty-http.xml,jetty-https.xml&#13;&#10;-Djava.io.tmpdir=tmp"/>\r
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dlog4j.configurationFile=settings/log4j2.xml&#13;&#10;-Djetty.home=settings/test-jetty&#13;&#10;-Dgosh.home=configuration&#13;&#10;-Djetty.etc.config.urls=jetty.xml,jetty-ssl.xml,jetty-ssl-context.xml,jetty-http.xml,jetty-https.xml&#13;&#10;-Djava.io.tmpdir=tmp"/>\r
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:\_workspace\USER\MediaCube\server\-product\production\MEDIAVIVANTIS"/>\r
     <stringAttribute key="pde.version" value="3.3"/>\r
     <setAttribute key="selected_target_bundles">\r
diff --git a/server/-dependencies/libs/org.apache.felix.gogo.command_0.10.0.v201209301215.jar b/server/-dependencies/libs/org.apache.felix.gogo.command_0.10.0.v201209301215.jar
deleted file mode 100644 (file)
index 6c7c9d7..0000000
Binary files a/server/-dependencies/libs/org.apache.felix.gogo.command_0.10.0.v201209301215.jar and /dev/null differ
diff --git a/server/-dependencies/libs/org.eclipse.equinox.launcher_1.3.200.v20160318-1642.jar b/server/-dependencies/libs/org.eclipse.equinox.launcher_1.3.200.v20160318-1642.jar
deleted file mode 100644 (file)
index 2aabbf4..0000000
Binary files a/server/-dependencies/libs/org.eclipse.equinox.launcher_1.3.200.v20160318-1642.jar and /dev/null differ
index 20945306e8bb1899789f4d7ebbfc988dbbe77cf2..2dd688224b7ee8cf1535742f48dcd7363e813689 100644 (file)
@@ -2,8 +2,8 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"\r
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
        <modelVersion>4.0.0</modelVersion>\r
-       <groupId>hu.user.chronos</groupId>\r
-       <artifactId>hu.user.chronos.dependencies</artifactId>\r
+       <groupId>hu.user.mediacube</groupId>\r
+       <artifactId>dependencies</artifactId>\r
        <version>1.0.0-SNAPSHOT</version>\r
        <packaging>pom</packaging>\r
        <properties>\r
                                                        <packaging>jar</packaging>\r
                                                </configuration>\r
                                        </execution>\r
-                                       <execution>\r
-                                               <id>install3</id>\r
-                                               <phase>package</phase>\r
-                                               <goals>\r
-                                                       <goal>install-file</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <file>libs/org.apache.felix.gogo.command_0.10.0.v201209301215.jar</file>\r
-                                                       <groupId>org.apache.felix</groupId>\r
-                                                       <artifactId>org.apache.felix.gogo.command</artifactId>\r
-                                                       <version>0.10.0.v201209301215</version>\r
-                                                       <packaging>jar</packaging>\r
-                                               </configuration>\r
-                                       </execution>\r
-<!--                                   <execution> -->\r
-<!--                                           <id>install4</id> -->\r
-<!--                                           <phase>package</phase> -->\r
-<!--                                           <goals> -->\r
-<!--                                                   <goal>install-file</goal> -->\r
-<!--                                           </goals> -->\r
-<!--                                           <configuration> -->\r
-<!--                                                   <file>libs/org.eclipse.equinox.launcher_1.3.200.v20160318-1642.jar</file> -->\r
-<!--                                                   <groupId>org.eclipse.platform</groupId> -->\r
-<!--                                                   <artifactId>org.eclipse.equinox.launcher</artifactId> -->\r
-<!--                                                   <version>1.3.200.v20160318-1642</version> -->\r
-<!--                                                   <packaging>jar</packaging> -->\r
-<!--                                           </configuration> -->\r
-<!--                                   </execution> -->\r
                                </executions>\r
                        </plugin>\r
                        <plugin>\r
                                <groupId>org.reficio</groupId>\r
                                <artifactId>p2-maven-plugin</artifactId>\r
-                               <version>1.3.0</version>\r
+                               <version>1.5.0</version>\r
                                <executions>\r
                                        <execution>\r
                                                <id>default-cli</id>\r
                                                                </artifact>\r
                                                                <artifact>\r
                                                                        <id>org.codehaus.groovy:groovy:3.0.3</id>\r
+                                                                       <source>true</source>\r
                                                                </artifact>\r
                                                                <artifact>\r
                                                                        <id>org.omnifaces:omnifaces:3.4.1</id>\r
+                                                                       <source>true</source>\r
                                                                </artifact>\r
                                                                <artifact>\r
                                                                        <id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.8</id>\r
                                </executions>\r
                        </plugin>\r
                </plugins>\r
+               \r
        </build>\r
-       <pluginRepositories>\r
-               <pluginRepository>\r
-                       <id>reficio</id>\r
-                       <url>http://repo.reficio.org/maven/</url>\r
-               </pluginRepository>\r
-       </pluginRepositories>\r
+<!--   <pluginRepositories> -->\r
+<!--           <pluginRepository> -->\r
+<!--                   <id>reficio</id> -->\r
+<!--                   <url>http://repo.reficio.org/maven/</url> -->\r
+<!--           </pluginRepository> -->\r
+<!--   </pluginRepositories> -->\r
 </project>\r
index 0231adbf5ded7da5c95f5d6e5de63b884adb558c..7495c69a9d688baf875f017cc582bec53ab4f726 100644 (file)
@@ -9,7 +9,6 @@
        <modules>\r
                <module>../user.mediacube.gui</module>\r
                <module>../user.mediacube.metadata</module>\r
-<!--           <module>../user.jobengine.executors</module> -->\r
                <module>../user.jobengine.osgi.commons</module>\r
                <module>../user.jobengine.osgi.db</module>\r
                <module>../user.jobengine.osgi.server</module>\r
        </modules>\r
 \r
        <properties>\r
-               <remote.hostkey>ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4</remote.hostkey>\r
-               <!-- <remote.hostkey>ssh-ed25519 256 ea:58:1c:d3:b8:d5:7a:92:4c:a3:a5:8d:e2:7b:07:fd</remote.hostkey> -->\r
                <project.version>1.0.0</project.version>\r
-               <tycho.version>1.0.0</tycho.version>\r
+               <tycho.version>1.7.0</tycho.version>\r
+<!--           <tycho.version>1.0.0</tycho.version> -->\r
                <maven.compiler.source>1.8</maven.compiler.source>\r
                <maven.compiler.target>1.8</maven.compiler.target>\r
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
        </properties>\r
 \r
        <repositories>\r
-<!--           <repository> -->\r
-<!--                   <id>eclipse-neon</id> -->\r
-<!--                   <url>http://download.eclipse.org/releases/neon</url> -->\r
-<!--                   <layout>p2</layout> -->\r
-<!--           </repository> -->\r
-\r
-<!--           <repository> -->\r
-<!--                   <id>mvn alternate</id> -->\r
-<!--                   <url>https://repo1.maven.org/maven2</url> -->\r
-<!--           </repository> -->\r
+               <!-- <repository> -->\r
+               <!-- <id>eclipse-neon</id> -->\r
+               <!-- <url>http://download.eclipse.org/releases/neon</url> -->\r
+               <!-- <layout>p2</layout> -->\r
+               <!-- </repository> -->\r
 \r
                <repository>\r
                        <id>dependencies</id>\r
 \r
        <build>\r
                <plugins>\r
-                       <!-- <plugin> -->\r
-                       <!-- <groupId>org.apache.maven.plugins</groupId> -->\r
-                       <!-- <artifactId>maven-compiler-plugin</artifactId> -->\r
-                       <!-- <version>3.7.0</version> -->\r
-                       <!-- <configuration> -->\r
-                       <!-- <source>1.8</source> -->\r
-                       <!-- <target>1.8</target> -->\r
-                       <!-- </configuration> -->\r
-                       <!-- </plugin> -->\r
-\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-antrun-plugin</artifactId>\r
-                               <version>1.1</version>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <phase>validate</phase>\r
-                                               <goals>\r
-                                                       <goal>run</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-<!--                                                   <tasks> -->\r
-<!--                                                           <echo>*** SETTINGS ***</echo> -->\r
-<!--                                                           <echo>[remote.address] ${remote.address}</echo> -->\r
-<!--                                                           <echo>[remote.location] ${remote.location}</echo> -->\r
-<!--                                                   </tasks> -->\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
                        <plugin>\r
                                <groupId>org.eclipse.tycho</groupId>\r
                                <artifactId>tycho-packaging-plugin</artifactId>\r
                        <plugin>\r
                                <groupId>org.eclipse.tycho</groupId>\r
                                <artifactId>target-platform-configuration</artifactId>\r
+                               <version>${tycho.version}</version>\r
                                <configuration>\r
-                                       <pomDependencies>consider</pomDependencies>\r
                                        <environments>\r
                                                <environment>\r
                                                        <os>linux</os>\r
                                                        <ws>gtk</ws>\r
                                                        <arch>x86_64</arch>\r
                                                </environment>\r
-<!--                                           <environment> -->\r
-<!--                                                   <os>win32</os> -->\r
-<!--                                                   <ws>win32</ws> -->\r
-<!--                                                   <arch>x86_64</arch> -->\r
-<!--                                           </environment> -->\r
-                                               <!-- <environment> -->\r
-                                               <!-- <os>aix</os> -->\r
-                                               <!-- <ws>gtk</ws> -->\r
-                                               <!-- <arch>ppc64</arch> -->\r
-                                               <!-- </environment> -->\r
-                                               <!-- <environment> -->\r
-                                               <!-- <os>macosx</os> -->\r
-                                               <!-- <ws>cocoa</ws> -->\r
-                                               <!-- <arch>x86_64</arch> -->\r
-                                               <!-- </environment> -->\r
                                        </environments>\r
                                </configuration>\r
                        </plugin>\r
index fd4c203b4975d17c08dc7634731ffa803e6acabf..dbb596e26dbf5a4af81dac08484592e5dbb1ac8f 100644 (file)
@@ -1,5 +1,5 @@
 #This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser\r
-#Wed Feb 10 16:05:17 CET 2021\r
+#Thu Feb 25 16:34:25 CET 2021\r
 osgi.bundles=reference\:file\:cglib_2.2.2.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-annotations_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-core_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-databind_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.dataformat.jackson-dataformat-yaml_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.datatype.jackson-datatype-joda_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-base_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.module.jackson-module-jaxb-annotations_2.4.5.jar@4,reference\:file\:com.ibm.db2.jcc_1.4.0.jar@4,reference\:file\:com.ibm.nosql_4.19.26.jar@4,reference\:file\:com.microsoft.sqlserver.sqljdbc_6.0.8112.100.jar@4,reference\:file\:com.sun.jna_4.2.0.jar@4,reference\:file\:groovy_3.0.3.jar@4,reference\:file\:io.humble.video-arch-x86_64-pc-linux-gnu6_0.2.1.jar@4,reference\:file\:io.humble.video-arch-x86_64-w64-mingw32_0.2.1.jar@4,reference\:file\:io.humble.video-noarch_0.2.1.jar@4,reference\:file\:javax.annotation-api_1.2.0.jar@4,reference\:file\:javax.mail_1.5.0.b01.jar@4,reference\:file\:javax.servlet-api_3.1.0.jar@4,reference\:file\:javax.ws.rs-api_2.0.1.jar@4,reference\:file\:jcifs_1.3.17.jar@4,reference\:file\:joda-time_2.2.0.jar@4,reference\:file\:junit_4.12.0.jar@4,reference\:file\:org.apache.aries.spifly.dynamic.bundle_1.0.8.jar@4,reference\:file\:org.apache.aries.util_1.0.0.jar@4,reference\:file\:org.apache.commons.beanutils_1.8.3.jar@4,reference\:file\:org.apache.commons.collections_3.2.2.jar@4,reference\:file\:org.apache.commons.digester_3.2.0.jar@4,reference\:file\:org.apache.commons.io_2.6.0.jar@4,reference\:file\:org.apache.commons.lang_2.6.0.jar@4,reference\:file\:org.apache.commons.net_3.6.0.jar@4,reference\:file\:org.apache.felix.gogo.command_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.runtime_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.shell_0.12.0.jar@4,reference\:file\:org.apache.httpcomponents.httpclient_4.2.6.jar@4,reference\:file\:org.apache.httpcomponents.httpcore_4.2.5.jar@4,reference\:file\:org.apache.logging.log4j.api_2.8.2.jar@1\:start,reference\:file\:org.apache.logging.log4j.core_2.8.2.jar@4,reference\:file\:org.apache.logging.log4j.slf4j-impl_2.8.2.jar@4,reference\:file\:org.apache.servicemix.bundles.quartz_2.3.0.2.jar@4,reference\:file\:org.eclipse.equinox.common_3.8.0.v20160509-1230.jar@2\:start,reference\:file\:org.eclipse.equinox.console_1.1.200.v20150929-1405.jar@4,reference\:file\:org.eclipse.equinox.ds_1.4.400.v20160226-2036.jar@1\:start,reference\:file\:org.eclipse.equinox.launcher_1.3.201.v20161025-1711.jar@4,reference\:file\:org.eclipse.equinox.util_1.0.500.v20130404-1337.jar@4,reference\:file\:org.eclipse.jetty.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.deploy_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.http_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.io_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.osgi.boot_9.3.9.v20160517.jar@4\:start,reference\:file\:org.eclipse.jetty.schemas_3.1.0.jar@4,reference\:file\:org.eclipse.jetty.security_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.util_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.webapp_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.api_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.common_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.xml_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.osgi.services_3.2.100.v20100503.jar@4,reference\:file\:org.hamcrest.core_1.3.0.jar@4,reference\:file\:org.jboss.resteasy.client_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxb-provider_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs-api_3.0.11.Final.jar@4,reference\:file\:org.jmock_2.6.0.jar@4,reference\:file\:org.jmock.junit4_2.6.0.jar@4,reference\:file\:org.mybatis.mybatis_3.5.2.jar@4,reference\:file\:org.objectweb.asm_5.0.1.jar@4,reference\:file\:org.objectweb.asm.commons_5.0.1.jar@4,reference\:file\:org.objectweb.asm.tree_5.0.1.jar@4,reference\:file\:org.omnifaces_3.4.1.jar@4,reference\:file\:slf4j.api_1.7.24.jar@4,reference\:file\:slf4j.simple_1.7.2.jar@4,reference\:file\:user.commons.log4j2_1.0.0.jar@4,reference\:file\:user.commons.zk_8.0.3.jar@4,reference\:file\:user.jobengine.osgi.commons_1.0.0.jar@4\:start,reference\:file\:user.jobengine.osgi.db_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.server_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.services_1.0.0.jar@4,reference\:file\:user.mediacube.gui_1.0.0.jar@4,reference\:file\:user.mediacube.metadata_1.0.0.jar@4,reference\:file\:user.tsm.client_1.2.0.jar@4\r
 equinox.use.ds=true\r
 osgi.bundles.defaultStartLevel=4\r
index fd4c203b4975d17c08dc7634731ffa803e6acabf..dbb596e26dbf5a4af81dac08484592e5dbb1ac8f 100644 (file)
@@ -1,5 +1,5 @@
 #This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser\r
-#Wed Feb 10 16:05:17 CET 2021\r
+#Thu Feb 25 16:34:25 CET 2021\r
 osgi.bundles=reference\:file\:cglib_2.2.2.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-annotations_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-core_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-databind_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.dataformat.jackson-dataformat-yaml_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.datatype.jackson-datatype-joda_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-base_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.module.jackson-module-jaxb-annotations_2.4.5.jar@4,reference\:file\:com.ibm.db2.jcc_1.4.0.jar@4,reference\:file\:com.ibm.nosql_4.19.26.jar@4,reference\:file\:com.microsoft.sqlserver.sqljdbc_6.0.8112.100.jar@4,reference\:file\:com.sun.jna_4.2.0.jar@4,reference\:file\:groovy_3.0.3.jar@4,reference\:file\:io.humble.video-arch-x86_64-pc-linux-gnu6_0.2.1.jar@4,reference\:file\:io.humble.video-arch-x86_64-w64-mingw32_0.2.1.jar@4,reference\:file\:io.humble.video-noarch_0.2.1.jar@4,reference\:file\:javax.annotation-api_1.2.0.jar@4,reference\:file\:javax.mail_1.5.0.b01.jar@4,reference\:file\:javax.servlet-api_3.1.0.jar@4,reference\:file\:javax.ws.rs-api_2.0.1.jar@4,reference\:file\:jcifs_1.3.17.jar@4,reference\:file\:joda-time_2.2.0.jar@4,reference\:file\:junit_4.12.0.jar@4,reference\:file\:org.apache.aries.spifly.dynamic.bundle_1.0.8.jar@4,reference\:file\:org.apache.aries.util_1.0.0.jar@4,reference\:file\:org.apache.commons.beanutils_1.8.3.jar@4,reference\:file\:org.apache.commons.collections_3.2.2.jar@4,reference\:file\:org.apache.commons.digester_3.2.0.jar@4,reference\:file\:org.apache.commons.io_2.6.0.jar@4,reference\:file\:org.apache.commons.lang_2.6.0.jar@4,reference\:file\:org.apache.commons.net_3.6.0.jar@4,reference\:file\:org.apache.felix.gogo.command_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.runtime_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.shell_0.12.0.jar@4,reference\:file\:org.apache.httpcomponents.httpclient_4.2.6.jar@4,reference\:file\:org.apache.httpcomponents.httpcore_4.2.5.jar@4,reference\:file\:org.apache.logging.log4j.api_2.8.2.jar@1\:start,reference\:file\:org.apache.logging.log4j.core_2.8.2.jar@4,reference\:file\:org.apache.logging.log4j.slf4j-impl_2.8.2.jar@4,reference\:file\:org.apache.servicemix.bundles.quartz_2.3.0.2.jar@4,reference\:file\:org.eclipse.equinox.common_3.8.0.v20160509-1230.jar@2\:start,reference\:file\:org.eclipse.equinox.console_1.1.200.v20150929-1405.jar@4,reference\:file\:org.eclipse.equinox.ds_1.4.400.v20160226-2036.jar@1\:start,reference\:file\:org.eclipse.equinox.launcher_1.3.201.v20161025-1711.jar@4,reference\:file\:org.eclipse.equinox.util_1.0.500.v20130404-1337.jar@4,reference\:file\:org.eclipse.jetty.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.deploy_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.http_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.io_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.osgi.boot_9.3.9.v20160517.jar@4\:start,reference\:file\:org.eclipse.jetty.schemas_3.1.0.jar@4,reference\:file\:org.eclipse.jetty.security_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.util_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.webapp_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.api_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.common_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.xml_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.osgi.services_3.2.100.v20100503.jar@4,reference\:file\:org.hamcrest.core_1.3.0.jar@4,reference\:file\:org.jboss.resteasy.client_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxb-provider_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs-api_3.0.11.Final.jar@4,reference\:file\:org.jmock_2.6.0.jar@4,reference\:file\:org.jmock.junit4_2.6.0.jar@4,reference\:file\:org.mybatis.mybatis_3.5.2.jar@4,reference\:file\:org.objectweb.asm_5.0.1.jar@4,reference\:file\:org.objectweb.asm.commons_5.0.1.jar@4,reference\:file\:org.objectweb.asm.tree_5.0.1.jar@4,reference\:file\:org.omnifaces_3.4.1.jar@4,reference\:file\:slf4j.api_1.7.24.jar@4,reference\:file\:slf4j.simple_1.7.2.jar@4,reference\:file\:user.commons.log4j2_1.0.0.jar@4,reference\:file\:user.commons.zk_8.0.3.jar@4,reference\:file\:user.jobengine.osgi.commons_1.0.0.jar@4\:start,reference\:file\:user.jobengine.osgi.db_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.server_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.services_1.0.0.jar@4,reference\:file\:user.mediacube.gui_1.0.0.jar@4,reference\:file\:user.mediacube.metadata_1.0.0.jar@4,reference\:file\:user.tsm.client_1.2.0.jar@4\r
 equinox.use.ds=true\r
 osgi.bundles.defaultStartLevel=4\r
diff --git a/server/-product/production/HIRTV/jobs/executors.yaml b/server/-product/production/HIRTV/jobs/executors.yaml
new file mode 100644 (file)
index 0000000..8cba80b
--- /dev/null
@@ -0,0 +1,5 @@
+executors:\r
+ - className: user.jobengine.server.steps.ArchiveListBuilderStep\r
+   maxConcurrent: 1\r
+ - className: user.jobengine.server.steps.ArchiveMaterialSubmitStep\r
+   maxConcurrent: 2\r
index 64cbf7812c198443750b48cf8697cc47b644bcac..5f9eb9558d3de4ce72ed2b1aba0e958e408cc4cf 100644 (file)
@@ -1,4 +1,5 @@
 @echo off\r
+:CHCP 65001 log4j2 elszall tole\r
 if exist tmp rmdir tmp /s /q\r
 mkdir tmp\r
 java ^\r
diff --git a/server/-product/production/HIRTV/settings/jetty/keystore b/server/-product/production/HIRTV/settings/jetty/keystore
deleted file mode 100644 (file)
index 95d7f4c..0000000
Binary files a/server/-product/production/HIRTV/settings/jetty/keystore and /dev/null differ
diff --git a/server/-product/production/HIRTV/settings/test-jetty/jetty-deployer.xml b/server/-product/production/HIRTV/settings/test-jetty/jetty-deployer.xml
deleted file mode 100644 (file)
index ba61d10..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- =============================================================== -->
-<!-- Create the deployment manager                                   -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- The deplyment manager handles the lifecycle of deploying web    -->
-<!-- applications. Apps are provided by instances of the             -->
-<!-- AppProvider interface.                                          -->
-<!-- =============================================================== -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-  <Call name="addBean">
-    <Arg>
-      <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
-        <Set name="contexts">
-          <Ref refid="Contexts" />
-        </Set>
-        <Call name="setContextAttribute">
-          <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
-          <Arg>.*/[^/]*servlet-api-[^/]*\.jar$|.*/javax.servlet.jsp.jstl-.*\.jar$|.*/org.apache.taglibs.taglibs-standard-impl-.*\.jar$</Arg>
-        </Call>
-
-        <!-- Add a customize step to the deployment lifecycle -->
-        <!-- uncomment and replace DebugBinding with your extended AppLifeCycle.Binding class
-        <Call name="insertLifeCycleNode">
-          <Arg>deployed</Arg>
-          <Arg>starting</Arg>
-          <Arg>customise</Arg>
-        </Call>
-        <Call name="addLifeCycleBinding">
-          <Arg>
-            <New class="org.eclipse.jetty.deploy.bindings.DebugBinding">
-              <Arg>customise</Arg>
-            </New>
-          </Arg>
-        </Call> -->
-
-        <Call id="webappprovider" name="addAppProvider">
-          <Arg>
-            <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
-              <Set name="monitoredDirName">
-                <Property>
-                  <Name>jetty.deploy.monitoredPath</Name>
-                  <Default>
-                    <Property name="jetty.base" default="." />/<Property name="jetty.deploy.monitoredDir" deprecated="jetty.deploy.monitoredDirName" default="."/>
-                  </Default>
-                </Property>
-              </Set>
-              <Set name="defaultsDescriptor">
-                <Property>
-                  <Name>jetty.deploy.defaultsDescriptorPath</Name>
-                  <Default>
-                    <Property name="jetty.home" default="." />/etc/webdefault.xml
-                  </Default>
-                </Property>
-              </Set>
-              <Set name="scanInterval"><Property name="jetty.deploy.scanInterval" default="1"/></Set>
-              <Set name="extractWars"><Property name="jetty.deploy.extractWars" default="true"/></Set>
-              <Set name="configurationManager">
-                <New class="org.eclipse.jetty.deploy.PropertiesConfigurationManager">
-                  <!-- file of context configuration properties
-                  <Set name="file"><SystemProperty name="jetty.base"/>/etc/some.properties</Set>
-                  -->
-                  <!-- set a context configuration property
-                  <Call name="put"><Arg>name</Arg><Arg>value</Arg></Call>
-                  -->
-                </New>
-              </Set>
-            </New>
-          </Arg>
-        </Call>
-      </New>
-    </Arg>
-  </Call>
-</Configure>
diff --git a/server/-product/production/HIRTV/settings/test-jetty/jetty-http-redirect.xml b/server/-product/production/HIRTV/settings/test-jetty/jetty-http-redirect.xml
deleted file mode 100644 (file)
index 556f544..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- Configure the Jetty Server instance with an ID "Server"       -->
-<!-- by adding a HTTP connector.                                   -->
-<!-- This configuration must be used in conjunction with jetty.xml -->
-<!-- ============================================================= -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-  <!-- =========================================================== -->
-  <!-- Add a HTTP Connector.                                       -->
-  <!-- Configure an o.e.j.server.ServerConnector with a single     -->
-  <!-- HttpConnectionFactory instance using the common httpConfig  -->
-  <!-- instance defined in jetty.xml                               -->
-  <!--                                                             -->
-  <!-- Consult the javadoc of o.e.j.server.ServerConnector and     -->
-  <!-- o.e.j.server.HttpConnectionFactory for all configuration    -->
-  <!-- that may be set here.                                       -->
-  <!-- =========================================================== -->
-  <Call name="addConnector">
-    <Arg>
-      <New id="httpConnector" class="org.eclipse.jetty.server.ServerConnector">
-        <Arg name="server"><Ref refid="Server" /></Arg>
-        <Arg name="acceptors" type="int"><Property name="jetty.http.acceptors" deprecated="http.acceptors" default="-1"/></Arg>
-        <Arg name="selectors" type="int"><Property name="jetty.http.selectors" deprecated="http.selectors" default="-1"/></Arg>
-        <Arg name="factories">
-          <Array type="org.eclipse.jetty.server.ConnectionFactory">
-            <Item>
-              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-               <Arg name="config">
-                  <New id="tlsHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-                                          <Arg>
-                                             <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-                                                <!-- This says... Redirect to https://host:8443 if server returns "NOT SECURE" error -->
-                                                <Set name="secureScheme">https</Set>
-                                                <Set name="securePort">8444</Set>
-                                             </New>
-                                          </Arg>
-                                          <Call name="addCustomizer">
-                                             <Arg>
-                                                <New class="org.eclipse.jetty.server.SecureRequestCustomizer" />
-                                             </Arg>
-                                          </Call>
-                                       </New>
-                </Arg>
-              </New>
-            </Item>
-          </Array>
-        </Arg>
-        <Set name="host"><Property name="jetty.http.host" deprecated="jetty.host" /></Set>
-        <Set name="port"><Property name="jetty.http.port" deprecated="jetty.port" default="9080" /></Set>
-        <Set name="idleTimeout"><Property name="jetty.http.idleTimeout" deprecated="http.timeout" default="30000"/></Set>
-        <Set name="soLingerTime"><Property name="jetty.http.soLingerTime" deprecated="http.soLingerTime" default="-1"/></Set>
-        <Set name="acceptorPriorityDelta"><Property name="jetty.http.acceptorPriorityDelta" deprecated="http.acceptorPriorityDelta" default="0"/></Set>
-        <Set name="acceptQueueSize"><Property name="jetty.http.acceptQueueSize" deprecated="http.acceptQueueSize" default="0"/></Set>
-      </New>
-    </Arg>
-  </Call>
-
-</Configure>
diff --git a/server/-product/production/HIRTV/settings/test-jetty/keystore b/server/-product/production/HIRTV/settings/test-jetty/keystore
deleted file mode 100644 (file)
index 95d7f4c..0000000
Binary files a/server/-product/production/HIRTV/settings/test-jetty/keystore and /dev/null differ
index fd4c203b4975d17c08dc7634731ffa803e6acabf..dbb596e26dbf5a4af81dac08484592e5dbb1ac8f 100644 (file)
@@ -1,5 +1,5 @@
 #This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser\r
-#Wed Feb 10 16:05:17 CET 2021\r
+#Thu Feb 25 16:34:25 CET 2021\r
 osgi.bundles=reference\:file\:cglib_2.2.2.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-annotations_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-core_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-databind_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.dataformat.jackson-dataformat-yaml_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.datatype.jackson-datatype-joda_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-base_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.module.jackson-module-jaxb-annotations_2.4.5.jar@4,reference\:file\:com.ibm.db2.jcc_1.4.0.jar@4,reference\:file\:com.ibm.nosql_4.19.26.jar@4,reference\:file\:com.microsoft.sqlserver.sqljdbc_6.0.8112.100.jar@4,reference\:file\:com.sun.jna_4.2.0.jar@4,reference\:file\:groovy_3.0.3.jar@4,reference\:file\:io.humble.video-arch-x86_64-pc-linux-gnu6_0.2.1.jar@4,reference\:file\:io.humble.video-arch-x86_64-w64-mingw32_0.2.1.jar@4,reference\:file\:io.humble.video-noarch_0.2.1.jar@4,reference\:file\:javax.annotation-api_1.2.0.jar@4,reference\:file\:javax.mail_1.5.0.b01.jar@4,reference\:file\:javax.servlet-api_3.1.0.jar@4,reference\:file\:javax.ws.rs-api_2.0.1.jar@4,reference\:file\:jcifs_1.3.17.jar@4,reference\:file\:joda-time_2.2.0.jar@4,reference\:file\:junit_4.12.0.jar@4,reference\:file\:org.apache.aries.spifly.dynamic.bundle_1.0.8.jar@4,reference\:file\:org.apache.aries.util_1.0.0.jar@4,reference\:file\:org.apache.commons.beanutils_1.8.3.jar@4,reference\:file\:org.apache.commons.collections_3.2.2.jar@4,reference\:file\:org.apache.commons.digester_3.2.0.jar@4,reference\:file\:org.apache.commons.io_2.6.0.jar@4,reference\:file\:org.apache.commons.lang_2.6.0.jar@4,reference\:file\:org.apache.commons.net_3.6.0.jar@4,reference\:file\:org.apache.felix.gogo.command_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.runtime_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.shell_0.12.0.jar@4,reference\:file\:org.apache.httpcomponents.httpclient_4.2.6.jar@4,reference\:file\:org.apache.httpcomponents.httpcore_4.2.5.jar@4,reference\:file\:org.apache.logging.log4j.api_2.8.2.jar@1\:start,reference\:file\:org.apache.logging.log4j.core_2.8.2.jar@4,reference\:file\:org.apache.logging.log4j.slf4j-impl_2.8.2.jar@4,reference\:file\:org.apache.servicemix.bundles.quartz_2.3.0.2.jar@4,reference\:file\:org.eclipse.equinox.common_3.8.0.v20160509-1230.jar@2\:start,reference\:file\:org.eclipse.equinox.console_1.1.200.v20150929-1405.jar@4,reference\:file\:org.eclipse.equinox.ds_1.4.400.v20160226-2036.jar@1\:start,reference\:file\:org.eclipse.equinox.launcher_1.3.201.v20161025-1711.jar@4,reference\:file\:org.eclipse.equinox.util_1.0.500.v20130404-1337.jar@4,reference\:file\:org.eclipse.jetty.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.deploy_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.http_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.io_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.osgi.boot_9.3.9.v20160517.jar@4\:start,reference\:file\:org.eclipse.jetty.schemas_3.1.0.jar@4,reference\:file\:org.eclipse.jetty.security_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.util_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.webapp_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.api_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.common_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.xml_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.osgi.services_3.2.100.v20100503.jar@4,reference\:file\:org.hamcrest.core_1.3.0.jar@4,reference\:file\:org.jboss.resteasy.client_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxb-provider_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs-api_3.0.11.Final.jar@4,reference\:file\:org.jmock_2.6.0.jar@4,reference\:file\:org.jmock.junit4_2.6.0.jar@4,reference\:file\:org.mybatis.mybatis_3.5.2.jar@4,reference\:file\:org.objectweb.asm_5.0.1.jar@4,reference\:file\:org.objectweb.asm.commons_5.0.1.jar@4,reference\:file\:org.objectweb.asm.tree_5.0.1.jar@4,reference\:file\:org.omnifaces_3.4.1.jar@4,reference\:file\:slf4j.api_1.7.24.jar@4,reference\:file\:slf4j.simple_1.7.2.jar@4,reference\:file\:user.commons.log4j2_1.0.0.jar@4,reference\:file\:user.commons.zk_8.0.3.jar@4,reference\:file\:user.jobengine.osgi.commons_1.0.0.jar@4\:start,reference\:file\:user.jobengine.osgi.db_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.server_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.services_1.0.0.jar@4,reference\:file\:user.mediacube.gui_1.0.0.jar@4,reference\:file\:user.mediacube.metadata_1.0.0.jar@4,reference\:file\:user.tsm.client_1.2.0.jar@4\r
 equinox.use.ds=true\r
 osgi.bundles.defaultStartLevel=4\r
diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/dsm.opt b/server/-product/production/MEDIAVIVANTIS/jobs/dsm.opt
new file mode 100644 (file)
index 0000000..4955eaa
--- /dev/null
@@ -0,0 +1,3 @@
+SErvername       MEDIACUBE\r
+*traceflags api\r
+*tracefile /opt/mediacube/log/tsm.trace
\ No newline at end of file
index 8cd7c04ccf6f996232f856601db93978136cbc0c..10cdb7f6d259a5a5d6adfce3b6d387685b6a2094 100644 (file)
@@ -1,41 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <executors>\r
-       <executor className="user.jobengine.server.steps.ArchiveListBuilderStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.ArchiveMaterialSubmitStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.BatchRetrieveForkStep" maxConcurrent="10" />\r
-       <executor className="user.jobengine.server.steps.CancelableStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.CheckLOWRESIntegrity" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.CheckMORPHEUSMissingMaterialsStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.CheckTRAFFICMissingMaterialsStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.CleanupMountedLocationStep" maxConcurrent="10" />\r
-       <executor className="user.jobengine.server.steps.ProjectCleanupMountedLocationStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.CopyForArchiveNEXIOMaterialsStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.CopyForArchiveNEXIORecordingsStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.CreateArchiveItemStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.CreateMissingLowresStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.DeleteNEXIOMaterialsStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.DetectMissingLengthStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.DeleteFileStep" maxConcurrent="100" />\r
-       <executor className="user.jobengine.server.steps.DownloadRecordingFromNexioStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.DuplicateRemoverStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.GenerateMorpheusMetadataStep" maxConcurrent="10" />\r
-       <executor className="user.jobengine.server.steps.HLSProxyStep" maxConcurrent="2" />\r
-       <executor className="user.jobengine.server.steps.ImportMORPHEUSMissingMaterialsStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.ImportStatisticsStep" maxConcurrent="7" />\r
-       <executor className="user.jobengine.server.steps.MXFCutterStep" maxConcurrent="7" />\r
-       <executor className="user.jobengine.server.steps.MetadataTransformStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.OutputPathAndNameSelectorStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.RecordingsArchiveItemBuilderStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.SyncOCTOPUSDataStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.TranscodeStep" maxConcurrent="2" />\r
-       <executor className="user.jobengine.server.steps.TranscodeFFAStranStep" maxConcurrent="2" />\r
-       <executor className="user.jobengine.server.steps.TranscodeSELENIOStep" maxConcurrent="2" />\r
-       <executor className="user.jobengine.server.steps.TSMBackupStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.TSMExtendedRetrieveStep" maxConcurrent="1"  />\r
-       <executor className="user.jobengine.server.steps.TSMRestoreStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.TSMSystemRestoreStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.TSMRetrieveMissingMaterialStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.UploadRecordingToNexioStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.MediaToolStep" maxConcurrent="1" />\r
-       <executor className="user.jobengine.server.steps.UpdateGhostMediaDataStep" maxConcurrent="1" />\r
+       <executor className="ArchiveRecursive.java" maxConcurrent="1" isRemote="false" />\r
+       <executor className="ArchiveListBuilderStep.java" maxConcurrent="1" isRemote="false" />\r
+       <executor className="ArchiveMaterialSubmitStep.java" maxConcurrent="1" isRemote="false" />\r
+       <executor className="BatchRetrieveForkStep.java" maxConcurrent="1" isRemote="false" />\r
+       <executor className="CancelableStep.java" maxConcurrent="20" isRemote="false" />\r
+       <executor className="CleanupMountedLocationStep.java" maxConcurrent="5" isRemote="false" />\r
+       <executor className="CreateArchiveItemStep.java" maxConcurrent="1" isRemote="false" />\r
+       <executor className="CreateMissingLowresStep.java" maxConcurrent="1" isRemote="false" />\r
+       <executor className="FileCopyStep.java" maxConcurrent="20" isRemote="false" />\r
+       <executor className="HSMMigrateStep.java" maxConcurrent="1" isRemote="false" />\r
+       <executor className="MediaToolStep.java" maxConcurrent="1" isRemote="false" />\r
+       <executor className="MetadataTransformStep.java" maxConcurrent="1" isRemote="false" />\r
+       <executor className="MXFCutterStep.java" maxConcurrent="1" isRemote="false" />\r
+       <executor className="OutputPathAndNameSelectorStep.java" maxConcurrent="1" isRemote="false" />\r
+       <executor className="TranscodeFFAStranStep.java" maxConcurrent="2" isRemote="false" />\r
+       <executor className="TSMBackupStep.java" maxConcurrent="1" isRemote="false" />\r
+       <executor className="TSMExtendedRetrieveStep.java" maxConcurrent="1"  isRemote="false" />\r
+       <executor className="TSMRestoreStep.java" maxConcurrent="1" isRemote="false" />\r
+       <executor className="TSMSimpleRestoreStep.java" maxConcurrent="1" isRemote="false" />\r
+       <executor className="UpdateGhostMediaDataStep.java" maxConcurrent="1" isRemote="false" />\r
 </executors>
\ No newline at end of file
index b500c0c85ad33ca83238d7bde21e9b85ecd23d2f..aaf714371135ed515c8dd9297b42f6110cab16ea 100644 (file)
 {"joblist":[\r
        {\r
-      "template": "cancelable.xml"\r
-       },      \r
-       {\r
       "active": true,\r
       "executeimmediate": true,\r
-         "name" : "OCTOPUS adatok szinkronizálása",\r
-      "template": "sync-octopus.xml",\r
-      "cronexpression": "0/30 * * * * ?",\r
-      "parameters": [\r
-       {"name": "includeArchived", "value": false, "type": "java.lang.Boolean"}\r
-      ]\r
-       },      \r
-       {\r
-      "active": true,\r
-      "executeimmediate": false,\r
-         "name" : "Limitált archiválás az ISILON/ARCHIVE mappából",\r
-      "template": "archive-limited.xml",\r
-      "cronexpression": "0 0 6-22/1 * * ?",\r
-      "parameters": [ \r
-       {"name": "sourcePath", "value": "/mnt/ISILON/ARCHIVE", "type": "java.lang.String"},\r
-       {"name": "killDateDays", "value": 1, "type": "java.lang.Integer"},\r
-       {"name": "limit", "value": 20, "type": "java.lang.Integer"}\r
+         "name" : "Proxy generálás",\r
+      "template": "sys-recreate-lowres.xml",\r
+      "cronexpression": "0 */1 * * * ?",\r
+      "parameters": [ \r
+       {"name": "globalRetrievePath", "value": "file://10.11.1.90/data", "type": "java.lang.String"},\r
+       {"name": "localRetrievePath", "value": "/mediacube/data", "type": "java.lang.String"},\r
+       {"name": "localHiresPath", "value": "/mediacube/data", "type": "java.lang.String" },\r
+       {"name": "globalHiresPath", "value": "\\\\10.11.1.90\\data", "type": "java.lang.String" },\r
+       {"name": "localLowresPath", "value": "/mediacube/data/TRANSCODER_OUT", "type": "java.lang.String" },\r
+       {"name": "transcoderAddress", "value": "http://10.11.1.111:65445/api/json/v1/", "type": "java.lang.String"},\r
+       {"name": "transcoderTemplateName", "value": "MP4", "type": "java.lang.String"}\r
       ]\r
        },\r
        {\r
-      "active": true,\r
+      "active": false,\r
       "executeimmediate": false,\r
-         "name" : "Archiválás az ISILON/ARCHIVE mappából",\r
-      "template": "archive-ondemand.xml",\r
-      "cronexpression": "0 0 1 * * ?",\r
+         "name" : "Rekurzív archiválás a POLC/FINISHED_SHOWS mappából",\r
+      "template": "archive-recursive.xml",\r
+      "cronexpression": "0 */1 * * * ?",\r
       "parameters": [ \r
-       {"name": "sourcePath", "value": "/mnt/ISILON/ARCHIVE", "type": "java.lang.String"},\r
-       {"name": "killDateDays", "value": 1, "type": "java.lang.Integer"},\r
-       {"name": "limit", "value": 0, "type": "java.lang.Integer"}\r
-      ]\r
-       },\r
-       {\r
-         "active": true,\r
-         "executeimmediate": false,\r
-         "name" : "PROXY pótlás FFASTRANS 71",\r
-         "template": "sys-recreate-lowres-71.xml",\r
-         "cronexpression": "0 * * * * ?",\r
-         "parameters": [ \r
-               {"name": "localLowresPath", "value": "/mnt/FIXTRANSCODER-71/OUTPUT", "type": "java.lang.String" },\r
-               {"name": "transcoderAddress", "value": "http://10.10.1.71:65445/api/json/v1/", "type": "java.lang.String"},\r
-               {"name": "globalRetrievePath", "value": "file://10.10.1.30/transcode", "type": "java.lang.String"},\r
-               {"name": "localRetrievePath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String"},\r
-               {"name": "localHiresPath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String" },\r
-               {"name": "globalHiresPath", "value": "L:\\transcode", "type": "java.lang.String" },\r
-               {"name": "transcoderTemplateName", "value": "MAM_proxy", "type": "java.lang.String"}\r
+               {"name": "sourcePath", "value": "/mnt/POLC/FINISHED_SHOWS", "type": "java.lang.String"},\r
+               {"name": "killDateDays", "value": 1, "type": "java.lang.Integer"},\r
+               {"name": "limit", "value": 1, "type": "java.lang.Integer"}\r
          ]\r
        },\r
        {\r
-         "active": true,\r
-         "executeimmediate": false,\r
-         "name" : "PROXY pótlás FFASTRANS 72",\r
-         "template": "sys-recreate-lowres-72.xml",\r
-         "cronexpression": "10 * * * * ?",\r
-         "parameters": [ \r
-               {"name": "localLowresPath", "value": "/mnt/FIXTRANSCODER-72/OUTPUT", "type": "java.lang.String" },\r
-               {"name": "transcoderAddress", "value": "http://10.10.1.72:65445/api/json/v1/", "type": "java.lang.String"},\r
-               {"name": "globalRetrievePath", "value": "file://10.10.1.30/transcode", "type": "java.lang.String"},\r
-               {"name": "localRetrievePath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String"},\r
-               {"name": "localHiresPath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String" },\r
-               {"name": "globalHiresPath", "value": "L:\\transcode", "type": "java.lang.String" },\r
-               {"name": "transcoderTemplateName", "value": "MAM_proxy", "type": "java.lang.String"}\r
-         ]\r
-       },\r
-       {\r
-         "active": true,\r
-         "executeimmediate": false,\r
-         "name" : "PROXY pótlás FFASTRANS 73",\r
-         "template": "sys-recreate-lowres-73.xml",\r
-         "cronexpression": "20 * * * * ?",\r
-         "parameters": [ \r
-               {"name": "localLowresPath", "value": "/mnt/FIXTRANSCODER-73/OUTPUT", "type": "java.lang.String" },\r
-               {"name": "transcoderAddress", "value": "http://10.10.1.73:65445/api/json/v1/", "type": "java.lang.String"},\r
-               {"name": "globalRetrievePath", "value": "file://10.10.1.30/transcode", "type": "java.lang.String"},\r
-               {"name": "localRetrievePath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String"},\r
-               {"name": "localHiresPath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String" },\r
-               {"name": "globalHiresPath", "value": "L:\\transcode", "type": "java.lang.String" },\r
-               {"name": "transcoderTemplateName", "value": "MAM_proxy", "type": "java.lang.String"}\r
-         ]\r
-       },\r
-       {\r
-      "active": true,\r
-      "executeimmediate": false,\r
-         "name" : "PROXY pótlás FFASTRANS 74",\r
-      "template": "sys-recreate-lowres-74.xml",\r
-      "cronexpression": "30 * * * * ?",\r
-      "parameters": [ \r
-       {"name": "localLowresPath", "value": "/mnt/FIXTRANSCODER-74/OUTPUT", "type": "java.lang.String" },\r
-       {"name": "transcoderAddress", "value": "http://10.10.1.74:65445/api/json/v1/", "type": "java.lang.String"},\r
-       {"name": "globalRetrievePath", "value": "file://10.10.1.30/transcode", "type": "java.lang.String"},\r
-       {"name": "localRetrievePath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String"},\r
-       {"name": "localHiresPath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String" },\r
-       {"name": "globalHiresPath", "value": "L:\\transcode", "type": "java.lang.String" },\r
-       {"name": "transcoderTemplateName", "value": "MAM_proxy", "type": "java.lang.String"}\r
-      ]\r
-       },\r
-       {\r
-         "name" : "SYS: create-lowres-ondemand",\r
-      "template": "create-lowres-ondemand.xml",\r
+      "active": false,\r
+      "executeimmediate": true,\r
+         "name" : "Limitált archiválás az PROMISE/ARCHIVE mappából",\r
+      "template": "archive-limited.xml",\r
+      "cronexpression": "0 */10 * * * ?",\r
       "parameters": [ \r
-       {"name": "globalRetrievePath", "value": "file://10.10.1.30/transcode", "type": "java.lang.String"},\r
-       {"name": "localRetrievePath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String"},\r
-       {"name": "localHiresPath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String" },\r
-       {"name": "globalHiresPath", "value": "L:\\transcode", "type": "java.lang.String" },\r
-       {"name": "localLowresPath", "value": "/mnt/FIXTRANSCODER/OUTPUT", "type": "java.lang.String" },\r
-       {"name": "transcoderAddress", "value": "http://10.10.1.74:65445/api/json/v1/", "type": "java.lang.String"},\r
-       {"name": "transcoderTemplateName", "value": "MAM_proxy", "type": "java.lang.String"}\r
+       {"name": "sourcePath", "value": "/mnt/PROMISE/ARCHIVE", "type": "java.lang.String"},\r
+       {"name": "globalSourcePath", "value": "\\\\10.11.1.100\\PROMISE\\ARCHIVE", "type": "java.lang.String"},\r
+       {"name": "transcoderTargetPath", "value": "/mnt/PROMISE/TRANSCODER/FFASTRANSCODER/Out", "type": "java.lang.String"},\r
+       {"name": "killDateDays", "value": -1, "type": "java.lang.Integer"},\r
+       {"name": "limit", "value": 10, "type": "java.lang.Integer"}\r
       ]\r
        },\r
        {\r
-      "active": true,\r
-      "executeimmediate": false,\r
-         "name" : "Lejárt ISILON/TQC/CHECK/KESZ anyagok törlése",\r
-      "template": "delete-materials.xml",\r
-      "cronexpression": "0 0 8 * * ?",\r
-      "parameters": [ \r
-       {"name": "sourcePath", "value": "/mnt/ISILON/TQC/CHECK/KESZ", "type": "java.lang.String"}\r
-      ]\r
-       },      \r
-       {\r
-      "active": true,\r
-      "executeimmediate": false,\r
-         "name" : "Lejárt ISILON/TQC/PROMO/KESZ anyagok törlése",\r
-      "template": "delete-materials.xml",\r
-      "cronexpression": "0 0 6 * * ?",\r
-      "parameters": [ \r
-       {"name": "sourcePath", "value": "/mnt/ISILON/TQC/PROMO/KESZ", "type": "java.lang.String"}\r
-      ]\r
-       },      \r
-       {\r
-      "active": true,\r
-      "executeimmediate": false,\r
-         "name" : "Lejárt ISILON/TQC/REKLAM/KESZ anyagok törlése",\r
-      "template": "delete-materials.xml",\r
-      "cronexpression": "0 0 7 * * ?",\r
-      "parameters": [ \r
-       {"name": "sourcePath", "value": "/mnt/ISILON/TQC/REKLAM/KESZ", "type": "java.lang.String"}\r
-      ]\r
-       },      \r
-       {\r
-      "active": true,\r
-      "executeimmediate": false,\r
-         "name" : "Lejárt ISILON/ARCHIVE anyagok törlése",\r
-      "template": "delete-materials.xml",\r
-      "cronexpression": "0 0 5 * * ?",\r
-      "parameters": [ \r
-       {"name": "sourcePath", "value": "/mnt/ISILON/ARCHIVE", "type": "java.lang.String"}\r
-      ]\r
-       },      \r
-       {\r
-      "active": true,\r
-      "executeimmediate": false,\r
-         "name" : "Lejárt ISILON/OCTOPUS/_NAPI_MEGTEKINTO anyagok törlése",\r
-      "template": "delete-materials.xml",\r
-      "cronexpression": "0 0 22 * * ?",\r
-      "parameters": [ \r
-       {"name": "sourcePath", "value": "/mnt/ISILON/OCTOPUS/_NAPI_MEGTEKINTO", "type": "java.lang.String"}\r
-      ]\r
-       },      \r
-       {\r
-      "active": true,\r
+      "active": false,\r
       "executeimmediate": false,\r
-         "name" : "Lejárt ISISLON/PROMO_NLE mappák törlése",\r
-      "template": "delete-promo-materials.xml",\r
-      "cronexpression": "0 0 6 * * ?",\r
-      "parameters": [ \r
-       {"name": "sourcePath", "value": "/mnt/ISILON/PROMO_NLE", "type": "java.lang.String"}\r
-      ]\r
-       },      \r
+         "name" : "Párhuzamosított teszt folyamat",\r
+      "template": "fake-noparams.xml",\r
+      "cronexpression": "0 40 22 * * ?",\r
+      "parameters": [ {"name": "itemID", "value": 1, "type": "java.lang.Long"} ]\r
+       },\r
        {\r
-      "active": true,\r
-      "executeimmediate": false,\r
-         "name" : "NEXIO bejátszó anyagok másolása az ISILON/ARCHIVE mappába",\r
-      "template": "copyforarchive-nexio-materials.xml",\r
-      "cronexpression": "0 0 10 * * ?",\r
-      "parameters": [ \r
-       {"name": "nexioPort", "value": 2098, "type": "java.lang.Integer"},\r
-       {"name": "nexioUserName", "value": "administrator", "type": "java.lang.String"},\r
-       {"name": "nexioPassword", "value": "system", "type": "java.lang.String"},\r
-       {"name": "archiveFtp", "value": "ftp://10.10.1.100/ARCHIVE", "type": "java.lang.String"},\r
-       {"name": "archiveUserName", "value": "mediacube", "type": "java.lang.String"},\r
-       {"name": "archivePassword", "value": "Broadca5T", "type": "java.lang.String"},\r
-       {"name": "daysBeforeNow", "value": 1, "type": "java.lang.Integer"},\r
-       {"name": "nexioKillDateDays", "value": 21, "type": "java.lang.Integer"},\r
-       {"name": "nexioAgency", "value": "ARCHIVED", "type": "java.lang.String"}\r
-      ]\r
+      "template": "cancelable.xml"\r
        },      \r
        {\r
-      "active": true,\r
+      "active": false,\r
       "executeimmediate": false,\r
-         "name" : "NEXIO visszarögzített anyagok másolása az ISILON/ARCHIVE mappába",\r
-      "template": "copyforarchive-nexio-recordings.xml",\r
-      "cronexpression": "0 0 12 * * ? *",\r
+         "name" : "HSM migrálás",\r
+      "template": "migrate-hsm.xml",\r
+      "cronexpression": "0 0 */1 * * ?",\r
       "parameters": [ \r
-       {"name": "nexioPort", "value": 2098, "type": "java.lang.Integer"},\r
-       {"name": "nexioUserName", "value": "administrator", "type": "java.lang.String"},\r
-       {"name": "nexioPassword", "value": "system", "type": "java.lang.String"},\r
-       {"name": "archiveFtp", "value": "ftp://10.10.1.100/ARCHIVE", "type": "java.lang.String"},\r
-       {"name": "archiveUserName", "value": "mediacube", "type": "java.lang.String"},\r
-       {"name": "archivePassword", "value": "Broadca5T", "type": "java.lang.String"},\r
-       {"name": "filterAgencies", "value": "schedule-rec", "type": "java.lang.String"},\r
-       {"name": "limit", "value": 30, "type": "java.lang.Integer"},\r
-       {"name": "nexioKillDateDays", "value": 7, "type": "java.lang.Integer"},\r
-       {"name": "nexioAgency", "value": "HIRADO_ARCHIVED", "type": "java.lang.String"}\r
+       {"name": "sourceLocation", "value": "", "type": "java.lang.String"},\r
+       {"name": "targetLocation", "value": "/mediacube/data/ARCHIVE", "type": "java.lang.String"}\r
       ]\r
-       },      \r
+       },\r
        {\r
-      "active": true,\r
-      "executeimmediate": false,\r
-         "name" : "Híranyag statisztika importálása",\r
-      "template": "import-statistics.xml",\r
-      "cronexpression": "0 0 6 * * ?",\r
+      "active": false,\r
+      "executeimmediate": true,\r
+         "name" : "Limitált archiválás a /mediacube/data/ARCHIVE mappából",\r
+      "template": "archive-limited.xml",\r
+      "cronexpression": "0 */10 * * * ?",\r
       "parameters": [ \r
-       {"name": "daysBeforeNow", "value": 1, "type": "java.lang.Integer"}\r
+       {"name": "sourcePath", "value": "/mediacube/data/ARCHIVE", "type": "java.lang.String"},\r
+       {"name": "globalSourcePath", "value": "\\\\10.11.1.90\\data\\ARCHIVE", "type": "java.lang.String"},\r
+       {"name": "transcoderTargetPath", "value": "/mnt/PROMISE/TRANSCODER/FFASTRANSCODER/Out", "type": "java.lang.String"},\r
+       {"name": "killDateDays", "value": -1, "type": "java.lang.Integer"},\r
+       {"name": "limit", "value": 1000, "type": "java.lang.Integer"}\r
       ]\r
        },\r
        {\r
       "active": false,\r
       "executeimmediate": true,\r
-         "name" : "TRAFFIC anyagok visszatöltése",\r
-      "template": "retrieve-traffic-missing-materials.xml",\r
-      "cronexpression": "0 0 0/1 1/1 * ? *",\r
-      "parameters": [\r
-       {"name": "dbUrl", "value": "jdbc:sqlserver://10.10.1.45\\sql16;databaseName=PA_Echo;", "type": "java.lang.String"},\r
-       {"name": "userName", "value": "MAM", "type": "java.lang.String"},\r
-       {"name": "password", "value": "Echotv.hu", "type": "java.lang.String"},\r
-       {"name": "lookupDays", "value": 7, "type": "java.lang.Integer"},\r
-       {"name": "targetPath", "value": "/mnt/ISILON/PLAYOUT/IceGateway/Input", "type": "java.lang.String"},\r
-       {"name": "killDateDays", "value": 10, "type": "java.lang.Integer"}\r
+         "name" : "Lejárt /mediacube/data/ARCHIVE anyagok törlése",\r
+      "template": "delete-materials.xml",\r
+      "cronexpression": "0 */10 * * * ?",\r
+      "parameters": [ \r
+       {"name": "sourcePath", "value": "/mediacube/data/ARCHIVE", "type": "java.lang.String"}\r
       ]\r
        },      \r
        {\r
       "active": false,\r
       "executeimmediate": true,\r
-         "name" : "Lejárt ISISLON/ARCHIVE_TEMP anyagok törlése",\r
+         "name" : "Lejárt /mediacube/data/OMARCHIVE anyagok törlése",\r
       "template": "delete-materials.xml",\r
-      "cronexpression": "0 0 0/1 1/1 * ? *",\r
+      "cronexpression": "0 */10 * * * ?",\r
       "parameters": [ \r
-       {"name": "sourcePath", "value": "/mnt/ISILON/ARCHIVE_TEMP", "type": "java.lang.String"}\r
+       {"name": "sourcePath", "value": "/mediacube/data/OMARCHIVE", "type": "java.lang.String"}\r
       ]\r
        },      \r
        {\r
-      "active": true,\r
-      "executeimmediate": false,\r
-         "name" : "Lejárt NEXIO anyagok törlése",\r
-      "template": "delete-nexio-materials.xml",\r
-      "cronexpression": "0 0 6 * * ?",\r
+      "active": false,\r
+      "executeimmediate": true,\r
+         "name" : "Lejárt /PROMISE/ARCHIVE anyagok törlése",\r
+      "template": "delete-materials.xml",\r
+      "cronexpression": "0 */10 * * * ?",\r
       "parameters": [ \r
-       {"name": "port", "value": 2098, "type": "java.lang.Integer"},\r
-       {"name": "userName", "value": "administrator", "type": "java.lang.String"},\r
-       {"name": "password", "value": "system", "type": "java.lang.String"},\r
-       {"name": "filterAgencies", "value": "HIRADO_23_00,HIRADO_ARCHIVED,HIRADO_CLN", "type": "java.lang.String"},\r
-       {"name": "gracePeriodDays", "value": 1, "type": "java.lang.Integer"},\r
-       {"name": "notificationOnly", "value": false, "type": "java.lang.Boolean"}\r
+       {"name": "sourcePath", "value": "/mnt/PROMISE/ARCHIVE", "type": "java.lang.String"}\r
       ]\r
        },      \r
        {\r
       "active": false,\r
       "executeimmediate": false,\r
-         "name" : "Párhuzamosított teszt folyamat",\r
-      "template": "fake-concurrent.xml",\r
-      "cronexpression": "0/10 * * ? * *",\r
-      "parameters": [ {"name": "itemID", "value": 1, "type": "java.lang.Long"} ]\r
-       },\r
-       {\r
-      "active": false,\r
-      "executeimmediate": false,\r
-         "name" : "Teszt folyamat",\r
-      "template": "fake.xml",\r
-      "cronexpression": "0/10 * * ? * *",\r
-      "parameters": [ {"name": "itemID", "value": 1, "type": "java.lang.Long"} ]\r
-       },\r
-       {\r
-         "name" : "SYS: MORPHEUS 'missing materials' importálása",\r
-      "template": "import-morpheus-missing-materials.xml",\r
+         "name" : "Lejárt /POLC/FINISHED_SHOWS anyagok törlése",\r
+      "template": "delete-materials.xml",\r
+      "cronexpression": "0 * 11 * * ?",\r
       "parameters": [ \r
-       {"name": "csvFilePath", "value": "/mnt/MORPHEUS", "type": "java.lang.String"},\r
-       {"name": "processedFolder", "value": "DONE", "type": "java.lang.String"},\r
-       {"name": "targetPath", "value": "/mnt/ISILON/ARCHIVE_RESTORE", "type": "java.lang.String"}\r
+       {"name": "sourcePath", "value": "/mnt/POLC/FINISHED_SHOWS", "type": "java.lang.String"}\r
       ]\r
-       },\r
+       },      \r
        {\r
          "name" : "SYS: batch-retrieve-ondemand",\r
       "template": "batch-retrieve-ondemand.xml",\r
+      "active": false,\r
+      "executeimmediate": false\r
        },\r
        {\r
          "name" : "SYS: retrieve-ondemand",\r
       "template": "retrieve-ondemand.xml",\r
+      "active": false,\r
+      "executeimmediate": false,\r
       "parameters": [ \r
-       {"name": "globalRetrievePath", "value": "file://isilon.intra.echotv.hu", "type": "java.lang.String"},\r
-       {"name": "localRetrievePath", "value": "/mnt/ISILON", "type": "java.lang.String"},\r
+       {"name": "globalRetrievePath", "value": "file://10.11.1.100", "type": "java.lang.String"},\r
+       {"name": "localRetrievePath", "value": "/mnt/PROMISE/", "type": "java.lang.String"},\r
        {"name": "materialOutputFolder", "value": "PLAYOUT_NLE", "type": "java.lang.String"},\r
        {"name": "promoOutputFolder", "value": "PROMO_NLE", "type": "java.lang.String"},\r
        {"name": "advertisementOutputFolder", "value": "REKLAM_NLE", "type": "java.lang.String"},\r
       ]\r
        },\r
        {\r
-         "name" : "sys: MORPHEUS 'missing materials' importálása",\r
-      "template": "sys-import-morpheus-missing-materials.xml",\r
+         "name" : "SYS: common-copy",\r
+      "template": "common-copy.xml",\r
+      "active": false,\r
+      "executeimmediate": false\r
+       },\r
+       {\r
+      "template": "create-lowres-ondemand.xml",\r
+      "active": false,\r
+      "executeimmediate": false,\r
       "parameters": [ \r
-       {"name": "csvFilePath", "value": "/mnt/MORPHEUS", "type": "java.lang.String"},\r
-       {"name": "processedFolder", "value": "DONE", "type": "java.lang.String"},\r
-       {"name": "targetPath", "value": "/mnt/ISILON/PLAYOUT/Video", "type": "java.lang.String"}\r
+       {"name": "globalRetrievePath", "value": "file://10.11.1.90/data", "type": "java.lang.String"},\r
+       {"name": "localRetrievePath", "value": "/mediacube/data", "type": "java.lang.String"},\r
+       {"name": "localHiresPath", "value": "/mediacube/data", "type": "java.lang.String" },\r
+       {"name": "globalHiresPath", "value": "\\\\10.11.1.90\\data", "type": "java.lang.String" },\r
+       {"name": "localLowresPath", "value": "/mediacube/data/TRANSCODER_OUT", "type": "java.lang.String" },\r
+       {"name": "transcoderAddress", "value": "http://10.11.1.111:65445/api/json/v1/", "type": "java.lang.String"},\r
+       {"name": "transcoderTemplateName", "value": "MP4", "type": "java.lang.String"}\r
       ]\r
        },\r
        {\r
-         "name" : "sys: MORPHEUS 'missing material' visszatöltése",\r
-      "template": "sys-retrieve-missing-material.xml",\r
+      "active": false,\r
+      "executeimmediate": false,\r
+      "template": "cancelable.xml",\r
       "parameters": [ \r
-       {"name": "targetPath", "value": "/mnt/ISILON/PLAYOUT/Video", "type": "java.lang.String"},\r
-       {"name": "globalRetrievePath", "value": "\\\\10.10.1.100\\BRAAVOS\\PLAYOUT\\Video", "type": "java.lang.String"},\r
-       {"name": "morpheusDeviceID", "value": "ISILON", "type": "java.lang.String"},\r
-       {"name": "dbUrl", "value": "jdbc:sqlserver://10.10.1.45;databaseName=PA_Echo;", "type": "java.lang.String"},\r
-       {"name": "userName", "value": "MAM", "type": "java.lang.String"},\r
-       {"name": "password", "value": "Echotv.hu", "type": "java.lang.String"},\r
-       {"name": "targetMetadataPath", "value": "/mnt/ISILON/PLAYOUT/MorpheusGateway/Input", "type": "java.lang.String"}\r
-      ]\r
+               {"name": "param", "value": 1, "type": "java.lang.Integer"}\r
+         ]\r
        }\r
 ]}\r
-\r
-\r
-\r
index 166a200ea80607d8b51348dfad87fe2ac0e5b893..f11e3a52054f5feebe907e44a024ca3bfdab1785 100644 (file)
@@ -31,8 +31,9 @@ public class ArchiveMaterialSubmitStep extends JobStep {
                                try {\r
                                        IJobRuntime runtime = jobEngine.submit(jobRuntime, null, JOBTEMPLATE, ARCHIVE,\r
                                                        ListUtils.asMap(ARCHIVE_ITEM, archiveItem, KILL_DATE_DAYS, killDateDays));\r
-                                       setProgress((i + 1) * 100 / archiveList.size());\r
-                                       //TODO kivezetni a submit hibaüzenetet\r
+                                                       \r
+                                       int progress = (i + 1) * 100 / archiveList.size();\r
+                                       setProgress(progress);\r
                                        if (runtime == null)\r
                                                throw new Exception("Submit returned null runtime");\r
                                } catch (Exception e) {\r
index 7fc1a4ccab2c60c52c89a14e4658c1fab99ec534..982240de8dcddadb21d9b0a60c762a9abe485dbe 100644 (file)
@@ -17,8 +17,6 @@ public class CancelableStep extends JobStep {
        @StepEntry\r
        public Object[] execute(int param) throws Exception {\r
                try {\r
-                       logger.info("{}", EscortFiles.DOT_CATCHED);\r
-\r
                        getJobRuntime().setRelated("TESZT1");\r
 \r
                        //                      ftpTest();\r
@@ -28,7 +26,7 @@ public class CancelableStep extends JobStep {
                        for (int i = 0; i < count; i++) {\r
                                if (getJobRuntime().isWaitingCancel())\r
                                        break;\r
-                               Thread.sleep(500);\r
+                               Thread.sleep(50);\r
                                int progress = (i + 1) * 100 / count;\r
                                setProgress(progress);\r
                                logger.info(marker, "{}", i);\r
diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/steps/TestForkCancelableStep.java b/server/-product/production/MEDIAVIVANTIS/jobs/steps/TestForkCancelableStep.java
deleted file mode 100644 (file)
index 28e66d3..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-package user.jobengine.server.steps;\r
-\r
-import org.apache.logging.log4j.LogManager;\r
-import org.apache.logging.log4j.Logger;\r
-\r
-import user.commons.IJob;\r
-import user.commons.JobStatus;\r
-import user.commons.ListUtils;\r
-import user.jobengine.server.IJobEngine;\r
-import user.jobengine.server.IJobRuntime;\r
-\r
-public class TestForkCancelableStep extends JobStep {\r
-       private static final String CHILD_TEMPLATE = "cancelable.xml";\r
-       private static final Logger logger = LogManager.getLogger();\r
-       int count = 5;\r
-\r
-       @StepEntry\r
-       public Object[] execute(IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
-               jobRuntime.forkPrepare();\r
-               for (int i = 0; i < count; i++) {\r
-                       if (getJobRuntime().isWaitingCancel())\r
-                               break;\r
-                       //jobEngine.submit(jobRuntime, null, CHILD_TEMPLATE, CHILD_TITLE, ListUtils.asMap("itemID", i));\r
-                       //                              IJobRuntime runtime = jobEngine.submit(jobRuntime, null, CHILD_TEMPLATE, "JOB " + i, ListUtils.asMap("param", i));\r
-                       IJobRuntime runtime = getEngine().submit(getJobRuntime(), e -> {\r
-                               if (e.getStatus().equals(JobStatus.CANCELED) || e.getStatus().equals(JobStatus.SUSPENDED))\r
-                                       logger.info("Cleanup occured because status is {} {}", e.getStatus(), ((IJob) e.getSource()).getId());\r
-                       }, CHILD_TEMPLATE, "JOB " + i, 0, IJobEngine.DEFAULT_OWNER, ListUtils.asMap("param", i));\r
-\r
-                       runtime.setRelated("TEST" + runtime.getId());\r
-               }\r
-\r
-               jobRuntime.forkWaitComplete();\r
-               logger.info("Done");\r
-               return null;\r
-       }\r
-}\r
diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/templates/template1.yaml b/server/-product/production/MEDIAVIVANTIS/jobs/templates/template1.yaml
new file mode 100644 (file)
index 0000000..4459b9f
--- /dev/null
@@ -0,0 +1,28 @@
+jobtemplate:\r
+   multiInstance: true\r
+   useSessionLog: true\r
+   declarations:\r
+      parameters:\r
+       - name: param1\r
+         type: java.lang.Integer\r
+       - name: param1\r
+         type: java.lang.Integer\r
+      variables:\r
+       - name: var1\r
+         type: java.lang.Integer\r
+       - name: var1\r
+         type: java.lang.Integer\r
+      commands:\r
+       - type: Step1.java\r
+         weight: 1\r
+         inputs:\r
+          - name: param1\r
+          - name: param2\r
+         outputs:\r
+          - name: var1\r
+          - name: var2\r
+       - type: StepS.java\r
+         weight: 1\r
+         inputs:\r
+          - name: var1\r
+          - name: var2\r
diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/templates/test-fork-cancelable.xml b/server/-product/production/MEDIAVIVANTIS/jobs/templates/test-fork-cancelable.xml
deleted file mode 100644 (file)
index f3d21d6..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<jobtemplate multiInstance="true">\r
-<commands>\r
-       <calljobstep type="TestForkCancelableStep.java" weight="1" />\r
-</commands>\r
-</jobtemplate>
\ No newline at end of file
index fea1fa287ea1ad0c01d24448605db579412935d3..8d4aff66572f29292bbbfc4ae72a49dbe70e3813 100644 (file)
@@ -1,57 +1,45 @@
 datasource:\r
-   mediacube:\r
-      url: jdbc:db2://10.11.1.90:50000/mc\r
-      user: db2admin\r
-      password: password\r
-      external-indexer: false\r
-      simple-search: true\r
-      login-timeout: 3\r
-      pool-size: 10\r
-   mediacube-nosql:\r
-      url: jdbc:db2://10.11.1.90:50000/mc\r
-      user: db2admin\r
-      password: password\r
-      schema: test\r
-      login-timeout: 3\r
-   nexio: \r
-      url: jdbc:db2://10.11.1.90:50000/mc\r
-      user: db2admin\r
-      password: password\r
-   hsm: \r
-      url: jdbc:db2://10.11.1.89:51500/tsmdb1\r
-      user: tsminst1\r
-      password: tsminst1\r
-   planair: \r
-      url: jdbc:sqlserver://10.11.254.86;databaseName=PA_Vivantis;\r
-      user: MAM\r
-      password: VDani\r
+  mediacube:\r
+    url: jdbc:db2://10.11.1.90:50000/mc\r
+    user: db2admin\r
+    password: password\r
+    external-indexer: false\r
+    simple-search: true\r
+    login-timeout: 3\r
+    pool-size: 10\r
+  mediacube-nosql:\r
+    url: jdbc:db2://10.11.1.90:50000/mc\r
+    user: db2admin\r
+    password: password\r
+    schema: test\r
+    login-timeout: 3\r
+  hsm: \r
+    url: jdbc:db2://10.11.1.89:51500/tsmdb1\r
+    user: tsminst1\r
+    password: tsminst1\r
+  planair: \r
+    url: jdbc:sqlserver://10.11.254.86;databaseName=PA_Vivantis;\r
+    user: MAM\r
+    password: VDani\r
 services:\r
-   ffmpeg:\r
-      execurable-location: /opt/ffmpeg/ffmpeg \r
-   mediacube:\r
-      proxy-root: /opt\r
-   nexio:\r
-      host: 10.10.1.55\r
-      collection-name: nexioclips\r
-      use-mos-gateway: true\r
-      disabled: true\r
-   octopus:\r
-      api:\r
-         address: http://10.10.1.11/api/v1\r
-         user: mama\r
-         password: napocska\r
-      rundowns-collection-name: rundowns\r
-      stories-collection-name: stories\r
-      folders-collection-name: storyfolders\r
+  ffmpeg:\r
+    execurable-location: /opt/ffmpeg/ffmpeg \r
+  mediacube:\r
+    proxy-root: /_workspace/data/video\r
+  nexio:\r
+    host: 10.10.1.55\r
+    collection-name: nexioclips\r
+    use-mos-gateway: true\r
+    disabled: true\r
 jobs:\r
-   validate-transfers: false\r
-   copy-buffer-size: 32768\r
-   scheduled-execution-disabled: true\r
+  validate-transfers: false\r
+  copy-buffer-size: 32768\r
+  scheduled-execution-disabled: true\r
 tsm:\r
-   randomize-archives: false \r
-   delimiter: /\r
-   node-name: JOBENGINE\r
-   fs-name: /JOBENGINE\r
-   alternate-fs-name: /JOBENGINE\r
-   hl-name: /JOBENGINE\r
+  randomize-archives: false \r
+  delimiter: /\r
+  node-name: JOBENGINE\r
+  fs-name: /JOBENGINE\r
+  alternate-fs-name: /JOBENGINE\r
+  hl-name: /JOBENGINE\r
    
\ No newline at end of file
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/http.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty/http.xml
deleted file mode 100644 (file)
index 95b6398..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-
-<!-- ============================================================= -->
-<!-- Configure the Jetty Server instance with an ID "Server"       -->
-<!-- by adding a HTTP connector.                                   -->
-<!-- This configuration must be used in conjunction with jetty.xml -->
-<!-- ============================================================= -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-  <!-- =========================================================== -->
-  <!-- Add a HTTP Connector.                                       -->
-  <!-- Configure an o.e.j.server.ServerConnector with a single     -->
-  <!-- HttpConnectionFactory instance using the common httpConfig  -->
-  <!-- instance defined in jetty.xml                               -->
-  <!--                                                             -->
-  <!-- Consult the javadoc of o.e.j.server.ServerConnector and     -->
-  <!-- o.e.j.server.HttpConnectionFactory for all configuration    -->
-  <!-- that may be set here.                                       -->
-  <!-- =========================================================== -->
-  <Call name="addConnector">
-    <Arg>
-      <New class="org.eclipse.jetty.server.ServerConnector">
-        <Arg name="server"><Ref refid="Server" /></Arg>
-        <Arg name="factories">
-          <Array type="org.eclipse.jetty.server.ConnectionFactory">
-            <Item>
-              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-                <Arg name="config"><Ref refid="httpConfig" /></Arg>
-              </New>
-            </Item>
-          </Array>
-        </Arg>
-        <Set name="host"><Property name="jetty.http.host" /></Set>
-        <Set name="port"><Property name="jetty.http.port" default="8888" /></Set>
-        <Set name="idleTimeout"><Property name="jetty.http.idleTimeout" default="30000"/></Set>
-      </New>
-    </Arg>
-  </Call>
-
-</Configure>
index f388a6a6bc3a3fdc9b81bb9b60930b453b51a350..ad94622321ef43dcd72b4972b039ba5b6c29e33d 100644 (file)
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <Configuration status="ERROR" monitorInterval="10" packages="user.commons.log4j2.appender">\r
        <Properties>\r
-               <Property name="logPath">/opt/mediacube/log</Property>\r
+               <Property name="logPath">log</Property>\r
                <Property name="fileName">${logPath}/mediacube.log</Property>\r
+               <Property name="movTestName">${logPath}/movtest.log</Property>\r
+               <Property name="movTestPattern">${logPath}/$${date:yyyy-MM}/movtest-%d{MM-dd-yyyy}-%i.log.gz</Property>\r
+               <Property name="delete-materials.log">${logPath}/delete-materials.log</Property>\r
+               <Property name="delete-materials.pattern">${logPath}/$${date:yyyy-MM}/delete-materials-%d{MM-dd-yyyy}-%i.log.gz</Property>\r
                <Property name="filePattern">${logPath}/$${date:yyyy-MM}/mediacube-%d{MM-dd-yyyy}-%i.log.gz</Property>\r
                <Property name="markeredFileName">${logPath}/markered-mediacube.log</Property>\r
                <Property name="markeredFilePattern">${logPath}/$${date:yyyy-MM}/markered-mediacube-%d{MM-dd-yyyy}-%i.log.gz</Property>\r
                        </Filters>\r
                        <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{1}.%M - %markerSimpleName - %msg (%F:%L)%n" />\r
                </Console>\r
-<!--\r
-               <HTMLMailAppender name="MarkeredMail" subject="[MAIN] MediaCube rendszerüzenet" to="shray.tarum@gmail.com,papp.zoltan@hirtv.net" \r
-               from="mediacube-noreply@echotv.hu" smtpHost="10.10.254.63" smtpPort="25" smtpProtocol="smtp" smtpUsername="intra\mediacube" \r
-               smtpPassword="s@vm*P#6Jh" ignoreExceptions="false" bufferSize="1">\r
--->            \r
-               <HTMLMailAppender name="MarkeredMail" subject="[MAIN] MediaCube rendszerüzenet" to="shray.tarum@gmail.com,papp.zoltan@hirtv.net" \r
-               from="mediacube-noreply@hirtv.net" smtpHost="10.10.254.120" smtpPort="25" smtpProtocol="smtp" ignoreExceptions="false" bufferSize="1">\r
+               <HTMLMailAppender name="MarkeredMail" subject="[Media Vivantis] MediaCube rendszerüzenet" to="zombori.mark@mediavivantis.hu,varga-nagy.lajos@mediavivantis.hu,vasary@elgekko.net" from="mediacubeserver@mediavivantis.hu" smtpHost="mediavivantis-hu.mail.protection.outlook.com"\r
+                       smtpPort="25" smtpProtocol="smtp" ignoreExceptions="false" bufferSize="1">\r
                        <Filters>\r
                                <MarkerFilter marker="MEDIACUBE" onMatch="ACCEPT" onMismatch="DENY" />\r
                        </Filters>\r
-                       <PatternLayout pattern="%d{HH:mm:ss} %level - %msg %n" />\r
+                       <PatternLayout pattern="%d{HH:mm:ss} %-5level - %msg %n%n A küldő a %F forráskód %L. sorából a %logger{1}.%M függvény volt. %n" />\r
                </HTMLMailAppender>\r
+               <RollingFile name="movTestName" fileName="${movTestName}" filePattern="${movTestPattern}">\r
+                       <Filters>\r
+                               <MarkerFilter marker="MOVTEST" onMatch="ACCEPT" onMismatch="DENY" />\r
+                       </Filters>\r
+                       <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{1}.%M - %markerSimpleName - %msg (%F:%L)%n %throwable" />\r
+                       <Policies>\r
+                               <TimeBasedTriggeringPolicy />\r
+                       </Policies>\r
+               </RollingFile>\r
+               <RollingFile name="delete-materials" fileName="${delete-materials.log}" filePattern="${delete-materials.pattern}">\r
+                       <Filters>\r
+                               <MarkerFilter marker="delete-materials.xml" onMatch="ACCEPT" onMismatch="DENY" />\r
+                       </Filters>\r
+                       <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{1}.%M - %markerSimpleName - %msg (%F:%L)%n %throwable" />\r
+                       <Policies>\r
+                               <TimeBasedTriggeringPolicy />\r
+                       </Policies>\r
+               </RollingFile>\r
                <RollingFile name="MarkeredRollingFile" fileName="${markeredFileName}" filePattern="${markeredFilePattern}">\r
                        <Filters>\r
                                <MarkerFilter marker="MEDIACUBE" onMatch="ACCEPT" onMismatch="DENY" />\r
@@ -69,7 +86,9 @@
                        <AppenderRef ref="RollingFile" />\r
                        <AppenderRef ref="RollingFileExceptions" />\r
                        <AppenderRef ref="MarkeredRollingFile" />\r
-                       <AppenderRef ref="MarkeredMail" />\r
+<!--                   <AppenderRef ref="MarkeredMail" />-->\r
+                       <AppenderRef ref="movTestName" />\r
+                       <AppenderRef ref="delete-materials" />\r
                </Root>\r
                <Logger name="org.zkoss" level="ERROR" additivity="false" />\r
                <Logger name="org.quartz" level="ERROR" additivity="false" />\r
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/maestro.json b/server/-product/production/MEDIAVIVANTIS/settings/maestro.json
deleted file mode 100644 (file)
index aa7778a..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-       "sourceStoreUri": {
-               "name": "Default",
-               "protocol": "LOCAL",
-               "uri": "/mnt/NLE",
-               "fileFilter": "*.mxf",
-               "showDirectories": true
-       },
-       "alternateSourceStoreUris": 
-               [
-                       {
-                               "name": "NLE1",
-                               "protocol": "LOCAL",
-                               "uri": "/mnt/NLE/NLE1",
-                               "fileFilter": "*.mxf",
-                               "showDirectories": true
-                       },
-                       {
-                               "name": "NLE2",
-                               "protocol": "LOCAL",
-                               "uri": "/mnt/NLE/NLE2",
-                               "fileFilter": "*.mxf",
-                               "showDirectories": true
-                       },
-                       {
-                               "name": "NLE3",
-                               "protocol": "LOCAL",
-                               "uri": "/mnt/NLE/NLE3",
-                               "fileFilter": "*.mxf",
-                               "showDirectories": true
-                       },
-                       {
-                               "name": "NLE4",
-                               "protocol": "LOCAL",
-                               "uri": "/mnt/NLE/NLE4",
-                               "fileFilter": "*.mxf",
-                               "showDirectories": true
-                       },
-                       {
-                               "name": "POLC",
-                               "protocol": "LOCAL",
-                               "uri": "/mnt/POLC",
-                               "fileFilter": "*.mxf",
-                               "showDirectories": true
-                       }
-       ],
-       "targets": 
-       [
-               {
-                       "name": "FINISHED_SHOWS",
-                       "killDateDays": 7,
-                       "storeUri": {
-                               "protocol": "LOCAL",
-                               "uri": "/mnt/PROMISE/FINISHED_SHOWS"
-                       }
-               }
-       ]
-}
-
-
-
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/maestro.yaml b/server/-product/production/MEDIAVIVANTIS/settings/maestro.yaml
new file mode 100644 (file)
index 0000000..1d36157
--- /dev/null
@@ -0,0 +1,38 @@
+sourceStoreUri:
+  name: Default
+  protocol: LOCAL
+  uri: "/mnt/NLE"
+  fileFilter: "*.mxf"
+  showDirectories: true
+alternateSourceStoreUris:
+- name: NLE1
+  protocol: LOCAL
+  uri: "/mnt/NLE/NLE1"
+  fileFilter: "*.mxf"
+  showDirectories: true
+- name: NLE2
+  protocol: LOCAL
+  uri: "/mnt/NLE/NLE2"
+  fileFilter: "*.mxf"
+  showDirectories: true
+- name: NLE3
+  protocol: LOCAL
+  uri: "/mnt/NLE/NLE3"
+  fileFilter: "*.mxf"
+  showDirectories: true
+- name: NLE4
+  protocol: LOCAL
+  uri: "/mnt/NLE/NLE4"
+  fileFilter: "*.mxf"
+  showDirectories: true
+- name: POLC
+  protocol: LOCAL
+  uri: "/mnt/POLC"
+  fileFilter: "*.mxf"
+  showDirectories: true
+targets:
+- name: FINISHED_SHOWS
+  killDateDays: 7
+  storeUri:
+    protocol: LOCAL
+    uri: "/mnt/PROMISE/FINISHED_SHOWS"
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/mediacube.json b/server/-product/production/MEDIAVIVANTIS/settings/mediacube.json
deleted file mode 100644 (file)
index d413314..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-{\r
-       "topTypeFilters": [\r
-               {\r
-                       "name": "Hír bejátszó",\r
-                       "color": "RED200",\r
-                       "icon": "ic_language_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "Hír nyers",\r
-                       "color": "RED100",\r
-                       "icon": "ic_perm_camera_mic_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "ECHO visszarögzített",\r
-                       "color": "BROWN100",\r
-                       "icon": "ic_group_work_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "Visszarögzített",\r
-                       "color": "BROWN100",\r
-                       "icon": "ic_group_work_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "Muszter DEMO",\r
-                       "color": "BROWN100",\r
-                       "icon": "ic_group_work_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "Műsor CLEAN",\r
-                       "color": "BROWN100",\r
-                       "icon": "ic_group_work_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "Egyéb",\r
-                       "color": "YELLOW200",\r
-                       "icon": "ic_view_quilt_black_18dp.png"\r
-               }\r
-       ],\r
-       "bottomTypeFilters": [\r
-               {\r
-                       "name": "ECHO műsor",\r
-                       "color": "TEAL200",\r
-                       "icon": "ic_theaters_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "Műsor",\r
-                       "color": "TEAL200",\r
-                       "icon": "ic_theaters_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "Műsor nyers",\r
-                       "color": "TEAL100",\r
-                       "icon": "ic_invert_colors_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "ECHO promo",\r
-                       "color": "INDIGO200",\r
-                       "icon": "ic_picture_in_picture_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "Promo",\r
-                       "color": "INDIGO200",\r
-                       "icon": "ic_picture_in_picture_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "Promo nyers",\r
-                       "color": "INDIGO100",\r
-                       "icon": "ic_bug_report_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "ECHO reklám",\r
-                       "color": "BLUE200",\r
-                       "icon": "ic_picture_in_picture_alt_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "Reklám",\r
-                       "color": "BLUE200",\r
-                       "icon": "ic_picture_in_picture_alt_black_18dp.png"\r
-               },\r
-               {\r
-                       "name": "Reklám nyers",\r
-                       "color": "BLUE100",\r
-                       "icon": "ic_settings_brightness_black_18dp.png"\r
-               }\r
-       ],\r
-       "authentication": {\r
-               "authEnabled": true,\r
-               "adHost": "10.10.254.11",\r
-               "adNonSecurePort": 3268,\r
-               "adBaseDn": "DC=intra,DC=echotv,DC=hu",\r
-               "adAdminMap": [\r
-                        "G_ECH_U_INFORMATIKUSOK",\r
-                        "G_ECH_U_MUSZAKVEZETOK",\r
-                        "ECH-ISILON-ADMINS"\r
-               ],\r
-               "adSubmitterMap": [\r
-                       "G_ECH_U_INFORMATIKUSOK",\r
-                       "G_ECH_U_MUSZAKVEZETOK",\r
-                       "ECH-ISILON-ADMINS",\r
-                       "G_ECH_U_PLAYOUT"\r
-               ],\r
-               "adEditorMap": [\r
-                       "G_ECH_U_INFORMATIKUSOK",\r
-                       "G_ECH_U_MUSZAKVEZETOK",\r
-                       "ECH-ISILON-ADMINS",\r
-                       "G_ECH_U_ARCHIVUM"\r
-               ],\r
-               "localAccounts": [\r
-                       {\r
-                               "user" : "user",\r
-                               "password" : "5F4DCC3B5AA765D61D8327DEB882CF99",\r
-                               "email" : null\r
-                       },\r
-                       {\r
-                               "user" : "lebony",\r
-                               "password" : "4E25B117B14D86D7DCECB4E433CF932C",\r
-                               "email" : null\r
-                       },\r
-                       {\r
-                               "user" : "root",\r
-                               "password" : "5F4DCC3B5AA765D61D8327DEB882CF99",\r
-                               "email" : "vasary@elgekko.net"\r
-                       }\r
-               ],\r
-               "localAdmins": [\r
-                       "root",\r
-                       "admin"\r
-               ],\r
-               "localSubmitters": [\r
-                       "lebony"\r
-               ],\r
-               "localEditors": [\r
-                       "editor"\r
-               ]\r
-       }\r
-}\r
-\r
-\r
-\r
diff --git a/server/-product/production/MEDIAVIVANTIS/settings/mediacube.yaml b/server/-product/production/MEDIAVIVANTIS/settings/mediacube.yaml
new file mode 100644 (file)
index 0000000..fcf8cf5
--- /dev/null
@@ -0,0 +1,46 @@
+jobQueuePollInterval: 1000\r
+topTypeFilters:\r
+- name: Hír bejátszó\r
+- name: Hír nyers\r
+- name: Visszarögzített\r
+- name: Egyéb\r
+bottomTypeFilters:\r
+- name: Műsor\r
+- name: Műsor nyers\r
+- name: Promo\r
+- name: Promo nyers\r
+- name: Reklám\r
+- name: Reklám nyers\r
+authentication:\r
+  authEnabled: true\r
+  adHost: intra.mediavivantis.hu\r
+  adNonSecurePort: 3268\r
+  adBaseDn: DC=intra,DC=mediavivantis,DC=hu\r
+  adAdminMap:\r
+  - G_MV_U_MUSZAK\r
+  - G_MV_U_INGEST\r
+  adSubmitterMap:\r
+  - G_ECH_U_INFORMATIKUSOK\r
+  - G_ECH_U_MUSZAKVEZETOK\r
+  - ECH-ISILON-ADMINS\r
+  adEditorMap:\r
+  - G_ECH_U_INFORMATIKUSOK\r
+  - G_ECH_U_MUSZAKVEZETOK\r
+  - ECH-ISILON-ADMINS\r
+  localAccounts:\r
+  - user: user\r
+    password: 5F4DCC3B5AA765D61D8327DEB882CF99\r
+    email:\r
+  - user: lebony\r
+    password: 4E25B117B14D86D7DCECB4E433CF932C\r
+    email:\r
+  - user: root\r
+    password: 5F4DCC3B5AA765D61D8327DEB882CF99\r
+    email: vasary@elgekko.net\r
+  localAdmins:\r
+  - root\r
+  - admin\r
+  localSubmitters:\r
+  - lebony\r
+  localEditors:\r
+  - editor\r
diff --git a/server/hu.user.mediacube.executors.tests/jobs/executors.yaml b/server/hu.user.mediacube.executors.tests/jobs/executors.yaml
new file mode 100644 (file)
index 0000000..8cba80b
--- /dev/null
@@ -0,0 +1,5 @@
+executors:\r
+ - className: user.jobengine.server.steps.ArchiveListBuilderStep\r
+   maxConcurrent: 1\r
+ - className: user.jobengine.server.steps.ArchiveMaterialSubmitStep\r
+   maxConcurrent: 2\r
diff --git a/server/hu.user.mediacube.executors.tests/jobs/template1.yaml b/server/hu.user.mediacube.executors.tests/jobs/template1.yaml
new file mode 100644 (file)
index 0000000..4459b9f
--- /dev/null
@@ -0,0 +1,28 @@
+jobtemplate:\r
+   multiInstance: true\r
+   useSessionLog: true\r
+   declarations:\r
+      parameters:\r
+       - name: param1\r
+         type: java.lang.Integer\r
+       - name: param1\r
+         type: java.lang.Integer\r
+      variables:\r
+       - name: var1\r
+         type: java.lang.Integer\r
+       - name: var1\r
+         type: java.lang.Integer\r
+      commands:\r
+       - type: Step1.java\r
+         weight: 1\r
+         inputs:\r
+          - name: param1\r
+          - name: param2\r
+         outputs:\r
+          - name: var1\r
+          - name: var2\r
+       - type: StepS.java\r
+         weight: 1\r
+         inputs:\r
+          - name: var1\r
+          - name: var2\r
index 818af0452e54c0a92e39871b149cfc97975a7c8e..d97cc44aaefcb2141be0589cea01583b23f40823 100644 (file)
@@ -43,6 +43,8 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;\r
 import org.apache.commons.lang.StringUtils;\r
 import org.apache.ibatis.jdbc.SQL;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
 import org.junit.Test;\r
 \r
 import com.ibm.nosql.json.api.BasicDBList;\r
@@ -50,6 +52,7 @@ import com.ibm.nosql.json.api.BasicDBObject;
 import com.ibm.nosql.json.api.DBObject;\r
 \r
 import groovy.lang.GroovyClassLoader;\r
+import groovy.lang.GroovyCodeSource;\r
 import user.commons.RemoteFile;\r
 import user.commons.StoreUri;\r
 import user.commons.configuration.IConfiguration;\r
@@ -1237,4 +1240,29 @@ public class SmallTests {
                        System.out.println(rundowns.size());\r
                }\r
        }\r
+\r
+       @Test\r
+       public void test999990() throws Exception {\r
+               Logger logger = LogManager.getLogger();\r
+               String className = "TestStep.java";\r
+               String root = "/opt/steps";\r
+               String script = new String(Files.readAllBytes(Paths.get(root, className)));\r
+               GroovyCodeSource codeSource = new GroovyCodeSource(script, className, "/groovy/script");\r
+               try (GroovyClassLoader cl = new GroovyClassLoader(this.getClass().getClassLoader())) {\r
+                       cl.addClasspath(root);\r
+\r
+                       Class class1 = cl.parseClass(codeSource);\r
+                       logger.info(class1);\r
+               } catch (Exception e) {\r
+                       logger.error(e);\r
+               }\r
+\r
+       }\r
+\r
+       @Test\r
+       public void test999991() throws Exception {\r
+               IConfiguration configuration = SystemConfiguration.getInstance();\r
+               String executors = configuration.getConfig("jobs/executors.yaml");\r
+               configuration.load(executors);\r
+       }\r
 }\r
index 57e805420e7d687277a33f64844cbbbba660ecac..1df52a326f6df5b0ffb4daba5c1c6d55dfcfab8b 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <projectDescription>\r
-       <name>bisz-income-info</name>\r
+       <name>hu.user.mediacube.indexer</name>\r
        <comment></comment>\r
        <projects>\r
        </projects>\r
index d7b3140c74557973fe923a65af2b8936318b3da5..fb037454b6641d71a900d31f69d99d40f7725f26 100644 (file)
@@ -37,7 +37,7 @@
                <dependency>\r
                        <groupId>com.ibm</groupId>\r
                        <artifactId>db2jcc4</artifactId>\r
-                       <version>4.19.26</version>\r
+                       <version>4.26.14</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>org.apache.lucene</groupId>\r
index 90aebf2994cebed3b6aa83132be1b741698bdfbc..67eff03d3e07f3a5bec206834b9cb64a70266c57 100644 (file)
@@ -8,6 +8,8 @@ public interface IConfiguration {
 \r
        void load(String file) throws Exception;\r
 \r
+       <T> T load(String file, Class<? extends T> configClass) throws Exception;\r
+\r
        <T> T value(String fqn);\r
 \r
        <T> T value(String fqn, T defValue);\r
index f068126639bdf6a508c440e86a5184290a202294..df2d02f2811be65b4e5bcbeb6ed05314c63f505b 100644 (file)
@@ -14,6 +14,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;\r
 \r
 public class SystemConfiguration implements IConfiguration {\r
+       private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(new YAMLFactory());\r
+\r
        private static Logger logger = LogManager.getLogger();\r
 \r
        static IConfiguration currentInstance = null;\r
@@ -52,10 +54,21 @@ public class SystemConfiguration implements IConfiguration {
                logger.info("Loading system configuration {}", file);\r
                if (file != null) {\r
                        String yaml = new String(Files.readAllBytes(Paths.get(file)));\r
-                       settings = new ObjectMapper(new YAMLFactory()).readValue(yaml, HashMap.class);\r
+                       settings = OBJECT_MAPPER.readValue(yaml, HashMap.class);\r
                }\r
        }\r
 \r
+       @Override\r
+       public <T> T load(String file, Class<? extends T> configClass) throws Exception {\r
+               T result = null;\r
+               logger.info("Loading {} configuration {}", file, configClass);\r
+               if (file != null) {\r
+                       String yaml = new String(Files.readAllBytes(Paths.get(file)));\r
+                       result = OBJECT_MAPPER.readValue(yaml, configClass);\r
+               }\r
+               return result;\r
+       }\r
+\r
        @SuppressWarnings("unchecked")\r
        @Override\r
        public <T> T value(String fqn) {\r
index e3cfaccf9a6443144a3748a7eada4d3652e6bebb..00ec8b500878976a2007653a17bb4e6b773ee66c 100644 (file)
@@ -36,8 +36,8 @@ import user.jobengine.server.steps.IJobStep;
 \r
 public class JobEngineConfiguration implements IJobEngineConfiguration {\r
        private static final Logger logger = LogManager.getLogger();\r
-       public static final String CONF_MEDIACUBE = "settings/mediacube.json";\r
-       public static final String CONF_MAESTRO = "settings/maestro.json";\r
+       public static final String CONF_MEDIACUBE = "settings/mediacube.yaml";\r
+       public static final String CONF_MAESTRO = "settings/maestro.yaml";\r
        public static final String CONF_EXECUTORS = "jobs/executors.xml";\r
        public static final String CONF_SCHEDULES = "jobs/schedules.json";\r
        public static final String DIR_STEPS = "jobs/steps";\r
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/ast/data/JobTemplateData.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/ast/data/JobTemplateData.java
new file mode 100644 (file)
index 0000000..c5515ce
--- /dev/null
@@ -0,0 +1,4 @@
+package user.jobengine.server.ast.data;\r
+\r
+public class JobTemplateData {\r
+}\r
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/ast/data/JobTemplateParameter.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/ast/data/JobTemplateParameter.java
new file mode 100644 (file)
index 0000000..70356b9
--- /dev/null
@@ -0,0 +1,4 @@
+package user.jobengine.server.ast.data;\r
+\r
+public class JobTemplateParameter {\r
+}\r
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/ast/data/JobTemplateVariable.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/ast/data/JobTemplateVariable.java
new file mode 100644 (file)
index 0000000..ef90f80
--- /dev/null
@@ -0,0 +1,4 @@
+package user.jobengine.server.ast.data;\r
+\r
+public class JobTemplateVariable {\r
+}\r
index 259b1935ee01ddbec6a40e2fdd1f8dd3aabb19d6..49b85508455bc5837d10f2e77120620dd59d23a9 100644 (file)
@@ -26,9 +26,9 @@ https://www.zkoss.org/wiki/ZK_Configuration_Reference/zk.xml
     \r
        <system-config>\r
        <label-location>/resources/i3-label_hu.properties</label-location>\r
+        <ui-factory-class>org.zkoss.zk.ui.http.SerializableUiFactory</ui-factory-class>\r
        </system-config>\r
        \r
-       \r
 <!--   <listener> -->\r
 <!--       <listener-class>user.jobengine.zk.util.LogEventInterceptor</listener-class> -->\r
 <!--   </listener>      -->\r
index 5b0e3b9a654bb5d7f2cd160cd2d19e75b72ea553..169f1de2a26666bf25f70374c9a9584a250ea2e3 100644 (file)
@@ -1210,8 +1210,10 @@ body.vjs-full-window {
   width: auto;
   padding-left: 1em;
   padding-right: 1em;
+  display: none;
 }
 
+
 .vjs-live .vjs-time-control {
   display: none;
 }
@@ -1221,6 +1223,15 @@ body.vjs-full-window {
   display: none;
 }
 
+/**/
+.video-js .vjs-current-time {
+    display: block;
+}
+.video-js .vjs-remaining-time {
+    display: none;
+}
+/**/
+
 .video-js .vjs-duration,
 .vjs-no-flex .vjs-duration {
   display: none;
index 96f83df0c1c678d9cd8396a1627c40241e4e9d49..c615098090276c533379d91d5b656f6726fcdda8 100644 (file)
@@ -27,6 +27,32 @@ setSource(null);
 //     src : '/services/proxy/media1/index.m3u8'\r
 //});\r
 \r
+\r
+function secondsToSMPTE(seconds) {\r
+    var f = Math.floor((seconds % 1) * 25);\r
+    var s = Math.floor(seconds);\r
+    var m = Math.floor(s / 60);\r
+    var h = Math.floor(m / 60);\r
+    m = m % 60;\r
+    s = s % 60;\r
+\r
+    return {h: h, m: m, s: s, f: f};\r
+}\r
+function SMPTEToString(timecode) {\r
+    if (timecode.h < 10) { timecode.h = "0" + timecode.h; }\r
+    if (timecode.m < 10) { timecode.m = "0" + timecode.m; }\r
+    if (timecode.s < 10) { timecode.s = "0" + timecode.s; }\r
+    if (timecode.f < 10) { timecode.f = "0" + timecode.f; }\r
+\r
+    return timecode.h + ":" + timecode.m + ":" + timecode.s + ":" + timecode.f;\r
+}\r
+function customTimeFormat(seconds) {\r
+        return SMPTEToString(secondsToSMPTE(seconds));\r
+}\r
+\r
+videojs.setFormatTime(customTimeFormat);       \r
+\r
+\r
 function pushTcIn() {\r
        var current = player.currentTime();\r
        console.log("pushTcIn", current);\r
index 601ed57b34ef1a8166f92cb0b83aff9a26b9c050..5434ecbb08ad30311880d91fd072067f2db9e799 100644 (file)
@@ -25,7 +25,8 @@
                                document.selection.empty();\r
                        }\r
                }\r
-               \r
+\r
+       \r
        </script>\r
 \r
        <!-- csak igy jo a list sebessege -->\r
@@ -56,7 +57,9 @@
                                <borderlayout height="100%" width="100%">\r
                                        <north border="none" size="60%" splittable="true" minsize="250" collapsible="true">\r
                                                <div align="center" height="100%" width="100%">\r
-                                                       <h:video-js id="myVideoDiv" class="video-js vjs-default-skin vjs-big-play-centered" style="width: 100%;height: 100%">\r
+                                                       <h:video-js id="myVideoDiv" class="video-js vjs-default-skin vjs-big-play-centered" \r
+                                                               data-setup='{"inactivityTimeout": 0}'\r
+                                                               style="width: 100%;height: 100%">\r
                                                        </h:video-js>\r
                                                        <div id="videoListener" onTcOut="@command('onTcOut')" onTcIn="@command('onTcIn')" />\r
                                                </div>\r
index e54983be72ea0960bac0ab36cdbd909e77370cb1..620f224a2fa50247d97031fe93782ecebf1f822b 100644 (file)
@@ -1,4 +1,4 @@
-version=2.7.1\r
+version=2.7.2\r
 footer=2016-2020 © Copyright User Rendszerház Kft.\r
 \r
 login_info=Információ\r
index 06cbc784d3c406ca31a0655b2548f7e861bbba30..4533d1d28cdb37017e6aa1aa6abcb70e7a036548 100644 (file)
@@ -203,6 +203,9 @@ public class SearchModel extends AsyncBaseModel {
 \r
        @AfterCompose\r
        public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {\r
+               //A MediaFileServlet a services/proxy alatt szolgal ki\r
+               Clients.evalJavaScript("setSource('http://localhost:9080/services/proxy/20209535_1-20205617.mp4', 'video/mp4')");\r
+\r
                try {\r
                        Selectors.wireComponents(view, this, false);\r
                        Selectors.wireEventListeners(view, this);\r
@@ -1022,7 +1025,6 @@ public class SearchModel extends AsyncBaseModel {
                                        Clients.evalJavaScript(String.format("setSource('%s', '%s')", video, srcType));\r
                                }\r
 \r
-                               // Clients.evalJavaScript("setSource('/img/Mediacube_todo2.mp4')");\r
                        } catch (Exception e) {\r
                                logger.error(e);\r
                        }\r
index 83898601a73b467c5702822ce9e6613a1b1c9f73..b2282e6ca3c9143359ff27caf8eff3533cc285ab 100644 (file)
@@ -22,7 +22,7 @@ import com.ibm.nosql.json.api.BasicDBList;
 import com.ibm.nosql.json.api.BasicDBObject;\r
 import com.ibm.nosql.json.api.QueryBuilder;\r
 \r
-import user.commons.config.JSONConfig;\r
+import user.commons.configuration.IConfiguration;\r
 import user.commons.nosql.NoSQLUtils;\r
 import user.jobengine.gui.ComponentBinder;\r
 import user.jobengine.server.IJobChangedListener;\r
@@ -150,8 +150,10 @@ public class SessionUtil {
                try {\r
                        result = (MaestroConfig) getAttribute(MAESTRO_CONFIG);\r
                        if (result == null) {\r
-                               String configFilePath = ComponentBinder.getSystemConfig().getConfig(JobEngineConfiguration.CONF_MAESTRO);\r
-                               result = JSONConfig.read(configFilePath, MaestroConfig.class);\r
+                               IConfiguration systemConfig = ComponentBinder.getSystemConfig();\r
+                               String configFilePath = systemConfig.getConfig(JobEngineConfiguration.CONF_MAESTRO);\r
+                               result = systemConfig.load(configFilePath, MaestroConfig.class);\r
+                               //result = JSONConfig.read(configFilePath, MaestroConfig.class);\r
                                setAttribute(MAESTRO_CONFIG, result);\r
                        }\r
                } catch (Exception e) {\r
@@ -165,8 +167,10 @@ public class SessionUtil {
                try {\r
                        result = (MediaCubeConfig) getAttribute(MEDIACUBE_CONFIG);\r
                        if (result == null) {\r
+                               IConfiguration systemConfig = ComponentBinder.getSystemConfig();\r
                                String configFilePath = ComponentBinder.getSystemConfig().getConfig(JobEngineConfiguration.CONF_MEDIACUBE);\r
-                               result = JSONConfig.read(configFilePath, MediaCubeConfig.class);\r
+                               result = systemConfig.load(configFilePath, MediaCubeConfig.class);\r
+                               //result = JSONConfig.read(configFilePath, MediaCubeConfig.class);\r
                                setAttribute(MEDIACUBE_CONFIG, result);\r
                        }\r
                } catch (Exception e) {\r