git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Mon, 27 Apr 2020 15:13:15 +0000 (15:13 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Mon, 27 Apr 2020 15:13:15 +0000 (15:13 +0000)
40 files changed:
server/-configuration/run-mediacube-server-hirtv.launch
server/-configuration/run-mediacube-server-mv.launch
server/-configuration/run-mediacube-server-user.launch
server/-configuration/scheduledjobs.json
server/-configuration/test-debug-mediacube-main-7777.launch [new file with mode: 0644]
server/user.jobengine.executors/config/config.xml
server/user.jobengine.executors/jobtemplates/archive-recording.xml [deleted file]
server/user.jobengine.executors/jobtemplates/create-lowres-ondemand.xml
server/user.jobengine.executors/jobtemplates/fake-concurrent.xml
server/user.jobengine.executors/jobtemplates/submit-child.xml [new file with mode: 0644]
server/user.jobengine.executors/jobtemplates/sys-recreate-lowres.xml
server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveMaterialSubmitStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/AttachLowresStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/CancelableStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/CreateArchiveItemStep.java [moved from server/user.jobengine.executors/src/user/jobengine/server/steps/CreateArchiveItem.java with 90% similarity]
server/user.jobengine.executors/src/user/jobengine/server/steps/CreateMissingLowresStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/FakeStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/HSMMigrateStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/MediaToolStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/SubmitChildStep.java [new file with mode: 0644]
server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/UpdateGhostMediaData.java
server/user.jobengine.osgi.commons/src/user/commons/FFAStransAPI.java
server/user.jobengine.osgi.db/migrations/scripts/007_add_alternate_store.sql
server/user.jobengine.osgi.db/src/user/jobengine/db/Media.java
server/user.jobengine.osgi.server/WEB-INF/web.xml
server/user.jobengine.osgi.server/pages/joblist.zul
server/user.jobengine.osgi.server/pages/login.zul
server/user.jobengine.osgi.server/resources/i3-label_hu.properties
server/user.jobengine.osgi.server/src/user/jobengine/server/IJobEngine.java
server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngine.java
server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java
server/user.jobengine.osgi.server/src/user/jobengine/server/JobStepExecutor.java
server/user.jobengine.osgi.server/src/user/jobengine/server/steps/JobStep.java
server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobListModel.java
server/user.jobengine.osgi.server/src/user/jobengine/zk/model/LoginModel.java
server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MediaCubeAuthentication.java
server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
server/user.jobengine.osgi.services/WEB-INF/web.xml

index acd8c01927c4b5c520e67bc8b4d494ee22a3648b..2d0bc066542f6ec2ddc834918a77c389c23485d3 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;"/>\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="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 43a0b0c9a0ff19be46fa2507839f24035c9ad093..5de9b7fd245c671b79e61a530fd79eb193f68a26 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.11.1.90: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.11.1.90: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.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;-Djobengine.mediacube.service.proxyroot=&quot;/opt&quot;&#13;&#10;-Dgui.statistics.disable=true&#13;&#10;-Dgui.help.disable=true&#13;&#10;-Dgui.editor.disable=true&#13;&#10;-Djobengine.mediafinder.external=false"/>\r
+<stringAttribute key="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.11.1.90: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.11.1.90: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.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.randomize.archives=true"/>\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 19a9c109b2f8ace19bd9b673500c640cd2d48ad7..670a5937b176da9d5a41ace7cd49730286a079bf 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"/>\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=true&#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.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 fa3564911d903bceab8f89a6557c17d8f50ba855..62c016ff9d8e109ac43947341f061d4c32dbb550 100644 (file)
@@ -1,6 +1,9 @@
 {"joblist":[\r
        {\r
       "template": "cancelable.xml"\r
+       },      \r
+       {\r
+      "template": "submit-child.xml"\r
        },      \r
        {\r
          "name" : "Proxy pótlása",\r
diff --git a/server/-configuration/test-debug-mediacube-main-7777.launch b/server/-configuration/test-debug-mediacube-main-7777.launch
new file mode 100644 (file)
index 0000000..df478a2
--- /dev/null
@@ -0,0 +1,18 @@
+<?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 892d9f3c58b4446fd9daf1ce5db4e2fb43781618..039626a1e6e31b38318228b0467cd7c35f9cd2f5 100644 (file)
@@ -28,6 +28,7 @@
        <executor className="user.jobengine.server.steps.OutputPathAndNameSelectorStep" maxConcurrent="1"/>\r
        <executor className="user.jobengine.server.steps.RecordingsArchiveItemBuilderStep" maxConcurrent="1"/>\r
        <executor className="user.jobengine.server.steps.SyncOCTOPUSDataStep" maxConcurrent="1"/>\r
+       <executor className="user.jobengine.server.steps.SubmitChildStep" maxConcurrent="1"/>\r
        <executor className="user.jobengine.server.steps.TranscodeFFAStranStep" maxConcurrent="1"/>\r
        <executor className="user.jobengine.server.steps.TranscodeSELENIOStep" maxConcurrent="4"/>\r
        <executor className="user.jobengine.server.steps.TranscodeStep" maxConcurrent="4"/>\r
diff --git a/server/user.jobengine.executors/jobtemplates/archive-recording.xml b/server/user.jobengine.executors/jobtemplates/archive-recording.xml
deleted file mode 100644 (file)
index 440285a..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<jobtemplate name="Visszarögzített anyagok archiválása mappából">\r
-       <declarations>\r
-               <parameters>\r
-                       <parameter name="localHiresSourcePath" type="java.lang.String" />\r
-                       <parameter name="localHiresTargetPath" type="java.lang.String" />\r
-                       <parameter name="nexioPort" type="java.lang.Integer" />\r
-                       <parameter name="nexioUserName" type="java.lang.String" />\r
-                       <parameter name="nexioPassword" type="java.lang.String" />\r
-                       <parameter name="transcoderAddress" type="java.lang.String" />\r
-                       <parameter name="transcoderTemplateName" type="java.lang.String" />\r
-                       <parameter name="globalHiresSourcePath" type="java.lang.String" />\r
-                       <parameter name="localLowresTargetPath" type="java.lang.String" />\r
-                       <parameter name="webPath" type="java.lang.String" />\r
-                       <parameter name="deleteSource" type="java.lang.Boolean" />\r
-               </parameters>\r
-               <variables>\r
-                       <variable name="archiveItem" type="user.jobengine.server.steps.ArchiveItem" />\r
-                       <variable name="targetFileName" type="java.lang.String" />\r
-                       <variable name="mediaCubeMedia" type="user.jobengine.db.Media" />\r
-                       <variable name="killDateDays" type="java.lang.Integer" />\r
-               </variables>\r
-       </declarations>\r
-       <commands>\r
-               <calljobstep type="user.jobengine.server.steps.RecordingsArchiveItemBuilderStep" weight="1">\r
-                       <inputs>\r
-                               <input>\r
-                                       <parameter name="localHiresSourcePath" />\r
-                               </input>\r
-                       </inputs>\r
-                       <outputs>\r
-                               <output>\r
-                                       <variable name="archiveItem" />\r
-                               </output>\r
-                               <output>\r
-                                       <variable name="targetFileName" />\r
-                               </output>\r
-                       </outputs>\r
-               </calljobstep>\r
-               <calljobstep type="user.jobengine.server.steps.UploadRecordingToNexioStep" weight="2">\r
-                       <inputs>\r
-                               <input>\r
-                                       <variable name="archiveItem" />\r
-                               </input>\r
-                               <input>\r
-                                       <variable name="targetFileName" />\r
-                               </input>\r
-                               <input>\r
-                                       <parameter name="nexioPort" />\r
-                               </input>\r
-                               <input>\r
-                                       <parameter name="nexioUserName" />\r
-                               </input>\r
-                               <input>\r
-                                       <parameter name="nexioPassword" />\r
-                               </input>\r
-                       </inputs>\r
-               </calljobstep>\r
-               <calljobstep type="user.jobengine.server.steps.DownloadRecordingFromNexioStep" weight="2">\r
-                       <inputs>\r
-                               <input>\r
-                                       <variable name="archiveItem" />\r
-                               </input>\r
-                               <input>\r
-                                       <parameter name="localHiresTargetPath" />\r
-                               </input>\r
-                               <input>\r
-                                       <variable name="targetFileName" />\r
-                               </input>\r
-                               <input>\r
-                                       <parameter name="nexioPort" />\r
-                               </input>\r
-                               <input>\r
-                                       <parameter name="nexioUserName" />\r
-                               </input>\r
-                               <input>\r
-                                       <parameter name="nexioPassword" />\r
-                               </input>\r
-                       </inputs>\r
-                       <outputs>\r
-                               <output>\r
-                                       <variable name="killDateDays" />\r
-                               </output>\r
-                       </outputs>\r
-               </calljobstep>\r
-               <calljobstep type="user.jobengine.server.steps.MetadataTransformStep" weight="1">\r
-                       <inputs>\r
-                               <input>\r
-                                       <variable name="archiveItem" />\r
-                               </input>\r
-                       </inputs>\r
-                       <outputs>\r
-                               <output>\r
-                                       <variable name="mediaCubeMedia" />\r
-                               </output>\r
-                       </outputs>\r
-               </calljobstep>\r
-               <calljobstep type="user.jobengine.server.steps.TSMBackupStep" weight="2">\r
-                       <inputs>\r
-                               <input>\r
-                                       <variable name="archiveItem" />\r
-                               </input>\r
-                               <input>\r
-                                       <variable name="mediaCubeMedia" />\r
-                               </input>\r
-                               <input>\r
-                                       <variable name="killDateDays" />\r
-                               </input>\r
-                       </inputs>\r
-               </calljobstep>\r
-               <calljobstep type="user.jobengine.server.steps.TranscodeFFAStranStep" weight="1">\r
-                       <inputs>\r
-                               <input>\r
-                                       <variable name="archiveItem" />\r
-                               </input>\r
-                               <input>\r
-                                       <variable name="mediaCubeMedia" />\r
-                               </input>\r
-                               <input>\r
-                                       <parameter name="transcoderAddress" />\r
-                               </input>\r
-                               <input>\r
-                                       <parameter name="transcoderTemplateName" />\r
-                               </input>\r
-                               <input>\r
-                                       <parameter name="globalHiresSourcePath" />\r
-                               </input>\r
-                               <input>\r
-                                       <parameter name="localLowresTargetPath" />\r
-                               </input>\r
-                               <input>\r
-                                       <parameter name="webPath" />\r
-                               </input>\r
-                               <input>\r
-                                       <parameter name="deleteSource" />\r
-                               </input>\r
-                       </inputs>\r
-               </calljobstep>\r
-       </commands>\r
-</jobtemplate>
\ No newline at end of file
index bf7ff2339562ced5896cbc4f64769d27f85169db..c00193cc7784481030d9f8d00e712b31fd53a285 100644 (file)
@@ -11,7 +11,6 @@
                        <parameter name="localLowresPath" type="java.lang.String" />\r
                        <parameter name="transcoderAddress" type="java.lang.String" />\r
                        <parameter name="transcoderTemplateName" type="java.lang.String" />\r
-                       <parameter name="webPath" type="java.lang.String" />\r
                        <parameter name="localRetrievePath" type="java.lang.String" />\r
                        <parameter name="globalRetrievePath" type="java.lang.String" />\r
                        <parameter name="targetNamePattern" type="java.lang.String" />\r
@@ -21,7 +20,7 @@
                </variables>\r
        </declarations>\r
        <commands>\r
-               <calljobstep type="user.jobengine.server.steps.CreateArchiveItem" weight="1">\r
+               <calljobstep type="user.jobengine.server.steps.CreateArchiveItemStep" weight="1">\r
                        <inputs>\r
                                <input>\r
                                        <parameter name="mediaCubeMedia" />\r
@@ -91,9 +90,6 @@
                                <input>\r
                                        <parameter name="localLowresPath" />\r
                                </input>\r
-                               <input>\r
-                                       <parameter name="webPath" />\r
-                               </input>\r
                                <input>\r
                                        <parameter name="deleteSource" />\r
                                </input>\r
index 5516c43f5570ef6bf6ba2652c48760ea03c2528f..6edbf8390a70c6a22ea9aeefc08d8d00721fc746 100644 (file)
@@ -4,34 +4,19 @@
        <parameters>\r
                <parameter name="itemID" type="java.lang.Long"/>\r
        </parameters>\r
-       <variables>\r
-               <variable name="resultID" type="java.lang.Long"/>\r
-       </variables>\r
 </declarations>\r
 <commands>\r
-       <calljobstep id="step1" type="user.jobengine.server.steps.FakeStep" weight="1">\r
-               <inputs>\r
-                       <input>\r
-                               <parameter name="itemID" />\r
-                       </input>\r
-               </inputs>\r
-               <outputs>\r
-                       <output>\r
-                               <variable name="resultID" />\r
-                       </output>\r
-               </outputs>\r
-       </calljobstep>\r
        <calljobstep id="step3" type="user.jobengine.server.steps.FakeStep" weight="1">\r
                <inputs>\r
                        <input>\r
-                               <variable name="resultID" />\r
+                               <parameter name="itemID" />\r
                        </input>\r
                </inputs>\r
                <commands>\r
-                       <calljobstep id="step2" type="user.jobengine.server.steps.FakeStep" weight="1">\r
+                       <calljobstep id="step2" type="user.jobengine.server.steps.Fake1Step" weight="1">\r
                                <inputs>\r
                                        <input>\r
-                                               <variable name="resultID" />\r
+                                               <parameter name="itemID" />\r
                                        </input>\r
                                </inputs>\r
                        </calljobstep>\r
diff --git a/server/user.jobengine.executors/jobtemplates/submit-child.xml b/server/user.jobengine.executors/jobtemplates/submit-child.xml
new file mode 100644 (file)
index 0000000..935df11
--- /dev/null
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<jobtemplate multiInstance="true">\r
+       <commands>\r
+               <calljobstep id="step1" type="user.jobengine.server.steps.SubmitChildStep" weight="1" />\r
+       </commands>\r
+</jobtemplate>
\ No newline at end of file
index 1b6d73223a3eb3dda91a84cd2c5da23a340b4fa1..3c1381db8194e4c23324c090b47069f9b4b792c5 100644 (file)
@@ -7,7 +7,6 @@
                        <parameter name="localLowresPath" type="java.lang.String" />\r
                        <parameter name="transcoderAddress" type="java.lang.String" />\r
                        <parameter name="transcoderTemplateName" type="java.lang.String" />\r
-                       <parameter name="webPath" type="java.lang.String" />\r
                        <parameter name="localRetrievePath" type="java.lang.String" />\r
                        <parameter name="globalRetrievePath" type="java.lang.String" />\r
                </parameters>\r
                                <input>\r
                                        <parameter name="localLowresPath" />\r
                                </input>\r
-                               <input>\r
-                                       <parameter name="webPath" />\r
-                               </input>\r
                                <input>\r
                                        <variable name="deleteSource" />\r
                                </input>\r
index 5ded673ed4a8cf71d8d42b170f95574d69bba95b..4a8d30ebaf2e8c1a8cabb17277661fb9736f1ad9 100644 (file)
@@ -15,16 +15,12 @@ public class ArchiveMaterialSubmitStep extends JobStep {
        private static final Logger logger = LogManager.getLogger();\r
        private static final String JOBTEMPLATE = "archive-material.xml";\r
        private static final String KILL_DATE_DAYS = "killDateDays";\r
-       private static final String WEB_PATH = "webPath";\r
-       private static final String TRANSCODER_TARGET_PATH = "transcoderTargetPath";\r
        private static final String ARCHIVE = "Archiválás";\r
-       private static final String GLOBAL_SOURCE_PATH = "globalSourcePath";\r
        private static final String ARCHIVE_ITEM = "archiveItem";\r
        private Marker marker;\r
 \r
        @StepEntry\r
-       public Object[] execute(String globalSourcePath, List<ArchiveItem> archiveList, String transcoderTargetPath, String webPath, int killDateDays,\r
-                       IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
+       public Object[] execute(List<ArchiveItem> archiveList, int killDateDays, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
                marker = jobRuntime.getMarker();\r
                if (archiveList == null || archiveList.size() == 0)\r
                        return null;\r
@@ -34,8 +30,7 @@ public class ArchiveMaterialSubmitStep extends JobStep {
                                ArchiveItem archiveItem = archiveList.get(i);\r
                                try {\r
                                        IJobRuntime runtime = jobEngine.submit(jobRuntime, null, JOBTEMPLATE, ARCHIVE,\r
-                                                       ListUtils.asMap(ARCHIVE_ITEM, archiveItem, GLOBAL_SOURCE_PATH, globalSourcePath, TRANSCODER_TARGET_PATH, transcoderTargetPath,\r
-                                                                       WEB_PATH, webPath, KILL_DATE_DAYS, killDateDays));\r
+                                                       ListUtils.asMap(ARCHIVE_ITEM, archiveItem, KILL_DATE_DAYS, killDateDays));\r
                                        setProgress((i + 1) * 100 / archiveList.size());\r
                                        //TODO kivezetni a submit hibaüzenetet\r
                                        if (runtime == null)\r
index c6ca8c9485918b388ca9c5ccd4527a0cb14d1e24..40c5c321622acc78797bb4cff260285bf3362e49 100644 (file)
@@ -34,8 +34,8 @@ public class AttachLowresStep extends JobStep {
        @StepEntry\r
        public Object[] execute(Media mediaCubeMedia, String localLowresTargetPath, String webPath) throws Exception {\r
 \r
-               this.marker = jobRuntime.getMarker();\r
-               this.manager = (IItemManager) jobRuntime.getPersister();\r
+               this.marker = getSessionMarker();\r
+               this.manager = getManager();\r
                this.store = check(manager.getSystemStore(true), "lowres Store");\r
                this.fileType = check(manager.getFileType(LOWRES_FILETYPE), "lowres FileType");\r
                this.mediaCubeMedia = check(mediaCubeMedia, "mediaCubeMedia");\r
index 334efe75c20ad8e7a7337106e4661548a47b173b..6a6c8ff377942c46596dbc032e1e79405ce28c50 100644 (file)
@@ -1,22 +1,26 @@
 package user.jobengine.server.steps;\r
 \r
-import user.jobengine.server.IJobRuntime;\r
-\r
 public class CancelableStep extends JobStep {\r
        int count = 10;\r
 \r
        @StepEntry\r
-       public Object[] execute(IJobRuntime jobRuntime) {\r
+       public Object[] execute() throws Exception {\r
                try {\r
                        for (int i = 0; i < count; i++) {\r
-                               if (jobRuntime.isWaitingCancel() || jobRuntime.isWaitingSuspend())\r
+                               if (getJobRuntime().isWaitingCancel() || getJobRuntime().isWaitingSuspend())\r
                                        break;\r
                                Thread.sleep(1000);\r
-                               jobRuntime.incrementProgress((i + 1) * count);\r
+                               setProgress((i + 1) * count);\r
                        }\r
                } catch (Exception e) {\r
                        e.printStackTrace();\r
                }\r
+\r
+               //              Path filePath = Paths.get("/mnt/ISILON/ARCHIVE_RESTORE/XXX/xxx-ARCH-209740793_2-207990326.MXF");\r
+               //              MediaInfo mi = new MediaInfo(filePath);\r
+               //              mi.process();\r
+               //              if (true)\r
+               //                      throw new Exception("Frames. " + mi.getFrames());\r
                return null;\r
        }\r
 \r
similarity index 90%
rename from server/user.jobengine.executors/src/user/jobengine/server/steps/CreateArchiveItem.java
rename to server/user.jobengine.executors/src/user/jobengine/server/steps/CreateArchiveItemStep.java
index e37400307864f1f82a7ef68315910715a6ba3ec7..cec48f78e56ab7c63168618c8f907b19d4613061 100644 (file)
@@ -13,7 +13,7 @@ import user.commons.nosql.NoSQLUtils;
 import user.jobengine.db.Media;\r
 import user.jobengine.db.Store;\r
 \r
-public class CreateArchiveItem extends JobStep {\r
+public class CreateArchiveItemStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r
 \r
        @StepEntry\r
@@ -29,7 +29,7 @@ public class CreateArchiveItem extends JobStep {
                        if (mediaCubeMedia.getMediaFiles().get(0).getStoreId() != highResStore.getId())\r
                                throw new Exception("Expected media store is a high-res store");\r
 \r
-                       String name = mediaCubeMedia.getMediaFilesName();\r
+                       String name = mediaCubeMedia.getMediaFileRealName();\r
                        archiveItem = new ArchiveItem();\r
                        archiveItem.setMediaFile(Paths.get(localHiresPath, name).toString());\r
                        collection.save(new BasicDBObject("name", name));\r
index bc1ff78ae595b0a9efa2299557c3779d84ea34b6..d8c18209130e57a113bd85fa2df625d2a5a386c9 100644 (file)
@@ -1,7 +1,6 @@
 package user.jobengine.server.steps;\r
 \r
 import java.nio.file.Paths;\r
-import java.util.List;\r
 \r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
@@ -15,7 +14,6 @@ import user.commons.MediaCubeUndoMarker;
 import user.commons.nosql.NoSQLUtils;\r
 import user.jobengine.db.IItemManager;\r
 import user.jobengine.db.Media;\r
-import user.jobengine.db.MediaFile;\r
 import user.jobengine.db.Store;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
@@ -44,7 +42,7 @@ public class CreateMissingLowresStep extends JobStep {
                                return null;\r
                        }\r
 \r
-                       String name = media.getMediaFilesName();\r
+                       String name = media.getMediaFileRealName();\r
                        result[0] = media;\r
                        ArchiveItem archiveItem = new ArchiveItem();\r
                        archiveItem.setMediaFile(Paths.get(localHiresPath, name).toString());\r
@@ -69,19 +67,8 @@ public class CreateMissingLowresStep extends JobStep {
                        try {\r
                                long mediaId = rs.getLong(1);\r
                                Media media = manager.getMedia(mediaId);\r
-\r
                                //a nevgeneralas miatt az eredeti MediaFilesName nem jo, a pontos nev kell nekunk\r
-                               List<MediaFile> mediaFiles = media.getMediaFiles();\r
-                               if (mediaFiles != null) {\r
-                                       for (MediaFile mf : mediaFiles) {\r
-                                               if (mf.getStoreId() == highResStore.getId()) {\r
-                                                       media.setMediaFilesName(mf.getRelativePath());\r
-                                                       break;\r
-                                               }\r
-                                       }\r
-                               }\r
-\r
-                               String name = media.getMediaFilesName();\r
+                               String name = media.getMediaFileRealName();\r
                                long existing = collection.find(new BasicDBObject("name", name)).count();\r
                                if (existing > 0)\r
                                        return true;\r
index 97ade7dfa0ad0b33d2277a3e42292bbe77e53092..13ab5eae28d92e16a5b001bf03df564c212b8c76 100644 (file)
@@ -6,8 +6,6 @@ import org.apache.logging.log4j.Logger;
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
 import user.mediacube.metadata.interfaces.IMetadataProvider;\r
-import user.mediacube.metadata.interfaces.IMetadataProviderFactory;\r
-import user.mediacube.metadata.interfaces.MetadataProviderType;\r
 \r
 public class FakeStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r
@@ -19,6 +17,9 @@ public class FakeStep extends JobStep {
        public Object[] execute(long itemID, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
                Object[] result = { itemID + 1 };\r
 \r
+               //              if (result != null)\r
+               //                      throw new Exception(\r
+               //                                      "Ez most egy nagyon hosszú hibaüzenet szeretne lenni, amit remélem hogy több sorban fogok látni. Mert ha nem! Akko lesz nemulass...");\r
                //              Files.copy(Paths.get("/etc/security/limits.conf"), Paths.get("/etc/security/limits.conf.bak"));\r
                //              Files.write(Paths.get("/etc/security/limits.conf"), new byte[0], StandardOpenOption.TRUNCATE_EXISTING);\r
 \r
@@ -37,7 +38,7 @@ public class FakeStep extends JobStep {
                                        break;\r
                                jobRuntime.incrementProgress((i + 1) * count);\r
                                for (int j = 0; j < 100; j++) {\r
-                                       Thread.sleep(1000);\r
+                                       Thread.sleep(10);\r
                                }\r
 \r
                                //jobEngine.sendMessage(new CancelRequest(jobRuntime.getId()));\r
@@ -51,10 +52,4 @@ public class FakeStep extends JobStep {
                return result;\r
        }\r
 \r
-       public void test() {\r
-               IMetadataProviderFactory factory = getService(IMetadataProviderFactory.class);\r
-               metadataProvider = factory.getProvider(MetadataProviderType.HSM);\r
-               logger.info(jobRuntime.getMarker(), metadataProvider);\r
-       }\r
-\r
 }\r
index 6c8f3cf526bdc01d9dc082785d3feee1b5b22451..7bcd3176ad3dab68f84d1c56d445381d306e8135 100644 (file)
@@ -95,8 +95,7 @@ public class HSMMigrateStep extends JobStep {
        @SuppressWarnings("serial")\r
        @StepEntry\r
        public Object[] execute(String sourceLocation, String targetLocation) throws Exception {\r
-               if (jobRuntime != null)\r
-                       marker = jobRuntime.getMarker();\r
+               marker = getJobRuntime().getMarker();\r
                //remove from prod\r
                //cleanupHistory();\r
                hsmProvider = getMetadataProvider(MetadataProviderType.HSM);\r
@@ -141,6 +140,13 @@ public class HSMMigrateStep extends JobStep {
                                                }\r
                                        }\r
                                        setProgress(p++ * 100 / contents.size());\r
+\r
+                                       if (getJobRuntime().isWaitingCancel()) {\r
+                                               logger.info("Job canceled by user");\r
+                                               //ne mentsuk a szalagot meg\r
+                                               return null;\r
+                                       }\r
+\r
                                }\r
 \r
                                if (oneSuccess && !hasError) {\r
@@ -210,7 +216,7 @@ public class HSMMigrateStep extends JobStep {
                        return false;\r
                }\r
 \r
-               IItemManager manager = (IItemManager) jobRuntime.getPersister();\r
+               IItemManager manager = getManager();\r
                MediaFileDAO mfDAO = (MediaFileDAO) manager.getBaseDAO(MediaFile.class);\r
                List<IEntityBase> mediaFiles = mfDAO.getByHouseId(source.getFileName().toString());\r
                if (mediaFiles != null && mediaFiles.size() > 0) {\r
index 8dc0ba4fc80efd884e537909800a921c5dd2c04d..031f81f9a77c1f41c01c495fa1b68279f814c7d0 100644 (file)
@@ -16,7 +16,7 @@ public class MediaToolStep extends JobStep {
 \r
        @StepEntry\r
        public Object[] execute(ArchiveItem archiveItem, Media mediaCubeMedia) throws Exception {\r
-               marker = jobRuntime.getMarker();\r
+               marker = getSessionMarker();\r
 \r
                if (mediaCubeMedia.getLength() > 0)\r
                        return null;\r
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/SubmitChildStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/SubmitChildStep.java
new file mode 100644 (file)
index 0000000..c934f31
--- /dev/null
@@ -0,0 +1,14 @@
+package user.jobengine.server.steps;\r
+\r
+import user.commons.ListUtils;\r
+\r
+public class SubmitChildStep extends JobStep {\r
+       @StepEntry\r
+       public Object[] execute() throws Exception {\r
+               if (getJobRuntime().forkPrepare())\r
+                       getEngine().submit(getJobRuntime(), null, "fake.xml", "Submit test", ListUtils.asMap("itemID", 1L));\r
+               getJobRuntime().forkWaitComplete();\r
+               return null;\r
+       }\r
+\r
+}\r
index 562ad8f2403ae66495d15a3ccc12cb9506e0df4a..b7e82a36480bb3ae31822cc37d607a382025a983 100644 (file)
@@ -42,17 +42,17 @@ public class TSMBackupStep extends JobStep {
        private Marker marker;\r
 \r
        @StepEntry\r
-       public Object[] execute(ArchiveItem archiveItem, Media mediaCubeMedia, int killDateDays, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
-               marker = jobRuntime.getMarker();\r
+       public Object[] execute(ArchiveItem archiveItem, Media mediaCubeMedia, int killDateDays) throws Exception {\r
+               marker = getSessionMarker();\r
 \r
                File sourceMediaFile = new File(archiveItem.getMediaFile());\r
                String sourceFileName = sourceMediaFile.getName();\r
                String details = String.format("%s (%d bytes)", sourceFileName, sourceMediaFile.length());\r
                try {\r
 \r
-                       setAndCheck(archiveItem, mediaCubeMedia, jobEngine);\r
+                       setAndCheck(archiveItem, mediaCubeMedia, getEngine());\r
 \r
-                       jobRuntime.setDescription(String.format("%s: %s", jobRuntime.getDescription(), details));\r
+                       getJobRuntime().setDescription(String.format("%s: %s", getJobRuntime().getDescription(), details));\r
 \r
                        //A dupla ellenorzes a napon beluli ismetlesek miatt kell\r
                        long existingMediaId = archiveItem.getExistingMediaId();\r
@@ -65,14 +65,20 @@ public class TSMBackupStep extends JobStep {
                        if (existingMediaId == 0)\r
                                existingMediaId = ItemManagerExtensions.getExistingRundownMedia(manager, sourceFileName.replace(MXFEXT, ""));\r
 \r
-                       // a-z, A-Z, 0-9. For example: WRMcpIk7, s57JwCVA\r
-                       //veletlenszeru neveket adunk!\r
-                       String targetFileName = String.format("%s-%s", RandomStringUtils.randomAlphanumeric(8), sourceFileName);\r
+                       boolean randomizeName = Boolean.parseBoolean(System.getProperty("jobengine.randomize.archives", "false"));\r
+\r
+                       String targetFileName;\r
+                       if (randomizeName) {\r
+                               // a-z, A-Z, 0-9. For example: WRMcpIk7, s57JwCVA\r
+                               //veletlenszeru neveket adunk!\r
+                               targetFileName = String.format("%s-%s", RandomStringUtils.randomAlphanumeric(8), sourceFileName);\r
+                       } else\r
+                               targetFileName = sourceFileName;\r
 \r
                        if (existingMediaId == 0) {\r
                                StoreUri sourceUri = manager.createStoreUri(RemoteStoreProtocol.LOCAL, sourceMediaFile.getParent().toString());\r
 \r
-                               final IJobRuntime runtime = jobRuntime;\r
+                               final IJobRuntime runtime = getJobRuntime();\r
                                sourceUri.addProgressListener(new IProgressEventListener() {\r
                                        @Override\r
                                        public void progressChanged(ProgressEvent evt) {\r
index 5a68f813861e4b806f7814cf3013f8af078c6f19..1b1cda9078604de541cdf6fac1bbf62eee87f949 100644 (file)
@@ -6,8 +6,8 @@ import user.jobengine.server.IJobRuntime;
 \r
 public class TranscodeStep extends JobStep {\r
        @StepEntry\r
-       public Object[] execute(String globalSourcePath, ArchiveItem archiveItem, Media mediaCubeMedia, String transcoderTargetPath, String webPath,\r
-                       IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
+       public Object[] execute(String globalSourcePath, ArchiveItem archiveItem, Media mediaCubeMedia, String transcoderTargetPath, IJobEngine jobEngine,\r
+                       IJobRuntime jobRuntime) throws Exception {\r
                int version = 0;\r
                try {\r
                        version = Integer.parseInt(System.getProperty("jobengine.transcoder.version"));\r
index 7b37d3cca1dd84781c57b817110e3471d828456f..1507e4c15a9a9a96e9dd0043e251c8c844a47b72 100644 (file)
@@ -27,6 +27,8 @@ public class UpdateGhostMediaData extends JobStep {
                List<MediaFile> mediaFiles = manager.getMedia(mediaCubeMedia.getId()).getMediaFiles();\r
                if (mediaFiles != null && mediaFiles.size() == 2) {\r
                        Store highresStore = manager.getSystemStore(false);\r
+\r
+                       //TODO atvezetni a lowres store lekerdezest az alternate-re\r
                        Store lowresStore = manager.getSystemStore(true);\r
                        MediaFile lowres = get(lowresStore, mediaFiles);\r
                        MediaFile highres = get(highresStore, mediaFiles);\r
index e0cad9cdc250a434f343b0736066841720b0379e..5da3b3571bdacc63968496ae7167c66784350263 100644 (file)
@@ -237,20 +237,25 @@ public class FFAStransAPI implements IFFAStransAPI {
 \r
                long started = System.currentTimeMillis();\r
 \r
-               BasicDBObject status = getStatus(jobId);\r
-\r
+               //              BasicDBObject status = getStatus(jobId);\r
+               //\r
+               //              while (true) {\r
+               //                      status = getStatus(jobId);\r
+               //                      long current = System.currentTimeMillis();\r
+               //                      if (status != null || current - started > 15 * 60 * 1000)\r
+               //                              break;\r
+               //\r
+               //                      Thread.sleep(pollIntervall);\r
+               //              }\r
+\r
+               BasicDBObject status = null;\r
+               boolean hasAnyResponse = false;\r
                while (true) {\r
-                       status = getStatus(jobId);\r
-                       long current = System.currentTimeMillis();\r
-                       if (status != null || current - started > 15 * 60 * 1000)\r
-                               break;\r
-\r
-                       Thread.sleep(pollIntervall);\r
-               }\r
+                       long queryTime = System.currentTimeMillis();\r
 \r
-               while (true) {\r
                        status = getStatus(jobId);\r
                        if (status != null) {\r
+                               hasAnyResponse = true;\r
                                List<BasicDBObject> splits = NoSQLUtils.asList(status, "splits");\r
 \r
                                int current = 0;\r
@@ -260,7 +265,6 @@ public class FFAStransAPI implements IFFAStransAPI {
                                                current += (int) Float.parseFloat(prg);\r
                                        }\r
                                        current = current / splits.size();\r
-                                       //System.out.println(String.format("%s %s %s", current, progress, current != progress));\r
                                }\r
                                if (current != progress) {\r
                                        progress = current;\r
@@ -271,27 +275,27 @@ public class FFAStransAPI implements IFFAStransAPI {
                        } else {\r
                                logger.info("{} status not exists, checking history", inputFileName);\r
                                listener.onProgressChanged(100);\r
-                               BasicDBObject history = null;\r
-                               int loop = 10;\r
-                               //ha tul gyorsan kerdezzuk le, meg nincs se history se status\r
-                               while (history == null || loop == 0) {\r
-                                       history = getHistory();\r
-                                       loop--;\r
-                                       Thread.sleep(pollIntervall);\r
-                               }\r
+                               BasicDBObject history = getHistory();\r
+                               if (history != null) {\r
+                                       hasAnyResponse = true;\r
+                                       long state = NoSQLUtils.asLong(history, "state");\r
+                                       String jobEnd = history.getString("job_end");\r
+                                       if (history == null || state != 1) {\r
+                                               String error = NoSQLUtils.asString(history, "outcome");\r
+                                               if (error == null)\r
+                                                       error = "Not specified error occured";\r
+                                               throw new Exception("State: " + state + ", message: " + error);\r
+                                       } else {\r
+                                               logger.info("{} | completed", inputFileName);\r
+                                               break;\r
+                                       }\r
 \r
-                               long state = NoSQLUtils.asLong(history, "state");\r
-                               if (history == null || (state != 1 && state != 0)) {\r
-                                       String error = NoSQLUtils.asString(history, "outcome");\r
-                                       if (error == null)\r
-                                               error = "Not specifiedy error occured";\r
-                                       throw new Exception("Transcode error. State: " + state + ", error: " + error);\r
-                               } else {\r
-                                       logger.info("{} | completed", inputFileName);\r
-                                       break;\r
                                }\r
-\r
                        }\r
+\r
+                       //5 percig nincs valasz\r
+                       if (!hasAnyResponse && (queryTime - started > 10 * 60 * 1000))\r
+                               throw new Exception("Transcoder timeout");\r
                        Thread.sleep(pollIntervall);\r
                }\r
        }\r
index ed0e1edde0325d1f3ebffa91f4eb9c42aac359c7..772565c669cb1147c1b8fa23623f77254f7bf618 100644 (file)
@@ -27,7 +27,7 @@ INSERT INTO STOREURI (STOREID, PROTOCOL, URI, ISSTREAM, ISSOURCE, ISTARGET)
 
 INSERT INTO STOREURI (STOREID, PROTOCOL, URI, ISSTREAM, ISSOURCE, ISTARGET) 
        VALUES 
-((SELECT ID FROM STORE WHERE NAME='Alternate Low-res'), 'LOCAL', '/mediacube/data/lowres/www/video/ITF3', 'N', 'Y', 'Y')
+((SELECT ID FROM STORE WHERE NAME='Alternate Low-res'), 'LOCAL', '/mediacube/data/lowres/www/video/IFT3', 'N', 'Y', 'Y')
 @
 
 -- //@UNDO
index c15074fdb3b84cab764b737b32d6a33761f37b5d..69f473f3a734399fe54183b7a0c98e4610ed6994 100644 (file)
@@ -29,6 +29,7 @@ public class Media extends DynamicAttributes {
        private boolean isPartialEnabled;
        private byte[] poster = null;
        private String mediaFilesName;
+       private String mediaFileRealName;
        private int mediaFilesCount = -1;
 
        public void appendMediaFile(MediaFile mediaFile) {
@@ -68,6 +69,22 @@ public class Media extends DynamicAttributes {
                return this.length;
        }
 
+       @JsonIgnore
+       public String getMediaFileRealName() {
+               if (mediaFileRealName == null) {
+                       List<MediaFile> mediaFiles = getMediaFiles();
+                       if (mediaFiles != null) {
+                               for (MediaFile mf : mediaFiles) {
+                                       if (mf.getStore().isSystem() && !mf.getStore().isLowres()) {
+                                               mediaFileRealName = mf.getRelativePath();
+                                               break;
+                                       }
+                               }
+                       }
+               }
+               return mediaFileRealName;
+       }
+
        @SuppressWarnings("unchecked")
        @JsonIgnore
        public List<MediaFile> getMediaFiles() {
index a5f81153b4e3c9968e1c224b91aee015c66e0a42..177b6de933f588106e1b3013e404afffb00f6baf 100644 (file)
@@ -69,7 +69,8 @@
                <welcome-file>default.jsp</welcome-file>\r
                <welcome-file>index.zhtml</welcome-file>\r
        </welcome-file-list>\r
-<!-- Enable http to https redirect -->\r
+<!-- Enable http to https redirect \r
+-->    \r
        <security-constraint>\r
                <web-resource-collection>\r
                        <web-resource-name>Everything on the app</web-resource-name>\r
index 1640677cf861fd0b043ceec79500d3be40b8c225..a078b635f09a024768a988e5a6fa961dd6e7636d 100644 (file)
@@ -37,9 +37,9 @@
                                <caption sclass="boldfont" label="Aktív folyamatok" />\r
                                <!--                            <borderlayout> -->\r
                                <!--                                    <center> -->\r
-                               <listbox id="lbJobList" sizedByContent="false" model="@load(jlm.jobList)" multiple="true" pagingPosition="top" mold="paging" autopaging="true"\r
+                               <listbox id="lbJobList" sizedByContent="false" span="false" model="@load(jlm.jobList)" multiple="true" pagingPosition="top" mold="paging" autopaging="true"\r
                                        vflex="true" checkmark="true" style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style" sclass="listbox-normal-style"\r
-                                       emptyMessage="Nincs futó folyamat" selectedItems="@bind(jlm.selectedJobs)">\r
+                                       emptyMessage="Nincs futó folyamat" >\r
                                        <listhead>\r
                                                <listheader label="Id" hflex="min" align="left" sort="auto" />\r
                                                <listheader label="Indítás" hflex="min" align="left" sort="auto" />\r
@@ -63,7 +63,7 @@
                                                        <listcell>\r
                                                                <progressmeter ca:data-animationspeed="-1" value="@load(each.progress)" width="100%" />\r
                                                        </listcell>\r
-                                                       <listcell label="@load(each.description)" />\r
+                                                       <listcell label="@load(each.description)" tooltiptext="@load(each.description)" />\r
                                                        <listcell>\r
                                                                <a href="javascript:void(0);" label="Paraméterek" onClick="@command('showParameters', item=each)" />\r
                                                        </listcell>\r
index fdec0cf9aa18fef306b0caa903cbf15781f773ab..01ded651e7cc60916ed0fc5d9ec3948459597efd 100644 (file)
@@ -3,12 +3,12 @@
 <hbox self="@define(content)" vflex="1" hflex="1" align="center" pack="center" spacing="20px">\r
         <vlayout>\r
             <window id="loginWin" apply="org.zkoss.bind.BindComposer" viewModel="@id('jlm') @init('user.jobengine.zk.model.LoginModel')"\r
-                border="normal" hflex="min">\r
+                border="normal" hflex="min" style="background-color: #212121">\r
                                <caption>\r
-                                       <hbox >\r
+                                       <hbox>\r
                                                <image src="/img/mediacube_logo_v2_50x50.png" width="20px" height="20px" />\r
-                                               <label style="font-size:14px;font-weight:bold" value="MediaCube" />\r
-                                               <label style="font-size:10px;font-weight:bold" value="v${labels.version}" /> \r
+                                               <label style="font-size:14px;font-weight:bold;color:#008AC8" value="MediaCube" />\r
+                                               <label style="font-size:10px;font-weight:bold;color:#e3e3e3;" value="v${labels.version}" /> \r
                                        </hbox>\r
                        </caption>                \r
                 <vbox hflex="min" align="center">\r
index f7d0886da24681939835a67951ed16ceec309241..1365bff0789c1c508a430deb2a0137df1b1e54da 100644 (file)
@@ -1,5 +1,5 @@
-version=2.5.0\r
-footer=2016-2019 © Copyright User Rendszerház Kft.\r
+version=2.5.1\r
+footer=2016-2020 © Copyright User Rendszerház Kft.\r
 \r
 login_info=Információ\r
 login_dialogtitle=Bejelentkezés\r
index ccf142dcafd2bd7f1218e9620917e6897bc5f6d6..1fd6bea71dd950752c3685ae4ba5d6487873aab3 100644 (file)
@@ -124,6 +124,8 @@ public interface IJobEngine {
 
        IJobRuntime submit(String template, String name, Map<String, Object> parameters, String owner) throws JobEngineException;
 
-       void suspendJob(Throwable t, IJobRuntime jobRuntime);
+       void suspendExecutingJob(Throwable t, IJobRuntime jobRuntime);
+
+       void suspendWaitExecutorJob(Throwable t, IJobRuntime jobRuntime);
 
 }
index f10f73c6efd86854c874d6d628986e9fb3167fa6..dafd1f8d741954d64eac40b68157670462d5ca2f 100644 (file)
@@ -142,7 +142,9 @@ public class JobEngine implements IJobEngine {
        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";
+       private static final String SCHEDULEDEXECUTION_DISABLED = "jobengine.scheduledexecution.disabled";
        private static final String EXECUTORCONFIGFILE = "config.xml";
+
        static private IItemManager itemManager;
        private static IJobEngine instance;
 
@@ -181,6 +183,11 @@ public class JobEngine implements IJobEngine {
         * 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.
         */
        public JobEngine() {
+               try {
+                       isScheduledExecutionDisabled = Boolean.parseBoolean(System.getProperty(SCHEDULEDEXECUTION_DISABLED, "false"));
+               } finally {
+               }
+
                runQueue = new PriorityBlockingQueue<IJobRuntime>();
                messageQueue = new LinkedBlockingQueue<IJobMessage>();
                jobTemplates = Collections.synchronizedList(new ArrayList<JobTemplate>());
@@ -226,12 +233,13 @@ public class JobEngine implements IJobEngine {
                        if (typeName == null)
                                throw new Exception(jobRuntime.toString() + " illegal execution state detected: executor name is null.");
                        String executorName = String.valueOf(typeName);
-                       if (!executors.containsKey(executorName))
+                       if (!executors.containsKey(executorName)) {
                                throw new Exception(jobRuntime.toString() + " executor is unavailable: " + executorName);
+                       }
                        executors.get(executorName).submit(jobRuntime);
                } catch (Exception e) {
                        logger.catching(e);
-                       suspendJob(e, jobRuntime);
+                       suspendWaitExecutorJob(e, jobRuntime);
                }
                //              logger.info("addToExecutorQueue: " + typeName);
                //              if (typeName != null && String.class.equals(typeName.getClass())) {
@@ -918,14 +926,24 @@ public class JobEngine implements IJobEngine {
        }
 
        @Override
-       public void suspendJob(Throwable t, IJobRuntime jobRuntime) {
+       public void suspendExecutingJob(Throwable t, IJobRuntime jobRuntime) {
                String description = t.getClass().getSimpleName() + ": " + t.getMessage();
-               logger.error(description);
                jobRuntime.setDescription(description);
+               logger.error(description);
+               //TODO itt miert FINISH a kovetkezo allapot, miert nem SUSPEND
                statusMachine.processAction(JobAction.FINISH, jobRuntime);
                closeSessionLog(jobRuntime);
        }
 
+       @Override
+       public void suspendWaitExecutorJob(Throwable t, IJobRuntime jobRuntime) {
+               String description = t.getClass().getSimpleName() + ": " + t.getMessage();
+               jobRuntime.setDescription(description);
+               logger.error(description);
+               statusMachine.processAction(JobAction.SUSPEND, jobRuntime);
+               closeSessionLog(jobRuntime);
+       }
+
        public synchronized void unbindItemManagerService(IItemManager service) {
                try {
                        shutdown();
index ad4ff47d468ec3a62701dc4c759dc4a777961954..33a4b99bfc342094638ae8fa3043181e7af9ff67 100644 (file)
@@ -299,6 +299,9 @@ public class JobRuntime extends Job implements IJobRuntime {
                return ip;
        }
 
+       /***
+        * Log session marker. A teljes folyamat osszes naplobejegyzese osszegyujtheto a segitsegevel. MediaCubeMarker tipusu, folyamatonkent uj peldany jon letre.
+        */
        @Override
        public Marker getMarker() {
                if (sessionMarker == null) {
@@ -436,13 +439,13 @@ public class JobRuntime extends Job implements IJobRuntime {
        }
 
        @Override
-       public boolean isWaitingExecutor() {
-               return getStatus() == JobStatus.WAIT_EXECUTOR;
+       public boolean isWaitingCancel() {
+               return getStatus() == JobStatus.WAIT_CANCEL;
        }
 
        @Override
-       public boolean isWaitingCancel() {
-               return getStatus() == JobStatus.WAIT_CANCEL;
+       public boolean isWaitingExecutor() {
+               return getStatus() == JobStatus.WAIT_EXECUTOR;
        }
 
        @Override
index 6a187ca7bc8c44f3fa082dc3338756b995cfccfd..2c21dcffe83efd38c0f6ee7447a6171f53289fee 100644 (file)
@@ -67,7 +67,7 @@ public class JobStepExecutor implements IJobStepExecutor {
                                        logger.error("Error in {}", jobRuntime);
                                        Throwable t = e.getCause() == null ? e : e.getCause();
                                        logger.catching(t);
-                                       jobEngine.suspendJob(t, jobRuntime);
+                                       jobEngine.suspendExecutingJob(t, jobRuntime);
                                } finally {
                                        if (step != null) {
                                                step.cleanup();
index e15a63bfb1fb55a3e892016c5cc9a68aa24e0752..42f8953b8b171c0136fb1d4492693aa1dd74eb77 100644 (file)
@@ -15,6 +15,8 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;\r
 import org.osgi.framework.ServiceReference;\r
 \r
+import user.commons.IEntityPersister;\r
+import user.commons.MediaCubeMarker;\r
 import user.jobengine.db.IItemManager;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
@@ -24,7 +26,8 @@ import user.jobengine.server.IJobRuntime;
  */\r
 public class JobStep implements IJobStep {\r
        private static final Logger logger = LogManager.getLogger();\r
-       protected IJobRuntime jobRuntime = null;\r
+       private IJobRuntime jobRuntime = null;\r
+       private IJobEngine jobEngine;\r
 \r
        private Object[] addParameter(Method stepEntry, Object[] inputs, Class<?> type, Object parameter) {\r
                Object[] result = inputs;\r
@@ -81,6 +84,10 @@ public class JobStep implements IJobStep {
                return null;\r
        }\r
 \r
+       protected IJobEngine getEngine() {\r
+               return jobEngine;\r
+       }\r
+\r
        public IJobRuntime getJobRuntime() {\r
                return jobRuntime;\r
        }\r
@@ -89,6 +96,11 @@ public class JobStep implements IJobStep {
                return (IItemManager) jobRuntime.getPersister();\r
        }\r
 \r
+       /***\r
+        * A runtime nevevel egyezo rendszerszintu gyerek. A szulo rendszer szintu MEDIACUBE cimkes.\r
+        * \r
+        * @return\r
+        */\r
        protected Marker getMarker() {\r
                Marker parentMarker = MarkerManager.getMarker("MEDIACUBE");\r
                Marker result = MarkerManager.getMarker(getRuntimeName());\r
@@ -96,6 +108,10 @@ public class JobStep implements IJobStep {
                return result;\r
        }\r
 \r
+       public IEntityPersister getPersister() {\r
+               return jobRuntime.getPersister();\r
+       }\r
+\r
        protected String getRuntimeName() {\r
                return jobRuntime.getName();\r
        }\r
@@ -113,10 +129,20 @@ public class JobStep implements IJobStep {
                return service;\r
        }\r
 \r
+       /***\r
+        * JobRuntime session marker\r
+        * \r
+        * @return\r
+        */\r
+       protected MediaCubeMarker getSessionMarker() {\r
+               return (MediaCubeMarker) jobRuntime.getMarker();\r
+       }\r
+\r
        @Override\r
        public Object[] run(IJobEngine jobEngine, IJobRuntime jobRuntime, Object[] inputs) throws Throwable {\r
-               Object[] result = null;\r
+               this.jobEngine = jobEngine;\r
                this.jobRuntime = jobRuntime;\r
+               Object[] result = null;\r
                //jobRuntime.setDescription("Feldolgozás: " + getClass().getSimpleName());\r
 \r
                if (jobRuntime != null)\r
index 39e0b629bf75a9d5211b4aa1f6567c00aaa849ec..c3f0b6477b3e4affa1abadb264d349a18d8cdda6 100644 (file)
@@ -1,6 +1,5 @@
 package user.jobengine.zk.model;\r
 \r
-import java.util.Collection;\r
 import java.util.Map;\r
 \r
 import org.apache.logging.log4j.LogManager;\r
@@ -8,7 +7,6 @@ import org.apache.logging.log4j.Logger;
 import org.zkoss.bind.annotation.BindingParam;\r
 import org.zkoss.bind.annotation.Command;\r
 import org.zkoss.bind.annotation.Init;\r
-import org.zkoss.bind.annotation.NotifyChange;\r
 import org.zkoss.zk.ui.Executions;\r
 import org.zkoss.zk.ui.event.Event;\r
 import org.zkoss.zk.ui.event.EventListener;\r
@@ -16,8 +14,6 @@ import org.zkoss.zul.ListModelList;
 import org.zkoss.zul.Messagebox;\r
 import org.zkoss.zul.Window;\r
 \r
-import com.ibm.nosql.json.api.BasicDBObject;\r
-\r
 import user.commons.ListUtils;\r
 import user.commons.nexio.INexioAPI;\r
 import user.commons.nexio.NexioDispatcher;\r
@@ -40,7 +36,6 @@ public class JobListModel extends AsyncBaseModel implements IJobChangedListener
        private boolean startupDisabled;\r
        private boolean allExecutionDisabled;\r
        private boolean scheduledExecutionDisabled;\r
-       private Collection<BasicDBObject> selectedJobs;\r
 \r
        @Command\r
        public void cancelJobs() {\r
@@ -91,10 +86,6 @@ public class JobListModel extends AsyncBaseModel implements IJobChangedListener
                return newPriority;\r
        }\r
 \r
-       public Collection<BasicDBObject> getSelectedJobs() {\r
-               return selectedJobs;\r
-       }\r
-\r
        @Init\r
        public void init() {\r
                try {\r
@@ -176,6 +167,7 @@ public class JobListModel extends AsyncBaseModel implements IJobChangedListener
        private void onJobDeleted(IJobRuntime job) {\r
                //              selectedJobs.remove(job);\r
                //              NotifyChange("selectedJobs");\r
+               jobList.removeFromSelection(job);\r
                jobList.remove(job);\r
                notifyChange("jobList");\r
        }\r
@@ -268,11 +260,6 @@ public class JobListModel extends AsyncBaseModel implements IJobChangedListener
                jobEngine.setScheduledExecutionDisabled(scheduledExecutionDisabled);\r
        }\r
 \r
-       @NotifyChange({ "updatePriorityDisabled" })\r
-       public void setSelectedJobs(Collection<BasicDBObject> selectedJobs) {\r
-               this.selectedJobs = selectedJobs;\r
-       }\r
-\r
        public void setShutdownDisabled(boolean shutdownDisabled) {\r
                this.shutdownDisabled = shutdownDisabled;\r
                notifyChange("shutdownDisabled");\r
index ef48a143185ee35024641c154ff59389a7e0e45a..ad8139bd54665464e1ce104e71c9011d4472bed9 100644 (file)
@@ -1,7 +1,6 @@
 package user.jobengine.zk.model;\r
 \r
-import java.io.IOException;\r
-\r
+import org.apache.commons.lang.StringUtils;\r
 import org.zkoss.bind.annotation.AfterCompose;\r
 import org.zkoss.bind.annotation.Command;\r
 import org.zkoss.bind.annotation.ContextParam;\r
@@ -22,16 +21,24 @@ public class LoginModel extends BaseModel {
        @AfterCompose\r
        public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {\r
                query = SessionUtil.getQueryString();\r
+\r
+               MediaCubeConfig mediaCubeConfig = SessionUtil.getMediaCubeConfig();\r
+               MediaCubeAuthentication authentication = mediaCubeConfig.getAuthentication();\r
+               if (StringUtils.isNotEmpty(authentication.getDefaultUser()) && StringUtils.isNotBlank(authentication.getDefaultPassword()))\r
+                       authenticate(authentication.getDefaultUser(), authentication.getDefaultPassword());\r
        }\r
 \r
        @Command\r
        @NotifyChange({ "message" })\r
-       public void authenticate() throws IOException {\r
-               if (!SessionUtil.authenticate(account, password)) {\r
+       public void authenticate() {\r
+               authenticate(account, password);\r
+       }\r
+\r
+       private void authenticate(String user, String pwd) {\r
+               if (!SessionUtil.authenticate(user, pwd)) {\r
                        setMessage("Hibás fiókadatok!");\r
                        return;\r
                }\r
-\r
                Executions.sendRedirect("/" + query);\r
        }\r
 \r
index 0829b3cb89885493b08b25c95a50e8fa3d0354d7..204ecce5daf57a67c61cc7c5c703841b150040aa 100644 (file)
@@ -7,6 +7,8 @@ public class MediaCubeAuthentication {
        private String adHost;\r
        private int adNonSecurePort;\r
        private String adBaseDn;\r
+       private String defaultUser;\r
+       private String defaultPassword;\r
        private List<String> adAdminMap;\r
        private List<String> adSubmitterMap;\r
        private List<String> adEditorMap;\r
@@ -39,6 +41,14 @@ public class MediaCubeAuthentication {
                return adSubmitterMap;\r
        }\r
 \r
+       public String getDefaultPassword() {\r
+               return defaultPassword;\r
+       }\r
+\r
+       public String getDefaultUser() {\r
+               return defaultUser;\r
+       }\r
+\r
        public List<MediaCubeAccount> getLocalAccounts() {\r
                return localAccounts;\r
        }\r
@@ -87,6 +97,14 @@ public class MediaCubeAuthentication {
                this.authEnabled = authEnabled;\r
        }\r
 \r
+       public void setDefaultPassword(String defaultPassword) {\r
+               this.defaultPassword = defaultPassword;\r
+       }\r
+\r
+       public void setDefaultUser(String defaultUser) {\r
+               this.defaultUser = defaultUser;\r
+       }\r
+\r
        public void setLocalAccounts(List<MediaCubeAccount> localAccounts) {\r
                this.localAccounts = localAccounts;\r
        }\r
index 3da7756559a44a6e663ea1fdbb95bc7affb612e6..2dd76466f779998fcc28eb6cd7f8569e0f8097a3 100644 (file)
@@ -51,6 +51,7 @@ import org.zkoss.zul.Hlayout;
 import org.zkoss.zul.ListModelList;\r
 import org.zkoss.zul.Menuitem;\r
 import org.zkoss.zul.Menupopup;\r
+import org.zkoss.zul.Messagebox;\r
 import org.zkoss.zul.Paging;\r
 import org.zkoss.zul.Row;\r
 import org.zkoss.zul.Timer;\r
@@ -249,8 +250,11 @@ public class SearchModel extends AsyncBaseModel {
 \r
                try {\r
                        jobEngine.submit(CREATE_LOWRES_TEMPLATE, scheduledJob.getJobName(), parameters, SessionUtil.getUserPrincipal().getDisplayName());\r
+                       Messagebox.show("A proxy pótlása elindult, emailben értesíti a rendszer a folyamat végeztével.", "Információ", Messagebox.OK,\r
+                                       Messagebox.INFORMATION);\r
                } catch (JobEngineException e) {\r
-                       logger.info("Hiba a job indításakor", e);\r
+                       logger.info("Hiba a feladat indításakor", e);\r
+                       Messagebox.show("Hiba a feladat indításakor. A rendszer üzenete: " + e.getMessage(), "Hiba", Messagebox.OK, Messagebox.ERROR);\r
                }\r
        }\r
 \r
@@ -394,7 +398,13 @@ public class SearchModel extends AsyncBaseModel {
                                        StoreUri sourceStoreUri = store.getSourceStoreUri(RemoteStoreProtocol.HTTP);\r
 \r
                                        if (sourceStoreUri != null && sourceStoreUri.isStream()) {\r
-                                               ret = sourceStoreUri.toString(true);\r
+\r
+                                               String base = store.isSystem() ? sourceStoreUri.toString(false) : sourceStoreUri.toString(true);\r
+                                               if (!base.endsWith("/"))\r
+                                                       base += "/";\r
+                                               String relative = mf.getRelativePath().replace("\\", "/");\r
+                                               ret = base + relative;\r
+                                               logger.info("Found lowres on store {}, url is {}", store.getName(), ret);\r
                                                break;\r
                                        }\r
                                }\r
index 4e13f8e7999b895649f3671601163d6e35fd43c5..629b2ac1303a992ee9f769ca28722afcaf361f21 100644 (file)
@@ -61,6 +61,8 @@
                <url-pattern>/proxy/*</url-pattern>\r
        </servlet-mapping>\r
 \r
+<!-- \r
+ -->\r
        <security-constraint>\r
                <web-resource-collection>\r
                        <web-resource-name>Everything on the app</web-resource-name>\r
                </user-data-constraint>\r
        </security-constraint>\r
 \r
-<!--   <security-constraint> -->\r
-<!--     <web-resource-collection> -->\r
-<!--      <web-resource-name>Everything</web-resource-name> -->\r
-<!--      <url-pattern>/*</url-pattern> -->\r
-<!--     </web-resource-collection> -->\r
-<!--     <user-data-constraint> -->\r
-<!--      <transport-guarantee>CONFIDENTIAL</transport-guarantee> -->\r
-<!--     </user-data-constraint> -->\r
-<!--   </security-constraint> -->\r
-\r
 </web-app>\r