git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorvasary.daniel <TFS\vasary.daniel>
Thu, 21 Jan 2021 20:24:18 +0000 (20:24 +0000)
committervasary.daniel <TFS\vasary.daniel>
Thu, 21 Jan 2021 20:24:18 +0000 (20:24 +0000)
23 files changed:
server/-configuration/mediacube.json
server/-configuration/run-mediacube-server-hirtv.launch
server/-configuration/run-mediacube-server-user (2).launch
server/-configuration/run-mediacube-server-user.launch
server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java
server/user.jobengine.executors/config/config-mv.xml
server/user.jobengine.executors/jobtemplates/cancelable.xml
server/user.jobengine.executors/jobtemplates/mediavivantis/cancelable.xml
server/user.jobengine.executors/jobtemplates/mediavivantis/test-fork-cancelable.xml [new file with mode: 0644]
server/user.jobengine.executors/jobtemplates/register-vod-restore.xml
server/user.jobengine.executors/src/user/jobengine/server/steps/CancelableStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/CleanupMountedLocationStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/TestForkCancelableStep.java
server/user.jobengine.osgi.commons/src/user/commons/MediaCubeDataSourceFactory.java
server/user.jobengine.osgi.commons/src/user/commons/mediatool/MediaInfo.java
server/user.jobengine.osgi.db/migrations/scripts/026_insert_itemtype_demo_nyers.sql [new file with mode: 0644]
server/user.jobengine.osgi.db/migrations/scripts/027_create_vod_store.sql [new file with mode: 0644]
server/user.jobengine.osgi.db/src/user/commons/pool/ContextPool.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.mediacube.gui/WEB-INF/zk.xml
server/user.mediacube.gui/pages/searchitems/filters.zul
server/user.mediacube.gui/resources/i3-label_hu.properties

index 44fe9f45fa74da3f3a4ef63d4ab5ee0f44e0706f..3cb5e227dd95453752e776ac25cef854b023c5af 100644 (file)
                        "color": "BROWN100",\r
                        "icon": "ic_group_work_black_18dp.png"\r
                },\r
+               {\r
+                       "name": "DEMO nyers",\r
+                       "color": "BROWN100",\r
+                       "icon": "ic_group_work_black_18dp.png"\r
+               },\r
                {\r
                        "name": "Egyéb",\r
                        "color": "YELLOW200",\r
index e7017ca4894d5e5fed5eb4642ae4d526c2c94d28..93820b4f58310c2d9f6e994ff80e26d99c643d6f 100644 (file)
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/bin&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.jobsteps.config=&quot;${workspace_loc}/user.jobengine.executors/config/config.xml&quot;&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.10.1.27:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=password&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:}/-configuration/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Dorg.eclipse.jetty.webapp.basetempdir=c:\temp\jetty&#13;&#10;-Djava.io.tmpdir=c:\temp\jetty&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.11/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://10.10.1.27:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=password&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC.zenium&#13;&#10;-Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;&#13;&#10;-Djobengine.nexio.db.user=sa&#13;&#10;-Djobengine.nexio.db.password=resolve&#13;&#10;-Dnexio.host=10.10.1.55&#13;&#10;-Djobengine.nexio.name=testnexioclips&#13;&#10;-Dnexio.useMOSGateway=true&#13;&#10;-Dnexio.disable=true&#13;&#10;-Djobengine.octopus.rundowns.name=rundowns&#13;&#10;-Djobengine.octopus.storyfolders.name=storyfolders&#13;&#10;-Djobengine.octopus.stories.name=stories&#13;&#10;-Dmediacube.auth.location=&quot;${workspace_loc}/-configuration/mediacube-auth.properties&quot;&#13;&#10;-Djobengine.mediacube.config=&quot;${workspace_loc}/-configuration/mediacube.json&quot;&#13;&#10;-Djobengine.mediacube.service.proxyroot=&quot;/opt&quot;&#13;&#10;-Djobengine.randomize.archives=false&#13;&#10;-Dmediacube.simplesearch=false"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/bin&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.jobsteps.config=&quot;${workspace_loc}/user.jobengine.executors/config/config.xml&quot;&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.10.1.27:50000/mc&#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&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=password&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC.zenium&#13;&#10;-Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;&#13;&#10;-Djobengine.nexio.db.user=sa&#13;&#10;-Djobengine.nexio.db.password=resolve&#13;&#10;-Dnexio.host=10.10.1.55&#13;&#10;-Djobengine.nexio.name=testnexioclips&#13;&#10;-Dnexio.useMOSGateway=true&#13;&#10;-Dnexio.disable=true&#13;&#10;-Djobengine.octopus.rundowns.name=rundowns&#13;&#10;-Djobengine.octopus.storyfolders.name=storyfolders&#13;&#10;-Djobengine.octopus.stories.name=stories&#13;&#10;-Dmediacube.auth.location=&quot;${workspace_loc}/-configuration/mediacube-auth.properties&quot;&#13;&#10;-Djobengine.mediacube.config=&quot;${workspace_loc}/-configuration/mediacube.json&quot;&#13;&#10;-Djobengine.mediacube.service.proxyroot=&quot;/opt&quot;&#13;&#10;-Djobengine.jobsteps.groovy.root=&quot;${workspace_loc}/user.jobengine.executors/src/user/jobengine/server/steps&quot;&#13;&#10;-Djobengine.randomize.archives=false&#13;&#10;-Dmediacube.simplesearch=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.db2.jcc@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,groovy@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-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
 <booleanAttribute key="tracing" value="false"/>\r
 <booleanAttribute key="useCustomFeatures" value="false"/>\r
 <booleanAttribute key="useDefaultConfigArea" value="true"/>\r
