From: vasary.daniel Date: Fri, 26 Feb 2021 13:33:36 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=49ef51bf351c1411e48afd14e04d6e539d2d7114;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32156 --- diff --git a/server/-configuration/build-mediacube-dependencies.launch b/server/-configuration/build-mediacube-dependencies.launch index 849b528e..63a14eba 100644 --- a/server/-configuration/build-mediacube-dependencies.launch +++ b/server/-configuration/build-mediacube-dependencies.launch @@ -1,19 +1,19 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/server/-configuration/build-mediacube-modules.launch b/server/-configuration/build-mediacube-modules.launch index 11dc88b6..b2984da7 100644 --- a/server/-configuration/build-mediacube-modules.launch +++ b/server/-configuration/build-mediacube-modules.launch @@ -1,19 +1,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/server/-configuration/run-mediacube-server-mv.launch b/server/-configuration/run-mediacube-server-mv.launch index 213a562e..47941dff 100644 --- a/server/-configuration/run-mediacube-server-mv.launch +++ b/server/-configuration/run-mediacube-server-mv.launch @@ -20,7 +20,7 @@ - + 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 index 6c7c9d75..00000000 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 index 2aabbf4b..00000000 Binary files a/server/-dependencies/libs/org.eclipse.equinox.launcher_1.3.200.v20160318-1642.jar and /dev/null differ diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml index 20945306..2dd68822 100644 --- a/server/-dependencies/pom.xml +++ b/server/-dependencies/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - hu.user.chronos - hu.user.chronos.dependencies + hu.user.mediacube + dependencies 1.0.0-SNAPSHOT pom @@ -64,40 +64,12 @@ jar - - install3 - package - - install-file - - - libs/org.apache.felix.gogo.command_0.10.0.v201209301215.jar - org.apache.felix - org.apache.felix.gogo.command - 0.10.0.v201209301215 - jar - - - - - - - - - - - - - - - - org.reficio p2-maven-plugin - 1.3.0 + 1.5.0 default-cli @@ -183,9 +155,11 @@ org.codehaus.groovy:groovy:3.0.3 + true org.omnifaces:omnifaces:3.4.1 + true org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.8 @@ -336,11 +310,12 @@ + - - - reficio - http://repo.reficio.org/maven/ - - + + + + + + diff --git a/server/-modules/pom.xml b/server/-modules/pom.xml index 0231adbf..7495c69a 100644 --- a/server/-modules/pom.xml +++ b/server/-modules/pom.xml @@ -9,7 +9,6 @@ ../user.mediacube.gui ../user.mediacube.metadata - ../user.jobengine.osgi.commons ../user.jobengine.osgi.db ../user.jobengine.osgi.server @@ -21,10 +20,9 @@ - ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4 - 1.0.0 - 1.0.0 + 1.7.0 + 1.8 1.8 UTF-8 @@ -32,16 +30,11 @@ - - - - - - - - - - + + + + + dependencies @@ -52,36 +45,6 @@ - - - - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.1 - - - validate - - run - - - - - - - - - - - org.eclipse.tycho tycho-packaging-plugin @@ -107,29 +70,14 @@ org.eclipse.tycho target-platform-configuration + ${tycho.version} - consider linux gtk x86_64 - - - - - - - - - - - - - - - diff --git a/server/-product/production/AMC/configuration/config.ini b/server/-product/production/AMC/configuration/config.ini index fd4c203b..dbb596e2 100644 --- a/server/-product/production/AMC/configuration/config.ini +++ b/server/-product/production/AMC/configuration/config.ini @@ -1,5 +1,5 @@ #This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser -#Wed Feb 10 16:05:17 CET 2021 +#Thu Feb 25 16:34:25 CET 2021 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 equinox.use.ds=true osgi.bundles.defaultStartLevel=4 diff --git a/server/-product/production/HIRTV/configuration/config.ini b/server/-product/production/HIRTV/configuration/config.ini index fd4c203b..dbb596e2 100644 --- a/server/-product/production/HIRTV/configuration/config.ini +++ b/server/-product/production/HIRTV/configuration/config.ini @@ -1,5 +1,5 @@ #This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser -#Wed Feb 10 16:05:17 CET 2021 +#Thu Feb 25 16:34:25 CET 2021 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 equinox.use.ds=true osgi.bundles.defaultStartLevel=4 diff --git a/server/-product/production/HIRTV/jobs/executors.yaml b/server/-product/production/HIRTV/jobs/executors.yaml new file mode 100644 index 00000000..8cba80bd --- /dev/null +++ b/server/-product/production/HIRTV/jobs/executors.yaml @@ -0,0 +1,5 @@ +executors: + - className: user.jobengine.server.steps.ArchiveListBuilderStep + maxConcurrent: 1 + - className: user.jobengine.server.steps.ArchiveMaterialSubmitStep + maxConcurrent: 2 diff --git a/server/-product/production/HIRTV/mediacube.bat b/server/-product/production/HIRTV/mediacube.bat index 64cbf781..5f9eb955 100644 --- a/server/-product/production/HIRTV/mediacube.bat +++ b/server/-product/production/HIRTV/mediacube.bat @@ -1,4 +1,5 @@ @echo off +:CHCP 65001 log4j2 elszall tole if exist tmp rmdir tmp /s /q mkdir tmp java ^ diff --git a/server/-product/production/HIRTV/settings/jetty/keystore b/server/-product/production/HIRTV/settings/jetty/keystore deleted file mode 100644 index 95d7f4c7..00000000 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 index ba61d105..00000000 --- a/server/-product/production/HIRTV/settings/test-jetty/jetty-deployer.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern - .*/[^/]*servlet-api-[^/]*\.jar$|.*/javax.servlet.jsp.jstl-.*\.jar$|.*/org.apache.taglibs.taglibs-standard-impl-.*\.jar$ - - - - - - - - - - - jetty.deploy.monitoredPath - - / - - - - - - jetty.deploy.defaultsDescriptorPath - - /etc/webdefault.xml - - - - - - - - - - - - - - - - - - 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 index 556f544d..00000000 --- a/server/-product/production/HIRTV/settings/test-jetty/jetty-http-redirect.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - https - 8444 - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/-product/production/HIRTV/settings/test-jetty/keystore b/server/-product/production/HIRTV/settings/test-jetty/keystore deleted file mode 100644 index 95d7f4c7..00000000 Binary files a/server/-product/production/HIRTV/settings/test-jetty/keystore and /dev/null differ diff --git a/server/-product/production/MEDIAVIVANTIS/configuration/config.ini b/server/-product/production/MEDIAVIVANTIS/configuration/config.ini index fd4c203b..dbb596e2 100644 --- a/server/-product/production/MEDIAVIVANTIS/configuration/config.ini +++ b/server/-product/production/MEDIAVIVANTIS/configuration/config.ini @@ -1,5 +1,5 @@ #This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser -#Wed Feb 10 16:05:17 CET 2021 +#Thu Feb 25 16:34:25 CET 2021 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 equinox.use.ds=true osgi.bundles.defaultStartLevel=4 diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/dsm.opt b/server/-product/production/MEDIAVIVANTIS/jobs/dsm.opt new file mode 100644 index 00000000..4955eaa4 --- /dev/null +++ b/server/-product/production/MEDIAVIVANTIS/jobs/dsm.opt @@ -0,0 +1,3 @@ +SErvername MEDIACUBE +*traceflags api +*tracefile /opt/mediacube/log/tsm.trace \ No newline at end of file diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/executors.xml b/server/-product/production/MEDIAVIVANTIS/jobs/executors.xml index 8cd7c04c..10cdb7f6 100644 --- a/server/-product/production/MEDIAVIVANTIS/jobs/executors.xml +++ b/server/-product/production/MEDIAVIVANTIS/jobs/executors.xml @@ -1,41 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/schedules.json b/server/-product/production/MEDIAVIVANTIS/jobs/schedules.json index b500c0c8..aaf71437 100644 --- a/server/-product/production/MEDIAVIVANTIS/jobs/schedules.json +++ b/server/-product/production/MEDIAVIVANTIS/jobs/schedules.json @@ -1,300 +1,136 @@ {"joblist":[ { - "template": "cancelable.xml" - }, - { "active": true, "executeimmediate": true, - "name" : "OCTOPUS adatok szinkronizálása", - "template": "sync-octopus.xml", - "cronexpression": "0/30 * * * * ?", - "parameters": [ - {"name": "includeArchived", "value": false, "type": "java.lang.Boolean"} - ] - }, - { - "active": true, - "executeimmediate": false, - "name" : "Limitált archiválás az ISILON/ARCHIVE mappából", - "template": "archive-limited.xml", - "cronexpression": "0 0 6-22/1 * * ?", - "parameters": [ - {"name": "sourcePath", "value": "/mnt/ISILON/ARCHIVE", "type": "java.lang.String"}, - {"name": "killDateDays", "value": 1, "type": "java.lang.Integer"}, - {"name": "limit", "value": 20, "type": "java.lang.Integer"} + "name" : "Proxy generálás", + "template": "sys-recreate-lowres.xml", + "cronexpression": "0 */1 * * * ?", + "parameters": [ + {"name": "globalRetrievePath", "value": "file://10.11.1.90/data", "type": "java.lang.String"}, + {"name": "localRetrievePath", "value": "/mediacube/data", "type": "java.lang.String"}, + {"name": "localHiresPath", "value": "/mediacube/data", "type": "java.lang.String" }, + {"name": "globalHiresPath", "value": "\\\\10.11.1.90\\data", "type": "java.lang.String" }, + {"name": "localLowresPath", "value": "/mediacube/data/TRANSCODER_OUT", "type": "java.lang.String" }, + {"name": "transcoderAddress", "value": "http://10.11.1.111:65445/api/json/v1/", "type": "java.lang.String"}, + {"name": "transcoderTemplateName", "value": "MP4", "type": "java.lang.String"} ] }, { - "active": true, + "active": false, "executeimmediate": false, - "name" : "Archiválás az ISILON/ARCHIVE mappából", - "template": "archive-ondemand.xml", - "cronexpression": "0 0 1 * * ?", + "name" : "Rekurzív archiválás a POLC/FINISHED_SHOWS mappából", + "template": "archive-recursive.xml", + "cronexpression": "0 */1 * * * ?", "parameters": [ - {"name": "sourcePath", "value": "/mnt/ISILON/ARCHIVE", "type": "java.lang.String"}, - {"name": "killDateDays", "value": 1, "type": "java.lang.Integer"}, - {"name": "limit", "value": 0, "type": "java.lang.Integer"} - ] - }, - { - "active": true, - "executeimmediate": false, - "name" : "PROXY pótlás FFASTRANS 71", - "template": "sys-recreate-lowres-71.xml", - "cronexpression": "0 * * * * ?", - "parameters": [ - {"name": "localLowresPath", "value": "/mnt/FIXTRANSCODER-71/OUTPUT", "type": "java.lang.String" }, - {"name": "transcoderAddress", "value": "http://10.10.1.71:65445/api/json/v1/", "type": "java.lang.String"}, - {"name": "globalRetrievePath", "value": "file://10.10.1.30/transcode", "type": "java.lang.String"}, - {"name": "localRetrievePath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String"}, - {"name": "localHiresPath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String" }, - {"name": "globalHiresPath", "value": "L:\\transcode", "type": "java.lang.String" }, - {"name": "transcoderTemplateName", "value": "MAM_proxy", "type": "java.lang.String"} + {"name": "sourcePath", "value": "/mnt/POLC/FINISHED_SHOWS", "type": "java.lang.String"}, + {"name": "killDateDays", "value": 1, "type": "java.lang.Integer"}, + {"name": "limit", "value": 1, "type": "java.lang.Integer"} ] }, { - "active": true, - "executeimmediate": false, - "name" : "PROXY pótlás FFASTRANS 72", - "template": "sys-recreate-lowres-72.xml", - "cronexpression": "10 * * * * ?", - "parameters": [ - {"name": "localLowresPath", "value": "/mnt/FIXTRANSCODER-72/OUTPUT", "type": "java.lang.String" }, - {"name": "transcoderAddress", "value": "http://10.10.1.72:65445/api/json/v1/", "type": "java.lang.String"}, - {"name": "globalRetrievePath", "value": "file://10.10.1.30/transcode", "type": "java.lang.String"}, - {"name": "localRetrievePath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String"}, - {"name": "localHiresPath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String" }, - {"name": "globalHiresPath", "value": "L:\\transcode", "type": "java.lang.String" }, - {"name": "transcoderTemplateName", "value": "MAM_proxy", "type": "java.lang.String"} - ] - }, - { - "active": true, - "executeimmediate": false, - "name" : "PROXY pótlás FFASTRANS 73", - "template": "sys-recreate-lowres-73.xml", - "cronexpression": "20 * * * * ?", - "parameters": [ - {"name": "localLowresPath", "value": "/mnt/FIXTRANSCODER-73/OUTPUT", "type": "java.lang.String" }, - {"name": "transcoderAddress", "value": "http://10.10.1.73:65445/api/json/v1/", "type": "java.lang.String"}, - {"name": "globalRetrievePath", "value": "file://10.10.1.30/transcode", "type": "java.lang.String"}, - {"name": "localRetrievePath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String"}, - {"name": "localHiresPath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String" }, - {"name": "globalHiresPath", "value": "L:\\transcode", "type": "java.lang.String" }, - {"name": "transcoderTemplateName", "value": "MAM_proxy", "type": "java.lang.String"} - ] - }, - { - "active": true, - "executeimmediate": false, - "name" : "PROXY pótlás FFASTRANS 74", - "template": "sys-recreate-lowres-74.xml", - "cronexpression": "30 * * * * ?", - "parameters": [ - {"name": "localLowresPath", "value": "/mnt/FIXTRANSCODER-74/OUTPUT", "type": "java.lang.String" }, - {"name": "transcoderAddress", "value": "http://10.10.1.74:65445/api/json/v1/", "type": "java.lang.String"}, - {"name": "globalRetrievePath", "value": "file://10.10.1.30/transcode", "type": "java.lang.String"}, - {"name": "localRetrievePath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String"}, - {"name": "localHiresPath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String" }, - {"name": "globalHiresPath", "value": "L:\\transcode", "type": "java.lang.String" }, - {"name": "transcoderTemplateName", "value": "MAM_proxy", "type": "java.lang.String"} - ] - }, - { - "name" : "SYS: create-lowres-ondemand", - "template": "create-lowres-ondemand.xml", + "active": false, + "executeimmediate": true, + "name" : "Limitált archiválás az PROMISE/ARCHIVE mappából", + "template": "archive-limited.xml", + "cronexpression": "0 */10 * * * ?", "parameters": [ - {"name": "globalRetrievePath", "value": "file://10.10.1.30/transcode", "type": "java.lang.String"}, - {"name": "localRetrievePath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String"}, - {"name": "localHiresPath", "value": "/mediacube/data/lowres/www/video/IFT3/transcode", "type": "java.lang.String" }, - {"name": "globalHiresPath", "value": "L:\\transcode", "type": "java.lang.String" }, - {"name": "localLowresPath", "value": "/mnt/FIXTRANSCODER/OUTPUT", "type": "java.lang.String" }, - {"name": "transcoderAddress", "value": "http://10.10.1.74:65445/api/json/v1/", "type": "java.lang.String"}, - {"name": "transcoderTemplateName", "value": "MAM_proxy", "type": "java.lang.String"} + {"name": "sourcePath", "value": "/mnt/PROMISE/ARCHIVE", "type": "java.lang.String"}, + {"name": "globalSourcePath", "value": "\\\\10.11.1.100\\PROMISE\\ARCHIVE", "type": "java.lang.String"}, + {"name": "transcoderTargetPath", "value": "/mnt/PROMISE/TRANSCODER/FFASTRANSCODER/Out", "type": "java.lang.String"}, + {"name": "killDateDays", "value": -1, "type": "java.lang.Integer"}, + {"name": "limit", "value": 10, "type": "java.lang.Integer"} ] }, { - "active": true, - "executeimmediate": false, - "name" : "Lejárt ISILON/TQC/CHECK/KESZ anyagok törlése", - "template": "delete-materials.xml", - "cronexpression": "0 0 8 * * ?", - "parameters": [ - {"name": "sourcePath", "value": "/mnt/ISILON/TQC/CHECK/KESZ", "type": "java.lang.String"} - ] - }, - { - "active": true, - "executeimmediate": false, - "name" : "Lejárt ISILON/TQC/PROMO/KESZ anyagok törlése", - "template": "delete-materials.xml", - "cronexpression": "0 0 6 * * ?", - "parameters": [ - {"name": "sourcePath", "value": "/mnt/ISILON/TQC/PROMO/KESZ", "type": "java.lang.String"} - ] - }, - { - "active": true, - "executeimmediate": false, - "name" : "Lejárt ISILON/TQC/REKLAM/KESZ anyagok törlése", - "template": "delete-materials.xml", - "cronexpression": "0 0 7 * * ?", - "parameters": [ - {"name": "sourcePath", "value": "/mnt/ISILON/TQC/REKLAM/KESZ", "type": "java.lang.String"} - ] - }, - { - "active": true, - "executeimmediate": false, - "name" : "Lejárt ISILON/ARCHIVE anyagok törlése", - "template": "delete-materials.xml", - "cronexpression": "0 0 5 * * ?", - "parameters": [ - {"name": "sourcePath", "value": "/mnt/ISILON/ARCHIVE", "type": "java.lang.String"} - ] - }, - { - "active": true, - "executeimmediate": false, - "name" : "Lejárt ISILON/OCTOPUS/_NAPI_MEGTEKINTO anyagok törlése", - "template": "delete-materials.xml", - "cronexpression": "0 0 22 * * ?", - "parameters": [ - {"name": "sourcePath", "value": "/mnt/ISILON/OCTOPUS/_NAPI_MEGTEKINTO", "type": "java.lang.String"} - ] - }, - { - "active": true, + "active": false, "executeimmediate": false, - "name" : "Lejárt ISISLON/PROMO_NLE mappák törlése", - "template": "delete-promo-materials.xml", - "cronexpression": "0 0 6 * * ?", - "parameters": [ - {"name": "sourcePath", "value": "/mnt/ISILON/PROMO_NLE", "type": "java.lang.String"} - ] - }, + "name" : "Párhuzamosított teszt folyamat", + "template": "fake-noparams.xml", + "cronexpression": "0 40 22 * * ?", + "parameters": [ {"name": "itemID", "value": 1, "type": "java.lang.Long"} ] + }, { - "active": true, - "executeimmediate": false, - "name" : "NEXIO bejátszó anyagok másolása az ISILON/ARCHIVE mappába", - "template": "copyforarchive-nexio-materials.xml", - "cronexpression": "0 0 10 * * ?", - "parameters": [ - {"name": "nexioPort", "value": 2098, "type": "java.lang.Integer"}, - {"name": "nexioUserName", "value": "administrator", "type": "java.lang.String"}, - {"name": "nexioPassword", "value": "system", "type": "java.lang.String"}, - {"name": "archiveFtp", "value": "ftp://10.10.1.100/ARCHIVE", "type": "java.lang.String"}, - {"name": "archiveUserName", "value": "mediacube", "type": "java.lang.String"}, - {"name": "archivePassword", "value": "Broadca5T", "type": "java.lang.String"}, - {"name": "daysBeforeNow", "value": 1, "type": "java.lang.Integer"}, - {"name": "nexioKillDateDays", "value": 21, "type": "java.lang.Integer"}, - {"name": "nexioAgency", "value": "ARCHIVED", "type": "java.lang.String"} - ] + "template": "cancelable.xml" }, { - "active": true, + "active": false, "executeimmediate": false, - "name" : "NEXIO visszarögzített anyagok másolása az ISILON/ARCHIVE mappába", - "template": "copyforarchive-nexio-recordings.xml", - "cronexpression": "0 0 12 * * ? *", + "name" : "HSM migrálás", + "template": "migrate-hsm.xml", + "cronexpression": "0 0 */1 * * ?", "parameters": [ - {"name": "nexioPort", "value": 2098, "type": "java.lang.Integer"}, - {"name": "nexioUserName", "value": "administrator", "type": "java.lang.String"}, - {"name": "nexioPassword", "value": "system", "type": "java.lang.String"}, - {"name": "archiveFtp", "value": "ftp://10.10.1.100/ARCHIVE", "type": "java.lang.String"}, - {"name": "archiveUserName", "value": "mediacube", "type": "java.lang.String"}, - {"name": "archivePassword", "value": "Broadca5T", "type": "java.lang.String"}, - {"name": "filterAgencies", "value": "schedule-rec", "type": "java.lang.String"}, - {"name": "limit", "value": 30, "type": "java.lang.Integer"}, - {"name": "nexioKillDateDays", "value": 7, "type": "java.lang.Integer"}, - {"name": "nexioAgency", "value": "HIRADO_ARCHIVED", "type": "java.lang.String"} + {"name": "sourceLocation", "value": "", "type": "java.lang.String"}, + {"name": "targetLocation", "value": "/mediacube/data/ARCHIVE", "type": "java.lang.String"} ] - }, + }, { - "active": true, - "executeimmediate": false, - "name" : "Híranyag statisztika importálása", - "template": "import-statistics.xml", - "cronexpression": "0 0 6 * * ?", + "active": false, + "executeimmediate": true, + "name" : "Limitált archiválás a /mediacube/data/ARCHIVE mappából", + "template": "archive-limited.xml", + "cronexpression": "0 */10 * * * ?", "parameters": [ - {"name": "daysBeforeNow", "value": 1, "type": "java.lang.Integer"} + {"name": "sourcePath", "value": "/mediacube/data/ARCHIVE", "type": "java.lang.String"}, + {"name": "globalSourcePath", "value": "\\\\10.11.1.90\\data\\ARCHIVE", "type": "java.lang.String"}, + {"name": "transcoderTargetPath", "value": "/mnt/PROMISE/TRANSCODER/FFASTRANSCODER/Out", "type": "java.lang.String"}, + {"name": "killDateDays", "value": -1, "type": "java.lang.Integer"}, + {"name": "limit", "value": 1000, "type": "java.lang.Integer"} ] }, { "active": false, "executeimmediate": true, - "name" : "TRAFFIC anyagok visszatöltése", - "template": "retrieve-traffic-missing-materials.xml", - "cronexpression": "0 0 0/1 1/1 * ? *", - "parameters": [ - {"name": "dbUrl", "value": "jdbc:sqlserver://10.10.1.45\\sql16;databaseName=PA_Echo;", "type": "java.lang.String"}, - {"name": "userName", "value": "MAM", "type": "java.lang.String"}, - {"name": "password", "value": "Echotv.hu", "type": "java.lang.String"}, - {"name": "lookupDays", "value": 7, "type": "java.lang.Integer"}, - {"name": "targetPath", "value": "/mnt/ISILON/PLAYOUT/IceGateway/Input", "type": "java.lang.String"}, - {"name": "killDateDays", "value": 10, "type": "java.lang.Integer"} + "name" : "Lejárt /mediacube/data/ARCHIVE anyagok törlése", + "template": "delete-materials.xml", + "cronexpression": "0 */10 * * * ?", + "parameters": [ + {"name": "sourcePath", "value": "/mediacube/data/ARCHIVE", "type": "java.lang.String"} ] }, { "active": false, "executeimmediate": true, - "name" : "Lejárt ISISLON/ARCHIVE_TEMP anyagok törlése", + "name" : "Lejárt /mediacube/data/OMARCHIVE anyagok törlése", "template": "delete-materials.xml", - "cronexpression": "0 0 0/1 1/1 * ? *", + "cronexpression": "0 */10 * * * ?", "parameters": [ - {"name": "sourcePath", "value": "/mnt/ISILON/ARCHIVE_TEMP", "type": "java.lang.String"} + {"name": "sourcePath", "value": "/mediacube/data/OMARCHIVE", "type": "java.lang.String"} ] }, { - "active": true, - "executeimmediate": false, - "name" : "Lejárt NEXIO anyagok törlése", - "template": "delete-nexio-materials.xml", - "cronexpression": "0 0 6 * * ?", + "active": false, + "executeimmediate": true, + "name" : "Lejárt /PROMISE/ARCHIVE anyagok törlése", + "template": "delete-materials.xml", + "cronexpression": "0 */10 * * * ?", "parameters": [ - {"name": "port", "value": 2098, "type": "java.lang.Integer"}, - {"name": "userName", "value": "administrator", "type": "java.lang.String"}, - {"name": "password", "value": "system", "type": "java.lang.String"}, - {"name": "filterAgencies", "value": "HIRADO_23_00,HIRADO_ARCHIVED,HIRADO_CLN", "type": "java.lang.String"}, - {"name": "gracePeriodDays", "value": 1, "type": "java.lang.Integer"}, - {"name": "notificationOnly", "value": false, "type": "java.lang.Boolean"} + {"name": "sourcePath", "value": "/mnt/PROMISE/ARCHIVE", "type": "java.lang.String"} ] }, { "active": false, "executeimmediate": false, - "name" : "Párhuzamosított teszt folyamat", - "template": "fake-concurrent.xml", - "cronexpression": "0/10 * * ? * *", - "parameters": [ {"name": "itemID", "value": 1, "type": "java.lang.Long"} ] - }, - { - "active": false, - "executeimmediate": false, - "name" : "Teszt folyamat", - "template": "fake.xml", - "cronexpression": "0/10 * * ? * *", - "parameters": [ {"name": "itemID", "value": 1, "type": "java.lang.Long"} ] - }, - { - "name" : "SYS: MORPHEUS 'missing materials' importálása", - "template": "import-morpheus-missing-materials.xml", + "name" : "Lejárt /POLC/FINISHED_SHOWS anyagok törlése", + "template": "delete-materials.xml", + "cronexpression": "0 * 11 * * ?", "parameters": [ - {"name": "csvFilePath", "value": "/mnt/MORPHEUS", "type": "java.lang.String"}, - {"name": "processedFolder", "value": "DONE", "type": "java.lang.String"}, - {"name": "targetPath", "value": "/mnt/ISILON/ARCHIVE_RESTORE", "type": "java.lang.String"} + {"name": "sourcePath", "value": "/mnt/POLC/FINISHED_SHOWS", "type": "java.lang.String"} ] - }, + }, { "name" : "SYS: batch-retrieve-ondemand", "template": "batch-retrieve-ondemand.xml", + "active": false, + "executeimmediate": false }, { "name" : "SYS: retrieve-ondemand", "template": "retrieve-ondemand.xml", + "active": false, + "executeimmediate": false, "parameters": [ - {"name": "globalRetrievePath", "value": "file://isilon.intra.echotv.hu", "type": "java.lang.String"}, - {"name": "localRetrievePath", "value": "/mnt/ISILON", "type": "java.lang.String"}, + {"name": "globalRetrievePath", "value": "file://10.11.1.100", "type": "java.lang.String"}, + {"name": "localRetrievePath", "value": "/mnt/PROMISE/", "type": "java.lang.String"}, {"name": "materialOutputFolder", "value": "PLAYOUT_NLE", "type": "java.lang.String"}, {"name": "promoOutputFolder", "value": "PROMO_NLE", "type": "java.lang.String"}, {"name": "advertisementOutputFolder", "value": "REKLAM_NLE", "type": "java.lang.String"}, @@ -309,28 +145,31 @@ ] }, { - "name" : "sys: MORPHEUS 'missing materials' importálása", - "template": "sys-import-morpheus-missing-materials.xml", + "name" : "SYS: common-copy", + "template": "common-copy.xml", + "active": false, + "executeimmediate": false + }, + { + "template": "create-lowres-ondemand.xml", + "active": false, + "executeimmediate": false, "parameters": [ - {"name": "csvFilePath", "value": "/mnt/MORPHEUS", "type": "java.lang.String"}, - {"name": "processedFolder", "value": "DONE", "type": "java.lang.String"}, - {"name": "targetPath", "value": "/mnt/ISILON/PLAYOUT/Video", "type": "java.lang.String"} + {"name": "globalRetrievePath", "value": "file://10.11.1.90/data", "type": "java.lang.String"}, + {"name": "localRetrievePath", "value": "/mediacube/data", "type": "java.lang.String"}, + {"name": "localHiresPath", "value": "/mediacube/data", "type": "java.lang.String" }, + {"name": "globalHiresPath", "value": "\\\\10.11.1.90\\data", "type": "java.lang.String" }, + {"name": "localLowresPath", "value": "/mediacube/data/TRANSCODER_OUT", "type": "java.lang.String" }, + {"name": "transcoderAddress", "value": "http://10.11.1.111:65445/api/json/v1/", "type": "java.lang.String"}, + {"name": "transcoderTemplateName", "value": "MP4", "type": "java.lang.String"} ] }, { - "name" : "sys: MORPHEUS 'missing material' visszatöltése", - "template": "sys-retrieve-missing-material.xml", + "active": false, + "executeimmediate": false, + "template": "cancelable.xml", "parameters": [ - {"name": "targetPath", "value": "/mnt/ISILON/PLAYOUT/Video", "type": "java.lang.String"}, - {"name": "globalRetrievePath", "value": "\\\\10.10.1.100\\BRAAVOS\\PLAYOUT\\Video", "type": "java.lang.String"}, - {"name": "morpheusDeviceID", "value": "ISILON", "type": "java.lang.String"}, - {"name": "dbUrl", "value": "jdbc:sqlserver://10.10.1.45;databaseName=PA_Echo;", "type": "java.lang.String"}, - {"name": "userName", "value": "MAM", "type": "java.lang.String"}, - {"name": "password", "value": "Echotv.hu", "type": "java.lang.String"}, - {"name": "targetMetadataPath", "value": "/mnt/ISILON/PLAYOUT/MorpheusGateway/Input", "type": "java.lang.String"} - ] + {"name": "param", "value": 1, "type": "java.lang.Integer"} + ] } ]} - - - diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/steps/ArchiveMaterialSubmitStep.java b/server/-product/production/MEDIAVIVANTIS/jobs/steps/ArchiveMaterialSubmitStep.java index 166a200e..f11e3a52 100644 --- a/server/-product/production/MEDIAVIVANTIS/jobs/steps/ArchiveMaterialSubmitStep.java +++ b/server/-product/production/MEDIAVIVANTIS/jobs/steps/ArchiveMaterialSubmitStep.java @@ -31,8 +31,9 @@ public class ArchiveMaterialSubmitStep extends JobStep { try { IJobRuntime runtime = jobEngine.submit(jobRuntime, null, JOBTEMPLATE, ARCHIVE, ListUtils.asMap(ARCHIVE_ITEM, archiveItem, KILL_DATE_DAYS, killDateDays)); - setProgress((i + 1) * 100 / archiveList.size()); - //TODO kivezetni a submit hibaüzenetet + + int progress = (i + 1) * 100 / archiveList.size(); + setProgress(progress); if (runtime == null) throw new Exception("Submit returned null runtime"); } catch (Exception e) { diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/steps/CancelableStep.java b/server/-product/production/MEDIAVIVANTIS/jobs/steps/CancelableStep.java index 7fc1a4cc..982240de 100644 --- a/server/-product/production/MEDIAVIVANTIS/jobs/steps/CancelableStep.java +++ b/server/-product/production/MEDIAVIVANTIS/jobs/steps/CancelableStep.java @@ -17,8 +17,6 @@ public class CancelableStep extends JobStep { @StepEntry public Object[] execute(int param) throws Exception { try { - logger.info("{}", EscortFiles.DOT_CATCHED); - getJobRuntime().setRelated("TESZT1"); // ftpTest(); @@ -28,7 +26,7 @@ public class CancelableStep extends JobStep { for (int i = 0; i < count; i++) { if (getJobRuntime().isWaitingCancel()) break; - Thread.sleep(500); + Thread.sleep(50); int progress = (i + 1) * 100 / count; setProgress(progress); logger.info(marker, "{}", i); diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/steps/TestForkCancelableStep.java b/server/-product/production/MEDIAVIVANTIS/jobs/steps/TestForkCancelableStep.java deleted file mode 100644 index 28e66d3f..00000000 --- a/server/-product/production/MEDIAVIVANTIS/jobs/steps/TestForkCancelableStep.java +++ /dev/null @@ -1,37 +0,0 @@ -package user.jobengine.server.steps; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import user.commons.IJob; -import user.commons.JobStatus; -import user.commons.ListUtils; -import user.jobengine.server.IJobEngine; -import user.jobengine.server.IJobRuntime; - -public class TestForkCancelableStep extends JobStep { - private static final String CHILD_TEMPLATE = "cancelable.xml"; - private static final Logger logger = LogManager.getLogger(); - int count = 5; - - @StepEntry - public Object[] execute(IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception { - jobRuntime.forkPrepare(); - for (int i = 0; i < count; i++) { - if (getJobRuntime().isWaitingCancel()) - break; - //jobEngine.submit(jobRuntime, null, CHILD_TEMPLATE, CHILD_TITLE, ListUtils.asMap("itemID", i)); - // IJobRuntime runtime = jobEngine.submit(jobRuntime, null, CHILD_TEMPLATE, "JOB " + i, ListUtils.asMap("param", i)); - IJobRuntime runtime = getEngine().submit(getJobRuntime(), e -> { - if (e.getStatus().equals(JobStatus.CANCELED) || e.getStatus().equals(JobStatus.SUSPENDED)) - logger.info("Cleanup occured because status is {} {}", e.getStatus(), ((IJob) e.getSource()).getId()); - }, CHILD_TEMPLATE, "JOB " + i, 0, IJobEngine.DEFAULT_OWNER, ListUtils.asMap("param", i)); - - runtime.setRelated("TEST" + runtime.getId()); - } - - jobRuntime.forkWaitComplete(); - logger.info("Done"); - return null; - } -} diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/templates/template1.yaml b/server/-product/production/MEDIAVIVANTIS/jobs/templates/template1.yaml new file mode 100644 index 00000000..4459b9fa --- /dev/null +++ b/server/-product/production/MEDIAVIVANTIS/jobs/templates/template1.yaml @@ -0,0 +1,28 @@ +jobtemplate: + multiInstance: true + useSessionLog: true + declarations: + parameters: + - name: param1 + type: java.lang.Integer + - name: param1 + type: java.lang.Integer + variables: + - name: var1 + type: java.lang.Integer + - name: var1 + type: java.lang.Integer + commands: + - type: Step1.java + weight: 1 + inputs: + - name: param1 + - name: param2 + outputs: + - name: var1 + - name: var2 + - type: StepS.java + weight: 1 + inputs: + - name: var1 + - name: var2 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 index f3d21d6e..00000000 --- a/server/-product/production/MEDIAVIVANTIS/jobs/templates/test-fork-cancelable.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/server/-product/production/MEDIAVIVANTIS/settings/application.yaml b/server/-product/production/MEDIAVIVANTIS/settings/application.yaml index fea1fa28..8d4aff66 100644 --- a/server/-product/production/MEDIAVIVANTIS/settings/application.yaml +++ b/server/-product/production/MEDIAVIVANTIS/settings/application.yaml @@ -1,57 +1,45 @@ datasource: - mediacube: - url: jdbc:db2://10.11.1.90:50000/mc - user: db2admin - password: password - external-indexer: false - simple-search: true - login-timeout: 3 - pool-size: 10 - mediacube-nosql: - url: jdbc:db2://10.11.1.90:50000/mc - user: db2admin - password: password - schema: test - login-timeout: 3 - nexio: - url: jdbc:db2://10.11.1.90:50000/mc - user: db2admin - password: password - hsm: - url: jdbc:db2://10.11.1.89:51500/tsmdb1 - user: tsminst1 - password: tsminst1 - planair: - url: jdbc:sqlserver://10.11.254.86;databaseName=PA_Vivantis; - user: MAM - password: VDani + mediacube: + url: jdbc:db2://10.11.1.90:50000/mc + user: db2admin + password: password + external-indexer: false + simple-search: true + login-timeout: 3 + pool-size: 10 + mediacube-nosql: + url: jdbc:db2://10.11.1.90:50000/mc + user: db2admin + password: password + schema: test + login-timeout: 3 + hsm: + url: jdbc:db2://10.11.1.89:51500/tsmdb1 + user: tsminst1 + password: tsminst1 + planair: + url: jdbc:sqlserver://10.11.254.86;databaseName=PA_Vivantis; + user: MAM + password: VDani services: - ffmpeg: - execurable-location: /opt/ffmpeg/ffmpeg - mediacube: - proxy-root: /opt - nexio: - host: 10.10.1.55 - collection-name: nexioclips - use-mos-gateway: true - disabled: true - octopus: - api: - address: http://10.10.1.11/api/v1 - user: mama - password: napocska - rundowns-collection-name: rundowns - stories-collection-name: stories - folders-collection-name: storyfolders + ffmpeg: + execurable-location: /opt/ffmpeg/ffmpeg + mediacube: + proxy-root: /_workspace/data/video + nexio: + host: 10.10.1.55 + collection-name: nexioclips + use-mos-gateway: true + disabled: true jobs: - validate-transfers: false - copy-buffer-size: 32768 - scheduled-execution-disabled: true + validate-transfers: false + copy-buffer-size: 32768 + scheduled-execution-disabled: true tsm: - randomize-archives: false - delimiter: / - node-name: JOBENGINE - fs-name: /JOBENGINE - alternate-fs-name: /JOBENGINE - hl-name: /JOBENGINE + randomize-archives: false + delimiter: / + node-name: JOBENGINE + fs-name: /JOBENGINE + alternate-fs-name: /JOBENGINE + hl-name: /JOBENGINE \ 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 index 95b63984..00000000 --- a/server/-product/production/MEDIAVIVANTIS/settings/jetty/http.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/-product/production/MEDIAVIVANTIS/settings/log4j2.xml b/server/-product/production/MEDIAVIVANTIS/settings/log4j2.xml index f388a6a6..ad946223 100644 --- a/server/-product/production/MEDIAVIVANTIS/settings/log4j2.xml +++ b/server/-product/production/MEDIAVIVANTIS/settings/log4j2.xml @@ -1,8 +1,12 @@ - /opt/mediacube/log + log ${logPath}/mediacube.log + ${logPath}/movtest.log + ${logPath}/$${date:yyyy-MM}/movtest-%d{MM-dd-yyyy}-%i.log.gz + ${logPath}/delete-materials.log + ${logPath}/$${date:yyyy-MM}/delete-materials-%d{MM-dd-yyyy}-%i.log.gz ${logPath}/$${date:yyyy-MM}/mediacube-%d{MM-dd-yyyy}-%i.log.gz ${logPath}/markered-mediacube.log ${logPath}/$${date:yyyy-MM}/markered-mediacube-%d{MM-dd-yyyy}-%i.log.gz @@ -22,18 +26,31 @@ - - + - + + + + + + + + + + + + + + + + + + + @@ -69,7 +86,9 @@ - + + + diff --git a/server/-product/production/MEDIAVIVANTIS/settings/maestro.json b/server/-product/production/MEDIAVIVANTIS/settings/maestro.json deleted file mode 100644 index aa7778a6..00000000 --- a/server/-product/production/MEDIAVIVANTIS/settings/maestro.json +++ /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 index 00000000..1d361571 --- /dev/null +++ b/server/-product/production/MEDIAVIVANTIS/settings/maestro.yaml @@ -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 index d413314a..00000000 --- a/server/-product/production/MEDIAVIVANTIS/settings/mediacube.json +++ /dev/null @@ -1,139 +0,0 @@ -{ - "topTypeFilters": [ - { - "name": "Hír bejátszó", - "color": "RED200", - "icon": "ic_language_black_18dp.png" - }, - { - "name": "Hír nyers", - "color": "RED100", - "icon": "ic_perm_camera_mic_black_18dp.png" - }, - { - "name": "ECHO visszarögzített", - "color": "BROWN100", - "icon": "ic_group_work_black_18dp.png" - }, - { - "name": "Visszarögzített", - "color": "BROWN100", - "icon": "ic_group_work_black_18dp.png" - }, - { - "name": "Muszter DEMO", - "color": "BROWN100", - "icon": "ic_group_work_black_18dp.png" - }, - { - "name": "Műsor CLEAN", - "color": "BROWN100", - "icon": "ic_group_work_black_18dp.png" - }, - { - "name": "Egyéb", - "color": "YELLOW200", - "icon": "ic_view_quilt_black_18dp.png" - } - ], - "bottomTypeFilters": [ - { - "name": "ECHO műsor", - "color": "TEAL200", - "icon": "ic_theaters_black_18dp.png" - }, - { - "name": "Műsor", - "color": "TEAL200", - "icon": "ic_theaters_black_18dp.png" - }, - { - "name": "Műsor nyers", - "color": "TEAL100", - "icon": "ic_invert_colors_black_18dp.png" - }, - { - "name": "ECHO promo", - "color": "INDIGO200", - "icon": "ic_picture_in_picture_black_18dp.png" - }, - { - "name": "Promo", - "color": "INDIGO200", - "icon": "ic_picture_in_picture_black_18dp.png" - }, - { - "name": "Promo nyers", - "color": "INDIGO100", - "icon": "ic_bug_report_black_18dp.png" - }, - { - "name": "ECHO reklám", - "color": "BLUE200", - "icon": "ic_picture_in_picture_alt_black_18dp.png" - }, - { - "name": "Reklám", - "color": "BLUE200", - "icon": "ic_picture_in_picture_alt_black_18dp.png" - }, - { - "name": "Reklám nyers", - "color": "BLUE100", - "icon": "ic_settings_brightness_black_18dp.png" - } - ], - "authentication": { - "authEnabled": true, - "adHost": "10.10.254.11", - "adNonSecurePort": 3268, - "adBaseDn": "DC=intra,DC=echotv,DC=hu", - "adAdminMap": [ - "G_ECH_U_INFORMATIKUSOK", - "G_ECH_U_MUSZAKVEZETOK", - "ECH-ISILON-ADMINS" - ], - "adSubmitterMap": [ - "G_ECH_U_INFORMATIKUSOK", - "G_ECH_U_MUSZAKVEZETOK", - "ECH-ISILON-ADMINS", - "G_ECH_U_PLAYOUT" - ], - "adEditorMap": [ - "G_ECH_U_INFORMATIKUSOK", - "G_ECH_U_MUSZAKVEZETOK", - "ECH-ISILON-ADMINS", - "G_ECH_U_ARCHIVUM" - ], - "localAccounts": [ - { - "user" : "user", - "password" : "5F4DCC3B5AA765D61D8327DEB882CF99", - "email" : null - }, - { - "user" : "lebony", - "password" : "4E25B117B14D86D7DCECB4E433CF932C", - "email" : null - }, - { - "user" : "root", - "password" : "5F4DCC3B5AA765D61D8327DEB882CF99", - "email" : "vasary@elgekko.net" - } - ], - "localAdmins": [ - "root", - "admin" - ], - "localSubmitters": [ - "lebony" - ], - "localEditors": [ - "editor" - ] - } -} - - - diff --git a/server/-product/production/MEDIAVIVANTIS/settings/mediacube.yaml b/server/-product/production/MEDIAVIVANTIS/settings/mediacube.yaml new file mode 100644 index 00000000..fcf8cf5c --- /dev/null +++ b/server/-product/production/MEDIAVIVANTIS/settings/mediacube.yaml @@ -0,0 +1,46 @@ +jobQueuePollInterval: 1000 +topTypeFilters: +- name: Hír bejátszó +- name: Hír nyers +- name: Visszarögzített +- name: Egyéb +bottomTypeFilters: +- name: Műsor +- name: Műsor nyers +- name: Promo +- name: Promo nyers +- name: Reklám +- name: Reklám nyers +authentication: + authEnabled: true + adHost: intra.mediavivantis.hu + adNonSecurePort: 3268 + adBaseDn: DC=intra,DC=mediavivantis,DC=hu + adAdminMap: + - G_MV_U_MUSZAK + - G_MV_U_INGEST + adSubmitterMap: + - G_ECH_U_INFORMATIKUSOK + - G_ECH_U_MUSZAKVEZETOK + - ECH-ISILON-ADMINS + adEditorMap: + - G_ECH_U_INFORMATIKUSOK + - G_ECH_U_MUSZAKVEZETOK + - ECH-ISILON-ADMINS + localAccounts: + - user: user + password: 5F4DCC3B5AA765D61D8327DEB882CF99 + email: + - user: lebony + password: 4E25B117B14D86D7DCECB4E433CF932C + email: + - user: root + password: 5F4DCC3B5AA765D61D8327DEB882CF99 + email: vasary@elgekko.net + localAdmins: + - root + - admin + localSubmitters: + - lebony + localEditors: + - editor 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 index 00000000..8cba80bd --- /dev/null +++ b/server/hu.user.mediacube.executors.tests/jobs/executors.yaml @@ -0,0 +1,5 @@ +executors: + - className: user.jobengine.server.steps.ArchiveListBuilderStep + maxConcurrent: 1 + - className: user.jobengine.server.steps.ArchiveMaterialSubmitStep + maxConcurrent: 2 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 index 00000000..4459b9fa --- /dev/null +++ b/server/hu.user.mediacube.executors.tests/jobs/template1.yaml @@ -0,0 +1,28 @@ +jobtemplate: + multiInstance: true + useSessionLog: true + declarations: + parameters: + - name: param1 + type: java.lang.Integer + - name: param1 + type: java.lang.Integer + variables: + - name: var1 + type: java.lang.Integer + - name: var1 + type: java.lang.Integer + commands: + - type: Step1.java + weight: 1 + inputs: + - name: param1 + - name: param2 + outputs: + - name: var1 + - name: var2 + - type: StepS.java + weight: 1 + inputs: + - name: var1 + - name: var2 diff --git a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java index 818af045..d97cc44a 100644 --- a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java +++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java @@ -43,6 +43,8 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang.StringUtils; import org.apache.ibatis.jdbc.SQL; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.junit.Test; import com.ibm.nosql.json.api.BasicDBList; @@ -50,6 +52,7 @@ import com.ibm.nosql.json.api.BasicDBObject; import com.ibm.nosql.json.api.DBObject; import groovy.lang.GroovyClassLoader; +import groovy.lang.GroovyCodeSource; import user.commons.RemoteFile; import user.commons.StoreUri; import user.commons.configuration.IConfiguration; @@ -1237,4 +1240,29 @@ public class SmallTests { System.out.println(rundowns.size()); } } + + @Test + public void test999990() throws Exception { + Logger logger = LogManager.getLogger(); + String className = "TestStep.java"; + String root = "/opt/steps"; + String script = new String(Files.readAllBytes(Paths.get(root, className))); + GroovyCodeSource codeSource = new GroovyCodeSource(script, className, "/groovy/script"); + try (GroovyClassLoader cl = new GroovyClassLoader(this.getClass().getClassLoader())) { + cl.addClasspath(root); + + Class class1 = cl.parseClass(codeSource); + logger.info(class1); + } catch (Exception e) { + logger.error(e); + } + + } + + @Test + public void test999991() throws Exception { + IConfiguration configuration = SystemConfiguration.getInstance(); + String executors = configuration.getConfig("jobs/executors.yaml"); + configuration.load(executors); + } } diff --git a/server/hu.user.mediacube.indexer/.project b/server/hu.user.mediacube.indexer/.project index 57e80542..1df52a32 100644 --- a/server/hu.user.mediacube.indexer/.project +++ b/server/hu.user.mediacube.indexer/.project @@ -1,6 +1,6 @@ - bisz-income-info + hu.user.mediacube.indexer diff --git a/server/hu.user.mediacube.indexer/pom.xml b/server/hu.user.mediacube.indexer/pom.xml index d7b3140c..fb037454 100644 --- a/server/hu.user.mediacube.indexer/pom.xml +++ b/server/hu.user.mediacube.indexer/pom.xml @@ -37,7 +37,7 @@ com.ibm db2jcc4 - 4.19.26 + 4.26.14 org.apache.lucene diff --git a/server/user.jobengine.osgi.commons/src/user/commons/configuration/IConfiguration.java b/server/user.jobengine.osgi.commons/src/user/commons/configuration/IConfiguration.java index 90aebf29..67eff03d 100644 --- a/server/user.jobengine.osgi.commons/src/user/commons/configuration/IConfiguration.java +++ b/server/user.jobengine.osgi.commons/src/user/commons/configuration/IConfiguration.java @@ -8,6 +8,8 @@ public interface IConfiguration { void load(String file) throws Exception; + T load(String file, Class configClass) throws Exception; + T value(String fqn); T value(String fqn, T defValue); diff --git a/server/user.jobengine.osgi.commons/src/user/commons/configuration/SystemConfiguration.java b/server/user.jobengine.osgi.commons/src/user/commons/configuration/SystemConfiguration.java index f0681266..df2d02f2 100644 --- a/server/user.jobengine.osgi.commons/src/user/commons/configuration/SystemConfiguration.java +++ b/server/user.jobengine.osgi.commons/src/user/commons/configuration/SystemConfiguration.java @@ -14,6 +14,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; public class SystemConfiguration implements IConfiguration { + private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(new YAMLFactory()); + private static Logger logger = LogManager.getLogger(); static IConfiguration currentInstance = null; @@ -52,10 +54,21 @@ public class SystemConfiguration implements IConfiguration { logger.info("Loading system configuration {}", file); if (file != null) { String yaml = new String(Files.readAllBytes(Paths.get(file))); - settings = new ObjectMapper(new YAMLFactory()).readValue(yaml, HashMap.class); + settings = OBJECT_MAPPER.readValue(yaml, HashMap.class); } } + @Override + public T load(String file, Class configClass) throws Exception { + T result = null; + logger.info("Loading {} configuration {}", file, configClass); + if (file != null) { + String yaml = new String(Files.readAllBytes(Paths.get(file))); + result = OBJECT_MAPPER.readValue(yaml, configClass); + } + return result; + } + @SuppressWarnings("unchecked") @Override public T value(String fqn) { diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java index e3cfaccf..00ec8b50 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java @@ -36,8 +36,8 @@ import user.jobengine.server.steps.IJobStep; public class JobEngineConfiguration implements IJobEngineConfiguration { private static final Logger logger = LogManager.getLogger(); - public static final String CONF_MEDIACUBE = "settings/mediacube.json"; - public static final String CONF_MAESTRO = "settings/maestro.json"; + public static final String CONF_MEDIACUBE = "settings/mediacube.yaml"; + public static final String CONF_MAESTRO = "settings/maestro.yaml"; public static final String CONF_EXECUTORS = "jobs/executors.xml"; public static final String CONF_SCHEDULES = "jobs/schedules.json"; public static final String DIR_STEPS = "jobs/steps"; 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 index 00000000..c5515ce1 --- /dev/null +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/ast/data/JobTemplateData.java @@ -0,0 +1,4 @@ +package user.jobengine.server.ast.data; + +public class JobTemplateData { +} 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 index 00000000..70356b9c --- /dev/null +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/ast/data/JobTemplateParameter.java @@ -0,0 +1,4 @@ +package user.jobengine.server.ast.data; + +public class JobTemplateParameter { +} 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 index 00000000..ef90f807 --- /dev/null +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/ast/data/JobTemplateVariable.java @@ -0,0 +1,4 @@ +package user.jobengine.server.ast.data; + +public class JobTemplateVariable { +} diff --git a/server/user.mediacube.gui/WEB-INF/zk.xml b/server/user.mediacube.gui/WEB-INF/zk.xml index 259b1935..49b85508 100644 --- a/server/user.mediacube.gui/WEB-INF/zk.xml +++ b/server/user.mediacube.gui/WEB-INF/zk.xml @@ -26,9 +26,9 @@ https://www.zkoss.org/wiki/ZK_Configuration_Reference/zk.xml /resources/i3-label_hu.properties + org.zkoss.zk.ui.http.SerializableUiFactory - diff --git a/server/user.mediacube.gui/css/video-js.css b/server/user.mediacube.gui/css/video-js.css index 5b0e3b9a..169f1de2 100644 --- a/server/user.mediacube.gui/css/video-js.css +++ b/server/user.mediacube.gui/css/video-js.css @@ -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; diff --git a/server/user.mediacube.gui/js/searchitems.js b/server/user.mediacube.gui/js/searchitems.js index 96f83df0..c6150980 100644 --- a/server/user.mediacube.gui/js/searchitems.js +++ b/server/user.mediacube.gui/js/searchitems.js @@ -27,6 +27,32 @@ setSource(null); // src : '/services/proxy/media1/index.m3u8' //}); + +function secondsToSMPTE(seconds) { + var f = Math.floor((seconds % 1) * 25); + var s = Math.floor(seconds); + var m = Math.floor(s / 60); + var h = Math.floor(m / 60); + m = m % 60; + s = s % 60; + + return {h: h, m: m, s: s, f: f}; +} +function SMPTEToString(timecode) { + if (timecode.h < 10) { timecode.h = "0" + timecode.h; } + if (timecode.m < 10) { timecode.m = "0" + timecode.m; } + if (timecode.s < 10) { timecode.s = "0" + timecode.s; } + if (timecode.f < 10) { timecode.f = "0" + timecode.f; } + + return timecode.h + ":" + timecode.m + ":" + timecode.s + ":" + timecode.f; +} +function customTimeFormat(seconds) { + return SMPTEToString(secondsToSMPTE(seconds)); +} + +videojs.setFormatTime(customTimeFormat); + + function pushTcIn() { var current = player.currentTime(); console.log("pushTcIn", current); diff --git a/server/user.mediacube.gui/pages/searchitems.zul b/server/user.mediacube.gui/pages/searchitems.zul index 601ed57b..5434ecbb 100644 --- a/server/user.mediacube.gui/pages/searchitems.zul +++ b/server/user.mediacube.gui/pages/searchitems.zul @@ -25,7 +25,8 @@ document.selection.empty(); } } - + + @@ -56,7 +57,9 @@
- +
diff --git a/server/user.mediacube.gui/resources/i3-label_hu.properties b/server/user.mediacube.gui/resources/i3-label_hu.properties index e54983be..620f224a 100644 --- a/server/user.mediacube.gui/resources/i3-label_hu.properties +++ b/server/user.mediacube.gui/resources/i3-label_hu.properties @@ -1,4 +1,4 @@ -version=2.7.1 +version=2.7.2 footer=2016-2020 © Copyright User Rendszerház Kft. login_info=Információ diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/SearchModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/SearchModel.java index 06cbc784..4533d1d2 100644 --- a/server/user.mediacube.gui/src/user/jobengine/zk/model/SearchModel.java +++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/SearchModel.java @@ -203,6 +203,9 @@ public class SearchModel extends AsyncBaseModel { @AfterCompose public void afterCompose(@ContextParam(ContextType.VIEW) Component view) { + //A MediaFileServlet a services/proxy alatt szolgal ki + Clients.evalJavaScript("setSource('http://localhost:9080/services/proxy/20209535_1-20205617.mp4', 'video/mp4')"); + try { Selectors.wireComponents(view, this, false); Selectors.wireEventListeners(view, this); @@ -1022,7 +1025,6 @@ public class SearchModel extends AsyncBaseModel { Clients.evalJavaScript(String.format("setSource('%s', '%s')", video, srcType)); } - // Clients.evalJavaScript("setSource('/img/Mediacube_todo2.mp4')"); } catch (Exception e) { logger.error(e); } diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/util/SessionUtil.java b/server/user.mediacube.gui/src/user/jobengine/zk/util/SessionUtil.java index 83898601..b2282e6c 100644 --- a/server/user.mediacube.gui/src/user/jobengine/zk/util/SessionUtil.java +++ b/server/user.mediacube.gui/src/user/jobengine/zk/util/SessionUtil.java @@ -22,7 +22,7 @@ import com.ibm.nosql.json.api.BasicDBList; import com.ibm.nosql.json.api.BasicDBObject; import com.ibm.nosql.json.api.QueryBuilder; -import user.commons.config.JSONConfig; +import user.commons.configuration.IConfiguration; import user.commons.nosql.NoSQLUtils; import user.jobengine.gui.ComponentBinder; import user.jobengine.server.IJobChangedListener; @@ -150,8 +150,10 @@ public class SessionUtil { try { result = (MaestroConfig) getAttribute(MAESTRO_CONFIG); if (result == null) { - String configFilePath = ComponentBinder.getSystemConfig().getConfig(JobEngineConfiguration.CONF_MAESTRO); - result = JSONConfig.read(configFilePath, MaestroConfig.class); + IConfiguration systemConfig = ComponentBinder.getSystemConfig(); + String configFilePath = systemConfig.getConfig(JobEngineConfiguration.CONF_MAESTRO); + result = systemConfig.load(configFilePath, MaestroConfig.class); + //result = JSONConfig.read(configFilePath, MaestroConfig.class); setAttribute(MAESTRO_CONFIG, result); } } catch (Exception e) { @@ -165,8 +167,10 @@ public class SessionUtil { try { result = (MediaCubeConfig) getAttribute(MEDIACUBE_CONFIG); if (result == null) { + IConfiguration systemConfig = ComponentBinder.getSystemConfig(); String configFilePath = ComponentBinder.getSystemConfig().getConfig(JobEngineConfiguration.CONF_MEDIACUBE); - result = JSONConfig.read(configFilePath, MediaCubeConfig.class); + result = systemConfig.load(configFilePath, MediaCubeConfig.class); + //result = JSONConfig.read(configFilePath, MediaCubeConfig.class); setAttribute(MEDIACUBE_CONFIG, result); } } catch (Exception e) {