From 833a4cb294f553cc2cb6f8a60302c856d462b338 Mon Sep 17 00:00:00 2001 From: "vasary.daniel" Date: Wed, 3 Mar 2021 21:25:05 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32160 --- .../run-mediacube-server-hirtv.launch | 6 +- .../run-mediacube-server-mv.launch | 6 +- .../run-mediacube-server-user.launch | 141 ++++++++++++++---- .../run-mediacube-server.launch | 133 +++++++++++++---- server/-dependencies/jobengine.target | 12 +- server/-dependencies/pom.xml | 7 +- server/-product/.tpignore | 1 + server/-product/production/AMC/mediacube.bat | 5 +- .../production/AMC/settings/jetty.xml | 45 ++++++ .../AMC/settings/jetty/jetty-http.xml | 41 ----- .../AMC/settings/jetty/jetty-https.xml | 29 ---- .../AMC/settings/jetty/jetty-ssl-context.xml | 29 ---- .../AMC/settings/jetty/jetty-ssl.xml | 58 ------- .../production/AMC/settings/jetty/jetty.xml | 129 ---------------- .../production/AMC/settings/jetty/keystore | Bin 2256 -> 0 bytes .../AMC/settings/jetty/localhost.jks | Bin 2256 -> 0 bytes .../production/AMC/settings/maestro.yaml | 38 +++++ .../production/AMC/settings/mediacube.json | 118 --------------- .../production/AMC/settings/mediacube.yaml | 57 +++++++ .../settings/test-jetty/jetty-deployer.xml | 76 ---------- .../test-jetty/jetty-http-redirect.xml | 61 -------- .../AMC/settings/test-jetty/jetty-http.xml | 41 ----- .../AMC/settings/test-jetty/jetty-https.xml | 29 ---- .../settings/test-jetty/jetty-ssl-context.xml | 29 ---- .../AMC/settings/test-jetty/jetty-ssl.xml | 58 ------- .../AMC/settings/test-jetty/jetty.xml | 129 ---------------- .../AMC/settings/test-jetty/keystore | Bin 2256 -> 0 bytes .../AMC/settings/test-jetty/localhost.jks | Bin 2256 -> 0 bytes .../-product/production/HIRTV/mediacube.bat | 5 +- .../production/HIRTV/settings/jetty.xml | 45 ++++++ .../MEDIAVIVANTIS/jobs/executors.xml | 1 + .../MEDIAVIVANTIS/jobs/schedules.json | 4 + .../jobs/steps/CancelableStep.java | 38 ++--- .../jobs/steps/TestForkCancelableStep.java | 35 +++++ .../jobs/templates/test-fork-cancelable.xml | 6 + .../production/MEDIAVIVANTIS/mediacube.bat | 5 +- .../MEDIAVIVANTIS/settings/jetty.xml | 45 ++++++ .../settings/jetty/jetty-http.xml | 41 ----- .../settings/jetty/jetty-https.xml | 29 ---- .../settings/jetty/jetty-ssl-context.xml | 29 ---- .../settings/jetty/jetty-ssl.xml | 58 ------- .../MEDIAVIVANTIS/settings/jetty/jetty.xml | 129 ---------------- .../MEDIAVIVANTIS/settings/jetty/keystore | Bin 2256 -> 0 bytes .../settings/jetty/localhost.jks | Bin 2256 -> 0 bytes .../MEDIAVIVANTIS/settings/mediacube.yaml | 7 + .../settings/test-jetty/jetty-deployer.xml | 76 ---------- .../test-jetty/jetty-http-redirect.xml | 61 -------- .../settings/test-jetty/jetty-http.xml | 41 ----- .../settings/test-jetty/jetty-https.xml | 29 ---- .../settings/test-jetty/jetty-ssl-context.xml | 29 ---- .../settings/test-jetty/jetty-ssl.xml | 58 ------- .../settings/test-jetty/jetty.xml | 129 ---------------- .../settings/test-jetty/keystore | Bin 2256 -> 0 bytes .../settings/test-jetty/localhost.jks | Bin 2256 -> 0 bytes server/RemoteSystemsTempFiles/.project | 12 -- .../user/jobengine/server/IJobRuntime.java | 8 +- .../src/user/jobengine/server/JobRuntime.java | 21 ++- .../user/jobengine/zk/model/SearchModel.java | 2 +- 58 files changed, 559 insertions(+), 1662 deletions(-) create mode 100644 server/-product/production/AMC/settings/jetty.xml delete mode 100644 server/-product/production/AMC/settings/jetty/jetty-http.xml delete mode 100644 server/-product/production/AMC/settings/jetty/jetty-https.xml delete mode 100644 server/-product/production/AMC/settings/jetty/jetty-ssl-context.xml delete mode 100644 server/-product/production/AMC/settings/jetty/jetty-ssl.xml delete mode 100644 server/-product/production/AMC/settings/jetty/jetty.xml delete mode 100644 server/-product/production/AMC/settings/jetty/keystore delete mode 100644 server/-product/production/AMC/settings/jetty/localhost.jks create mode 100644 server/-product/production/AMC/settings/maestro.yaml delete mode 100644 server/-product/production/AMC/settings/mediacube.json create mode 100644 server/-product/production/AMC/settings/mediacube.yaml delete mode 100644 server/-product/production/AMC/settings/test-jetty/jetty-deployer.xml delete mode 100644 server/-product/production/AMC/settings/test-jetty/jetty-http-redirect.xml delete mode 100644 server/-product/production/AMC/settings/test-jetty/jetty-http.xml delete mode 100644 server/-product/production/AMC/settings/test-jetty/jetty-https.xml delete mode 100644 server/-product/production/AMC/settings/test-jetty/jetty-ssl-context.xml delete mode 100644 server/-product/production/AMC/settings/test-jetty/jetty-ssl.xml delete mode 100644 server/-product/production/AMC/settings/test-jetty/jetty.xml delete mode 100644 server/-product/production/AMC/settings/test-jetty/keystore delete mode 100644 server/-product/production/AMC/settings/test-jetty/localhost.jks create mode 100644 server/-product/production/HIRTV/settings/jetty.xml create mode 100644 server/-product/production/MEDIAVIVANTIS/jobs/steps/TestForkCancelableStep.java create mode 100644 server/-product/production/MEDIAVIVANTIS/jobs/templates/test-fork-cancelable.xml create mode 100644 server/-product/production/MEDIAVIVANTIS/settings/jetty.xml delete mode 100644 server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-http.xml delete mode 100644 server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-https.xml delete mode 100644 server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl-context.xml delete mode 100644 server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl.xml delete mode 100644 server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty.xml delete mode 100644 server/-product/production/MEDIAVIVANTIS/settings/jetty/keystore delete mode 100644 server/-product/production/MEDIAVIVANTIS/settings/jetty/localhost.jks delete mode 100644 server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-deployer.xml delete mode 100644 server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-http-redirect.xml delete mode 100644 server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-http.xml delete mode 100644 server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-https.xml delete mode 100644 server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-ssl-context.xml delete mode 100644 server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-ssl.xml delete mode 100644 server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty.xml delete mode 100644 server/-product/production/MEDIAVIVANTIS/settings/test-jetty/keystore delete mode 100644 server/-product/production/MEDIAVIVANTIS/settings/test-jetty/localhost.jks delete mode 100644 server/RemoteSystemsTempFiles/.project diff --git a/server/-configuration/run-mediacube-server-hirtv.launch b/server/-configuration/run-mediacube-server-hirtv.launch index 48c21127..3730ad92 100644 --- a/server/-configuration/run-mediacube-server-hirtv.launch +++ b/server/-configuration/run-mediacube-server-hirtv.launch @@ -6,7 +6,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -115,5 +115,5 @@ - + diff --git a/server/-configuration/run-mediacube-server-mv.launch b/server/-configuration/run-mediacube-server-mv.launch index 47941dff..bcebdcfe 100644 --- a/server/-configuration/run-mediacube-server-mv.launch +++ b/server/-configuration/run-mediacube-server-mv.launch @@ -6,7 +6,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -115,5 +115,5 @@ - + diff --git a/server/-configuration/run-mediacube-server-user.launch b/server/-configuration/run-mediacube-server-user.launch index 96e8844d..19766b8d 100644 --- a/server/-configuration/run-mediacube-server-user.launch +++ b/server/-configuration/run-mediacube-server-user.launch @@ -1,30 +1,117 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/server/-configuration/run-mediacube-server.launch b/server/-configuration/run-mediacube-server.launch index 1d0b7bb9..0a93a254 100644 --- a/server/-configuration/run-mediacube-server.launch +++ b/server/-configuration/run-mediacube-server.launch @@ -1,29 +1,110 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target index 7b9d8e41..61e35124 100644 --- a/server/-dependencies/jobengine.target +++ b/server/-dependencies/jobengine.target @@ -1,5 +1,6 @@ - + + @@ -52,7 +53,6 @@ - @@ -85,12 +85,12 @@ - - - + + + win32 @@ -101,4 +101,4 @@ -Dosgi.requiredJavaVersion=1.8 -XX:+UseG1GC -XX:+UseStringDeduplication -Dosgi.requiredJavaVersion=1.8 -Xms256m -Xmx1024m -Dorg.eclipse.epp.logging.aeri.skipReports=true - + \ No newline at end of file diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml index 2dd68822..35500f6c 100644 --- a/server/-dependencies/pom.xml +++ b/server/-dependencies/pom.xml @@ -11,6 +11,7 @@ 1.7 UTF-8 UTF-8 + 9.3.9.v20160517 3.0.11.Final 2.4.5 @@ -141,9 +142,6 @@ org.eclipse.platform:org.eclipse.osgi.util:3.3.100 - - org.eclipse.jetty:jetty-server:9.3.9.v20160517 - commons-io:commons-io:2.2 @@ -275,6 +273,9 @@ org.eclipse.jetty:jetty-servlet:${jetty.version} + + org.eclipse.jetty:jetty-server:${jetty.version} + org.eclipse.jetty.websocket:websocket-api:${jetty.version} diff --git a/server/-product/.tpignore b/server/-product/.tpignore index c3ae4d9d..ac77a1bc 100644 --- a/server/-product/.tpignore +++ b/server/-product/.tpignore @@ -8,3 +8,4 @@ \Q/production/HIRTV/configuration/org.eclipse.osgi/\E.* \Q/production/HIRTV/tmp/\E.* \Q/production/MEDIAVIVANTIS/log/\E.* +\Q/production/AMC/tmp/\E.* diff --git a/server/-product/production/AMC/mediacube.bat b/server/-product/production/AMC/mediacube.bat index 64cbf781..099f5aee 100644 --- a/server/-product/production/AMC/mediacube.bat +++ b/server/-product/production/AMC/mediacube.bat @@ -2,13 +2,12 @@ if exist tmp rmdir tmp /s /q mkdir tmp java ^ --Dclean ^ -Dorg.eclipse.epp.logging.aeri.skipReports=true ^ -Declipse.ignoreApp=true ^ -Dosgi.noShutdown=true ^ -Dlog4j.configurationFile=settings/log4j2.xml ^ --Djetty.home=settings/test-jetty ^ --Djetty.etc.config.urls=jetty.xml,jetty-ssl.xml,jetty-ssl-context.xml,jetty-http.xml,jetty-https.xml ^ +-Djetty.home=settings ^ +-Djetty.etc.config.urls=jetty.xml ^ -Djava.io.tmpdir=tmp ^ -Dfile.encoding=UTF-8 ^ -Dgosh.home=configuration ^ diff --git a/server/-product/production/AMC/settings/jetty.xml b/server/-product/production/AMC/settings/jetty.xml new file mode 100644 index 00000000..5e47cacd --- /dev/null +++ b/server/-product/production/AMC/settings/jetty.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/-product/production/AMC/settings/jetty/jetty-http.xml b/server/-product/production/AMC/settings/jetty/jetty-http.xml deleted file mode 100644 index 95b63984..00000000 --- a/server/-product/production/AMC/settings/jetty/jetty-http.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/-product/production/AMC/settings/jetty/jetty-https.xml b/server/-product/production/AMC/settings/jetty/jetty-https.xml deleted file mode 100644 index 71a08377..00000000 --- a/server/-product/production/AMC/settings/jetty/jetty-https.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - http/1.1 - - - - - - - - - - - - - - - diff --git a/server/-product/production/AMC/settings/jetty/jetty-ssl-context.xml b/server/-product/production/AMC/settings/jetty/jetty-ssl-context.xml deleted file mode 100644 index e1edaf05..00000000 --- a/server/-product/production/AMC/settings/jetty/jetty-ssl-context.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - / - - - - - / - - - - - - - - - - diff --git a/server/-product/production/AMC/settings/jetty/jetty-ssl.xml b/server/-product/production/AMC/settings/jetty/jetty-ssl.xml deleted file mode 100644 index a079c1f6..00000000 --- a/server/-product/production/AMC/settings/jetty/jetty-ssl.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/-product/production/AMC/settings/jetty/jetty.xml b/server/-product/production/AMC/settings/jetty/jetty.xml deleted file mode 100644 index 0ba38381..00000000 --- a/server/-product/production/AMC/settings/jetty/jetty.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5000 - - - - diff --git a/server/-product/production/AMC/settings/jetty/keystore b/server/-product/production/AMC/settings/jetty/keystore deleted file mode 100644 index 95d7f4c7f49eb51400498486ead08cd5b9aad753..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2256 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 - - - - - - - - - - - - - - - - - - - org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern - .*/[^/]*servlet-api-[^/]*\.jar$|.*/javax.servlet.jsp.jstl-.*\.jar$|.*/org.apache.taglibs.taglibs-standard-impl-.*\.jar$ - - - - - - - - - - - jetty.deploy.monitoredPath - - / - - - - - - jetty.deploy.defaultsDescriptorPath - - /etc/webdefault.xml - - - - - - - - - - - - - - - - - - diff --git a/server/-product/production/AMC/settings/test-jetty/jetty-http-redirect.xml b/server/-product/production/AMC/settings/test-jetty/jetty-http-redirect.xml deleted file mode 100644 index 556f544d..00000000 --- a/server/-product/production/AMC/settings/test-jetty/jetty-http-redirect.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - https - 8444 - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/-product/production/AMC/settings/test-jetty/jetty-http.xml b/server/-product/production/AMC/settings/test-jetty/jetty-http.xml deleted file mode 100644 index f4f61bfa..00000000 --- a/server/-product/production/AMC/settings/test-jetty/jetty-http.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/-product/production/AMC/settings/test-jetty/jetty-https.xml b/server/-product/production/AMC/settings/test-jetty/jetty-https.xml deleted file mode 100644 index 71a08377..00000000 --- a/server/-product/production/AMC/settings/test-jetty/jetty-https.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - http/1.1 - - - - - - - - - - - - - - - diff --git a/server/-product/production/AMC/settings/test-jetty/jetty-ssl-context.xml b/server/-product/production/AMC/settings/test-jetty/jetty-ssl-context.xml deleted file mode 100644 index e1edaf05..00000000 --- a/server/-product/production/AMC/settings/test-jetty/jetty-ssl-context.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - / - - - - - / - - - - - - - - - - diff --git a/server/-product/production/AMC/settings/test-jetty/jetty-ssl.xml b/server/-product/production/AMC/settings/test-jetty/jetty-ssl.xml deleted file mode 100644 index db6e2eb4..00000000 --- a/server/-product/production/AMC/settings/test-jetty/jetty-ssl.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/-product/production/AMC/settings/test-jetty/jetty.xml b/server/-product/production/AMC/settings/test-jetty/jetty.xml deleted file mode 100644 index c9afdb5f..00000000 --- a/server/-product/production/AMC/settings/test-jetty/jetty.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5000 - - - - diff --git a/server/-product/production/AMC/settings/test-jetty/keystore b/server/-product/production/AMC/settings/test-jetty/keystore deleted file mode 100644 index 95d7f4c7f49eb51400498486ead08cd5b9aad753..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2256 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/executors.xml b/server/-product/production/MEDIAVIVANTIS/jobs/executors.xml index 10cdb7f6..82fe6bf6 100644 --- a/server/-product/production/MEDIAVIVANTIS/jobs/executors.xml +++ b/server/-product/production/MEDIAVIVANTIS/jobs/executors.xml @@ -1,5 +1,6 @@ + diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/schedules.json b/server/-product/production/MEDIAVIVANTIS/jobs/schedules.json index aaf71437..fac78485 100644 --- a/server/-product/production/MEDIAVIVANTIS/jobs/schedules.json +++ b/server/-product/production/MEDIAVIVANTIS/jobs/schedules.json @@ -1,5 +1,9 @@ {"joblist":[ { + "template": "test-fork-cancelable.xml", + "parameters": [ {"name": "itemID", "value": 1, "type": "java.lang.Long"} ] + }, + { "active": true, "executeimmediate": true, "name" : "Proxy generálás", diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/steps/CancelableStep.java b/server/-product/production/MEDIAVIVANTIS/jobs/steps/CancelableStep.java index 982240de..ebbe2d36 100644 --- a/server/-product/production/MEDIAVIVANTIS/jobs/steps/CancelableStep.java +++ b/server/-product/production/MEDIAVIVANTIS/jobs/steps/CancelableStep.java @@ -17,48 +17,28 @@ public class CancelableStep extends JobStep { @StepEntry public Object[] execute(int param) throws Exception { try { - getJobRuntime().setRelated("TESZT1"); - - // ftpTest(); Marker marker = MarkerManager.getMarker("MEDIAPROFILE"); + getJobRuntime().setRelated("TESZT" + param); for (int i = 0; i < count; i++) { if (getJobRuntime().isWaitingCancel()) break; - Thread.sleep(50); + Thread.sleep(500); + if (param==0) + throw new Exception(); + if (param==1) { + getJobRuntime().setDisableRetry(true); + throw new Exception(); + } int progress = (i + 1) * 100 / count; setProgress(progress); - logger.info(marker, "{}", i); } } catch (Exception e) { - e.printStackTrace(); + logger.info(e.getMessage()); throw e; } return null; } - void ftpTest() throws Exception { - StoreUri source = null; - StoreUri target = null; - try { - source = getManager().getStoreUri("MEDIACUBE_UPLOADS", RemoteStoreProtocol.LOCAL); - target = getManager().getStoreUri("NEXIO1", RemoteStoreProtocol.FTP); - source.addProgressListener(e -> setProgress(e.getProgress())); - logger.info("Uploading file PART_TEST.mxf"); - source.transferFrom(target, "PART_TEST.mxf", "PART_TEST.mxf"); - FTPClient client = ((FtpDirectoryLister) target.getLister()).connect(); - logger.info("Renaming file PART_TEST.mxf to RENAME_TEST.mxf"); - client.rename("PART_TEST.mxf", "RENAME_TEST.mxf"); - } catch (Exception e) { - logger.catching(e); - } finally { - if (target != null) - target.cleanUp(); - if (source != null) - source.cleanUp(); - } - - } - } diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/steps/TestForkCancelableStep.java b/server/-product/production/MEDIAVIVANTIS/jobs/steps/TestForkCancelableStep.java new file mode 100644 index 00000000..c1b49f76 --- /dev/null +++ b/server/-product/production/MEDIAVIVANTIS/jobs/steps/TestForkCancelableStep.java @@ -0,0 +1,35 @@ +package user.jobengine.server.steps; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import user.commons.IJob; +import user.commons.JobStatus; +import user.commons.ListUtils; +import user.jobengine.server.IJobEngine; +import user.jobengine.server.IJobRuntime; + +public class TestForkCancelableStep extends JobStep { + private static final String CHILD_TITLE = "Párhuzamosított alfolyamat"; + // private static final String CHILD_TEMPLATE = "fake-concurrent.xml"; + private static final String CHILD_TEMPLATE = "cancelable.xml"; + private static final Logger logger = LogManager.getLogger(); + int count = 3; + + @StepEntry + public Object[] execute(IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception { + for (int i = 0; i < count; i++) { + IJobRuntime rt = getEngine().submit(null, e -> { + if (e.getStatus().equals(JobStatus.SUSPENDED)) { + IJobRuntime rt = (IJobRuntime) e.getSource(); + logger.info("Cleanup on SUSPEND {}, {}", rt.getId(), rt.isDisableRetry()); + } + }, CHILD_TEMPLATE, "JOB " + i, 0, IJobEngine.DEFAULT_OWNER, ListUtils.asMap("param", i)); + + rt.setRelated("TEST" + rt.getId()); + } + + logger.info("Done"); + return null; + } +} diff --git a/server/-product/production/MEDIAVIVANTIS/jobs/templates/test-fork-cancelable.xml b/server/-product/production/MEDIAVIVANTIS/jobs/templates/test-fork-cancelable.xml new file mode 100644 index 00000000..8c88d84b --- /dev/null +++ b/server/-product/production/MEDIAVIVANTIS/jobs/templates/test-fork-cancelable.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/server/-product/production/MEDIAVIVANTIS/mediacube.bat b/server/-product/production/MEDIAVIVANTIS/mediacube.bat index 64cbf781..099f5aee 100644 --- a/server/-product/production/MEDIAVIVANTIS/mediacube.bat +++ b/server/-product/production/MEDIAVIVANTIS/mediacube.bat @@ -2,13 +2,12 @@ if exist tmp rmdir tmp /s /q mkdir tmp java ^ --Dclean ^ -Dorg.eclipse.epp.logging.aeri.skipReports=true ^ -Declipse.ignoreApp=true ^ -Dosgi.noShutdown=true ^ -Dlog4j.configurationFile=settings/log4j2.xml ^ --Djetty.home=settings/test-jetty ^ --Djetty.etc.config.urls=jetty.xml,jetty-ssl.xml,jetty-ssl-context.xml,jetty-http.xml,jetty-https.xml ^ +-Djetty.home=settings ^ +-Djetty.etc.config.urls=jetty.xml ^ -Djava.io.tmpdir=tmp ^ -Dfile.encoding=UTF-8 ^ -Dgosh.home=configuration ^ diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty.xml new file mode 100644 index 00000000..5e47cacd --- /dev/null +++ b/server/-product/production/MEDIAVIVANTIS/settings/jetty.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-http.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-http.xml deleted file mode 100644 index 95b63984..00000000 --- a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-http.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-https.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-https.xml deleted file mode 100644 index 71a08377..00000000 --- a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-https.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - http/1.1 - - - - - - - - - - - - - - - diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl-context.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl-context.xml deleted file mode 100644 index e1edaf05..00000000 --- a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl-context.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - / - - - - - / - - - - - - - - - - diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl.xml deleted file mode 100644 index a079c1f6..00000000 --- a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty.xml deleted file mode 100644 index 0ba38381..00000000 --- a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5000 - - - - diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/keystore b/server/-product/production/MEDIAVIVANTIS/settings/jetty/keystore deleted file mode 100644 index 95d7f4c7f49eb51400498486ead08cd5b9aad753..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2256 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 - - - - - - - - - - - - - - - - - - - org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern - .*/[^/]*servlet-api-[^/]*\.jar$|.*/javax.servlet.jsp.jstl-.*\.jar$|.*/org.apache.taglibs.taglibs-standard-impl-.*\.jar$ - - - - - - - - - - - jetty.deploy.monitoredPath - - / - - - - - - jetty.deploy.defaultsDescriptorPath - - /etc/webdefault.xml - - - - - - - - - - - - - - - - - - diff --git a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-http-redirect.xml b/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-http-redirect.xml deleted file mode 100644 index 556f544d..00000000 --- a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-http-redirect.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - https - 8444 - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-http.xml b/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-http.xml deleted file mode 100644 index f4f61bfa..00000000 --- a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-http.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-https.xml b/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-https.xml deleted file mode 100644 index 71a08377..00000000 --- a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-https.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - http/1.1 - - - - - - - - - - - - - - - diff --git a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-ssl-context.xml b/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-ssl-context.xml deleted file mode 100644 index e1edaf05..00000000 --- a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-ssl-context.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - / - - - - - / - - - - - - - - - - diff --git a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-ssl.xml b/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-ssl.xml deleted file mode 100644 index db6e2eb4..00000000 --- a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-ssl.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty.xml b/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty.xml deleted file mode 100644 index c9afdb5f..00000000 --- a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5000 - - - - diff --git a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/keystore b/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/keystore deleted file mode 100644 index 95d7f4c7f49eb51400498486ead08cd5b9aad753..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2256 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 - - RemoteSystemsTempFiles - - - - - - - org.eclipse.rse.ui.remoteSystemsTempNature - - diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/IJobRuntime.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/IJobRuntime.java index d58c0c8b..a7c660fc 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/IJobRuntime.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/IJobRuntime.java @@ -52,8 +52,6 @@ public interface IJobRuntime extends IJob { IJobEngine getJobEngine(); - Marker getSessionMarker(); - IInstruction getNextInstruction() throws NoSuchElementException; Object getParameter(String name); @@ -64,6 +62,8 @@ public interface IJobRuntime extends IJob { JobStatus getSavedStatus(); + Marker getSessionMarker(); + int getSpawnOrder(); Stack getStack(); @@ -80,6 +80,8 @@ public interface IJobRuntime extends IJob { boolean isCancelable(); + boolean isDisableRetry(); + boolean isRunable(); boolean isService(); @@ -112,6 +114,8 @@ public interface IJobRuntime extends IJob { void setCurrentStep(String currentStep); + void setDisableRetry(boolean disableRetry); + @Override void setParameters(Map parameters); diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java index d9ee5afa..f05de1ec 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java @@ -92,6 +92,7 @@ public class JobRuntime extends Job implements IJobRuntime { private boolean cancelable = true; private List finishedStates = Arrays.asList(JobStatus.FINISHED, JobStatus.CANCELED, JobStatus.SUSPENDED); + private boolean disableRetry; public JobRuntime() { variables = null; @@ -570,6 +571,11 @@ public class JobRuntime extends Job implements IJobRuntime { return cancelable; } + @Override + public boolean isDisableRetry() { + return disableRetry; + } + @Override public boolean isRunable() { return JobStatus.RUNABLE.equals(status); @@ -713,11 +719,6 @@ public class JobRuntime extends Job implements IJobRuntime { savedStack = (Stack) stack.clone(); } - @Override - public void saveStatus() { - savedStatus = status; - } - /* private final EventListenerList listeners = new EventListenerList(); private List children; @@ -730,6 +731,11 @@ public class JobRuntime extends Job implements IJobRuntime { * */ + @Override + public void saveStatus() { + savedStatus = status; + } + @Override public void setCancelable(boolean cancelable) { this.cancelable = cancelable; @@ -740,6 +746,11 @@ public class JobRuntime extends Job implements IJobRuntime { this.currentStep = currentStep; } + @Override + public void setDisableRetry(boolean disableRetry) { + this.disableRetry = disableRetry; + } + @Override public void setId(long id) { super.setId(id); diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/SearchModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/SearchModel.java index 4533d1d2..785b8e9e 100644 --- a/server/user.mediacube.gui/src/user/jobengine/zk/model/SearchModel.java +++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/SearchModel.java @@ -204,7 +204,7 @@ public class SearchModel extends AsyncBaseModel { @AfterCompose public void afterCompose(@ContextParam(ContextType.VIEW) Component view) { //A MediaFileServlet a services/proxy alatt szolgal ki - Clients.evalJavaScript("setSource('http://localhost:9080/services/proxy/20209535_1-20205617.mp4', 'video/mp4')"); + //Clients.evalJavaScript("setSource('http://localhost:9080/services/proxy/20209535_1-20205617.mp4', 'video/mp4')"); try { Selectors.wireComponents(view, this, false); -- 2.54.0