git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Wed, 15 Apr 2020 15:38:09 +0000 (15:38 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Wed, 15 Apr 2020 15:38:09 +0000 (15:38 +0000)
21 files changed:
server/-configuration/run-mediacube-server-bsh.launch [deleted file]
server/-configuration/run-mediacube-server-user.launch
server/-configuration/scheduledjobs.json
server/-dependencies/jobengine.target
server/-product/mediacube.product
server/user.jobengine.executors/config/scheduledjobs.json
server/user.jobengine.executors/jobtemplates/create-lowres-ondemand.xml [new file with mode: 0644]
server/user.jobengine.executors/src/user/jobengine/server/steps/CreateArchiveItem.java [new file with mode: 0644]
server/user.jobengine.osgi.db/META-INF/MANIFEST.MF
server/user.jobengine.osgi.db/src/user/jobengine/search/LuceneMediaFinder.java
server/user.jobengine.osgi.server/foo.jsp [deleted file]
server/user.jobengine.osgi.server/index.jsp [deleted file]
server/user.jobengine.osgi.server/index.zul
server/user.jobengine.osgi.server/pages/jobselector.zul
server/user.jobengine.osgi.server/pages/mediaplayer.jsp [deleted file]
server/user.jobengine.osgi.server/pages/searchitems/details.zul
server/user.jobengine.osgi.server/src/user/jobengine/server/steps/JobStep.java
server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobSelectorModel.java
server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
server/user.jobengine.osgi.services/src/user/jobengine/osgi/mediacube/MediaCubeService.java
server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/RESTApplications.java

diff --git a/server/-configuration/run-mediacube-server-bsh.launch b/server/-configuration/run-mediacube-server-bsh.launch
deleted file mode 100644 (file)
index 56ee6a1..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">\r
-<booleanAttribute key="append.args" value="true"/>\r
-<booleanAttribute key="automaticAdd" value="false"/>\r
-<booleanAttribute key="automaticValidate" value="true"/>\r
-<stringAttribute key="bootstrap" value=""/>\r
-<stringAttribute key="checked" value="[NONE]"/>\r
-<booleanAttribute key="clearConfig" value="true"/>\r
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/run-mediacube-server-bsh"/>\r
-<booleanAttribute key="default" value="true"/>\r
-<booleanAttribute key="default_auto_start" value="false"/>\r
-<intAttribute key="default_start_level" value="4"/>\r
-<booleanAttribute key="includeOptional" value="false"/>\r
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>\r
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
-</listAttribute>\r
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>\r
-<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;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/config&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.10.1.27:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=password&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:}/-configuration/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Dorg.eclipse.jetty.webapp.basetempdir=c:\temp\jetty&#13;&#10;-Djava.io.tmpdir=c:\temp\jetty&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.11/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://10.10.1.27:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=password&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;&#13;&#10;-Djobengine.nexio.db.user=sa&#13;&#10;-Djobengine.nexio.db.password=resolve&#13;&#10;-Dnexio.host=10.10.1.55&#13;&#10;-Djobengine.nexio.name=testnexioclips&#13;&#10;-Dnexio.useMOSGateway=true&#13;&#10;-Dnexio.disable=true&#13;&#10;-Djobengine.octopus.rundowns.name=rundowns&#13;&#10;-Djobengine.octopus.storyfolders.name=storyfolders&#13;&#10;-Djobengine.octopus.stories.name=stories&#13;&#10;-Dmediacube.auth.location=&quot;${workspace_loc}/-configuration/mediacube-auth.properties&quot;"/>\r
-<stringAttribute key="pde.version" value="3.3"/>\r
-<booleanAttribute key="show_selected_only" value="false"/>\r
-<stringAttribute key="target_bundles" value="cglib@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,humble.video.noarch@default:default,humble.video.windows@default:default,javax.annotation-api@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.ws.rs-api@default:default,jcifs@default:default,joda-time@default:default,org.apache.aries.spifly.dynamic.bundle@default:default,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.logging.log4j.api@1:true,org.apache.logging.log4j.core@default:default,org.apache.logging.log4j.slf4j-impl@default:default,org.apache.servicemix.bundles.quartz@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.schemas@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jboss.resteasy.client@default:default,org.jboss.resteasy.jackson2-provider@default:default,org.jboss.resteasy.jaxrs@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.junit@default:default,org.mybatis.mybatis@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.omnifaces@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r
-<booleanAttribute key="tracing" value="false"/>\r
-<booleanAttribute key="useCustomFeatures" value="false"/>\r
-<booleanAttribute key="useDefaultConfigArea" value="true"/>\r
-<stringAttribute key="workspace_bundles" value="user.commons.log4j2@default:false,user.jobengine.osgi.commons@default:true,user.jobengine.osgi.db@default:default,user.jobengine.osgi.server@default:default,user.jobengine.osgi.services@default:default,user.mediacube.metadata@default:default,user.tsm.client@default:default"/>\r
-</launchConfiguration>\r
index 86c2acb0b985e03bd43e8ecbdd95c88866c6a17e..19a9c109b2f8ace19bd9b673500c640cd2d48ad7 100644 (file)
@@ -22,7 +22,7 @@
 <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;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/config&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.228.198.1:50000/mediaarc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=password&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:}/-configuration/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Dorg.eclipse.jetty.webapp.basetempdir=c:\temp\jetty&#13;&#10;-Djava.io.tmpdir=c:\temp\jetty&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.11/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=password&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC.zenium&#13;&#10;-Djobengine.transcoder.address=http://10.11.1.111:65445/api/json/v1/&#13;&#10;-Djobengine.transcoder.template=MP4&#13;&#10;-Djobengine.transcoder.version=1&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;&#13;&#10;-Djobengine.nexio.db.user=sa&#13;&#10;-Djobengine.nexio.db.password=resolve&#13;&#10;-Djobengine.planair.db.url=jdbc:sqlserver://10.11.254.86;databaseName=PA_Vivantis;&#13;&#10;-Djobengine.planair.db.user=MAM&#13;&#10;-Djobengine.planair.db.password=VDani&#13;&#10;-Dnexio.host=192.168.0.12&#13;&#10;-Djobengine.nexio.name=testnexioclips&#13;&#10;-Dnexio.useMOSGateway=false&#13;&#10;-Dnexio.disable=true&#13;&#10;-Djobengine.octopus.rundowns.name=rundowns181026&#13;&#10;-Djobengine.octopus.storyfolders.name=storyfolders181026&#13;&#10;-Djobengine.octopus.stories.name=stories181026&#13;&#10;-Djobengine.maestro.config=&quot;${workspace_loc}/-configuration/maestro.json&quot;&#13;&#10;-Djobengine.mediacube.config=&quot;${workspace_loc}/-configuration/mediacube.json&quot;&#13;&#10;-Dgui.statistics.disable=true&#13;&#10;-Dgui.help.disable=true&#13;&#10;-Dgui.editor.disable=true&#13;&#10;-Djobengine.mediafinder.external=false"/>\r
 <stringAttribute key="pde.version" value="3.3"/>\r
 <booleanAttribute key="show_selected_only" value="false"/>\r
