git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Mon, 2 Oct 2017 22:06:00 +0000 (22:06 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Mon, 2 Oct 2017 22:06:00 +0000 (22:06 +0000)
21 files changed:
server/-configuration/run-mediacube-server-bsh.launch
server/-configuration/run-mediacube-server-localhost.launch
server/-configuration/run-mediacube-server.launch
server/-configuration/run-mediacube-server2_adam.launch
server/-configuration/scheduledjobs.json
server/-product/mediacube.product
server/user.jobengine.executors/config/config.xml
server/user.jobengine.executors/jobtemplates/archive-material.xml
server/user.jobengine.executors/jobtemplates/retrieve-material.xml [new file with mode: 0644]
server/user.jobengine.executors/jobtemplates/retrieve-traffic-missing-materials.xml [new file with mode: 0644]
server/user.jobengine.executors/jobtemplates/sync-octopus.xml
server/user.jobengine.executors/src/user/jobengine/server/steps/CheckTrafficMissingMaterialsStep.java [new file with mode: 0644]
server/user.jobengine.executors/src/user/jobengine/server/steps/SyncOCTOPUSDataStep.java [moved from server/user.jobengine.executors/src/user/jobengine/server/steps/OCTOPUSDataMinerStep.java with 92% similarity]
server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRestoreStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeSELENIOStep.java [moved from server/user.jobengine.executors/src/user/jobengine/server/steps/SelenioLowresTranscodeStep.java with 96% similarity]
server/user.jobengine.osgi.db/database/db_create.sql
server/user.jobengine.osgi.db/database/structure.sql
server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFile.java
server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFileDAO.sqlj
server/user.jobengine.osgi.db/src/user/jobengine/db/SearchDefinitionDAO.java.tmp [deleted file]
server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java

index 0cef7afc6fd000316c7c75f97e732c0fc063438d..ed3b20130813e8b63bec1f3ebb8bdc9ea0d37687 100644 (file)
@@ -19,7 +19,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.http.jetty.http.port=8080&#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.28: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/user/jobengine/server/steps&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;-Djobengine.octopus.api.address=http://10.10.1.21/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.28: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_v4.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Dnexio.host=10.10.1.55"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.http.jetty.http.port=8080&#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.28: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/user/jobengine/server/steps&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;-Djobengine.octopus.api.address=http://10.10.1.21/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.28: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_v4.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Dnexio.host=10.10.1.55&#13;&#10;-Dtraffic.db.url=jdbc:sqlserver://folkloredb.hu\sql08:33860;databaseName=CLArchiveTF_0;&#13;&#10;-Dtraffic.db.user=MAM&#13;&#10;-Dtraffic.db.password=Echotv.hu"/>\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.auth0.java-jwt@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.dataformat.jackson-dataformat-yaml@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.google.guava@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.el.javax.el@default:default,commons-logging@default:default,javassist@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.servlet.jsp-api@default:default,javax.validation.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.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@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.jasper.glassfish@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.jdt.core.compiler.batch@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jsp@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,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.jvnet.mimepull@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.reflections@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r
index 232365c4f45e0ce7b02747712a5aff1cc1dc9222..810aaaf9553a033a83346a0008afce1bc0d3b034 100644 (file)
@@ -19,7 +19,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.http.jetty.http.port=8080&#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://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=salabakter&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Djobengine.rcc.host=localhost&#13;&#10;-Djobengine.rcc.defaultlowresprofile=&quot;WindowsMedia - Web Streaming - DSL or Cable Modem&quot;&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/user/jobengine/server/steps&quot;&#13;&#10;-Djobengine.transcoder.source=c:\_Movie\hires\&#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;-Djobengine.octopus.api.address=http://10.10.1.21/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=salabakter&#13;&#10;-Djobengine.nosql.db.schema=test&#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.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Dnexio.host=10.10.1.55"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.http.jetty.http.port=8080&#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://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=salabakter&#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/user/jobengine/server/steps&quot;&#13;&#10;-Djobengine.transcoder.source=c:\_Movie\hires\&#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;-Djobengine.octopus.api.address=http://10.10.1.21/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=salabakter&#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_v4.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Dnexio.host=10.10.1.55&#13;&#10;-Dtraffic.db.url=jdbc:sqlserver://folkloredb.hu\sql08:33860;databaseName=CLArchiveTF_0;&#13;&#10;-Dtraffic.db.user=MAM&#13;&#10;-Dtraffic.db.password=Echotv.hu"/>\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.auth0.java-jwt@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.dataformat.jackson-dataformat-yaml@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.google.guava@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.el.javax.el@default:default,commons-logging@default:default,javassist@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.servlet.jsp-api@default:default,javax.validation.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.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@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.jasper.glassfish@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.jdt.core.compiler.batch@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jsp@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,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.jvnet.mimepull@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.reflections@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r
index e127a428fb860e591871daa84bcd58dcdc8c4bf0..e1005b1ce1946f316d87b7080f84d32fc1c98bc5 100644 (file)
@@ -19,7 +19,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.http.jetty.http.port=8080&#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;-Djobengine.rcc.host=localhost&#13;&#10;-Djobengine.rcc.defaultlowresprofile=&quot;WindowsMedia - Web Streaming - DSL or Cable Modem&quot;&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/user/jobengine/server/steps&quot;&#13;&#10;-Djobengine.transcoder.source=c:\_Movie\hires\&#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;-Djobengine.octopus.api.address=http://10.10.1.21/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.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.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Dnexio.host=10.10.1.55"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.http.jetty.http.port=8080&#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/user/jobengine/server/steps&quot;&#13;&#10;-Djobengine.transcoder.source=c:\_Movie\hires\&#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;-Djobengine.octopus.api.address=http://10.10.1.21/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_v4.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Dnexio.host=10.10.1.55&#13;&#10;-Dtraffic.db.url=jdbc:sqlserver://folkloredb.hu\sql08:33860;databaseName=CLArchiveTF_0;&#13;&#10;-Dtraffic.db.user=MAM&#13;&#10;-Dtraffic.db.password=Echotv.hu"/>\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.auth0.java-jwt@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.dataformat.jackson-dataformat-yaml@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.google.guava@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.el.javax.el@default:default,commons-logging@default:default,javassist@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.servlet.jsp-api@default:default,javax.validation.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.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@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.jasper.glassfish@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.jdt.core.compiler.batch@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jsp@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,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.jvnet.mimepull@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.reflections@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r
index 171e419b747f8e0931c82cd2a7387cfd0e882980..e4400e2afe5b6936924a872cc68adf9367da9451 100644 (file)
 <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="-Dorg.eclipse.equinox.http.jetty.http.port=8080&#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.osgi.server/resources/templates&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;-Djobengine.rcc.host=localhost&#13;&#10;-Djobengine.rcc.defaultlowresprofile=&quot;WindowsMedia - Web Streaming - DSL or Cable Modem&quot;&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/user/jobengine/server/steps&quot;&#13;&#10;-Djobengine.transcoder.source=c:\_Movie\hires\&#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;-Djobengine.octopus.api.address=http://10.10.1.21/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/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.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.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.http.jetty.http.port=8080&#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.osgi.server/resources/templates&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;-Djobengine.rcc.host=localhost&#13;&#10;-Djobengine.rcc.defaultlowresprofile=&quot;WindowsMedia - Web Streaming - DSL or Cable Modem&quot;&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/user/jobengine/server/steps&quot;&#13;&#10;-Djobengine.transcoder.source=c:\_Movie\hires\&#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;-Djobengine.octopus.api.address=http://10.10.1.21/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/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.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.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Dtraffic.db.url=jdbc:sqlserver://folkloredb.hu\sql08:33860;databaseName=CLArchiveTF_0;&#13;&#10;-Dtraffic.db.user=MAM&#13;&#10;-Dtraffic.db.password=Echotv.hu"/>\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.auth0.java-jwt@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.dataformat.jackson-dataformat-yaml@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.google.guava@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.el.javax.el@default:default,commons-logging@default:default,javassist@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.servlet.jsp-api@default:default,javax.validation.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.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@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.jasper.glassfish@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.jdt.core.compiler.batch@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jsp@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,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.glassfish.hk2.api@default:default,org.glassfish.hk2.external.aopalliance-repackaged@default:default,org.glassfish.hk2.external.javax.inject@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,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.jvnet.mimepull@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.reflections@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r
+<stringAttribute key="target_bundles" value="cglib@default:default,com.auth0.java-jwt@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.dataformat.jackson-dataformat-yaml@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.google.guava@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.el.javax.el@default:default,commons-logging@default:default,javassist@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.servlet.jsp-api@default:default,javax.validation.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.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@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.jasper.glassfish@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.jdt.core.compiler.batch@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jsp@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,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.jvnet.mimepull@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.reflections@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 0c947a478fd13cae1ddce166da6288e0eb1be180..2d0a4edb9e19ee90ae52083a672a5972a5021649 100644 (file)
       ]\r
        },      \r
        {\r
+      "active": false,\r
+         "name" : "Traffic anyagok visszatöltése",\r
+      "template": "retrieve-traffic-missing-materials.xml",\r
+      "executeimmediate": true,\r
+      "cronexpression": "0 0 0/1 1/1 * ? *"\r
+       },      \r
+       {\r
       "active": false,\r
          "name" : "NEXIO anyagok törlése",\r
       "template": "delete-nexio-materials.xml",\r
index c600e8571645ffb37fc2cf1657778c9577cb3171..2af44d6c1340713e4fe2c8a5cba1c8fb5c502dc9 100644 (file)
@@ -9,19 +9,19 @@
    <launcherArgs>\r
       <programArgs>-consoleLog -console\r
       </programArgs>\r
-      <vmArgs>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888\r
-\r
-#System\r
--Dorg.eclipse.equinox.http.jetty.http.port=8080\r
--Dorg.eclipse.epp.logging.aeri.skipReports=true \r
--Declipse.ignoreApp=true \r
--Dosgi.noShutdown=true\r
--Djetty.home=./configuration/jetty\r
--Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,etc/user-jetty-http.xml,etc/user-jetty-https.xml\r
--Dlog4j.configurationFile=./configuration/log4j2.xml\r
--Djobengine.loglevel=INFO\r
--Djobengine.jobsteps.root=./configuration/executors\r
--Djobengine.jobtemplates.root=./configuration/jobtemplates\r
+      <vmArgs>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888
+
+#System
+-Dorg.eclipse.equinox.http.jetty.http.port=8080
+-Dorg.eclipse.epp.logging.aeri.skipReports=true 
+-Declipse.ignoreApp=true 
+-Dosgi.noShutdown=true
+-Djetty.home=./configuration/jetty
+-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
+-Dlog4j.configurationFile=./configuration/log4j2.xml
+-Djobengine.loglevel=INFO
+-Djobengine.jobsteps.root=./configuration/executors
+-Djobengine.jobtemplates.root=./configuration/jobtemplates
 -Djobengine.jobscheduling.config=./configuration/scheduledjobs.json\r
       </vmArgs>\r
       <vmArgsLin>#Database
       <plugin id="org.eclipse.jetty.xml"/>\r
       <plugin id="org.eclipse.osgi"/>\r
       <plugin id="org.eclipse.osgi.services"/>\r
-      <plugin id="org.glassfish.hk2.api"/>\r
-      <plugin id="org.glassfish.hk2.external.aopalliance-repackaged"/>\r
-      <plugin id="org.glassfish.hk2.external.javax.inject"/>\r
-      <plugin id="org.glassfish.hk2.locator"/>\r
-      <plugin id="org.glassfish.hk2.osgi-resource-locator"/>\r
-      <plugin id="org.glassfish.hk2.utils"/>\r
       <plugin id="org.hamcrest.core"/>\r
       <plugin id="org.jboss.resteasy.client"/>\r
       <plugin id="org.jboss.resteasy.jaxrs"/>\r
index 3b8fa33f09be8e089c54461fc36c31e774ccff6c..4baca82395115ad32ed54e828aceb3f0690d29d3 100644 (file)
@@ -2,9 +2,13 @@
 <executors>\r
        <executor className="user.jobengine.server.steps.ArchiveMaterialSubmitStep" maxConcurrent="1"/>\r
        <executor className="user.jobengine.server.steps.ArchiveListBuilderStep" maxConcurrent="1"/>\r
+       <executor className="user.jobengine.server.steps.CheckTrafficMissingMaterialsStep" maxConcurrent="1"/>\r
+       <executor className="user.jobengine.server.steps.DeleteMaterialsStep" maxConcurrent="1"/>\r
+       <executor className="user.jobengine.server.steps.DeleteNEXIOMaterialsStep" maxConcurrent="1"/>\r
        <executor className="user.jobengine.server.steps.FakeStep" maxConcurrent="10"/>\r
        <executor className="user.jobengine.server.steps.MetadataTransformStep" maxConcurrent="1"/>\r
-       <executor className="user.jobengine.server.steps.SelenioLowresTranscodeStep" maxConcurrent="1"/>\r
+       <executor className="user.jobengine.server.steps.SyncOCTOPUSDataStep" maxConcurrent="1"/>\r
+       <executor className="user.jobengine.server.steps.TranscodeSELENIOStep" maxConcurrent="1"/>\r
        <executor className="user.jobengine.server.steps.TSMBackupStep" maxConcurrent="1"/>\r
        <executor className="user.jobengine.server.steps.TSMRestoreStep" maxConcurrent="1"/>\r
 </executors>
\ No newline at end of file
index bc716cea1653230596ffe3d72a8a25cf01ca8e3f..784b0f5080f8c6b9cc241331a4b8829b0b8c4172 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<jobtemplate name="Anyag archiválás" description="Kiválasztott média nagy felbontású verziójának mentése TSM archívumba.">\r
+<jobtemplate name="Anyag archiválása">\r
        <declarations>\r
                <parameters>\r
                        <parameter name="archiveItem" type="user.jobengine.server.steps.ArchiveItem" />\r
@@ -32,7 +32,7 @@
                                </input>\r
                        </inputs>\r
                        <commands>\r
-                               <calljobstep id="id3" type="user.jobengine.server.steps.SelenioLowresTranscodeStep" weight="1">\r
+                               <calljobstep id="id3" type="user.jobengine.server.steps.TranscodeSELENIOStep" weight="1">\r
                                        <inputs>\r
                                                <input>\r
                                                        <parameter name="globalInputFolder" />\r
diff --git a/server/user.jobengine.executors/jobtemplates/retrieve-material.xml b/server/user.jobengine.executors/jobtemplates/retrieve-material.xml
new file mode 100644 (file)
index 0000000..b236b50
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<jobtemplate name="Archivált anyag visszatöltése">\r
+       <declarations>\r
+               <variables>\r
+                       <variable name="mediaCubeMedia" type="user.jobengine.db.Media" />\r
+               </variables>\r
+       </declarations>\r
+       <commands>\r
+               <calljobstep id="id1" type="user.jobengine.server.steps.TSMRestoreStep" 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/jobtemplates/retrieve-traffic-missing-materials.xml b/server/user.jobengine.executors/jobtemplates/retrieve-traffic-missing-materials.xml
new file mode 100644 (file)
index 0000000..d311ad4
--- /dev/null
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<jobtemplate name="Traffic anyagok visszatöltése">\r
+       <commands>\r
+               <calljobstep id="id1" type="user.jobengine.server.steps.CheckTrafficMissingMaterialsStep" weight="1" />\r
+       </commands>\r
+</jobtemplate>
\ No newline at end of file
index 04642a7f0a4e1f38364957c81fec5afe330cbb70..8a6d0b12cb30d253d5f329d6c3e773c69c6718a8 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <jobtemplate name="OCTOPUS adatok szinkronizálása">\r
        <commands>\r
-               <calljobstep id="id1" type="user.jobengine.server.steps.OCTOPUSDataMinerStep" weight="1" />\r
+               <calljobstep id="id1" type="user.jobengine.server.steps.SyncOCTOPUSDataStep" weight="1" />\r
        </commands>\r
 </jobtemplate>
\ No newline at end of file
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckTrafficMissingMaterialsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckTrafficMissingMaterialsStep.java
new file mode 100644 (file)
index 0000000..487de5e
--- /dev/null
@@ -0,0 +1,84 @@
+package user.jobengine.server.steps;\r
+\r
+import java.sql.Connection;\r
+import java.sql.DriverManager;\r
+import java.sql.PreparedStatement;\r
+import java.sql.ResultSet;\r
+import java.util.ArrayList;\r
+import java.util.List;\r
+\r
+import org.apache.commons.lang.StringUtils;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
+\r
+import user.jobengine.db.IItemManager;\r
+import user.jobengine.db.Media;\r
+import user.jobengine.db.MediaFile;\r
+import user.jobengine.db.MediaFileDAO;\r
+import user.jobengine.server.IJobEngine;\r
+import user.jobengine.server.IJobRuntime;\r
+\r
+public class CheckTrafficMissingMaterialsStep extends JobStep {\r
+       private static final Logger logger = LogManager.getLogger();\r
+       private static final String SQLSERVER_JDBC_SQL_SERVER_DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver";\r
+       private static final String TRAFFIC_DB_PASSWORD = "traffic.db.password";\r
+       private static final String TRAFFIC_DB_USER = "traffic.db.user";\r
+       private static final String TRAFFIC_DB_URL = "traffic.db.url";\r
+       private static final String SQL = "{call clIFsp_EC_MAM(1001, 40, Null,  Null, ?)}";\r
+       private IItemManager manager;\r
+\r
+       @StepEntry\r
+       public Object[] execute(IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
+               List<Media> result = new ArrayList<>();\r
+               manager = jobEngine.getItemManager();\r
+               try (Connection con = getSQLConnection(); PreparedStatement stmt = con.prepareStatement(SQL)) {\r
+                       stmt.setInt(1, 7);\r
+                       try (ResultSet rs = stmt.executeQuery()) {\r
+                               if (rs.next()) {\r
+                                       String trafficId = rs.getString(5);\r
+                                       if (StringUtils.isNotBlank(trafficId)) {\r
+                                               try {\r
+                                                       processTrafficId(result, trafficId);\r
+                                               } catch (Exception e) {\r
+                                                       logger.error(getMarker(), "Hiba lépett fel az {} anyag visszatöltéskor. A rendszer hibaüzenete: {}", trafficId, e.getMessage());\r
+                                               }\r
+                                       }\r
+\r
+                               }\r
+                       }\r
+               } catch (Exception e) {\r
+                       logger.catching(e);\r
+                       throw e;\r
+               } finally {\r
+               }\r
+               return new Object[] {};\r
+       }\r
+\r
+       private Connection getSQLConnection() throws Exception {\r
+               Connection result = null;\r
+               Class.forName(SQLSERVER_JDBC_SQL_SERVER_DRIVER);\r
+               String url = System.getProperty(TRAFFIC_DB_URL);\r
+               String user = System.getProperty(TRAFFIC_DB_USER);\r
+               String pass = System.getProperty(TRAFFIC_DB_PASSWORD);\r
+               result = DriverManager.getConnection(url, user, pass);\r
+               return result;\r
+       }\r
+\r
+       private void processTrafficId(List<Media> result, String trafficId) throws Exception {\r
+               MediaFileDAO dao = (MediaFileDAO) manager.getBaseDAO(MediaFile.class);\r
+               List<Media> medias = dao.getByHouseId(trafficId);\r
+               if (medias.size() == 0) {\r
+                       logger.error(getMarker(), "Az {} anyag nem található az archívumban.", trafficId);\r
+                       return;\r
+               }\r
+\r
+               if (medias.size() > 0) {\r
+                       logger.error(getMarker(), "Az {} anyagból egynél több található az archívumban.", trafficId);\r
+                       return;\r
+               }\r
+\r
+               result.add(medias.get(0));\r
+\r
+       }\r
+\r
+}\r
similarity index 92%
rename from server/user.jobengine.executors/src/user/jobengine/server/steps/OCTOPUSDataMinerStep.java
rename to server/user.jobengine.executors/src/user/jobengine/server/steps/SyncOCTOPUSDataStep.java
index 91e45b72bcef42ed9f00715f4a01a6c2604c8550..f6e6fc21df09b4b7f3dd7d86c37211295aea55a8 100644 (file)
@@ -9,7 +9,7 @@ import user.commons.remotestore.ProgressEvent;
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
 \r
-public class OCTOPUSDataMinerStep extends JobStep {\r
+public class SyncOCTOPUSDataStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r
        private IProgressEventListener progressListener;\r
 \r
index 915ffbf689c6740de4606330364483a8dcb2d6f4..1a745b5cdaf7a66b3138c4caf249615f0f933af2 100644 (file)
@@ -20,26 +20,28 @@ import user.jobengine.server.IJobRuntime;
 public class TSMRestoreStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r
 \r
+       @Override\r
+       public void cleanup() {\r
+               // if (sourceUri != null)\r
+               // sourceUri.clearListeners();\r
+       }\r
+\r
        @StepEntry\r
        public Object[] execute(Media media, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
-\r
                RemoteFile result = null;\r
                final IJobRuntime runtime = jobRuntime;\r
                IItemManager manager = jobEngine.getItemManager();\r
                Store systemStore = manager.getSystemStore(false);\r
-               Store mfStore = null;\r
                MediaFile mediaFile = null;\r
                for (MediaFile mf : media.getMediaFiles()) {\r
-                       mediaFile = mf;\r
-                       mfStore = mf.getStore();\r
-                       if (mfStore.getId() == systemStore.getId())\r
+                       if (mf.getStore().getId() == systemStore.getId()) {\r
+                               mediaFile = mf;\r
                                break;\r
+                       }\r
                }\r
 \r
                if (mediaFile == null)\r
                        throw new Exception("Can not find HIRES media file");\r
-               if (mfStore == null)\r
-                       throw new Exception("Can not find HIRES store");\r
 \r
                String path = mediaFile.getRelativePath();\r
                logger.info("Relative path is: " + path);\r
@@ -55,7 +57,7 @@ public class TSMRestoreStep extends JobStep {
 \r
                StoreUri sourceUri = new StoreUri();\r
                sourceUri.setProtocol(RemoteStoreProtocol.TSM);\r
-               StoreUri target = mfStore.getTargetStoreUri(RemoteStoreProtocol.LOCAL);\r
+               StoreUri target = systemStore.getTargetStoreUri(RemoteStoreProtocol.LOCAL);\r
                logger.info("Target is: " + target.getUri());\r
                sourceUri.addProgressListener(new IProgressEventListener() {\r
                        @Override\r
@@ -72,10 +74,4 @@ public class TSMRestoreStep extends JobStep {
                result = sourceUri.transferFrom(target, sourceFileName, "restored_" + sourceFileName);\r
                return new Object[] { result };\r
        }\r
-\r
-       @Override\r
-       public void cleanup() {\r
-               // if (sourceUri != null)\r
-               // sourceUri.clearListeners();\r
-       }\r
 }\r
similarity index 96%
rename from server/user.jobengine.executors/src/user/jobengine/server/steps/SelenioLowresTranscodeStep.java
rename to server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeSELENIOStep.java
index a88d75a60e022151067184374f5c723e05befe81..33082441ed663523d82bf6d29eab2d8dc1d713be 100644 (file)
@@ -37,7 +37,7 @@ import user.jobengine.db.Store;
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
 \r
-public class SelenioLowresTranscodeStep extends JobStep {\r
+public class TranscodeSELENIOStep extends JobStep {\r
 \r
        private static final String LOWRES_FILETYPE = "Low-res";\r
        private static final Logger logger = LogManager.getLogger();\r
@@ -49,7 +49,7 @@ public class SelenioLowresTranscodeStep extends JobStep {
        private Store store;\r
        private FileType fileType;\r
 \r
-       public SelenioLowresTranscodeStep() throws Exception {\r
+       public TranscodeSELENIOStep() throws Exception {\r
                try {\r
                        address = System.getProperty("jobengine.selenio.address");\r
                        if (StringUtils.isBlank(address))\r
index 9c11841caf7a78214769127d0a7654af3ddfc294..65ef63502df9d2d4b7f2cc4a2b857a2c145cea5d 100644 (file)
@@ -251,11 +251,14 @@ CREATE TABLE MEDIAFILE
        FILETYPEID BIGINT NOT NULL,\r
        RELATIVEPATH VARCHAR(255) NOT NULL,\r
        FILESTRUCTINFO VARCHAR(255),\r
+       HOUSEID VARCHAR(40), \r
        CONSTRAINT FK_MEDIAFILE_MEDIAID FOREIGN KEY (MEDIAID) REFERENCES MEDIA (ID),\r
        CONSTRAINT FK_MEDIAFILE_STOREID FOREIGN KEY (STOREID) REFERENCES STORE (ID),\r
        CONSTRAINT FK_MEDIAFILE_FILETYPEID FOREIGN KEY (FILETYPEID) REFERENCES FILETYPE (ID)\r
 )@\r
 \r
+CREATE INDEX IDX_MEDIAFILE_HOUSEID ON MEDIAFILE ("HOUSEID")@\r
+\r
 CREATE TABLE STOREURI \r
 (\r
        ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 1) PRIMARY KEY,\r
index 7e08eae888c362c7366aa60f2ac11888739578b8..2d5fb7b6428bafeb66476c06d1741ab14b40cc3c 100644 (file)
@@ -1,3 +1,7 @@
+\r
+ALTER TABLE MEDIAFILE ADD COLUMN HOUSEID VARCHAR(40)\r
+CREATE INDEX IDX_MEDIAFILE_HOUSEID ON MEDIAFILE ("HOUSEID")\r
+\r
 ALTER TABLE JOB ADD COLUMN PARENTJOBID BIGINT\r
 \r
 /*ezt futtasd*/\r
index 810bc27f136a09a6aec78839edce2fec65376e74..e7acd34b745731380d3d8504cb5c0bead37f1fbc 100644 (file)
@@ -15,6 +15,7 @@ public class MediaFile extends EntityBase implements Serializable {
        private String relativePath = null;
        private Store store = null;
        private long storeId = 0;
+       private String houseId = null;
 
        public String getFileStructInfo() {
                return this.fileStructInfo;
@@ -30,9 +31,13 @@ public class MediaFile extends EntityBase implements Serializable {
                return this.fileTypeId;
        }
 
+       public String getHouseId() {
+               return houseId;
+       }
+
        public Media getMedia() {
                if (this.media == null && this.mediaId != 0) {
-                       this.media = (Media)ItemManager.getInstance().getMedia(this.mediaId);
+                       this.media = ItemManager.getInstance().getMedia(this.mediaId);
                }
                return this.media;
        }
@@ -40,7 +45,7 @@ public class MediaFile extends EntityBase implements Serializable {
        public long getMediaId() {
                return this.mediaId;
        }
-       
+
        public String getRelativePath() {
                return this.relativePath;
        }
@@ -52,7 +57,7 @@ public class MediaFile extends EntityBase implements Serializable {
                }
                return this.store;
        }
-       
+
        public long getStoreId() {
                return this.storeId;
        }
@@ -72,10 +77,14 @@ public class MediaFile extends EntityBase implements Serializable {
                this.fileTypeId = fileTypeId;
        }
 
+       public void setHouseId(String houseId) {
+               this.houseId = houseId;
+       }
+
        public void setMedia(Media media) {
                //checkParameter("Media", media);
                this.media = media;
-               this.mediaId = media.getId(); 
+               this.mediaId = media.getId();
        }
 
        public void setMediaId(long mediaId) {
index 4171300f94f8c54c3c9d556fa77a7650be7daac6..2a9e05da5f5d42f0e43e82f62242cafcd31a4172 100644 (file)
@@ -6,7 +6,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
-#sql iterator MediaFileIter(long id, long mediaId, long storeId, long fileTypeId, String relativePath, String fileStructInfo);\r
+#sql iterator MediaFileIter(long id, long mediaId, long storeId, long fileTypeId, String relativePath, String fileStructInfo, String houseId);\r
 \r
 @SuppressWarnings("unused")\r
 public class MediaFileDAO extends EntityBaseDAO {\r
@@ -27,6 +27,7 @@ public class MediaFileDAO extends EntityBaseDAO {
                        entity.setFileTypeId(iterator.fileTypeId());\r
                        entity.setRelativePath(iterator.relativePath());\r
                        entity.setFileStructInfo(iterator.fileStructInfo());\r
+                       entity.setHouseId(iterator.houseId());\r
 \r
                        if (result == null)\r
                                result = new ArrayList<IEntityBase>();                          \r
@@ -39,21 +40,21 @@ public class MediaFileDAO extends EntityBaseDAO {
        @Override\r
        protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{\r
                MediaFileIter iter = null;\r
-               #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO FROM MEDIAFILE WHERE ID = :id };\r
+               #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID FROM MEDIAFILE WHERE ID = :id };\r
                return iter;\r
        }\r
 \r
        @Override\r
        protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException{\r
                MediaFileIter iter = null;\r
-               #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO FROM MEDIAFILE WHERE MEDIAID = :id };\r
+               #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID FROM MEDIAFILE WHERE MEDIAID = :id };\r
                return iter;\r
        }\r
        \r
        @Override\r
        protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{\r
                MediaFileIter iter = null;\r
-               #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO FROM MEDIAFILE };\r
+               #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID FROM MEDIAFILE };\r
                return iter;\r
        }\r
        \r
@@ -76,8 +77,9 @@ public class MediaFileDAO extends EntityBaseDAO {
                long fileTypeId = obj.getFileTypeId();\r
                String relativePath = obj.getRelativePath();\r
                String fileStructInfo = obj.getFileStructInfo();\r
+               String houseId = obj.getHouseId();\r
                \r
-               #sql [context] { UPDATE MEDIAFILE SET MEDIAID = :mediaId, STOREID = :storeId, FILETYPEID = :fileTypeId, RELATIVEPATH = :relativePath, FILESTRUCTINFO = :fileStructInfo WHERE ID = :id };\r
+               #sql [context] { UPDATE MEDIAFILE SET MEDIAID = :mediaId, STOREID = :storeId, FILETYPEID = :fileTypeId, RELATIVEPATH = :relativePath, FILESTRUCTINFO = :fileStructInfo, HOUSEID = :houseId WHERE ID = :id };\r
        }\r
        \r
        @Override\r
@@ -88,8 +90,9 @@ public class MediaFileDAO extends EntityBaseDAO {
                long fileTypeId = obj.getFileTypeId();\r
                String relativePath = obj.getRelativePath();\r
                String fileStructInfo = obj.getFileStructInfo();\r
+               String houseId = obj.getHouseId();\r
 \r
-               #sql [context] { INSERT INTO MEDIAFILE (MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO) VALUES (:mediaId, :storeId, :fileTypeId, :relativePath, :fileStructInfo) };\r
+               #sql [context] { INSERT INTO MEDIAFILE (MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID) VALUES (:mediaId, :storeId, :fileTypeId, :relativePath, :fileStructInfo, :houseId) };\r
        }\r
        \r
        void addAll(DefaultContext context, IEntityBase entity) throws SQLException {\r
@@ -113,4 +116,27 @@ public class MediaFileDAO extends EntityBaseDAO {
                #sql [context] { DELETE FROM MEDIAFILE WHERE MEDIAID = :filterId };\r
                manager.traceOut();\r
        }\r
+\r
+       private MediaFileIter selectByHouseId(DefaultContext context, String houseId) throws SQLException{\r
+               MediaFileIter iter = null;\r
+               #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID FROM MEDIAFILE WHERE HOUSEID = :houseId };\r
+               return iter;\r
+       }\r
+       \r
+       public List<Media> getByHouseId(String houseId) {\r
+               manager.traceIn();\r
+               List<Media> result = null;\r
+               DefaultContext context = manager.getDbContext();\r
+               try {\r
+                       MediaFileIter iter = selectByHouseId(context, houseId);\r
+                       result = getList(context, iter, false);\r
+               } catch (Exception e) {\r
+                       throw new ItemManagerException(e);\r
+               } finally {\r
+                       manager.putDbContext(context);\r
+               }\r
+               manager.traceOut();\r
+               return result;\r
+       }\r
+       \r
 }\r
diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/SearchDefinitionDAO.java.tmp b/server/user.jobengine.osgi.db/src/user/jobengine/db/SearchDefinitionDAO.java.tmp
deleted file mode 100644 (file)
index da742aa..0000000
+++ /dev/null
@@ -1,440 +0,0 @@
-/*@lineinfo:filename=SearchDefinitionDAO*//*@lineinfo:user-code*//*@lineinfo:1^1*/package user.jobengine.db;\r
-\r
-import user.commons.IEntityBase;\r
-import sqlj.runtime.ref.*;\r
-import java.sql.SQLException;\r
-import java.sql.Timestamp;\r
-import java.util.ArrayList;\r
-import java.util.List;\r
-\r
-/*@lineinfo:generated-code*//*@lineinfo:10^2*/\r
-\r
-//  ************************************************************\r
-//  SQLJ iterator declaration:\r
-//  ************************************************************\r
-\r
-class SearchDefinitionIter \r
-extends sqlj.runtime.ref.ResultSetIterImpl\r
-implements sqlj.runtime.NamedIterator\r
-{\r
-  private int dataNdx;\r
-  private int modifiedNdx;\r
-  private int createdNdx;\r
-  private int nameNdx;\r
-  private int idNdx;\r
-  public SearchDefinitionIter(sqlj.runtime.profile.RTResultSet resultSet) \r
-    throws java.sql.SQLException \r
-  {\r
-    super(resultSet);\r
-    idNdx = findColumn("id");\r
-    nameNdx = findColumn("name");\r
-    createdNdx = findColumn("created");\r
-    modifiedNdx = findColumn("modified");\r
-    dataNdx = findColumn("data");\r
-  }\r
-  public SearchDefinitionIter(sqlj.runtime.profile.RTResultSet resultSet, int fetchSize, int maxRows) \r
-    throws java.sql.SQLException \r
-  {\r
-    super(resultSet, fetchSize, maxRows);\r
-    idNdx = findColumn("id");\r
-    nameNdx = findColumn("name");\r
-    createdNdx = findColumn("created");\r
-    modifiedNdx = findColumn("modified");\r
-    dataNdx = findColumn("data");\r
-  }\r
-  public long id() \r
-    throws java.sql.SQLException \r
-  {\r
-    return resultSet.getLongNoNull(idNdx);\r
-  }\r
-  public String name() \r
-    throws java.sql.SQLException \r
-  {\r
-    return resultSet.getString(nameNdx);\r
-  }\r
-  public Timestamp created() \r
-    throws java.sql.SQLException \r
-  {\r
-    return resultSet.getTimestamp(createdNdx);\r
-  }\r
-  public Timestamp modified() \r
-    throws java.sql.SQLException \r
-  {\r
-    return resultSet.getTimestamp(modifiedNdx);\r
-  }\r
-  public byte[] data() \r
-    throws java.sql.SQLException \r
-  {\r
-    return resultSet.getBytes(dataNdx);\r
-  }\r
-}\r
-\r
-\r
-//  ************************************************************\r
-\r
-/*@lineinfo:user-code*//*@lineinfo:10^107*/\r
-\r
-@SuppressWarnings("unused")\r
-public class SearchDefinitionDAO extends EntityBaseDAO {\r
-\r
-       public SearchDefinitionDAO(ItemManager manager) {\r
-               super(manager);\r
-       }\r
-       \r
-       @Override\r
-       protected List<IEntityBase> entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) throws SQLException {\r
-               List<IEntityBase> result = null;\r
-               SearchDefinitionIter iterator = (SearchDefinitionIter) iter;\r
-               while (iterator.next()) {\r
-                       SearchDefinition entity = new SearchDefinition();\r
-                       entity.setId(iterator.id());\r
-                       entity.setName(iterator.name());\r
-                       entity.setCreated(iterator.created());\r
-                       entity.setModified(iterator.modified());\r
-                       if(isChunked == false){\r
-                               entity.setData(iterator.data());\r
-                       }\r
-\r
-                       if (result == null)\r
-                               result = new ArrayList<IEntityBase>();                          \r
-                       result.add(entity);\r
-               }       \r
-               iterator.close();\r
-               return result;\r
-       }\r
-       \r
-       protected ResultSetIterImpl selectByName(DefaultContext context, String nameFilter) throws SQLException{\r
-               SearchDefinitionIter iter = null;\r
-               /*@lineinfo:generated-code*//*@lineinfo:43^2*/\r
-\r
-//  ************************************************************\r
-//  #sql [context] iter = { SELECT ID, NAME, CREATED, MODIFIED, DATA FROM SEARCHDEFINITION WHERE (UPPER(NAME) LIKE :nameFilter) ORDER BY CREATED DESC };\r
-//  ************************************************************\r
-\r
-{\r
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-  synchronized (__sJT_execCtx) {\r
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, SearchDefinitionDAO_SJProfileKeys.getKey(0), 0);\r
-    try \r
-    {\r
-      __sJT_stmt.setString(1, nameFilter);\r
-      iter = new SearchDefinitionIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());\r
-    }\r
-    finally \r
-    {\r
-      __sJT_execCtx.releaseStatement();\r
-    }\r
-  }\r
-}\r
-\r
-\r
-//  ************************************************************\r
-\r
-/*@lineinfo:user-code*//*@lineinfo:43^147*/\r
-               return iter;\r
-       }\r
-       \r
-       protected ResultSetIterImpl selectByModified(DefaultContext context) throws SQLException{\r
-               SearchDefinitionIter iter = null;\r
-               /*@lineinfo:generated-code*//*@lineinfo:49^2*/\r
-\r
-//  ************************************************************\r
-//  #sql [context] iter = { SELECT ID, NAME, CREATED, MODIFIED, DATA FROM SEARCHDEFINITION ORDER BY CREATED DESC FETCH FIRST 5 ROWS ONLY };\r
-//  ************************************************************\r
-\r
-{\r
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-  synchronized (__sJT_execCtx) {\r
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, SearchDefinitionDAO_SJProfileKeys.getKey(0), 1);\r
-    try \r
-    {\r
-      iter = new SearchDefinitionIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());\r
-    }\r
-    finally \r
-    {\r
-      __sJT_execCtx.releaseStatement();\r
-    }\r
-  }\r
-}\r
-\r
-\r
-//  ************************************************************\r
-\r
-/*@lineinfo:user-code*//*@lineinfo:49^134*/\r
-               return iter;\r
-       }\r
-       \r
-       @Override\r
-       protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{\r
-               SearchDefinitionIter iter = null;\r
-               /*@lineinfo:generated-code*//*@lineinfo:56^2*/\r
-\r
-//  ************************************************************\r
-//  #sql [context] iter = { SELECT ID, NAME, CREATED, MODIFIED, DATA FROM SEARCHDEFINITION WHERE ID = :id  };\r
-//  ************************************************************\r
-\r
-{\r
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-  synchronized (__sJT_execCtx) {\r
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, SearchDefinitionDAO_SJProfileKeys.getKey(0), 2);\r
-    try \r
-    {\r
-      __sJT_stmt.setLong(1, id);\r
-      iter = new SearchDefinitionIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());\r
-    }\r
-    finally \r
-    {\r
-      __sJT_execCtx.releaseStatement();\r
-    }\r
-  }\r
-}\r
-\r
-\r
-//  ************************************************************\r
-\r
-/*@lineinfo:user-code*//*@lineinfo:56^104*/\r
-               return iter;\r
-       }\r
-\r
-       @Override\r
-       protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{\r
-               SearchDefinitionIter iter = null;\r
-               /*@lineinfo:generated-code*//*@lineinfo:63^2*/\r
-\r
-//  ************************************************************\r
-//  #sql [context] iter = { SELECT ID, NAME, CREATED, MODIFIED, DATA FROM SEARCHDEFINITION };\r
-//  ************************************************************\r
-\r
-{\r
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-  synchronized (__sJT_execCtx) {\r
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, SearchDefinitionDAO_SJProfileKeys.getKey(0), 3);\r
-    try \r
-    {\r
-      iter = new SearchDefinitionIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());\r
-    }\r
-    finally \r
-    {\r
-      __sJT_execCtx.releaseStatement();\r
-    }\r
-  }\r
-}\r
-\r
-\r
-//  ************************************************************\r
-\r
-/*@lineinfo:user-code*//*@lineinfo:63^88*/\r
-               return iter;\r
-       }\r
-       \r
-       @Override\r
-       protected void delete(DefaultContext context, long id) throws SQLException{\r
-               /*@lineinfo:generated-code*//*@lineinfo:69^2*/\r
-\r
-//  ************************************************************\r
-//  #sql [context] { DELETE FROM SEARCHDEFINITION WHERE ID = :id  };\r
-//  ************************************************************\r
-\r
-{\r
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-  synchronized (__sJT_execCtx) {\r
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, SearchDefinitionDAO_SJProfileKeys.getKey(0), 4);\r
-    try \r
-    {\r
-      __sJT_stmt.setLong(1, id);\r
-      __sJT_execCtx.executeUpdate();\r
-    }\r
-    finally \r
-    {\r
-      __sJT_execCtx.releaseStatement();\r
-    }\r
-  }\r
-}\r
-\r
-\r
-//  ************************************************************\r
-\r
-/*@lineinfo:user-code*//*@lineinfo:69^63*/\r
-       }\r
-       \r
-       @Override\r
-       protected void truncateTable(DefaultContext context) throws SQLException{\r
-               /*@lineinfo:generated-code*//*@lineinfo:74^2*/\r
-\r
-//  ************************************************************\r
-//  #sql [context] { TRUNCATE TABLE SEARCHDEFINITION DROP STORAGE IGNORE DELETE TRIGGERS IMMEDIATE  };\r
-//  ************************************************************\r
-\r
-{\r
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-  synchronized (__sJT_execCtx) {\r
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, SearchDefinitionDAO_SJProfileKeys.getKey(0), 5);\r
-    try \r
-    {\r
-      __sJT_execCtx.executeUpdate();\r
-    }\r
-    finally \r
-    {\r
-      __sJT_execCtx.releaseStatement();\r
-    }\r
-  }\r
-}\r
-\r
-\r
-//  ************************************************************\r
-\r
-/*@lineinfo:user-code*//*@lineinfo:74^97*/\r
-       }\r
-       \r
-       @Override\r
-       protected void update(DefaultContext context, IEntityBase entity) throws SQLException{\r
-               SearchDefinition obj = (SearchDefinition) entity;\r
-               long id = obj.getId();\r
-               String name = obj.getName();\r
-               Timestamp created = obj.getCreated();\r
-               Timestamp modified = obj.getModified();\r
-               byte[] data = obj.getData();\r
-\r
-               /*@lineinfo:generated-code*//*@lineinfo:86^2*/\r
-\r
-//  ************************************************************\r
-//  #sql [context] { UPDATE SEARCHDEFINITION SET NAME = :name, CREATED = :created, MODIFIED = :modified, DATA = :data WHERE ID = :id  };\r
-//  ************************************************************\r
-\r
-{\r
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-  synchronized (__sJT_execCtx) {\r
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, SearchDefinitionDAO_SJProfileKeys.getKey(0), 6);\r
-    try \r
-    {\r
-      __sJT_stmt.setString(1, name);\r
-      __sJT_stmt.setTimestamp(2, created);\r
-      __sJT_stmt.setTimestamp(3, modified);\r
-      __sJT_stmt.setBytes(4, data);\r
-      __sJT_stmt.setLong(5, id);\r
-      __sJT_execCtx.executeUpdate();\r
-    }\r
-    finally \r
-    {\r
-      __sJT_execCtx.releaseStatement();\r
-    }\r
-  }\r
-}\r
-\r
-\r
-//  ************************************************************\r
-\r
-/*@lineinfo:user-code*//*@lineinfo:86^131*/\r
-       }\r
-       \r
-       @Override\r
-       protected void insert(DefaultContext context, IEntityBase entity) throws SQLException{\r
-               SearchDefinition obj = (SearchDefinition) entity;               \r
-               String name = obj.getName();\r
-               Timestamp created = obj.getCreated();\r
-               Timestamp modified = obj.getModified();\r
-               byte[] data = obj.getData();\r
-               \r
-               /*@lineinfo:generated-code*//*@lineinfo:97^2*/\r
-\r
-//  ************************************************************\r
-//  #sql [context] { INSERT INTO SEARCHDEFINITION (NAME, CREATED, MODIFIED, DATA) VALUES (:name, :created, :modified, :data)  };\r
-//  ************************************************************\r
-\r
-{\r
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-  synchronized (__sJT_execCtx) {\r
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, SearchDefinitionDAO_SJProfileKeys.getKey(0), 7);\r
-    try \r
-    {\r
-      __sJT_stmt.setString(1, name);\r
-      __sJT_stmt.setTimestamp(2, created);\r
-      __sJT_stmt.setTimestamp(3, modified);\r
-      __sJT_stmt.setBytes(4, data);\r
-      __sJT_execCtx.executeUpdate();\r
-    }\r
-    finally \r
-    {\r
-      __sJT_execCtx.releaseStatement();\r
-    }\r
-  }\r
-}\r
-\r
-\r
-//  ************************************************************\r
-\r
-/*@lineinfo:user-code*//*@lineinfo:97^123*/\r
-       }\r
-       \r
-       public List<IEntityBase> getFilteredEntities(String nameFilter, boolean isChunked){\r
-               manager.traceIn();\r
-               List<IEntityBase> result = new ArrayList<IEntityBase>();\r
-               if (isChunked == true) {\r
-                       DefaultContext context = manager.getDbContext();\r
-                       try {\r
-                               ResultSetIterImpl iter = null;\r
-                               if (nameFilter != null) {\r
-                                       String filter = ("%" + nameFilter + "%").toUpperCase(); \r
-                                       iter = selectByName(context, filter);\r
-                               } else {\r
-                                       iter = selectByModified(context);\r
-                               }\r
-                               checkNull(iter, ResultSetIterImpl.class);\r
-                               result = getList(context, iter, isChunked);\r
-                       } catch (Exception e) {\r
-                               throw new ItemManagerException(e);\r
-                       } finally {\r
-                               manager.putDbContext(context);\r
-                       }\r
-               }\r
-               manager.traceOut();\r
-               return result;\r
-       }\r
-       \r
-}/*@lineinfo:generated-code*/class SearchDefinitionDAO_SJProfileKeys \r
-{\r
-  private java.lang.Object[] keys;\r
-  private final sqlj.runtime.profile.Loader loader = sqlj.runtime.RuntimeContext.getRuntime().getLoaderForClass(getClass());\r
-  private static SearchDefinitionDAO_SJProfileKeys inst = null;\r
-  public static java.lang.Object getKey(int keyNum) \r
-    throws java.sql.SQLException \r
-  {\r
-    synchronized(user.jobengine.db.SearchDefinitionDAO_SJProfileKeys.class) {\r
-      if (inst == null)\r
-      {\r
-        inst = new SearchDefinitionDAO_SJProfileKeys();\r
-      }\r
-    }\r
-    return inst.keys[keyNum];\r
-  }\r
-  private SearchDefinitionDAO_SJProfileKeys() \r
-    throws java.sql.SQLException \r
-  {\r
-    keys = new java.lang.Object[1];\r
-    keys[0] = DefaultContext.getProfileKey(loader, "user.jobengine.db.SearchDefinitionDAO_SJProfile0");\r
-  }\r
-}\r
index 8ab91193be261db73b6d3df93e672bae84764a04..724616076f3939b8ab5f0e4757c81c8500425425 100644 (file)
@@ -46,10 +46,10 @@ public class SearchModel extends BaseModel {
        public void downloadMedia() {\r
                if (getHasTSMMediaFile()) {\r
                        try {\r
-                               Map<String, Object> parameters1 = new HashMap<>();\r
-                               parameters1.put("media", this.selectedMedia);\r
+                               Map<String, Object> parameters = new HashMap<>();\r
+                               parameters.put("mediaCubeMedia", this.selectedMedia);\r
                                IJobEngine jobEngine = JobEngine.getInstance();\r
-                               IJobRuntime runtime1 = jobEngine.submit("tsmrestore.xml", "TSMRestoreMedia", parameters1);\r
+                               IJobRuntime runtime1 = jobEngine.submit("retrieve-material.xml", "TSMRestoreMedia", parameters);\r
                        } catch (Exception exc) {\r
                                logger.error("", exc);\r
                        }\r
@@ -135,7 +135,7 @@ public class SearchModel extends BaseModel {
                        }\r
                        return ret;\r
                }\r
-       \r
+\r
                public boolean getHasSelectedMediaFile(){\r
                        String mediaFilePath =getMediaFilePath();\r
                        return (mediaFilePath != null && !"".equals(mediaFilePath));\r