-<stringAttribute key="workspace_bundles" value="user.commons.log4j2@default:false,user.jobengine.osgi.commons@default:true,user.jobengine.osgi.db@default:default,user.jobengine.osgi.server@default:default,user.jobengine.osgi.services@default:default,user.mediacube.metadata@default:default,user.tsm.client@default:default"/>\r
+<stringAttribute key="workspace_bundles" value="user.commons.log4j2@default:false,user.commons.zk@default:default,user.jobengine.osgi.commons@default:true,user.jobengine.osgi.db@default:default,user.jobengine.osgi.server@default:default,user.jobengine.osgi.services@default:default,user.mediacube.gui@default:default,user.mediacube.metadata@default:default,user.tsm.client@default:default"/>\r
 </launchConfiguration>\r
index b818cae9163b74781da9d9f5138a4b0dac0c5a71..c249daef25ecad1f77f8f0caa562af268abc6953 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/bin&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.228.212.42:50000/mc&#13;&#10;-Djobengine.db.user=blobtest&#13;&#10;-Djobengine.db.password=blobtest&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:}/-configuration/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Dorg.eclipse.jetty.webapp.basetempdir=c:\temp\jetty&#13;&#10;-Djava.io.tmpdir=c:\temp\jetty&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.11/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache&#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;-Dgui.maestro.disable=true&#13;&#10;-Djobengine.mediafinder.external=false&#13;&#10;-Djobengine.mediacube.service.proxyroot=&quot;/opt&quot;&#13;&#10;-Djobengine.scheduledexecution.disabled=false&#13;&#10;-Djobengine.randomize.archives=false&#13;&#10;-Djobengine.jobsteps.config=&quot;${workspace_loc}/user.jobengine.executors/config/config.xml&quot;&#13;&#10;-Djobengine.jobsteps.groovy.root=&quot;${workspace_loc}/user.jobengine.executors/src/user/jobengine/server/steps&quot;&#13;&#10;-Dgui.jobs.alternate.selector=true&#13;&#10;-Dmediacube.simplesearch=true"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/bin&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.228.212.42:50000/mc&#13;&#10;-Djobengine.db.user=blobtest&#13;&#10;-Djobengine.db.password=blobtest&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:}/-configuration/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Dorg.eclipse.jetty.webapp.basetempdir=c:\temp\jetty&#13;&#10;-Djava.io.tmpdir=c:\temp\jetty&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.11/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://10.228.212.42:50000/mc&#13;&#10;-Djobengine.nosql.db.user=blobtest&#13;&#10;-Djobengine.nosql.db.password=blobtest&#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;-Dgui.maestro.disable=true&#13;&#10;-Djobengine.mediafinder.external=false&#13;&#10;-Djobengine.mediacube.service.proxyroot=&quot;/opt&quot;&#13;&#10;-Djobengine.scheduledexecution.disabled=false&#13;&#10;-Djobengine.randomize.archives=false&#13;&#10;-Djobengine.jobsteps.config=&quot;${workspace_loc}/user.jobengine.executors/config/config.xml&quot;&#13;&#10;-Djobengine.jobsteps.groovy.root=&quot;${workspace_loc}/user.jobengine.executors/src/user/jobengine/server/steps&quot;&#13;&#10;-Dgui.jobs.alternate.selector=true&#13;&#10;-Dmediacube.simplesearch=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.db2.jcc@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,groovy@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 62004149a049e6a6fece441f2ebda2495ebf0ccf..b702737269435b3216fb609d560fdeabd12ba766 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/bin&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.228.198.1:50000/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;-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;-Dgui.maestro.disable=true&#13;&#10;-Djobengine.mediafinder.external=false&#13;&#10;-Djobengine.mediacube.service.proxyroot=&quot;/opt&quot;&#13;&#10;-Djobengine.scheduledexecution.disabled=false&#13;&#10;-Djobengine.randomize.archives=false&#13;&#10;-Djobengine.jobsteps.config=&quot;${workspace_loc}/user.jobengine.executors/config/config.xml&quot;&#13;&#10;-Djobengine.jobsteps.groovy.root=&quot;${workspace_loc}/user.jobengine.executors/src/user/jobengine/server/steps&quot;&#13;&#10;-Dgui.jobs.alternate.selector=true&#13;&#10;-Dmediacube.simplesearch=true"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/bin&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.228.198.1:50000/mc&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=password&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:}/-configuration/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Dorg.eclipse.jetty.webapp.basetempdir=c:\temp\jetty&#13;&#10;-Djava.io.tmpdir=c:\temp\jetty&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.11/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache&#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;-Dgui.maestro.disable=true&#13;&#10;-Djobengine.mediafinder.external=false&#13;&#10;-Djobengine.mediacube.service.proxyroot=&quot;/opt&quot;&#13;&#10;-Djobengine.scheduledexecution.disabled=false&#13;&#10;-Djobengine.randomize.archives=false&#13;&#10;-Djobengine.jobsteps.config=&quot;${workspace_loc}/user.jobengine.executors/config/config.xml&quot;&#13;&#10;-Djobengine.jobsteps.groovy.root=&quot;${workspace_loc}/user.jobengine.executors/src/user/jobengine/server/steps&quot;&#13;&#10;-Dgui.jobs.alternate.selector=true&#13;&#10;-Dmediacube.simplesearch=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.db2.jcc@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,groovy@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 26e8dd0b6a4e02772f93eb68f29a55f17f41b7a7..65aad9889417528952dea09061b35577cd4dbf11 100644 (file)
@@ -1018,4 +1018,65 @@ public class SmallTests {
                System.out.println(sut.toString());\r
        }\r
 \r