-<stringAttribute key="target_bundles" value="cglib@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default,com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,humble.video.noarch@default:default,humble.video.windows@default:default,javax.annotation-api@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.ws.rs-api@default:default,jcifs@default:default,joda-time@default:default,org.apache.aries.spifly.dynamic.bundle@default:default,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.logging.log4j.api@1:true,org.apache.logging.log4j.core@default:default,org.apache.logging.log4j.slf4j-impl@default:default,org.apache.servicemix.bundles.quartz@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.schemas@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jboss.resteasy.client@default:default,org.jboss.resteasy.jackson2-provider@default:default,org.jboss.resteasy.jaxrs-api@default:default,org.jboss.resteasy.jaxrs@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.junit@default:default,org.mybatis.mybatis@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.omnifaces@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r
+<stringAttribute key="target_bundles" value="cglib@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default,com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,humble.video.noarch@default:default,humble.video.windows@default:default,javax.annotation-api@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.ws.rs-api@default:default,jcifs@default:default,joda-time@default:default,org.apache.aries.spifly.dynamic.bundle@default:default,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.logging.log4j.api@1:true,org.apache.logging.log4j.core@default:default,org.apache.logging.log4j.slf4j-impl@default:default,org.apache.servicemix.bundles.quartz@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.schemas@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jboss.resteasy.client@default:default,org.jboss.resteasy.jaxrs@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.junit@default:default,org.mybatis.mybatis@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.omnifaces@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r
 <booleanAttribute key="tracing" value="false"/>\r
 <booleanAttribute key="useCustomFeatures" value="false"/>\r
 <booleanAttribute key="useDefaultConfigArea" value="true"/>\r
