From: vasary.daniel Date: Wed, 3 Mar 2021 21:25:05 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=833a4cb294f553cc2cb6f8a60302c856d462b338;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32160 --- 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 95d7f4c7..00000000 Binary files a/server/-product/production/AMC/settings/jetty/keystore and /dev/null differ diff --git a/server/-product/production/AMC/settings/jetty/localhost.jks b/server/-product/production/AMC/settings/jetty/localhost.jks deleted file mode 100644 index 95d7f4c7..00000000 Binary files a/server/-product/production/AMC/settings/jetty/localhost.jks and /dev/null differ diff --git a/server/-product/production/AMC/settings/maestro.yaml b/server/-product/production/AMC/settings/maestro.yaml new file mode 100644 index 00000000..1d361571 --- /dev/null +++ b/server/-product/production/AMC/settings/maestro.yaml @@ -0,0 +1,38 @@ +sourceStoreUri: + name: Default + protocol: LOCAL + uri: "/mnt/NLE" + fileFilter: "*.mxf" + showDirectories: true +alternateSourceStoreUris: +- name: NLE1 + protocol: LOCAL + uri: "/mnt/NLE/NLE1" + fileFilter: "*.mxf" + showDirectories: true +- name: NLE2 + protocol: LOCAL + uri: "/mnt/NLE/NLE2" + fileFilter: "*.mxf" + showDirectories: true +- name: NLE3 + protocol: LOCAL + uri: "/mnt/NLE/NLE3" + fileFilter: "*.mxf" + showDirectories: true +- name: NLE4 + protocol: LOCAL + uri: "/mnt/NLE/NLE4" + fileFilter: "*.mxf" + showDirectories: true +- name: POLC + protocol: LOCAL + uri: "/mnt/POLC" + fileFilter: "*.mxf" + showDirectories: true +targets: +- name: FINISHED_SHOWS + killDateDays: 7 + storeUri: + protocol: LOCAL + uri: "/mnt/PROMISE/FINISHED_SHOWS" diff --git a/server/-product/production/AMC/settings/mediacube.json b/server/-product/production/AMC/settings/mediacube.json deleted file mode 100644 index d7113939..00000000 --- a/server/-product/production/AMC/settings/mediacube.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "jobQueuePollInterval": 1000, - "targetRestoreFilters": [ - "FILEZILLA_AVID", "FILEZILLA_PASARESTORE" - ], - "topTypeFilters": [ - { - "name": "Hír bejátszó", - "color": "RED200", - "icon": "ic_language_black_18dp.png" - }, - { - "name": "Hír nyers", - "color": "RED100", - "icon": "ic_perm_camera_mic_black_18dp.png" - }, - { - "name": "Visszarögzített", - "color": "BROWN100", - "icon": "ic_group_work_black_18dp.png" - }, - { - "name": "Egyéb", - "color": "YELLOW200", - "icon": "ic_view_quilt_black_18dp.png" - } - ], - "bottomTypeFilters": [ - { - "name": "Műsor", - "color": "TEAL200", - "icon": "ic_theaters_black_18dp.png" - }, - { - "name": "Műsor nyers", - "color": "TEAL100", - "icon": "ic_invert_colors_black_18dp.png" - }, - { - "name": "Promo", - "color": "INDIGO200", - "icon": "ic_picture_in_picture_black_18dp.png" - }, - { - "name": "Promo nyers", - "color": "INDIGO100", - "icon": "ic_bug_report_black_18dp.png" - }, - { - "name": "Reklám", - "color": "BLUE200", - "icon": "ic_picture_in_picture_alt_black_18dp.png" - }, - { - "name": "Reklám nyers", - "color": "BLUE100", - "icon": "ic_settings_brightness_black_18dp.png" - } - ], - "authentication": { - "authEnabled": true, - "adHost": "intra.amc.hu", - "adNonSecurePort": 3268, - "adBaseDn": "DC=intra,DC=amc,DC=hu", - "adAdminMap": [ - "INFORMATIKUSOK", - "MUSZAKVEZETOK" - ], - "adSubmitterMap": [ - "INFORMATIKUSOK", - "MUSZAKVEZETOK" - ], - "adEditorMap": [ - "INFORMATIKUSOK", - "MUSZAKVEZETOK" - ], - "localAccounts": [ - { - "user" : "user", - "password" : "5F4DCC3B5AA765D61D8327DEB882CF99", - "email" : null - }, - { - "user" : "user1", - "password" : "5F4DCC3B5AA765D61D8327DEB882CF99", - "email" : null - }, - { - "user" : "lebony", - "password" : "4E25B117B14D86D7DCECB4E433CF932C", - "email" : null - }, - { - "user" : "editor", - "password" : "5AEE9DBD2A188839105073571BEE1B1F", - "email" : null - }, - { - "user" : "root", - "password" : "5F4DCC3B5AA765D61D8327DEB882CF99", - "email" : "vasary@elgekko.net" - } - ], - "localAdmins": [ - "root", - "admin" - ], - "localSubmitters": [ - "lebony" - ], - "localEditors": [ - "editor" - ] - } -} - - - diff --git a/server/-product/production/AMC/settings/mediacube.yaml b/server/-product/production/AMC/settings/mediacube.yaml new file mode 100644 index 00000000..fcf8e5c7 --- /dev/null +++ b/server/-product/production/AMC/settings/mediacube.yaml @@ -0,0 +1,57 @@ +jobQueuePollInterval: 1000 +disableHelp: true +maestroDisabled: false +alternateRetrieveSelector: false +disableStatistics: true +disableEditor: false +targetRestoreFilters: +- FILEZILLA_AVID +- FILEZILLA_PASARESTORE +topTypeFilters: +- name: Hír bejátszó +- name: Hír nyers +- name: Visszarögzített +- name: Egyéb +bottomTypeFilters: +- name: Műsor +- name: Műsor nyers +- name: Promo +- name: Promo nyers +- name: Reklám +- name: Reklám nyers +authentication: + authEnabled: true + defaultUser: root + defaultPassword: password + adHost: intra.amc.hu + adNonSecurePort: 3268 + adBaseDn: DC=intra,DC=amc,DC=hu + adAdminMap: + - INFORMATIKUSOK + - MUSZAKVEZETOK + adSubmitterMap: + - INFORMATIKUSOK + - MUSZAKVEZETOK + adEditorMap: + - INFORMATIKUSOK + - MUSZAKVEZETOK + localAccounts: + - user: user + password: 5F4DCC3B5AA765D61D8327DEB882CF99 + email: + - user: user1 + password: 5F4DCC3B5AA765D61D8327DEB882CF99 + email: + - user: lebony + password: 4E25B117B14D86D7DCECB4E433CF932C + email: + - user: root + password: 5F4DCC3B5AA765D61D8327DEB882CF99 + email: vasary@elgekko.net + localAdmins: + - root + - admin + localSubmitters: + - lebony + localEditors: + - editor diff --git a/server/-product/production/AMC/settings/test-jetty/jetty-deployer.xml b/server/-product/production/AMC/settings/test-jetty/jetty-deployer.xml deleted file mode 100644 index ba61d105..00000000 --- a/server/-product/production/AMC/settings/test-jetty/jetty-deployer.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - 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 95d7f4c7..00000000 Binary files a/server/-product/production/AMC/settings/test-jetty/keystore and /dev/null differ diff --git a/server/-product/production/AMC/settings/test-jetty/localhost.jks b/server/-product/production/AMC/settings/test-jetty/localhost.jks deleted file mode 100644 index 95d7f4c7..00000000 Binary files a/server/-product/production/AMC/settings/test-jetty/localhost.jks and /dev/null differ diff --git a/server/-product/production/HIRTV/mediacube.bat b/server/-product/production/HIRTV/mediacube.bat index 5f9eb955..ae7a1d40 100644 --- a/server/-product/production/HIRTV/mediacube.bat +++ b/server/-product/production/HIRTV/mediacube.bat @@ -3,13 +3,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/HIRTV/settings/jetty.xml b/server/-product/production/HIRTV/settings/jetty.xml new file mode 100644 index 00000000..5e47cacd --- /dev/null +++ b/server/-product/production/HIRTV/settings/jetty.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 95d7f4c7..00000000 Binary files a/server/-product/production/MEDIAVIVANTIS/settings/jetty/keystore and /dev/null differ diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/localhost.jks b/server/-product/production/MEDIAVIVANTIS/settings/jetty/localhost.jks deleted file mode 100644 index 95d7f4c7..00000000 Binary files a/server/-product/production/MEDIAVIVANTIS/settings/jetty/localhost.jks and /dev/null differ diff --git a/server/-product/production/MEDIAVIVANTIS/settings/mediacube.yaml b/server/-product/production/MEDIAVIVANTIS/settings/mediacube.yaml index fcf8cf5c..347ca896 100644 --- a/server/-product/production/MEDIAVIVANTIS/settings/mediacube.yaml +++ b/server/-product/production/MEDIAVIVANTIS/settings/mediacube.yaml @@ -1,4 +1,9 @@ jobQueuePollInterval: 1000 +disableHelp: true +maestroDisabled: false +alternateRetrieveSelector: false +disableStatistics: true +disableEditor: false topTypeFilters: - name: Hír bejátszó - name: Hír nyers @@ -13,6 +18,8 @@ bottomTypeFilters: - name: Reklám nyers authentication: authEnabled: true + defaultUser: root + defaultPassword: password adHost: intra.mediavivantis.hu adNonSecurePort: 3268 adBaseDn: DC=intra,DC=mediavivantis,DC=hu diff --git a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-deployer.xml b/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-deployer.xml deleted file mode 100644 index ba61d105..00000000 --- a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/jetty-deployer.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - 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 95d7f4c7..00000000 Binary files a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/keystore and /dev/null differ diff --git a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/localhost.jks b/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/localhost.jks deleted file mode 100644 index 95d7f4c7..00000000 Binary files a/server/-product/production/MEDIAVIVANTIS/settings/test-jetty/localhost.jks and /dev/null differ diff --git a/server/RemoteSystemsTempFiles/.project b/server/RemoteSystemsTempFiles/.project deleted file mode 100644 index 76756293..00000000 --- a/server/RemoteSystemsTempFiles/.project +++ /dev/null @@ -1,12 +0,0 @@ - - - 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);