+       //htv errors\r
+       @Test\r
+       public void test9999() throws Exception {\r
+               Set<String> tsm = new LinkedHashSet<>(Files.readAllLines(Paths.get("/opt/HTV/htv-tsm.txt")));\r
+               Set<String> mc = new LinkedHashSet<>(Files.readAllLines(Paths.get("/opt/HTV/htv-mc.txt")));\r
+\r
+               int errorCount = 0;\r
+               int current = 0;\r
+\r
+               for (String mcfile : mc) {\r
+                       current++;\r
+                       boolean tsmContains = tsm.contains(mcfile);\r
+                       if (!tsmContains) {\r
+                               errorCount++;\r
+                               int p = current * 100 / mc.size();\r
+                               System.out.println("Missing " + mcfile + " %" + p);\r
+                       }\r
+               }\r
+               System.out.println("All missing: " + errorCount);\r
+       }\r
+\r
+       //amc format check\r
+       @Test\r
+       public void test99990() throws Exception {\r
+               //              Path source = Paths.get("/opt/AMC/2021/ISSUES/#203/SD/");\r
+               //              String tag = "SD_MAIN_422";\r
+               //              Path source = Paths.get("/opt/AMC/2021/ISSUES/#203/HD/");\r
+               //              String tag = "HD";\r
+               Path source = Paths.get("/opt/AMC/2021/ISSUES/#203/SelenioPool_16_9/");\r
+               String tag = "SD_HIGH_16_9";\r
+\r
+               Set<String> ids = new LinkedHashSet<>();\r
+               try (DirectoryStream<Path> paths = Files.newDirectoryStream(source)) {\r
+                       paths.forEach(path -> {\r
+                               try {\r
+                                       List<String> lines = Files.readAllLines(path);\r
+                                       lines.forEach(i -> ids.add(i.split(";")[1]));\r
+                               } catch (IOException e) {\r
+                                       e.printStackTrace();\r
+                               }\r
+                       });\r
+               }\r
+\r
+               Set<String> mcids = new LinkedHashSet<>();\r
+               List<String> mc = Files.readAllLines(Paths.get("/opt/AMC/2021/ISSUES/#203/mediaprofile.log"));\r
+               mc.forEach(i -> {\r
+                       if (i.contains(tag)) {\r
+                               String id = i.replace(String.format(" is %s", tag), "");\r
+                               id = id.substring(id.lastIndexOf(" ") + 1);\r
+                               mcids.add(id);\r
+                       }\r
+               });\r
+\r
+               System.out.println("Processing");\r
+               for (String id : ids) {\r
+                       if (mcids.contains(id))\r
+                               continue;\r
+                       System.out.println("Missing: " + id);\r
+               }\r
+       }\r
+\r
 }\r
index 8599ec6f46f490c94af6ec91bc09ee12beaa4b55..e0f67e2ebb5d92aa1129c387d526f9326dd4dccf 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <executors>\r
-       <executor className="CancelableStep.java" maxConcurrent="1" isRemote="true" />\r
+       <executor className="CancelableStep.java" maxConcurrent="5" isRemote="true" />\r
        <executor className="TestForkCancelableStep.java" maxConcurrent="10" isRemote="false" />\r
 </executors>
\ No newline at end of file
index 2be289b3fa73d9de54cd551fbe52519823ecd7af..c0accf910f35efe96136e81a2accbf5e633c3b0a 100644 (file)
@@ -4,6 +4,9 @@
                <parameters>\r
                        <parameter name="param" type="java.lang.Integer" />\r
                </parameters>\r
+               <variables>\r
+                       <variable name="var" type="java.lang.Integer" />\r
+               </variables>\r
        </declarations>\r
        <commands>\r
                <calljobstep remote="true" type="CancelableStep.java" weight="1" >\r
                                </input>\r
                        </inputs>\r
                </calljobstep>\r
+               <calljobstep remote="true" type="CancelableStep.java" weight="1" >\r
+                       <inputs>\r
+                               <input>\r
+                                       <variable name="var" />\r
+                               </input>\r
+                       </inputs>\r
+               </calljobstep>\r
        </commands>\r
 </jobtemplate>
\ No newline at end of file
index 2be289b3fa73d9de54cd551fbe52519823ecd7af..15e21ce17a3ef851a80f8066eeead53f76acce8b 100644 (file)
@@ -4,6 +4,9 @@
                <parameters>\r
                        <parameter name="param" type="java.lang.Integer" />\r
                </parameters>\r
+               <variables>\r
+                       <variable name="var" type="java.lang.Integer" />\r
+               </variables>\r
        </declarations>\r
        <commands>\r
                <calljobstep remote="true" type="CancelableStep.java" weight="1" >\r
                                        <parameter name="param" />\r
                                </input>\r
                        </inputs>\r
+                       <outputs>\r
+                               <output>\r
+                                       <variable name="var" />\r
+                               </output>\r
+                       </outputs>\r
+               </calljobstep>\r
+               <calljobstep remote="true" type="CancelableStep.java" weight="1" >\r
+                       <inputs>\r
+                               <input>\r
+                                       <variable name="var" />\r
+                               </input>\r
+                       </inputs>\r
                </calljobstep>\r
        </commands>\r
 </jobtemplate>
\ No newline at end of file
diff --git a/server/user.jobengine.executors/jobtemplates/mediavivantis/test-fork-cancelable.xml b/server/user.jobengine.executors/jobtemplates/mediavivantis/test-fork-cancelable.xml
new file mode 100644 (file)
index 0000000..f3d21d6
--- /dev/null
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<jobtemplate multiInstance="true">\r
+<commands>\r
+       <calljobstep type="TestForkCancelableStep.java" weight="1" />\r
+</commands>\r
+</jobtemplate>
\ No newline at end of file
index 6097d32157f6e67df90fbebf211267f40cb15815..ac996108c34acf116c6b182a545c824988e0720e 100644 (file)
@@ -2,12 +2,16 @@
 <jobtemplate useSessionLog="false">\r
        <declarations>\r
                <parameters>\r
+                       <parameter name="targetStoreName" type="java.lang.String" />\r
                        <parameter name="basket" type="com.ibm.nosql.json.api.BasicDBList" />\r
                </parameters>\r
        </declarations>\r
        <commands>\r
-               <calljobstep type="user.jobengine.server.steps.RegisterVODRestoreStep" weight="1">\r
+               <calljobstep type="RegisterVODRestoreStep.java" weight="1">\r
                        <inputs>\r
+                               <input>\r
+                                       <parameter name="targetStoreName"/>\r
+                               </input>\r
                                <input>\r
                                        <parameter name="basket"/>\r
                                </input>\r