index e53315e801a4d40f0fd3972330fc5691d363cf85..44221188e6d4f3a66239c017bc7222c59d3c86b9 100644 (file)
@@ -1,4 +1,18 @@
 {"joblist":[\r
+       {\r
+         "name" : "Proxy pótlása",\r
+      "template": "create-lowres-ondemand.xml",\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": "localHiresPath", "value": "/mediacube/data/lowres/", "type": "java.lang.String" },\r
+       {"name": "globalHiresPath", "value": "L:\\", "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": "webPath", "value": "/mediacube/data/lowres/www/video/", "type": "java.lang.String" }\r
+      ]\r
+       },      \r
        {\r
          "name" : "sys: Migrate HSM",\r
       "template": "migrate-hsm.xml",\r
index 7a2d47eaeb53c00ddd1cd7bade139d1d3e7aa646..2ca556af96afcec2e1a76cf7cc898887bed496f8 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<?pde version="3.8"?><target name="JobEngine" sequenceNumber="297">\r
+<?pde version="3.8"?><target name="JobEngine" sequenceNumber="301">\r
 <locations>\r
 <location path="${eclipse_home}" type="Profile"/>\r
 <location path="${workspace_loc}/-dependencies/target/repository/plugins" type="Directory"/>\r
@@ -21,6 +21,7 @@
 <plugin id="humble.video.noarch"/>\r
 <plugin id="humble.video.windows"/>\r
 <plugin id="javax.annotation-api"/>\r
+<plugin id="javax.inject"/>\r
 <plugin id="javax.mail" version="1.5.0.b01"/>\r
 <plugin id="javax.servlet-api"/>\r
 <plugin id="javax.servlet.jsp"/>\r
index 115d45749d2ca1719bc18fa8ed082016d64a469a..c6a83a88ef14710f6995e888350f83d9f31433b6 100644 (file)
       <plugin id="org.objectweb.asm"/>\r
       <plugin id="org.objectweb.asm.commons"/>\r
       <plugin id="org.objectweb.asm.tree"/>\r
+      <plugin id="org.omnifaces"/>\r
       <plugin id="slf4j.api"/>\r
       <plugin id="slf4j.simple" fragment="true"/>\r
       <plugin id="user.commons.log4j2" fragment="true"/>\r
index 43e716cf4fcc0f6d0cbf3d09d6f37ebbe4dda5a2..412824966b1775bed07463d2b8ee3103f2578018 100644 (file)
@@ -1,4 +1,18 @@
 {"joblist":[\r
+       {\r
+         "name" : "Proxy pótlása",\r
+      "template": "create-lowres-ondemand.xml",\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": "localHiresPath", "value": "/mediacube/data/lowres/", "type": "java.lang.String" },\r
+       {"name": "globalHiresPath", "value": "L:\\", "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": "webPath", "value": "/mediacube/data/lowres/www/video/", "type": "java.lang.String" }\r
+      ]\r
+       },\r
        {\r
          "name" : "sys: Migrate HSM",\r
       "template": "migrate-hsm.xml",\r
diff --git a/server/user.jobengine.executors/jobtemplates/create-lowres-ondemand.xml b/server/user.jobengine.executors/jobtemplates/create-lowres-ondemand.xml
new file mode 100644 (file)
index 0000000..bf7ff23
--- /dev/null
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<jobtemplate name="Hiányzó PROXY videók pótlása">\r
+       <declarations>\r
+               <parameters>\r
+                       <parameter name="mediaCubeMedia" type="user.jobengine.db.Media" />\r
+                       <parameter name="deleteSource" type="java.lang.Boolean"/>\r
+                       <parameter name="killDateDays" type="java.lang.Integer"/>\r
+                       <parameter name="successRecipient" type="java.lang.String" />\r
+                       <parameter name="localHiresPath" type="java.lang.String" />\r
+                       <parameter name="globalHiresPath" type="java.lang.String" />\r
+                       <parameter name="localLowresPath" type="java.lang.String" />\r
+                       <parameter name="transcoderAddress" type="java.lang.String" />\r
+                       <parameter name="transcoderTemplateName" type="java.lang.String" />\r
+                       <parameter name="webPath" type="java.lang.String" />\r
+                       <parameter name="localRetrievePath" type="java.lang.String" />\r
+                       <parameter name="globalRetrievePath" type="java.lang.String" />\r
+                       <parameter name="targetNamePattern" type="java.lang.String" />\r
+               </parameters>\r
+               <variables>\r
+                       <variable name="archiveItem" type="user.jobengine.server.steps.ArchiveItem" />\r
+               </variables>\r
+       </declarations>\r
+       <commands>\r
+               <calljobstep type="user.jobengine.server.steps.CreateArchiveItem" weight="1">\r
+                       <inputs>\r
+                               <input>\r
+                                       <parameter name="mediaCubeMedia" />\r
+                               </input>\r
+                               <input>\r
+                                       <parameter name="localHiresPath" />\r
+                               </input>\r
+                       </inputs>\r
+                       <outputs>\r
+                               <output>\r
+                                       <variable name="archiveItem" />\r
+                               </output>\r
+                       </outputs>\r
+               </calljobstep>\r
+               <calljobstep type="user.jobengine.server.steps.TSMRestoreStep" weight="1">\r
+                       <inputs>\r
+                               <input>\r
+                                       <parameter name="mediaCubeMedia" />\r
+                               </input>\r
+                               <input>\r
+                                       <parameter name="localHiresPath" />\r
+                               </input>\r
+                               <input>\r
+                                       <parameter name="targetNamePattern" />\r
+                               </input>\r
+                               <input>\r
+                                       <parameter name="successRecipient" />\r
+                               </input>\r
+                               <input>\r
+                                       <parameter name="killDateDays" />\r
+                               </input>\r
+                               <input>\r
+                                       <parameter name="localRetrievePath" />\r
+                               </input>\r
+                               <input>\r
+                                       <parameter name="globalRetrievePath" />\r
+                               </input>\r
+                       </inputs>\r
+               </calljobstep>\r
+               <calljobstep type="user.jobengine.server.steps.MediaToolStep" weight="1">\r
+                       <inputs>\r
+                               <input>\r
+                                       <variable name="archiveItem" />\r
+                               </input>\r
+                               <input>\r
+                                       <parameter name="mediaCubeMedia" />\r
+                               </input>\r
+                       </inputs>\r
+               </calljobstep>\r
+               <calljobstep type="user.jobengine.server.steps.TranscodeFFAStranStep" weight="1">\r
+                       <inputs>\r
+                               <input>\r
+                                       <variable name="archiveItem" />\r
+                               </input>\r
+                               <input>\r
+                                       <parameter name="mediaCubeMedia" />\r
+                               </input>\r
+                               <input>\r
+                                       <parameter name="transcoderAddress" />\r
+                               </input>\r
+                               <input>\r
+                                       <parameter name="transcoderTemplateName" />\r
+                               </input>\r
+                               <input>\r
+                                       <parameter name="globalHiresPath" />\r
+                               </input>\r
+                               <input>\r
+                                       <parameter name="localLowresPath" />\r
+                               </input>\r
+                               <input>\r
+                                       <parameter name="webPath" />\r
+                               </input>\r
+                               <input>\r
+                                       <parameter name="deleteSource" />\r
+                               </input>\r
+                       </inputs>\r
+               </calljobstep>\r
+               <calljobstep type="user.jobengine.server.steps.UpdateGhostMediaData" weight="1">\r
+                       <inputs>\r
+                               <input>\r
+                                       <parameter name="mediaCubeMedia" />\r
+                               </input>\r
+                       </inputs>\r
+               </calljobstep>\r
+       </commands>\r
+</jobtemplate>
\ No newline at end of file
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CreateArchiveItem.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CreateArchiveItem.java
new file mode 100644 (file)
index 0000000..e374003
--- /dev/null
@@ -0,0 +1,46 @@
+package user.jobengine.server.steps;\r
+\r
+import java.nio.file.Paths;\r
+\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
+\r
+import com.ibm.nosql.json.api.BasicDBObject;\r
+import com.ibm.nosql.json.api.DB;\r
+import com.ibm.nosql.json.api.DBCollection;\r
+\r
+import user.commons.nosql.NoSQLUtils;\r
+import user.jobengine.db.Media;\r
+import user.jobengine.db.Store;\r
+\r
+public class CreateArchiveItem extends JobStep {\r
+       private static final Logger logger = LogManager.getLogger();\r
+\r
+       @StepEntry\r
+       public Object[] execute(Media mediaCubeMedia, String localHiresPath) throws Exception {\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
+               DBCollection collection = db.getCollection("missing_lowres");\r
+               Store highResStore = getManager().getSystemStore(false);\r
+\r
+               ArchiveItem archiveItem = null;\r
+               try {\r
+                       if (mediaCubeMedia.getMediaFilesCount() != 1)\r
+                               throw new Exception("Expected media count is 1, found " + mediaCubeMedia.getMediaFilesCount());\r
+                       if (mediaCubeMedia.getMediaFiles().get(0).getStoreId() != highResStore.getId())\r
+                               throw new Exception("Expected media store is a high-res store");\r
+\r
+                       String name = mediaCubeMedia.getMediaFilesName();\r
+                       archiveItem = new ArchiveItem();\r
+                       archiveItem.setMediaFile(Paths.get(localHiresPath, name).toString());\r
+                       collection.save(new BasicDBObject("name", name));\r
+               } catch (Exception e) {\r
+                       logger.catching(e);\r
+                       logger.info(getMarker(), e.getMessage());\r
+                       throw e;\r
+               } finally {\r
+                       setProgress(100);\r
+               }\r
+               Object[] result = { archiveItem };\r
+               return result;\r
+       }\r
+}\r
index 0bf64ad37bdc62934889103e0d1848b9033560ff..5ceaaa3fc74b68b9d4f9b8a732606f856d6707fd 100644 (file)
@@ -14,14 +14,9 @@ Require-Bundle: user.jobengine.osgi.commons;bundle-version="1.0.0",
 Service-Component: OSGI-INF/component.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: com.fasterxml.jackson.annotation;version="2.4.5",
- com.fasterxml.jackson.jaxrs.base;version="2.4.5",
  javax.ws.rs.client,
  javax.ws.rs.core,
- org.apache.logging.log4j;version="2.8.2",
- org.jboss.resteasy.client.jaxrs,
- org.jboss.resteasy.plugins.providers,
- org.jboss.resteasy.plugins.providers.jackson,
- org.jboss.resteasy.spi
+ org.apache.logging.log4j;version="2.8.2"
 Export-Package: user.jobengine.db,
  user.jobengine.search
 
index a65228f4a32d4253b22a1e83c5882dc8f061a2d0..df953709067c229b8f1b8d1e07f3794e1cdcccf2 100644 (file)
@@ -3,10 +3,6 @@ package user.jobengine.search;
 import java.util.List;\r
 \r
 import javax.ws.rs.client.WebTarget;\r
-import javax.ws.rs.core.GenericType;\r
-\r
-import org.jboss.resteasy.client.jaxrs.ResteasyClient;\r
-import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;\r
 \r
 import user.jobengine.db.ArchivedMedia;\r
 \r
@@ -21,7 +17,7 @@ public class LuceneMediaFinder implements IMediaFinder {
                        int toResult) {\r
                SearchResult<ArchivedMedia> ret = new SearchResult<ArchivedMedia>();\r
                // TODO Auto-generated method stub\r
-               ResteasyClient client = new ResteasyClientBuilder().build();\r
+               //              ResteasyClient client = new ResteasyClientBuilder().build();\r
                // if (criteria == "" || criteria == null)\r
                // apiPath = apiPath + "*:*/";\r
                // else\r
@@ -30,8 +26,8 @@ public class LuceneMediaFinder implements IMediaFinder {
                // apiPath = apiPath + fromResult + "/" + (toResult - fromResult) + "/"\r
                // + (orderAscending == true ? "1" : "0") + "/1";\r
 \r
-               webTarget = client.target(apiAddress);\r
-               WebTarget target = webTarget.path(apiPath);\r
+               //              webTarget = client.target(apiAddress);\r
+               //              WebTarget target = webTarget.path(apiPath);\r
                // Response response = target.request().get(IndexerDescription.class);\r
                // Response response = target.get(new\r
                // GenericType<List<IndexerDescription>>() {\r
@@ -42,8 +38,8 @@ public class LuceneMediaFinder implements IMediaFinder {
 \r
                // List<ArchivedMedia> archivedMedia = (List<ArchivedMedia>) response;\r
                // ret = (SearchResult<ArchivedMedia>) response;\r
-               ret = target.request().get(new GenericType<SearchResult<ArchivedMedia>>() {\r
-               });\r
+               //              ret = target.request().get(new GenericType<SearchResult<ArchivedMedia>>() {\r
+               //              });\r
 \r
                return ret;\r
        }\r
diff --git a/server/user.jobengine.osgi.server/foo.jsp b/server/user.jobengine.osgi.server/foo.jsp
deleted file mode 100644 (file)
index 71d31ad..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page import="java.util.*, java.io.*, java.net.*, user.jobengine.zk.util.SessionUtil"%>\r
-<link rel="shortcut icon" href="/img/mediacube_logo_small.ico">\r
-<%\r
-       out.println("HELLO");\r
-%>
\ No newline at end of file
diff --git a/server/user.jobengine.osgi.server/index.jsp b/server/user.jobengine.osgi.server/index.jsp
deleted file mode 100644 (file)
index 8bd4c93..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page import="java.util.*, java.io.*, java.net.*, user.jobengine.zk.util.SessionUtil, org.apache.logging.log4j.*"%>\r
-<link rel="shortcut icon" href="/img/mediacube_logo_small.ico">\r
-<%\r
-       pageContext.forward("/pages/index.zul");\r
-%>
\ No newline at end of file
index 6e2af2e97ce373f544fbcda793b854b833693ec0..9c3b92bcf1b3be36c616a8ca4e44a7b7b911c5e6 100644 (file)
                });//zk.afterLoad\r
        </script>\r
        \r
-       <window id="zkwindow" border="none" width="100%" height="100%" contentStyle="padding:0;" onClientInfo="onClientInfo(event)" \r
-               apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.IndexModel')">\r
+<!--   onClientInfo="onClientInfo(event)" -->\r
+\r
+       <window id="zkwindow" viewModel="@id('vm') @init('user.jobengine.zk.model.IndexModel')" border="none" width="100%" height="100%" contentStyle="padding:0;">\r
                <custom-attributes org.zkoss.zul.image.preload="true" />\r
-               <borderlayout width="${myWidth}" height="${myHeight}">\r
+<!--           <borderlayout width="${myWidth}" height="${myHeight}"> -->\r
+               <borderlayout>\r
                        <north border="0">\r
                                <div id="divMenu" onPopHistory="@command('popHistory')">\r
                                        <borderlayout height="50px">\r
@@ -72,7 +74,7 @@
                                                <west border="0" style="background: ${backcolor}">\r
                                                        <hbox height="100%" width="100%" align="center" pack="left">\r
                                                                <image src="/img/mediacube_logo_v2_50x50.png" />\r
-                                                               <label style="color:#e3e3e3;font-size:26px;font-weight:bold" value="MediaCube" />\r
+                                                               <label style="color:#008AC8;font-size:26px;font-weight:bold" value="MediaCube" />\r
                                                                <label style="color:#e3e3e3;font-size:12px;font-weight:bold" value="v${labels.version}" /> \r
                                                        </hbox>\r
                                                </west>\r
index 276051941e47bf998324c3310915ac4bce1d4acc..871521ee214027f41f31beb544f59cf2604e4266 100644 (file)
@@ -3,7 +3,7 @@
        viewModel="@id('jlm') @init('user.jobengine.zk.model.JobSelectorModel')" forward="onCancel=closeButton.onClick">\r
        <borderlayout height="450px">\r
                <center border="none" flex="true">\r
-                       <listbox model="@load(jlm.jobs)" selectedItem="@bind(jlm.selectedJob)" selectedItems="@bind(jlm.selectedJobs)">\r
+                       <listbox model="@load(jlm.jobs)" selectedItem="@bind(jlm.selectedJob)">\r
                                <listhead>\r
                                        <listheader hflex="1" label="Név" align="left" />\r
                                </listhead>\r
                        </listbox>\r
                </center>\r
                <east size="60%" flex="true" splittable="true" collapsible="true">\r
-                       <grid sizedByContent="false" span="true" model="@load(jlm.selectedJob)" vflex="true" style="border: none; background: #e3e3e3 !important;"\r
-                               oddRowSclass="listbox-odd-style" sclass="listbox-normal-style" emptyMessage="A részletek megtekintéséhez jelöljön ki egy folyamatot.">\r
-<!--                           <columns> -->\r
-<!--                                   <column label="Paraméter" hflex="1" align="left" /> -->\r
-<!--                                   <column label="Érték" hflex="1" align="left" /> -->\r
-<!--                           </columns> -->\r
-<!--                           <rows> -->\r
-<!--                                   <row> -->\r
-<!--                                           <label value="Aktív"></label> -->\r
-<!--                                           <label value="${each.get('active'))}"></label> -->\r
-<!--                                   </row> -->\r
-<!--                                   <row> -->\r
-<!--                                           <label value="Szerverrel indul"></label> -->\r
-<!--                                           <label value="${each.get('executeimmediate'))}"></label> -->\r
-<!--                                   </row> -->\r
-<!--                           </rows> -->\r
-                       </grid>\r
+                       <borderlayout>\r
+                               <north size="50%" splittable="true">\r
+                                       <grid visible="@bind(not empty jlm.selectedJob)" sizedByContent="false" span="true" vflex="true"\r
+                                               style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style" sclass="listbox-normal-style"\r
+                                               emptyMessage="A részletek megtekintéséhez jelöljön ki egy folyamatot.">\r
+                                               <columns>\r
+                                                       <column hflex="min"></column>\r
+                                                       <column hflex="true"></column>\r
+                                               </columns>\r
+                                               <rows>\r
+                                                       <row>\r
+                                                               <label value="Name"></label>\r
+                                                               <label value="@bind(jlm.selectedJob.name)"></label>\r
+                                                       </row>\r
+                                                       <row>\r
+                                                               <label value="Template"></label>\r
+                                                               <label value="@bind(jlm.selectedJob.template)"></label>\r
+                                                       </row>\r
+                                                       <row>\r
+                                                               <label value="Active"></label>\r
+                                                               <label value="@bind(empty jlm.selectedJob.active ? false : jlm.selectedJob.active)"></label>\r
+                                                       </row>\r
+                                                       <row>\r
+                                                               <label value="Execute immediate"></label>\r
+                                                               <label value="@bind(empty jlm.selectedJob.executeimmediate ? false : jlm.selectedJob.executeimmediate)"></label>\r
+                                                       </row>\r
+                                                       <row>\r
+                                                               <label value="Cron expression"></label>\r
+                                                               <label value="@bind(jlm.selectedJob.cronexpression)"></label>\r
+                                                       </row>\r
+                                                       <row>\r
+                                                               <label value="Next execution"></label>\r
+                                                               <label value="@bind(jlm.selectedJob.nextTime)"></label>\r
+                                                       </row>\r
+                                               </rows>\r
+                                       </grid>\r
+\r
+                               </north>\r
+                               <center border="none" flex="true">\r
+                                       <grid model="@load(jlm.selectedJob.parameters)" style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style"\r
+                                               sclass="listbox-normal-style">\r
+                                               <columns sizable="true">\r
+                                                       <column label="Name" hflex="1"></column>\r
+                                                       <column label="Value" hflex="3"></column>\r
+                                                       <column label="Type" hflex="1"></column>\r
+                                               </columns>\r
+                                               <rows>\r
+                                                       <template name="model">\r
+                                                               <row>\r
+                                                                       <label value="@load(each.name)"></label>\r
+                                                                       <label value="@load(each.value)"></label>\r
+                                                                       <label value="@load(each.type)"></label>\r
+                                                               </row>\r
+                                                       </template>\r
+                                               </rows>\r
+                                       </grid>\r
+\r
+                               </center>\r
+                       </borderlayout>\r
+\r
                </east>\r
        </borderlayout>\r
            \r
diff --git a/server/user.jobengine.osgi.server/pages/mediaplayer.jsp b/server/user.jobengine.osgi.server/pages/mediaplayer.jsp
deleted file mode 100644 (file)
index 79ee4a4..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<%@page import="java.util.*"%>\r
-<%\r
-       String mediaURL = request.getParameter("mediaurl");\r
-       String poster = request.getParameter("poster");\r
-%>\r
-<head>\r
-<style>\r
-.myVideoDiv-dimensions {\r
-       width: 100%;\r
-       height: 100%;\r
-}\r
-\r
-.vjs-error {\r
-       width: 100%;\r
-       height: 100%;\r
-}\r
-.vjs-modal-dialog-content {\r
-       width: 100%;\r
-       height: 100%;\r
-       display: none;\r
-}\r
-\r
-.vjs-no-js {\r
-       width: 100%;\r
-       height: 100%;\r
-}\r
-</style>\r
-<link href="/css/video-js.css" rel="stylesheet">\r
-<!-- If you'd like to support IE8 -->\r
-<script src="/js/videojs-ie8.min.js"></script>\r
-<script src="/js/video.js"></script>\r
-</head>\r
-\r
-<body>\r
-\r
-       <script>\r
-               //console.log('URL is: <%=mediaURL%> ');\r
-       </script>\r
-       <center>\r
-       <video id="myVideoDiv" class="video-js vjs-default-skin vjs-big-play-centered"\r
-               <%if (poster != null && !poster.isEmpty()) {%> \r
-               poster="<%=poster%>"\r
-               <%}%>>\r
-               <%if (mediaURL != null && !mediaURL.isEmpty()) {%> \r
-               poster="<%=poster%>"\r
-               <%}%>>\r
-               <source src="<%=mediaURL%>" type='video/mp4'>\r
-               <!--source src="/zk/media_oceans.mp4" type='video/mp4' -->\r
-               <!--source src="MY_VIDEO.webm" type='video/webm' -->\r
-               <p class="vjs-no-js">\r
-                       To view this video please enable JavaScript, and consider upgrading\r
-                       to a web browser that <a\r
-                               href="http://videojs.com/html5-video-support/" target="_blank">supports\r
-                               HTML5 video</a>\r
-               </p>\r
-       </video>\r
-       </center>\r
-\r
-       <script>\r
-               var player = videojs('myVideoDiv', {\r
-                       controls : true,\r
-                       preload : "auto"\r
-               });\r
-/*\r
-               var myVar = setInterval(myTimer, 5000);\r
-               function myTimer() {\r
-                       console.log(player.currentTime());\r
-                       myVar = setInterval(myTimer, 5000);\r
-               }\r
-               */\r
-       </script>\r
-</body>\r
index 63b0d82176d622a62cbd342553436743b53f79cd..e0069a4434acfedaac9e3cf00ee665cfdb39244f 100644 (file)
@@ -12,6 +12,9 @@
                                        <toolbarbutton image="/img/baseline_edit_black_18dp.png" autodisable="self" onClick="@command('openMetaDataDialog')"\r
                                                disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" label="Szerkesztés" />\r
                                        <separator />\r
+                                       <toolbarbutton iconSclass="z-icon-film" autodisable="self" onClick="@command('createLowres')"\r
+                                               disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" label="Proxy pótlása" />\r
+                                       \r
                                        <toolbarbutton autodisable="self" c:onClick="pushTcIn('${arg.field}')" label="IN" visible="${not sessionScope.guiEditorDisable}" />\r
                                        <toolbarbutton autodisable="self" c:onClick="pushTcOut('${arg.field}')" label="OUT" visible="${not sessionScope.guiEditorDisable}" />\r
                                </div>\r
index 4899111c72002c405b1ad08cd6cf75cd2acc1041..bfc816309d5f6b79130b4bca605f1b648f14443c 100644 (file)
@@ -15,6 +15,7 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;\r
 import org.osgi.framework.ServiceReference;\r
 \r
+import user.jobengine.db.IItemManager;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
 \r
@@ -84,6 +85,10 @@ public class JobStep implements IJobStep {
                return jobRuntime;\r
        }\r
 \r
+       protected IItemManager getManager() {\r
+               return (IItemManager) jobRuntime.getPersister();\r
+       }\r
+\r
        protected Marker getMarker() {\r
                Marker parentMarker = MarkerManager.getMarker("MEDIACUBE");\r
                Marker result = MarkerManager.getMarker(getRuntimeName());\r
index 0fa1563fc3bfd77f18c9d77003a43c8864e09ad8..db532ba7c43ce4db01c6c86ff5ca08f752b4db33 100644 (file)
@@ -79,22 +79,6 @@ public class JobSelectorModel extends BaseModel {
        public void init() {\r
                this.jobEngine = (IJobEngine) Executions.getCurrent().getArg().get("jobEngine");\r
                jobs = new ListModelList<>(NoSQLUtils.asList(jobEngine.getScheduler().getScheduleJobs()));\r
-               if (jobs != null) {\r
-                       for (BasicDBObject job : jobs) {\r
-                               String cronExpression = job.getString(CRONEXPRESSION);\r
-                               if (StringUtils.isNotBlank(cronExpression)) {\r
-                                       CronExpression ce;\r
-                                       try {\r
-                                               ce = new CronExpression(cronExpression);\r
-                                               Date nextTime = ce.getNextValidTimeAfter(new Date());\r
-                                               job.put(NEXT_TIME, nextTime);\r
-                                       } catch (ParseException e) {\r
-                                               logger.catching(e);\r
-                                       }\r
-                               }\r
-                       }\r
-\r
-               }\r
        }\r
 \r
        public void setJobs(ListModelList<BasicDBObject> jobs) {\r
@@ -103,6 +87,21 @@ public class JobSelectorModel extends BaseModel {
 \r
        public void setSelectedJob(BasicDBObject selectedJob) {\r
                this.selectedJob = selectedJob;\r
+\r
+               if (selectedJob == null)\r
+                       return;\r
+\r
+               String cronExpression = selectedJob.getString(CRONEXPRESSION);\r
+               if (StringUtils.isBlank(cronExpression))\r
+                       return;\r
+\r
+               try {\r
+                       CronExpression ce = new CronExpression(cronExpression);\r
+                       Date nextTime = ce.getNextValidTimeAfter(new Date());\r
+                       selectedJob.put(NEXT_TIME, nextTime);\r
+               } catch (ParseException e) {\r
+                       logger.catching(e);\r
+               }\r
        }\r
 \r
        public void setSelectedJobs(ListModelList<BasicDBObject> selectedJobs) {\r
index 143a46b063c1b40419d74a5925187aabeb93075f..db2f5f0a10b54478544f9cb9cd8c8b57718a27c3 100644 (file)
@@ -57,10 +57,14 @@ import user.jobengine.db.IItemManager;
 import user.jobengine.db.ItemManager;\r
 import user.jobengine.db.MediaFile;\r
 import user.jobengine.db.Store;\r
+import user.jobengine.server.IJobEngine;\r
+import user.jobengine.server.JobEngine;\r
+import user.jobengine.server.JobEngineException;\r
+import user.jobengine.server.scheduler.ScheduledJob;\r
 import user.jobengine.zk.util.SessionUtil;\r
 \r
 public class SearchModel extends AsyncBaseModel {\r
-\r
+       private static final String CREATE_LOWRES_TEMPLATE = "create-lowres-ondemand.xml";\r
        private static final String ARG = "arg";\r
        private static final String MEDIA_ID = "showMediaID";\r
        private static final Logger logger = LogManager.getLogger();\r
@@ -219,6 +223,25 @@ public class SearchModel extends AsyncBaseModel {
                Executions.getCurrent().sendRedirect(email);\r
        }\r
 \r
+       @Command\r
+       public void createLowres() {\r
+               IJobEngine jobEngine = JobEngine.getInstance();\r
+\r
+               ScheduledJob scheduledJob = jobEngine.getScheduledJob(CREATE_LOWRES_TEMPLATE);\r
+               Map<String, Object> parameters = scheduledJob.getJobParameters();\r
+               parameters.put("mediaCubeMedia", selectedObject.getMedia());\r
+               parameters.put("deleteSource", true);\r
+               parameters.put("killDateDays", 0);\r
+               parameters.put("targetNamePattern", "%s");\r
+               parameters.put("successRecipient", SessionUtil.getUserPrincipal().getEmail());\r
+\r
+               try {\r
+                       jobEngine.submit(CREATE_LOWRES_TEMPLATE, scheduledJob.getJobName(), parameters, SessionUtil.getUserPrincipal().getDisplayName());\r
+               } catch (JobEngineException e) {\r
+                       logger.info("Hiba a job indításakor", e);\r
+               }\r
+       }\r
+\r
        @Command\r
        @NotifyChange({ "searchResult", "selectedObject", "hasTSMMediaFile", "hasLowresMediaFile", "lowresMediaFilePath" })\r
        public void doSearch() {\r
index b9b45abae2a840167cbd2901261396d06dc85945..022e4b1380762cd70ea5d08dc323ec2de85c6de8 100644 (file)
@@ -31,7 +31,7 @@ public class MediaCubeService {
        private IItemManager itemManager = ComponentBinder.getItemManager();\r
 \r
        public MediaCubeService() {\r
-               //logger.info("Created");\r
+               logger.info("Created");\r
        }\r
 \r
        @GET\r
index 1c1650cfb136dc35fb212239af618b84d9a433a6..8ec8060ae4864481751f7f7099ec9b7c25c5d75e 100644 (file)
@@ -6,17 +6,20 @@ import java.util.Set;
 \r
 import javax.ws.rs.core.Application;\r
 \r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
+\r
 import user.jobengine.osgi.mediacube.MediaCubeService;\r
 import user.jobengine.osgi.rest.octopus.OctopusRESTService;\r
 \r
 public class RESTApplications extends Application {\r
+       private static final Logger logger = LogManager.getLogger();\r
 \r
        public RESTApplications() {\r
                // ResteasyProviderFactory instance =\r
                // ResteasyProviderFactory.getInstance();\r
                // instance.registerProvider(DefaultTextPlain.class, true);\r
-               // System.out.println("");\r
-\r
+               logger.info("Created");\r
        }\r
 \r
        @Override\r