git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Fri, 8 May 2020 11:09:04 +0000 (11:09 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Fri, 8 May 2020 11:09:04 +0000 (11:09 +0000)
22 files changed:
server/-configuration/mediacube-dev-user.properties
server/-configuration/run-mediacube-server-hirtv.launch
server/-configuration/run-mediacube-server-user.launch
server/-configuration/test-debug-mediacube-main-7777.launch [deleted file]
server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/Support.java
server/user.jobengine.executors/config/config-worker.xml [new file with mode: 0644]
server/user.jobengine.executors/src/user/jobengine/server/steps/ImportMORPHEUSMissingMaterialsStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/MediaToolStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataTransformStep.java
server/user.jobengine.osgi.server/build-server-module.launch [moved from server/user.jobengine.osgi.server/deploy.launch with 100% similarity]
server/user.jobengine.osgi.server/src/user/jobengine/server/DynamicClassLocator.java
server/user.jobengine.osgi.server/src/user/jobengine/server/ExecutorConfigParser.java
server/user.jobengine.osgi.server/src/user/jobengine/server/IJobEngine.java
server/user.jobengine.osgi.server/src/user/jobengine/server/IJobStepExecutor.java
server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngine.java
server/user.jobengine.osgi.server/src/user/jobengine/server/JobStatusChangedEvent.java
server/user.jobengine.osgi.server/src/user/jobengine/server/JobStepExecutor.java
server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
server/user.jobengine.osgi.server/src/user/jobengine/zk/util/LDAPUserHandler.java
server/user.jobengine.osgi.server/test/user/jobengine/server/IT/JobengineIT.java
server/user.jobengine.osgi.services/src/user/jobengine/osgi/mediacube/ClusterService.java
server/user.jobengine.osgi.services/src/user/jobengine/osgi/mediacube/ClusteredJob.java [new file with mode: 0644]

index bb284ab363823df2134f29297d980045a5efba40..2c0621ca5559d26756a194dc9352e8d9092e4454 100644 (file)
@@ -1,23 +1,17 @@
-#A user.dir mindig a test projekt mappaja, a relativ hivatkozasok ehhez kepest ertendok. \r
-#JobEngine\r
-jobengine.loglevel=INFO\r
-jobengine.jobsteps.root=../user.jobengine.osgi.server/resources/executors\r
-jobengine.jobtemplates.root=../user.jobengine.osgi.server/resources/templates\r
-jobengine.jobsteps.alternate.root=../user.jobengine.executors/bin/user/jobengine/server/steps\r
+jobengine.jobsteps.root=../user.jobengine.executors/bin\r
+jobengine.jobsteps.config=../user.jobengine.executors/config/config-worker.xml\r
+jobengine.jobtemplates.root=../user.jobengine.executors/jobtemplates\r
+\r
+jetty.home=../-configuration/jetty\r
+jetty.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
+\r
+log4j.configurationFile=../-configuration/log4j2.xml\r
+\r
 jobengine.db.url=jdbc:db2://10.228.198.1:50000/mediaarc:retrieveMessagesFromServerOnGetMessage=true;\r
 jobengine.db.user=db2admin\r
 jobengine.db.password=password\r
-jobengine.octopus.api.address=http://10.10.1.11/api/v1\r
-jobengine.octopus.api.user=mam\r
-jobengine.octopus.api.password=napocska\r
 jobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache:retrieveMessagesFromServerOnGetMessage=true;\r
 jobengine.nosql.db.user=db2admin\r
 jobengine.nosql.db.password=password\r
-jobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;\r
-jobengine.nexio.db.user=sa\r
-jobengine.nexio.db.password=resolve\r
-#System\r
-jetty.home=../user.jobengine.osgi.rest/\r
-jetty.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
-log4j.configuration=../-configuration/log4j.properties\r
-log4j.configurationFile=../-configuration/log4j2.xml
\ No newline at end of file
+\r
+jobengine.master.server=http://localhost:8888
\ No newline at end of file
index 2d0bc066542f6ec2ddc834918a77c389c23485d3..18fa46004f9ba8982593424d78d4ad970e6a9fd6 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="-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;&#13;&#10;-Djobengine.mediacube.config=&quot;${workspace_loc}/-configuration/mediacube.json&quot;&#13;&#10;-Djobengine.mediacube.service.proxyroot=&quot;/opt&quot;&#13;&#10;-Djobengine.randomize.archives=false"/>\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;&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/bin&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.jobsteps.config=&quot;${workspace_loc}/user.jobengine.executors/config/config.xml&quot;&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;&#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.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;&#13;&#10;-Djobengine.mediacube.config=&quot;${workspace_loc}/-configuration/mediacube.json&quot;&#13;&#10;-Djobengine.mediacube.service.proxyroot=&quot;/opt&quot;&#13;&#10;-Djobengine.randomize.archives=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
index 263f1dc8e51c2547f461f2b1ec321b1867f5317b..c15aaebf7fe00dbad164e53713668fe786a1ebba 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="-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&#13;&#10;-Djobengine.mediacube.service.proxyroot=&quot;/opt&quot;&#13;&#10;-Djobengine.scheduledexecution.disabled=false&#13;&#10;-Djobengine.randomize.archives=false"/>\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/bin&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;-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&#13;&#10;-Djobengine.mediacube.service.proxyroot=&quot;/opt&quot;&#13;&#10;-Djobengine.scheduledexecution.disabled=false&#13;&#10;-Djobengine.randomize.archives=false&#13;&#10;-Djobengine.jobsteps.config=&quot;${workspace_loc}/user.jobengine.executors/config/config.xml&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.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
diff --git a/server/-configuration/test-debug-mediacube-main-7777.launch b/server/-configuration/test-debug-mediacube-main-7777.launch
deleted file mode 100644 (file)
index df478a2..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<launchConfiguration type="org.eclipse.jdt.launching.remoteJavaApplication">\r
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">\r
-<listEntry value="/user.jobengine.osgi.server"/>\r
-</listAttribute>\r
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">\r
-<listEntry value="4"/>\r
-</listAttribute>\r
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>\r
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;user.commons.log4j2&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;user.jobengine.executors&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;user.jobengine.osgi.commons&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;user.jobengine.osgi.db&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;user.jobengine.osgi.server&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkcharts.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/classes&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/commons-codec-1.10.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/commons-fileupload-1.2.1.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/commons-io-1.4.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/commons-logging-1.1.1.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zcommon.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zel.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zhtml.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_bsh.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_commons-collections.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_elinez.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_eplotz.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_Filters.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_flashchart.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_gmapsz.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jackson-annotations.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jackson-core.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jackson-databind.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jasperreports.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_javassist.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jcommon.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jfreechart.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_jsp.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_monitor.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_psz.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_sapphire.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_shchart.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_silvertail.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_timelinez.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_timeplotz.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk_zuljsp.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zk.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkbind.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkex_r.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkmax.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zkplus.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zml.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zsoup.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zul.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zuti.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;packageFragmentRoot handle=&amp;quot;=user.jobengine.osgi.server/WEB-INF\/lib\/zweb.jar&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;user.jobengine.osgi.services&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;user.tsm.client&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>\r
-<booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE" value="false"/>\r
-<mapAttribute key="org.eclipse.jdt.launching.CONNECT_MAP">\r
-<mapEntry key="hostname" value="10.10.1.27"/>\r
-<mapEntry key="port" value="7777"/>\r
-</mapAttribute>\r
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="user.jobengine.osgi.server"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.VM_CONNECTOR_ID" value="org.eclipse.jdt.launching.socketAttachConnector"/>\r
-</launchConfiguration>\r
index b18139a3c09e88f71a7966256df21f58ba48436f..dd444539928588f81ddfded562d6c200cc15f80b 100644 (file)
@@ -61,11 +61,11 @@ public class Support {
                System.setProperty("jobengine.octopus.stories.name", "stories181217");\r
                System.setProperty("jobengine.octopus.storyfolders.name", "storyfolders181217");\r
 \r
-               System.setProperty("jobengine.nosql.db.url", "jdbc:db2://10.11.1.90:50000/mc:retrieveMessagesFromServerOnGetMessage=true;");\r
-               System.setProperty("jobengine.nosql.db.user", "db2admin");\r
-               System.setProperty("jobengine.nosql.db.password", "password");\r
+               //              System.setProperty("jobengine.nosql.db.url", "jdbc:db2://10.11.1.90:50000/mc:retrieveMessagesFromServerOnGetMessage=true;");\r
+               //              System.setProperty("jobengine.nosql.db.user", "db2admin");\r
+               //              System.setProperty("jobengine.nosql.db.password", "password");\r
                System.setProperty("nexio.host", "10.10.1.55");\r
-               System.setProperty(ItemManager.DBURL, "jdbc:db2://10.11.1.90:50000/mc:retrieveMessagesFromServerOnGetMessage=true;");\r
+               System.setProperty(ItemManager.DBURL, "jdbc:db2://10.10.1.27:50000/mc:retrieveMessagesFromServerOnGetMessage=true;");\r
                System.setProperty(ItemManager.DBUSERNAME, "db2admin");\r
                System.setProperty(ItemManager.DBPASSWORD, "password");\r
                System.setProperty(LogUtils.LOGLEVEL, "INFO");\r
@@ -260,14 +260,16 @@ public class Support {
 \r
        @Test\r
        public void test2() throws Exception {\r
-               Item i = manager.createItem("Generic", "Trigger teszt", "itemdesc1", "itemhouseid1");\r
-               Media m = manager.createMedia("Generic", "mediatitle1", "mediadesc1", "mediahouseid1");\r
+               Item i = manager.createItem("Generic", "Trigger teszt2", "itemdesc2", "itemhouseid2");\r
+               Media m = manager.createMedia("Generic", "mediatitle2", "mediadesc2", "mediahouseid2");\r
                i.appendMedia(m);\r
-               MediaFile mf = manager.createMediaFile("filename1", manager.getFileType("High-res"), manager.getSystemStore(false), m);\r
+               MediaFile mf = manager.createMediaFile("filename2", manager.getFileType("High-res"), manager.getSystemStore(false), m);\r
                m.appendMediaFile(mf);\r
                manager.mergeItemStructure(i);\r
 \r
                System.out.println("itemid=" + i.getId() + " AND mediaid=" + m.getId() + " AND mediafileid=" + mf.getId());\r
+\r
+               manager.remove(i);\r
        }\r
 \r
        @Test\r
diff --git a/server/user.jobengine.executors/config/config-worker.xml b/server/user.jobengine.executors/config/config-worker.xml
new file mode 100644 (file)
index 0000000..5764b63
--- /dev/null
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<executors>\r
+       <executor className="user.jobengine.server.steps.CancelableStep" maxConcurrent="1" isRemote="true" />\r
+</executors>
\ No newline at end of file
index 4908da306f300bba3377c681b132a9ecee83cb1f..4ca332cf6ddacd828fb9df3ee0a02e066d63fc77 100644 (file)
@@ -118,7 +118,10 @@ public class ImportMORPHEUSMissingMaterialsStep extends JobStep {
                //              dbObject.put(MorpheusStrings.REASON, reason);\r
 \r
                String fileName = materialID + MXF_EXT;\r
-               if (Files.exists(Paths.get(targetPath, fileName))) {\r
+\r
+               Path targetFilePath = Paths.get(targetPath, fileName);\r
+               boolean exists = Files.exists(targetFilePath);\r
+               if (exists && targetFilePath.toFile().length() > 0) {\r
                        logger.warn(jobRuntime.getMarker(), "Az '{}' anyag már be van töltve.", materialID);\r
                        dbObject.put(MorpheusStrings.STATUS, MorpheusStrings.STATUS_SKIPPED);\r
                } else {\r
index 031f81f9a77c1f41c01c495fa1b68279f814c7d0..ad6b51362ac4cc26e268cfa3817a1967aae51029 100644 (file)
@@ -28,7 +28,7 @@ public class MediaToolStep extends JobStep {
                        long frames = mi.getFrames();\r
                        if (frames > 0) {\r
                                mediaCubeMedia.setLength(frames);\r
-                               mediaCubeMedia.modify();\r
+                               getManager().modify(mediaCubeMedia);\r
                        }\r
                } catch (Exception e) {\r
                        logger.catching(e);\r
index 164928560c0dacff7d3f89a6ecc057ff5058c3cf..94190c632def99236c4f1a412b7b58aa997cf910 100644 (file)
@@ -96,7 +96,15 @@ public class MetadataTransformStep extends JobStep {
                        jobRuntime.incrementProgress(50);\r
                        String mediaType = getCreateType(archiveItem);\r
                        mediaCubeMedia = createMedia(archiveItem, mediaCubeItem, mediaType);\r
-                       itemManager.mergeItemStructure(mediaCubeItem);\r
+                       //ha itemid 0 akkor merge, egyebkent media insert \r
+\r
+                       if (mediaCubeItem.getId() == 0)\r
+                               itemManager.mergeItemStructure(mediaCubeItem);\r
+                       else {\r
+                               mediaCubeMedia.setItemId(mediaCubeItem.getId());\r
+                               mediaCubeMedia.add();\r
+                       }\r
+\r
                } catch (Exception e) {\r
                        logger.catching(e);\r
                        String fileName = new File(archiveItem.getMediaFile()).getName();\r
index 0467c609dfff8afb1d6784b3adc1b279596437c7..370a25867a3b4605c582341e78402ceb92e6f780 100644 (file)
@@ -1,7 +1,8 @@
 package user.jobengine.server;\r
 \r
-import java.io.File;\r
 import java.net.URL;\r
+import java.nio.file.Path;\r
+import java.nio.file.Paths;\r
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
@@ -15,9 +16,10 @@ public class DynamicClassLocator {
                try {\r
                        String pathname = System.getProperty(property);\r
                        if (pathname != null && pathname.length() > 0) {\r
-                               File rootDirectory = new File(pathname);\r
-                               if (rootDirectory.exists())\r
-                                       result.add(rootDirectory.toURI().toURL());\r
+\r
+                               Path path = Paths.get(pathname);\r
+                               if (path.toFile().exists())\r
+                                       result.add(path.toUri().toURL());\r
                        }\r
                } catch (Exception e) {\r
                        logger.catching(e);\r
@@ -27,7 +29,6 @@ public class DynamicClassLocator {
        public static URL[] makeURLs() {\r
                List<URL> result = new ArrayList<>();\r
                addPath(result, JobEngine.STEPSROOT);\r
-               addPath(result, JobEngine.STEPSALTERNATEROOT);\r
                return result.toArray(new URL[result.size()]);\r
        }\r
 \r
index 921c79d64246ef92661c9a8bed76745674b32f8a..cdc82b6e4aaccc1eec6e560d05b94342e73f773b 100644 (file)
@@ -19,13 +19,17 @@ public class ExecutorConfigParser {
                this.stream = stream;\r
        }\r
 \r
-       @SuppressWarnings("unchecked")\r
        public List<IJobStepExecutor> parse() throws Exception {\r
+               return parse(this.getClass().getClassLoader());\r
+       }\r
+\r
+       @SuppressWarnings("unchecked")\r
+       public List<IJobStepExecutor> parse(ClassLoader classLoader) throws Exception {\r
                List<IJobStepExecutor> result = null;\r
 \r
                try {\r
                        Digester digester = new Digester();\r
-                       digester.setClassLoader(this.getClass().getClassLoader());\r
+                       digester.setClassLoader(classLoader);\r
                        digester.addObjectCreate(EXECUTORS, ArrayList.class);\r
                        digester.addObjectCreate(EXECUTOR, JobStepExecutor.class);\r
                        digester.addCallMethod(EXECUTOR, "create", 3, new Class<?>[] { String.class, int.class, boolean.class });\r
index ca13905923e0b60801b703fb9ab6ed4c20b5cf35..752bba977d33740e365e2c992b5d3efd6e4376b9 100644 (file)
@@ -53,6 +53,8 @@ public interface IJobEngine {
 
        IJobRuntime getJobById(long jobId);
 
+       IJobRuntime getJobForRemote(String className) throws Exception;
+
        Map<Long, IJobRuntime> getJobs();
 
        IProgram getProgram(String name);
index 2ebe331471376e362370fe2cc5b73ca22a76d63c..ac4a6c58ba5372998507eabe6e4e2bbf6a42ece3 100644 (file)
@@ -29,6 +29,8 @@ public interface IJobStepExecutor {
         */
        Class<IJobStep> getStepClass();
 
+       boolean isRemoteEnabled();
+
        void revoke(IJobRuntime jobRuntime);
 
        /**
@@ -41,6 +43,8 @@ public interface IJobStepExecutor {
         */
        void startup(IJobEngine jobEngine) throws Exception;
 
+       IJobRuntime steelJob() throws InterruptedException;
+
        /**
         * Folyamat elhelyez�se a v�grehajt� v�rakoz�si sor�ba.
         *
index e4c26b1c96bf96579aba664d3dd0d818cdf8f488..9eb30de7dfbf2e80ac42d3134b1062bc38a4c7e7 100644 (file)
@@ -1,9 +1,11 @@
+
 package user.jobengine.server;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Paths;
 import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.util.ArrayList;
@@ -146,7 +148,7 @@ public class JobEngine implements IJobEngine {
        private static final Logger logger = LogManager.getLogger();
        public static final String TEMPLATEROOT = "jobengine.jobtemplates.root";
        public static final String STEPSROOT = "jobengine.jobsteps.root";
-       public static final String STEPSALTERNATEROOT = "jobengine.jobsteps.alternate.root";
+       public static final String STEPSCONFIG = "jobengine.jobsteps.config";
        private static final String SCHEDULEDEXECUTION_DISABLED = "jobengine.scheduledexecution.disabled";
        private static final String EXECUTORCONFIGFILE = "config.xml";
 
@@ -184,7 +186,7 @@ public class JobEngine implements IJobEngine {
 
        private List<IJobChangedListener> jobChangedListenerList = new CopyOnWriteArrayList<>();
        private Map<String, LocalDate> remoteWorkers;
-       private String masterServerAddress = System.getProperty("jobengine.master.server", "false");
+       private String masterServerAddress = System.getProperty("jobengine.master.server", "");
 
        /**
         * A MAM motor példányosítása. Ennek során létrejönnek a várakozási sorok, az ütemező szál, az üzenet kezelő szál.
@@ -421,6 +423,17 @@ public class JobEngine implements IJobEngine {
                return submittedJobs.get(jobId);
        }
 
+       @Override
+       public IJobRuntime getJobForRemote(String className) throws Exception {
+               if (!executors.containsKey(className))
+                       throw new Exception("Unregistered executor request: " + className);
+
+               IJobStepExecutor executor = executors.get(className);
+               if (!executor.isRemoteEnabled())
+                       throw new Exception("Job is not registered for remote workers: " + className);
+               return executor.steelJob();
+       }
+
        @Override
        public Map<Long, IJobRuntime> getJobs() {
                return submittedJobs;
@@ -448,13 +461,12 @@ public class JobEngine implements IJobEngine {
                Response response = null;
                try {
                        response = target.request().get();
-                       if (response.getEntity() != null) {
-
-                       }
+                       if (response.getEntity() instanceof IJobRuntime)
+                               result = (IJobRuntime) response.getEntity();
                } catch (Exception e) {
                        logger.error(e.getMessage());
                } finally {
-                       logger.debug("Keep alive response: {}", response.getStatus());
+                       logger.debug("Response status: {}", response.getStatus());
                        if (response != null)
                                response.close();
                }
@@ -519,7 +531,7 @@ public class JobEngine implements IJobEngine {
 
        @Override
        public boolean isWorker() {
-               return Boolean.parseBoolean(masterServerAddress);
+               return masterServerAddress.length() > 0;
        }
 
        private void jobCleanup(IJobRuntime jobRuntime) {
@@ -538,14 +550,13 @@ public class JobEngine implements IJobEngine {
                executors.clear();
                InputStream stream = null;
                try {
-                       // String configFile =
-                       // DirectoryUtils.checkEndSlash(System.getProperty(STEPROOT)) +
-                       // EXECUTORCONFIGFILE;
                        String stepRoot = DirectoryUtils.normalize(System.getProperty(STEPSROOT), File.separator);
-                       String stepsAlternateRoot = DirectoryUtils.normalize(System.getProperty(STEPSALTERNATEROOT), File.separator);
-                       String configFile = DirectoryUtils.combine(stepRoot, EXECUTORCONFIGFILE, true, true);
-                       logger.info("Loading executors based on configuration: " + configFile);
-                       stream = new FileInputStream(configFile);
+                       String stepsConfig = DirectoryUtils.normalize(System.getProperty(STEPSCONFIG), File.separator);
+                       if (stepsConfig == null || !Paths.get(stepsConfig).toFile().exists())
+                               stepsConfig = DirectoryUtils.combine(stepRoot, EXECUTORCONFIGFILE, true, true);
+
+                       logger.info("Loading executors based on configuration: " + stepsConfig);
+                       stream = new FileInputStream(stepsConfig);
                        ExecutorConfigParser parser = new ExecutorConfigParser(stream);
 
                        List<IJobStepExecutor> executorList = parser.parse();
@@ -605,10 +616,15 @@ public class JobEngine implements IJobEngine {
                        store.setProtocol(RemoteStoreProtocol.LOCAL);
                        store.setUri(DirectoryUtils.normalize(System.getProperty(TEMPLATEROOT), File.separator));
                        store.setFileFilter("*.xml");
+
+                       //                      String userDirectory = System.getProperty("user.dir");
+                       //
+                       //                      Path path = Paths.get(userDirectory + "\\" + System.getProperty(TEMPLATEROOT, ""));
+                       //                      boolean exists = path.toFile().exists();
                        String templateRoot = store.toString(true);
                        logger.info("Template root is: " + templateRoot);
-                       File f = new File(templateRoot);
-                       System.out.println(f.getAbsolutePath());
+                       //                      File f = new File(templateRoot);
+                       //                      System.out.println(f.getAbsolutePath());
                        List<RemoteFile> files = store.getRemoteFiles();
 
                        for (RemoteFile file : files) {
index 3681336bd744402fbeb3f0fc4bc3595014e84967..6cfffb72e292fa9b191e992f14d487b7e3c00898 100644 (file)
@@ -4,14 +4,13 @@ import java.util.EventObject;
 \r
 import user.commons.JobStatus;\r
 \r
-\r
 /**\r
- * Folyamat státusz változás eseményfigyelõ implementáció. \r
+ * Folyamat statusz valtozas esemenyfigyelo implementacio.\r
  */\r
 public class JobStatusChangedEvent extends EventObject {\r
 \r
-       private final JobStatus status;\r
        private static final long serialVersionUID = 6467056911182084042L;\r
+       private final JobStatus status;\r
 \r
        public JobStatusChangedEvent(Object source, JobStatus status) {\r
                super(source);\r
index 14531c7e1307ead068b743109a7c6b4ba5859f20..b992c3d3affc2e8921686935b72c3a9160563430 100644 (file)
@@ -19,10 +19,10 @@ import user.commons.JobStatus;
 import user.jobengine.server.messages.JobStepCompletedMessage;
 import user.jobengine.server.messages.JobStepSkippedMessage;
 import user.jobengine.server.steps.IJobStep;
-import user.jobengine.zk.util.SessionUtil;
 
 public class JobStepExecutor implements IJobStepExecutor {
        private class Worker extends Thread {
+               private static final int WAIT_FOR_REMOTE = 30000;
                private volatile boolean shutdown = false;
 
                @Override
@@ -37,10 +37,21 @@ public class JobStepExecutor implements IJobStepExecutor {
                        while (true) {
                                try {
                                        if (jobEngine.isWorker()) {
-                                               jobRuntime = jobEngine.getRemoteJob(className);
-                                               jobRuntime.setDescription(PROCESSING_REMOTLY);
+                                               //a worker is csak azokat akarja vegrehajtani
+                                               if (isRemote) {
+                                                       Object o = jobEngine.getRemoteJob(className);
+
+                                                       if (o == null) {
+                                                               Thread.sleep(1000);
+                                                               continue;
+                                                       }
+                                                       jobRuntime = (IJobRuntime) o;
+
+                                                       jobRuntime.setDescription(PROCESSING_REMOTLY);
+                                               }
                                        } else {
-                                               jobRuntime = queue.poll(SessionUtil.getMediaCubeConfig().getJobQueuePollInterval(), TimeUnit.MILLISECONDS);
+                                               //SessionUtil.getMediaCubeConfig().getJobQueuePollInterval()
+                                               jobRuntime = queue.poll(10, TimeUnit.MILLISECONDS);
                                                if (jobRuntime == null && shutdown) {
                                                        logger.trace("Shutting down");
                                                        break;
@@ -55,7 +66,7 @@ public class JobStepExecutor implements IJobStepExecutor {
 
                                                long submitted = jobRuntime.getSubmitted().getTime();
                                                long current = System.currentTimeMillis();
-                                               boolean timeout = current - submitted > 3000;
+                                               boolean timeout = current - submitted > WAIT_FOR_REMOTE;
                                                if (isRemote) {
                                                        if (timeout) {
                                                                logger.info("Remote JobStep timed out, processing locally.");
@@ -71,9 +82,6 @@ public class JobStepExecutor implements IJobStepExecutor {
                                                jobRuntime.setDescription(PROCESSING_LOCALLY);
                                        }
 
-                                       if (jobRuntime == null)
-                                               continue;
-
                                        //processing locally
                                        Object[] inputs = jobEngine.getInputsFromStack(jobRuntime);
                                        Object[] outputs = null;
@@ -235,6 +243,11 @@ public class JobStepExecutor implements IJobStepExecutor {
                return stepClass;
        }
 
+       @Override
+       public boolean isRemoteEnabled() {
+               return isRemote;
+       }
+
        @Override
        public void revoke(IJobRuntime jobRuntime) {
                //synchronized(queue){
@@ -266,6 +279,11 @@ public class JobStepExecutor implements IJobStepExecutor {
                }
        }
 
+       @Override
+       public IJobRuntime steelJob() throws InterruptedException {
+               return queue.poll(5, TimeUnit.MILLISECONDS);
+       }
+
        @Override
        public void submit(IJobRuntime jobRuntime) {
                queue.put(jobRuntime);
index 2dd76466f779998fcc28eb6cd7f8569e0f8097a3..fb87296cfe351708afeb72f1cb9cc1d9346b7a42 100644 (file)
@@ -399,7 +399,8 @@ public class SearchModel extends AsyncBaseModel {
 \r
                                        if (sourceStoreUri != null && sourceStoreUri.isStream()) {\r
 \r
-                                               String base = store.isSystem() ? sourceStoreUri.toString(false) : sourceStoreUri.toString(true);\r
+                                               String noProtocolUri = sourceStoreUri.toString(true);\r
+                                               String base = noProtocolUri.startsWith("/") ? noProtocolUri : sourceStoreUri.toString(false);\r
                                                if (!base.endsWith("/"))\r
                                                        base += "/";\r
                                                String relative = mf.getRelativePath().replace("\\", "/");\r
index 93c0b278deb621992820c01b02b9bb81c32d1f29..2a03c0993f2ead7728736507835b317e3856e6d7 100644 (file)
@@ -3,7 +3,6 @@ package user.jobengine.zk.util;
 import java.lang.invoke.MethodHandles;\r
 import java.net.URL;\r
 import java.util.ArrayList;\r
-import java.util.Arrays;\r
 import java.util.Hashtable;\r
 import java.util.LinkedHashSet;\r
 import java.util.List;\r
@@ -43,7 +42,6 @@ public class LDAPUserHandler {
        private static final String AD_ADMIN_MAP = "ad_admin_map";\r
        private static final String AD_SUBMITTER_MAP = "ad_submitter_map";\r
        private static final String AD_EDITOR_MAP = "ad_editor_map";\r
-       private static MediaCubeAuthentication mediaCubeAuthentication;\r
 \r
        public static void main(String[] args) throws Exception {\r
                // Properties cfg = new Properties();\r
@@ -58,13 +56,15 @@ public class LDAPUserHandler {
 \r
                // LDAPHandler h = new LDAPHandler("echotest", "aA123456+", cfg);\r
                // LDAPHandler h = new LDAPHandler("stibor.adm", "Qwer1234", cfg);\r
-               LDAPUserHandler h = new LDAPUserHandler("nagy.ilona", "k0rianDER", mediaCubeAuthentication);\r
+               LDAPUserHandler h = new LDAPUserHandler("nagy.ilona", "k0rianDER", null);\r
 \r
                UserPrincipal user = h.getUserPrincipal();\r
                System.out.println(user);\r
                // List<String> allGroups = h.getAllGroups();\r
        }\r
 \r
+       private MediaCubeAuthentication mediaCubeAuthentication;\r
+\r
        // private Properties cfg = null;\r
        private String account;\r
        private String password;\r
@@ -83,7 +83,12 @@ public class LDAPUserHandler {
                // String groupMap = cfg.getProperty(property);\r
                if (property == null)\r
                        return false;\r
-               List<String> remains = ListUtils.intersect(Arrays.asList(property.toString().split(",")), memberOf);\r
+\r
+               // maradvany?\r
+               //List<String> remains = ListUtils.intersect(Arrays.asList(property.toString().split(",")), memberOf);\r
+\r
+               List<String> remains = ListUtils.intersect(property, memberOf);\r
+\r
                return (remains.size() > 0);\r
 \r
        }\r
index faa3ed0dfb14ef2986ac9c4c0669589d9c1a5110..b3b59398ab4725ee7f743fecd5e0ed6b9b1c436b 100644 (file)
@@ -1,5 +1,7 @@
 package user.jobengine.server.IT;
 
+import static org.junit.Assert.assertEquals;
+
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -15,6 +17,7 @@ import org.junit.Test;
 import user.commons.JobStatus;
 import user.jobengine.db.IItemManager;
 import user.jobengine.db.ItemManager;
+import user.jobengine.db.ItemManagerData.SignalType;
 import user.jobengine.server.IJobEngine;
 import user.jobengine.server.IJobRuntime;
 import user.jobengine.server.IJobStatusChangedListener;
@@ -81,19 +84,21 @@ public class JobengineIT {
                jobEngine.startup();
                jobEngine.bindItemManagerService(manager);
                Map<String, Object> parameters = new HashMap<>();
-               //parameters.put("itemID", 100);
-               IJobRuntime runtime = jobEngine.submit("fake.xml", "Fake", parameters);
-               runtime.addEventListener(new IJobStatusChangedListener() {
-                       @Override
-                       public void statusChanged(JobStatusChangedEvent event) {
-                               if (JobStatus.FINISHED.equals(event.getStatus()))
-                                       sync.suspend();
-
+               parameters.put("itemID", 100);
+               IJobRuntime runtime = jobEngine.submit(null, e -> {
+                       if (JobStatus.FINISHED.equals(e.getStatus()) || JobStatus.SUSPENDED.equals(e.getStatus()))
+                               sync.suspend();
+               }, "fake.xml", "Fake", parameters);
+               jobEngine.addJobChangedEventListener(e -> {
+                       if (e.getSignalType().equals(SignalType.UPDATE)) {
+                               System.out.println(e.getJob().getProgress());
                        }
                });
                sync.waitSuspend();
                sync.resume();
                jobEngine.shutdown();
+
+               assertEquals(JobStatus.FINISHED, runtime.getStatus());
        }
 
        /***
@@ -163,6 +168,37 @@ public class JobengineIT {
                jobEngine.shutdown();
        }
 
+       /***
+        * Tavoli teszt folyamat kiszolgalas
+        *
+        * @throws Exception
+        */
+       @Test
+       public void remote() throws Exception {
+               final ThreadSynchronizer sync = new ThreadSynchronizer();
+               final IJobEngine jobEngine = new JobEngine();
+               jobEngine.startup();
+               jobEngine.bindItemManagerService(manager);
+               /*
+                               Map<String, Object> parameters = new HashMap<>();
+                               parameters.put("itemID", 100);
+                               IJobRuntime runtime = jobEngine.submit(null, e -> {
+                                       if (JobStatus.FINISHED.equals(e.getStatus()) || JobStatus.SUSPENDED.equals(e.getStatus()))
+                                               sync.suspend();
+                               }, "fake.xml", "Fake", parameters);
+                               jobEngine.addJobChangedEventListener(e -> {
+                                       if (e.getSignalType().equals(SignalType.UPDATE)) {
+                                               System.out.println(e.getJob().getProgress());
+                                       }
+                               });
+               */
+               sync.waitSuspend();
+               sync.resume();
+               jobEngine.shutdown();
+
+               //assertEquals(JobStatus.FINISHED, runtime.getStatus());
+       }
+
        /***
         * NEXIO adatok szinkronizalo folyamat futtatasa
         *
index bf252521398b2360fc429fd5bf5e41a4b16d7470..3ba06f8e25cd2372c0505d69e631709be3d864bd 100644 (file)
@@ -3,8 +3,10 @@ package user.jobengine.osgi.mediacube;
 import javax.servlet.http.HttpServletRequest;\r
 import javax.ws.rs.GET;\r
 import javax.ws.rs.Path;\r
+import javax.ws.rs.Produces;\r
 import javax.ws.rs.QueryParam;\r
 import javax.ws.rs.core.Context;\r
+import javax.ws.rs.core.MediaType;\r
 import javax.ws.rs.core.Response;\r
 \r
 import org.apache.logging.log4j.LogManager;\r
@@ -23,6 +25,23 @@ public class ClusterService {
                logger.debug("Created");\r
        }\r
 \r
+       @GET\r
+       @Path("/getjob")\r
+       @Produces({ MediaType.APPLICATION_JSON })\r
+       public Response getJob(@QueryParam("className") String className) {\r
+               Response result = null;\r
+               try {\r
+                       //IJobRuntime job = jobEngine.getJobForRemote(className);\r
+                       ClusteredJob j = new ClusteredJob();\r
+                       j.setId(100);\r
+                       j.setName("Jobname");\r
+                       result = Response.ok().entity(j).build();\r
+               } catch (Exception e) {\r
+                       result = Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();\r
+               }\r
+               return result;\r
+       }\r
+\r
        @GET\r
        @Path("/keepalive")\r
        public Response keepAlive(@Context HttpServletRequest request, @QueryParam("responseRoot") String responseRoot) {\r
diff --git a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/mediacube/ClusteredJob.java b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/mediacube/ClusteredJob.java
new file mode 100644 (file)
index 0000000..85f2067
--- /dev/null
@@ -0,0 +1,23 @@
+package user.jobengine.osgi.mediacube;\r
+\r
+public class ClusteredJob {\r
+       private long id;\r
+       private String name;\r
+\r
+       public long getId() {\r
+               return id;\r
+       }\r
+\r
+       public String getName() {\r
+               return name;\r
+       }\r
+\r
+       public void setId(long id) {\r
+               this.id = id;\r
+       }\r
+\r
+       public void setName(String name) {\r
+               this.name = name;\r
+       }\r
+\r
+}\r