index 14cfbd6f2d39c1a77ef6e9b45d8654e9bc7649f3..b01bf0a26ad445d1d95e085207bb7f76d29577f6 100644 (file)
@@ -21,6 +21,11 @@ public class CancelableStep extends JobStep {
 \r
                        //                      ftpTest();\r
 \r
+                       if (param == 0)\r
+                               Thread.sleep(5000);\r
+                       if (param == 1)\r
+                               throw new Exception("Error teszt");\r
+\r
                        Marker marker = MarkerManager.getMarker("MEDIAPROFILE");\r
 \r
                        for (int i = 0; i < count; i++) {\r
@@ -35,7 +40,7 @@ public class CancelableStep extends JobStep {
                        e.printStackTrace();\r
                        throw e;\r
                }\r
-               return null;\r
+               return new Object[] { param };\r
        }\r
 \r
        void ftpTest() throws Exception {\r
index 7fa3d092b409f27f947cd11c99fe6ac234d751ec..4e6f10d13ded11e555a20ff7080cc0dd5e16cfed 100644 (file)
@@ -23,6 +23,10 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;\r
 import org.apache.logging.log4j.Marker;\r
 \r
+import user.commons.RemoteFile;\r
+import user.commons.StoreUri;\r
+import user.commons.remotestore.RemoteStoreProtocol;\r
+import user.jobengine.db.Store;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
 \r
@@ -64,6 +68,7 @@ public class CleanupMountedLocationStep extends JobStep implements FileVisitor<P
 \r
        private Path sourcePath;\r
        private SimpleDateFormat dateFormat;\r
+       private StoreUri tsmStoreUri;\r
 \r
        private Date checkExpiration(List<Path> killDateFiles) {\r
                Date killDate = null;\r
@@ -79,7 +84,7 @@ public class CleanupMountedLocationStep extends JobStep implements FileVisitor<P
 \r
        @StepEntry\r
        public Object[] execute(String sourceFolder, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
-               marker = jobRuntime.getSessionMarker();\r
+               marker = getSessionMarker();\r
                sourcePath = Paths.get(sourceFolder);\r
                DirectoryStream<Path> directoryStream = null;\r
                if (StringUtils.isBlank(sourcePath.toString())) {\r
@@ -91,9 +96,19 @@ public class CleanupMountedLocationStep extends JobStep implements FileVisitor<P
                        logger.error(marker, "A {} mappa nem létezik.", sourceFolder);\r
                        throw new NullPointerException(String.format("Directory %s not exists.", sourceFolder));\r
                }\r
+\r
+               Store tsmStore = getManager().getSystemStore(false);\r
+               if (tsmStore == null)\r
+                       throw new NullPointerException("A TSM bejegyzés nem található!");\r
+\r
+               tsmStoreUri = tsmStore.getSourceStoreUri(RemoteStoreProtocol.TSM);\r
+               if (tsmStoreUri == null)\r
+                       throw new NullPointerException("A TSM forrás elérése nem található!");\r
+\r
                try {\r
                        setProgress(1);\r
                        dateFormat = new SimpleDateFormat(DATEFORMAT);\r
+\r
                        Files.walkFileTree(sourcePath, new SimpleFileVisitor<Path>() {\r
                                @Override\r
                                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {\r
@@ -104,7 +119,7 @@ public class CleanupMountedLocationStep extends JobStep implements FileVisitor<P
                        Files.walkFileTree(sourcePath, this);\r
                } catch (Exception e) {\r
                        logger.catching(e);\r
-                       logger.error(marker, "Az '{}' mappa elérése sikertelen. A rendszer hibaüzenete: {}", sourcePath, e.getMessage());\r
+                       logger.error(marker, "Hiba a '{}' mappa feldolgozásában. A rendszer hibaüzenete: {}", sourcePath, e.getMessage());\r
                        throw e;\r
                } finally {\r
                        if (directoryStream != null) {\r
@@ -161,6 +176,29 @@ public class CleanupMountedLocationStep extends JobStep implements FileVisitor<P
                return result;\r
        }\r
 \r
+       private boolean isArchived(Path filePath) {\r
+               boolean result = false;\r
+               String name = filePath.getFileName().toString();\r
+               String[] tsmName = new String[] { null };\r
+               String query = String.format("SELECT relativepath FROM MEDIAFILE WHERE houseid = '%s'", name);\r
+               getManager().executeQuery(query, rs -> {\r
+                       tsmName[0] = rs.getString("relativepath");\r
+                       return false;\r
+               }, null);\r
+\r
+               if (tsmName[0] != null) {\r
+                       try {\r
+                               RemoteFile remoteFile = tsmStoreUri.getRemoteFile(tsmName[0]);\r
+                               result = remoteFile != null;\r
+                       } catch (Exception e) {\r
+                               logger.error(e.getMessage());\r
+                       } finally {\r
+                               tsmStoreUri.cleanUp();\r
+                       }\r
+               }\r
+               return result;\r
+       }\r
+\r
        @Override\r
        public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {\r
                if (!dir.equals(sourcePath) && isEmpty(dir)) {\r
@@ -188,6 +226,9 @@ public class CleanupMountedLocationStep extends JobStep implements FileVisitor<P
        private void processPathItem(Path filePath) {\r
                currentCount[0]++;\r
 \r
+               if (filePath.getFileName().toString().startsWith("."))\r
+                       return;\r
+\r
                int progress = currentCount[0] * 100 / allCount[0];\r
                setProgress(progress);\r
 \r
@@ -205,6 +246,11 @@ public class CleanupMountedLocationStep extends JobStep implements FileVisitor<P
                if (killDate == null)\r
                        return;\r
 \r
+               if (!isArchived(filePath)) {\r
+                       logger.error(marker, "A(z) {} anyag törlésre van kijelölve, de nem található az archívumban.", filePath);\r
+                       return;\r
+               }\r
+\r
                if (removeFiles(filePath, killDateFiles))\r
                        logger.info(marker, "A {} fájl és kapcsolódó állományai a {} killdate bejegyzés alapján sikeresen törlődtek.", filePath.getFileName(),\r
                                        dateFormat.format(killDate));\r
index 94c2ee44053d1599854bb7f010b6110a71ba8d0b..e622b54367553332bb6e3a6a88698993c6f274b0 100644 (file)
@@ -10,11 +10,9 @@ import user.jobengine.server.IJobEngine;
 import user.jobengine.server.IJobRuntime;\r
 \r
 public class TestForkCancelableStep extends JobStep {\r
-       private static final String CHILD_TITLE = "Párhuzamosított alfolyamat";\r
-       //      private static final String CHILD_TEMPLATE = "fake-concurrent.xml";\r
        private static final String CHILD_TEMPLATE = "cancelable.xml";\r
        private static final Logger logger = LogManager.getLogger();\r
-       int count = 1000;\r
+       int count = 10;\r
 \r
        @StepEntry\r
        public Object[] execute(IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
index cb32078a8faec438ee7e3c9c7b64369a8534f0b6..cb8f28fde020a5d81e60959a02b39d92f33c8156 100644 (file)
@@ -1,33 +1,80 @@
 package user.commons;\r
 \r
-import java.net.URI;\r
-\r
 import javax.sql.DataSource;\r
 \r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
+\r
 import com.ibm.db2.jcc.DB2SimpleDataSource;\r
 \r
 public class MediaCubeDataSourceFactory {\r
-\r
+       private static Logger logger = LogManager.getLogger();\r
        private static DB2SimpleDataSource dataSource;\r
+       private static DB2SimpleDataSource noSQLDataSource;\r
+       private static String DBURL = "jobengine.db.url";\r
+       private static String DBUSERNAME = "jobengine.db.user";\r
+       private static String DBPASSWORD = "jobengine.db.password";\r
+       private static String DBLOGINTIMEOUT = "jobengine.db.loginTimeout";\r
+       private static String NOSQLURL = "jobengine.nosql.db.url";\r
+       private static String NOSQLUSERNAME = "jobengine.nosql.db.user";\r
+       private static String NOSQLPASSWORD = "jobengine.nosql.db.password";\r
+       private static String NOSQLLOGINTIMEOUT = "jobengine.nosql.db.loginTimeout";\r
+       //      Url = System.getProperty("jobengine.nosql.db.url");\r
+       //      User = System.getProperty("jobengine.nosql.db.user");\r
+       //      Pass = System.getProperty("jobengine.nosql.db.password");\r
 \r
-       public static void create() {\r
-               URI dbUri;\r
-               try {\r
-                       dbUri = new URI("jdbc:db2://10.11.1.90:50000/mc:retrieveMessagesFromServerOnGetMessage=true;");\r
-                       dataSource = new DB2SimpleDataSource();\r
-\r
-                       dataSource.setDatabaseName(dbUri.getPath());\r
-                       dataSource.setPassword("");\r
-                       dataSource.setUser("");\r
-                       dataSource.setPortNumber(dbUri.getPort());\r
-               } catch (Exception e) {\r
-                       // TODO Auto-generated catch block\r
-                       e.printStackTrace();\r
+       public static DataSource getDatasource() {\r
+               if (dataSource == null) {\r
+                       try {\r
+                               String[] dbUri = System.getProperty(DBURL).split("/");\r
+                               dataSource = new DB2SimpleDataSource();\r
+                               dataSource.setDriverType(4);\r
+                               dataSource.setRetrieveMessagesFromServerOnGetMessage(true);\r
+                               dataSource.setDatabaseName(dbUri[dbUri.length - 1]);\r
+                               dataSource.setServerName(dbUri[2].substring(0, dbUri[2].lastIndexOf(":")));\r
+                               dataSource.setUser(System.getProperty(DBUSERNAME));\r
+                               dataSource.setPassword(System.getProperty(DBPASSWORD));\r
+                               dataSource.setPortNumber(Integer.parseInt(dbUri[2].substring(dbUri[2].lastIndexOf(":") + 1)));\r
+                               String timeout = System.getProperty(DBLOGINTIMEOUT);\r
+                               if (timeout == null)\r
+                                       dataSource.setLoginTimeout(1);\r
+                               else\r
+                                       dataSource.setLoginTimeout(Integer.parseInt(timeout));\r
+                               //                              Connection connection = dataSource.getConnection();\r
+                               //                              System.out.println(connection);\r
+                       } catch (Exception e) {\r
+                               // TODO Auto-generated catch block\r
+                               e.printStackTrace();\r
+                       }\r
                }\r
-       }\r
 \r
-       public static DataSource getDataSource() {\r
                return dataSource;\r
        }\r
 \r
+       public static DataSource getNoSQLDatasource() {\r
+               if (noSQLDataSource == null) {\r
+                       try {\r
+                               String[] dbUri = System.getProperty(NOSQLURL).split("/");\r
+                               noSQLDataSource = new DB2SimpleDataSource();\r
+                               noSQLDataSource.setDriverType(4);\r
+                               noSQLDataSource.setRetrieveMessagesFromServerOnGetMessage(true);\r
+                               noSQLDataSource.setDatabaseName(dbUri[dbUri.length - 1]);\r
+                               noSQLDataSource.setServerName(dbUri[2].substring(0, dbUri[2].lastIndexOf(":")));\r
+                               noSQLDataSource.setUser(System.getProperty(NOSQLUSERNAME));\r
+                               noSQLDataSource.setPassword(System.getProperty(NOSQLPASSWORD));\r
+                               noSQLDataSource.setPortNumber(Integer.parseInt(dbUri[2].substring(dbUri[2].lastIndexOf(":") + 1)));\r
+                               String timeout = System.getProperty(NOSQLLOGINTIMEOUT);\r
+                               if (timeout == null)\r
+                                       noSQLDataSource.setLoginTimeout(3);\r
+                               else\r
+                                       noSQLDataSource.setLoginTimeout(Integer.parseInt(timeout));\r
+                               //                              Connection connection = dataSource.getConnection();\r
+                               //                              System.out.println(connection);\r
+                       } catch (Exception e) {\r
+                               logger.error(e);\r
+                       }\r
+               }\r
+\r
+               return noSQLDataSource;\r
+       }\r
 }\r
index f6a61aa46ac37639f066c2269abd99e411078135..071a6e9909844850e20cc9828741796c099e50b1 100644 (file)
@@ -12,6 +12,7 @@ import io.humble.video.Decoder;
 import io.humble.video.Demuxer;\r
 import io.humble.video.DemuxerStream;\r
 import io.humble.video.MediaDescriptor;\r
+import io.humble.video.Rational;\r
 \r
 public class MediaInfo {\r
        private static final Logger logger = LogManager.getLogger();\r
@@ -106,11 +107,12 @@ public class MediaInfo {
                                                if (profile != null && profile.getName() != null)\r
                                                        codecProfileName = profile.getName().toUpperCase();\r
 \r
-                                               float dasp = width / height;\r
-                                               if (dasp == 4 / 3)\r
+                                               Rational sampleAspectRatio = stream.getSampleAspectRatio();\r
+                                               float dasp = (float) (sampleAspectRatio.getNumerator() * width) / (sampleAspectRatio.getDenominator() * height);\r
+                                               if (dasp == 4f / 3f)\r
                                                        displayAspect = "4:3";\r
 \r
-                                               if (dasp == 16 / 9)\r
+                                               if (dasp == 16f / 9f)\r
                                                        displayAspect = "16:9";\r
 \r
                                        }\r
diff --git a/server/user.jobengine.osgi.db/migrations/scripts/026_insert_itemtype_demo_nyers.sql b/server/user.jobengine.osgi.db/migrations/scripts/026_insert_itemtype_demo_nyers.sql
new file mode 100644 (file)
index 0000000..6685886
--- /dev/null
@@ -0,0 +1,11 @@
+-- // Insert DEMO nyers itemtype
+-- Migration SQL that makes the change goes here.
+
+INSERT INTO ITEMTYPE (NAME) VALUES ('DEMO nyers')
+@
+
+-- //@UNDO
+-- SQL to undo the change goes here.
+
+DELETE FROM ITEMTYPE WHERE NAME='DEMO nyers'
+@
\ No newline at end of file
diff --git a/server/user.jobengine.osgi.db/migrations/scripts/027_create_vod_store.sql b/server/user.jobengine.osgi.db/migrations/scripts/027_create_vod_store.sql
new file mode 100644 (file)
index 0000000..afeacf1
--- /dev/null
@@ -0,0 +1,16 @@
+-- // Create VOD store
+-- Migration SQL that makes the change goes here.
+
+INSERT INTO STORE (NAME, ISSYSTEM, ISLOWRES) VALUES ('VOD', 'N', 'N')
+@
+
+INSERT INTO STOREURI(STOREID,PROTOCOL,DELIVERY,URI,ISSTREAM,ISSOURCE,ISTARGET,USERNAME,PASSWORD,ROOTPATH,PORTNUMBER) VALUES
+((SELECT ID FROM STORE WHERE NAME='VOD'),'FTP',null,'192.168.0.101','N','Y','Y','ftpuser','FtPVs3r@1',null,null)
+@
+
+-- //@UNDO
+-- SQL to undo the change goes here.
+DELETE FROM STOREURI WHERE STOREID=(SELECT ID FROM STORE WHERE NAME='VOD')
+@
+DELETE FROM STORE WHERE NAME='VOD'
+@
index e270456dbff19cb615508827f58abb6786ac2388..10f74cd4ee237520918b7ed871c16fe97836188c 100644 (file)
@@ -2,14 +2,18 @@ package user.commons.pool;
 \r
 import java.lang.reflect.InvocationTargetException;\r
 import java.sql.Connection;\r
-import java.sql.DriverManager;\r
 import java.sql.SQLException;\r
-import java.util.Properties;\r
+\r
+import javax.sql.DataSource;\r
 \r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
 \r
+import com.ibm.nosql.json.api.DB;\r
+import com.ibm.nosql.json.api.NoSQLClient;\r
+\r
 import sqlj.runtime.ref.DefaultContext;\r
+import user.commons.MediaCubeDataSourceFactory;\r
 \r
 /**\r
  * <b>Adatbázis kontextus erőforrás kezelő.</b>\r
@@ -18,6 +22,19 @@ import sqlj.runtime.ref.DefaultContext;
 public class ContextPool extends ResourcePool {\r
        private static final Logger logger = LogManager.getLogger();\r
 \r
+       public static DB getNoSQLDB() {\r
+               DB result = null;\r
+               try {\r
+                       DataSource dataSource = MediaCubeDataSourceFactory.getNoSQLDatasource();\r
+                       Connection connection = dataSource.getConnection();\r
+                       result = NoSQLClient.getDB(connection);\r
+               } catch (Exception e) {\r
+                       logger.error(e);\r
+               }\r
+\r
+               return result;\r
+       }\r
+\r
        public ContextPool(ConnectionPoolProperties properties) {\r
                super(properties);\r
        }\r
@@ -71,26 +88,11 @@ public class ContextPool extends ResourcePool {
 \r
        @Override\r
        protected DefaultContext createObject() {\r
-               ConnectionPoolProperties cpp = (ConnectionPoolProperties) this.getProperties();\r
                Connection connection = null;\r
                DefaultContext context = null;\r
                try {\r
-                       Class.forName(cpp.getDriverName());\r
-               } catch (ClassNotFoundException e) {\r
-                       throw new PoolException(e.getMessage());\r
-               }\r
-\r
-               try {\r
-                       DriverManager.setLoginTimeout(cpp.getTimeout());\r
-                       Properties p = new Properties();\r
-                       p.setProperty(ConnectionPoolProperties.USERNAME, cpp.getUserName());\r
-                       p.setProperty(ConnectionPoolProperties.PASSWORD, cpp.getPassword());\r
-                       p.setProperty(ConnectionPoolProperties.TRACELEVEL, cpp.getTraceLevel());\r
-                       p.setProperty(ConnectionPoolProperties.TRACEFILE, cpp.getTraceFile());\r
-                       p.setProperty(ConnectionPoolProperties.TRACEFILEAPPEND, cpp.getTraceFileAppend());\r
-\r
-                       connection = DriverManager.getConnection(cpp.getUrl(), p);\r
-                       connection.setAutoCommit(cpp.getAutoCommit());\r
+                       DataSource dataSource = MediaCubeDataSourceFactory.getNoSQLDatasource();\r
+                       connection = dataSource.getConnection();\r
                        context = new DefaultContext(connection);\r
                } catch (Throwable t) {\r
                        logger.error("System can't create JDBC connection. Reason: " + t.getMessage());\r
@@ -103,6 +105,39 @@ public class ContextPool extends ResourcePool {
                return context;\r
        }\r
 \r
+       //      @Override\r
+       //      protected DefaultContext createObject() {\r
+       //              ConnectionPoolProperties cpp = (ConnectionPoolProperties) this.getProperties();\r
+       //              Connection connection = null;\r
+       //              DefaultContext context = null;\r
+       //              try {\r
+       //                      Class.forName(cpp.getDriverName());\r
+       //              } catch (ClassNotFoundException e) {\r
+       //                      throw new PoolException(e.getMessage());\r
+       //              }\r
+       //\r
+       //              try {\r
+       //                      DriverManager.setLoginTimeout(cpp.getTimeout());\r
+       //                      Properties p = new Properties();\r
+       //                      p.setProperty(ConnectionPoolProperties.USERNAME, cpp.getUserName());\r
+       //                      p.setProperty(ConnectionPoolProperties.PASSWORD, cpp.getPassword());\r
+       //                      p.setProperty(ConnectionPoolProperties.TRACELEVEL, cpp.getTraceLevel());\r
+       //                      p.setProperty(ConnectionPoolProperties.TRACEFILE, cpp.getTraceFile());\r
+       //                      p.setProperty(ConnectionPoolProperties.TRACEFILEAPPEND, cpp.getTraceFileAppend());\r
+       //\r
+       //                      connection = DriverManager.getConnection(cpp.getUrl(), p);\r
+       //                      connection.setAutoCommit(cpp.getAutoCommit());\r
+       //                      context = new DefaultContext(connection);\r
+       //              } catch (Throwable t) {\r
+       //                      logger.error("System can't create JDBC connection. Reason: " + t.getMessage());\r
+       //                      Throwable cause = t.getCause();\r
+       //                      if (cause instanceof InvocationTargetException) {\r
+       //                              Throwable targetException = ((InvocationTargetException) cause).getTargetException();\r
+       //                              logger.error(targetException.getMessage());\r
+       //                      }\r
+       //              }\r
+       //              return context;\r
+       //      }\r
        public void lendObject(DefaultContext context) {\r
                super.lendObject(context);\r
        }\r
index 484970fbe1c9a56707cab9cf6209cbfda34c28cc..d9ee5afa8b5f816462ca0b0de42af3f243073c5c 100644 (file)
@@ -7,6 +7,7 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -90,6 +91,7 @@ public class JobRuntime extends Job implements IJobRuntime {
        private int spawnOrder;
 
        private boolean cancelable = true;
+       private List<JobStatus> finishedStates = Arrays.asList(JobStatus.FINISHED, JobStatus.CANCELED, JobStatus.SUSPENDED);
 
        public JobRuntime() {
                variables = null;
@@ -317,16 +319,9 @@ public class JobRuntime extends Job implements IJobRuntime {
 
                                if (childrenIDs.contains(child.getId())) {
                                        //logger.info("Child {} notification", child.getId());
-                                       switch (event.getSignalType()) {
-                                       case UPDATE:
-                                               //TODO calculate progress
-                                               if (JobStatus.SUSPENDED.equals(child.getStatus()))
-                                                       forkSempahore.release();
-                                               break;
-                                       case DELETE:
-                                               removeSpanwChild(child.getId());
-                                               break;
-                                       }
+                                       if (event.getSignalType() == SignalType.UPDATE)
+                                               if (finishedStates.contains(child.getStatus()))
+                                                       removeSpanwChild(child.getId());
 
                                        if (!getJobEngine().isRunning())
                                                forkSempahore.release();
@@ -732,7 +727,7 @@ public class JobRuntime extends Job implements IJobRuntime {
                private Semaphore forkSempahore;
                private IJobChangedListener jobChangedListener;
                private List<Long> childrenIDs;
-       
+
         * */
 
        @Override
index 0ded9362f0c91e2f67cb7fe0647077da0001911d..c9fcbdf9e47077c6bb04641c0be9efe17f2e469b 100644 (file)
@@ -289,6 +289,8 @@ public class JobStepExecutor implements IJobStepExecutor {
 
        private Class<?> parseClassHierarchy(GroovyClassLoader cl, String root, String className) throws IOException {
                Path path = Paths.get(root, className);
+
+               logger.info("Loading class {} from {}", className, path.toString());
                Class<?> result = null;
                if (!path.toFile().exists())
                        return result;
@@ -296,9 +298,11 @@ public class JobStepExecutor implements IJobStepExecutor {
 
                for (String line : lines) {
                        if (line.contains("extends")) {
+
                                String[] tokens = line.split("extends");
                                String parent = tokens[tokens.length - 1];
                                parent = parent.replace("{", "").trim();
+                               logger.info("Class {} needs parent class {}", className, parent);
 
                                parseClassHierarchy(cl, root, parent);
                                break;
index f921ea3a49bac9fe089fcbbee71db87f5c30decf..259b1935ee01ddbec6a40e2fdd1f8dd3aabb19d6 100644 (file)
@@ -40,18 +40,18 @@ https://www.zkoss.org/wiki/ZK_Configuration_Reference/zk.xml
 <!--           <description>ZK performance monitor</description> -->\r
 <!--           <listener-class>org.zkoss.performance.monitor.PerformanceMeter</listener-class> -->\r
 <!--     </listener> -->\r
-       <listener>\r
-               <listener-class>user.jobengine.zk.util.DesktopCleanupListener</listener-class>\r
-       </listener>\r
-       <listener>\r
-               <listener-class>user.jobengine.zk.util.SessionCleanupListener</listener-class>\r
-       </listener>\r
+<!--   <listener> -->\r
+<!--           <listener-class>user.jobengine.zk.util.DesktopCleanupListener</listener-class> -->\r
+<!--   </listener> -->\r
+<!--   <listener> -->\r
+<!--           <listener-class>user.jobengine.zk.util.SessionCleanupListener</listener-class> -->\r
+<!--   </listener> -->\r
 <!--   <listener> -->\r
 <!--           <listener-class>user.jobengine.zk.util.WebAppCleanupListener</listener-class> -->\r
 <!--   </listener> -->\r
-       <listener>\r
-               <listener-class>user.jobengine.zk.util.LifeCycleListener</listener-class>\r
-       </listener>\r
+<!--   <listener> -->\r
+<!--           <listener-class>user.jobengine.zk.util.LifeCycleListener</listener-class> -->\r
+<!--   </listener> -->\r
 <!--   <listener> -->\r
 <!--           <listener-class>org.zkoss.zk.ui.http.HttpSessionListener</listener-class> -->\r
 <!--   </listener> -->\r
index e751f76c366273fb39df7aa7e76b1dd808f85a9a..c6a109cbf5ea0353e4404f1b74c3efd2286b837e 100644 (file)
                                <groupbox>\r
                                        <caption label="Anyag típus" />\r
        \r
+<!--                                   <hbox pack="left" align="top" height="min" id="searchFiltersMenu"> -->\r
+<!--                                           <toolbar class="toolbar" style="width: 40px;"> -->\r
+<!--                                                   <toolbarbutton label="Mind" style="font-size:9px;padding:0px;margin:0px 10px 0px 0px;background:none;" mode="toggle" -->\r
+<!--                                                           checked="@bind(vm.allChecked)" /> -->\r
+<!--                                           </toolbar> -->\r
+<!--                                           <vlayout> -->\r
+<!--                                                   <toolbar class="toolbar"> -->\r
+<!--                                                           <forEach items="@load(vm.topTypeFilters)"> -->\r
+<!--                                                                   <toolbarbutton label="@load(each.getName())" mode="toggle" image="@load(c:cat('/img/types/', each.getIcon()))" -->\r
+<!--                                                                           checked="@bind(each.checked) @validator(vm.allFilterCheckedValidator)" class="@load(c:cat(each.getColor(), ' typefilter'))" /> -->\r
+<!--                                                           </forEach> -->\r
+<!--                                                   </toolbar> -->\r
+<!--                                                   <toolbar class="toolbar"> -->\r
+<!--                                                           <forEach items="@load(vm.bottomTypeFilters)"> -->\r
+<!--                                                                   <toolbarbutton label="@load(each.getName())" mode="toggle" image="@load(c:cat('/img/types/', each.getIcon()))" -->\r
+<!--                                                                           checked="@bind(each.checked) @validator(vm.allFilterCheckedValidator)" class="@load(c:cat(each.getColor(), ' typefilter'))" /> -->\r
+<!--                                                           </forEach> -->\r
+<!--                                                   </toolbar> -->\r
+<!--                                           </vlayout> -->\r
+<!--                                   </hbox> -->\r
                                        <hbox pack="left" align="top" height="min" id="searchFiltersMenu">\r
-                                               <toolbar class="toolbar" style="width: 40px;">\r
-                                                       <toolbarbutton label="Mind" style="font-size:9px;padding:0px;margin:0px 10px 0px 0px;background:none;" mode="toggle"\r
-                                                               checked="@bind(vm.allChecked)" />\r
-                                               </toolbar>\r
+                                               <hbox pack="left" align="top" vflex="1" style="border-right: 1px solid gray;">\r
+                                                       <checkbox label="Mind" checked="@bind(vm.allChecked)" style="padding-right: 10px" />\r
+                                               </hbox>\r
                                                <vlayout>\r
-                                                       <toolbar class="toolbar">\r
+                                                       <hbox pack="left" align="top" height="min">\r
                                                                <forEach items="@load(vm.topTypeFilters)">\r
-                                                                       <toolbarbutton label="@load(each.getName())" mode="toggle" image="@load(c:cat('/img/types/', each.getIcon()))"\r
-                                                                               checked="@bind(each.checked) @validator(vm.allFilterCheckedValidator)" class="@load(c:cat(each.getColor(), ' typefilter'))" />\r
+                                                                       <checkbox label="@load(each.getName())" checked="@bind(each.checked) @validator(vm.allFilterCheckedValidator)" />\r
                                                                </forEach>\r
-                                                       </toolbar>\r
-                                                       <toolbar class="toolbar">\r
+                                                       </hbox>\r
+                                                       <hbox pack="left" align="top" height="min">\r
                                                                <forEach items="@load(vm.bottomTypeFilters)">\r
-                                                                       <toolbarbutton label="@load(each.getName())" mode="toggle" image="@load(c:cat('/img/types/', each.getIcon()))"\r
-                                                                               checked="@bind(each.checked) @validator(vm.allFilterCheckedValidator)" class="@load(c:cat(each.getColor(), ' typefilter'))" />\r
+                                                                       <checkbox label="@load(each.getName())" checked="@bind(each.checked) @validator(vm.allFilterCheckedValidator)" />\r
                                                                </forEach>\r
-                                                       </toolbar>\r
+                                                       </hbox>\r
                                                </vlayout>\r
                                        </hbox>\r
                                        \r
index afba507ebd23a1a7f9457ed1d9b927a06567bb16..b0e183c6e80105f112d52620e12f96864248e6ab 100644 (file)
@@ -1,4 +1,4 @@
-version=2.6.8\r
+version=2.7.0\r
 footer=2016-2020 © Copyright User Rendszerház Kft.\r
 \r
 login_info=Információ\r