From: vasary.daniel Date: Mon, 8 Feb 2021 20:08:30 +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=9cf5321becdd8b03772677e6262e03c166d5336c;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32141 --- diff --git a/server/-modules/pom.xml b/server/-modules/pom.xml index 6fe687f7..0231adbf 100644 --- a/server/-modules/pom.xml +++ b/server/-modules/pom.xml @@ -32,11 +32,11 @@ - - eclipse-neon - http://download.eclipse.org/releases/neon - p2 - + + + + + @@ -115,11 +115,11 @@ gtk x86_64 - - win32 - win32 - x86_64 - + + + + + diff --git a/server/-product/production/MEDIAVIVANTIS/settings/application.yaml b/server/-product/production/MEDIAVIVANTIS/settings/application.yaml new file mode 100644 index 00000000..c584e2a4 --- /dev/null +++ b/server/-product/production/MEDIAVIVANTIS/settings/application.yaml @@ -0,0 +1,63 @@ +datasource: + mediacube: + url: jdbc:db2://10.11.1.90:50000/mc + user: db2admin + password: password + external-indexer: false + simple-search: true + login-timeout: 3 + pool-size: 10 + mediacube-nosql: + url: jdbc:db2://10.11.1.90:50000/mc + user: db2admin + password: password + schema: test + login-timeout: 3 + nexio: + url: jdbc:db2://10.11.1.90:50000/mc + user: db2admin + password: password + hsm: + url: jdbc:db2://10.11.1.89:51500/tsmdb1 + user: tsminst1 + password: tsminst1 + planair: + url: jdbc:sqlserver://10.11.254.86;databaseName=PA_Vivantis; + user: MAM + password: VDani +services: + ffmpeg: + execurable-location: /opt/ffmpeg/ffmpeg + peablebeach: + template-root: configuration/soap + mediacube: + proxy-root: /opt + nexio: + host: 10.10.1.55 + collection-name: nexioclips + use-mos-gateway: true + disabled: true + octopus: + api: + address: http://10.10.1.11/api/v1 + user: mama + password: napocska + rundowns-collection-name: rundowns + stories-collection-name: stories + folders-collection-name: storyfolders +jobs: + nexio-track: false + randomize-archives: false + scheduled-execution: false + validate-transfers: false + copy-buffer-size: 32768 + scheduled-execution-disabled: true + randomize-archives: false +tsm: + randomize-archives: false + delimiter: / + node-name: JOBENGINE + fs-name: /JOBENGINE + alternate-fs-name: /JOBENGINE + hl-name: /JOBENGINE + \ 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 new file mode 100644 index 00000000..95b63984 --- /dev/null +++ b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-http.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-https.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-https.xml new file mode 100644 index 00000000..71a08377 --- /dev/null +++ b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-https.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + 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 new file mode 100644 index 00000000..e1edaf05 --- /dev/null +++ b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl-context.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + / + + + + + / + + + + + + + + + + diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl.xml new file mode 100644 index 00000000..a079c1f6 --- /dev/null +++ b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty-ssl.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty.xml b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty.xml new file mode 100644 index 00000000..0ba38381 --- /dev/null +++ b/server/-product/production/MEDIAVIVANTIS/settings/jetty/jetty.xml @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5000 + + + + diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/keystore b/server/-product/production/MEDIAVIVANTIS/settings/jetty/keystore new file mode 100644 index 00000000..95d7f4c7 Binary files /dev/null and b/server/-product/production/MEDIAVIVANTIS/settings/jetty/keystore differ diff --git a/server/-product/production/MEDIAVIVANTIS/settings/jetty/localhost.jks b/server/-product/production/MEDIAVIVANTIS/settings/jetty/localhost.jks new file mode 100644 index 00000000..95d7f4c7 Binary files /dev/null and b/server/-product/production/MEDIAVIVANTIS/settings/jetty/localhost.jks differ diff --git a/server/-product/production/MEDIAVIVANTIS/settings/log4j2.xml b/server/-product/production/MEDIAVIVANTIS/settings/log4j2.xml new file mode 100644 index 00000000..62e8b78f --- /dev/null +++ b/server/-product/production/MEDIAVIVANTIS/settings/log4j2.xml @@ -0,0 +1,21 @@ + + + + log/mediacube.log + /opt/log/$${date:yyyy-MM}/mediacube-%d{MM-dd-yyyy}-%i.log.gz + /opt/log/mediacube-err.log + /opt/log/$${date:yyyy-MM}/mediacube-err-%d{MM-dd-yyyy}-%i.log.gz + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/-product/production/MEDIAVIVANTIS/settings/maestro.json b/server/-product/production/MEDIAVIVANTIS/settings/maestro.json new file mode 100644 index 00000000..aa7778a6 --- /dev/null +++ b/server/-product/production/MEDIAVIVANTIS/settings/maestro.json @@ -0,0 +1,61 @@ +{ + "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/MEDIAVIVANTIS/settings/mediacube.json b/server/-product/production/MEDIAVIVANTIS/settings/mediacube.json new file mode 100644 index 00000000..c01d31f8 --- /dev/null +++ b/server/-product/production/MEDIAVIVANTIS/settings/mediacube.json @@ -0,0 +1,107 @@ +{ + "jobQueuePollInterval": 1000, + "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.mediavivantis.hu", + "adNonSecurePort": 3268, + "adBaseDn": "DC=intra,DC=mediavivantis,DC=hu", + "adAdminMap": [ + "G_MV_U_MUSZAK", + "G_MV_U_INGEST" + ], + "adSubmitterMap": [ + "G_ECH_U_INFORMATIKUSOK", + "G_ECH_U_MUSZAKVEZETOK", + "ECH-ISILON-ADMINS" + ], + "adEditorMap": [ + "G_ECH_U_INFORMATIKUSOK", + "G_ECH_U_MUSZAKVEZETOK", + "ECH-ISILON-ADMINS" + ], + "localAccounts": [ + { + "user" : "user", + "password" : "5F4DCC3B5AA765D61D8327DEB882CF99", + "email" : null + }, + { + "user" : "lebony", + "password" : "4E25B117B14D86D7DCECB4E433CF932C", + "email" : null + }, + { + "user" : "root", + "password" : "5F4DCC3B5AA765D61D8327DEB882CF99", + "email" : "vasary@elgekko.net" + } + ], + "localAdmins": [ + "root", + "admin" + ], + "localSubmitters": [ + "lebony" + ], + "localEditors": [ + "editor" + ] + } +} + + + diff --git a/server/user.jobengine.osgi.commons/src/user/commons/configuration/SystemConfiguration.java b/server/user.jobengine.osgi.commons/src/user/commons/configuration/SystemConfiguration.java index 42ef1c54..f0681266 100644 --- a/server/user.jobengine.osgi.commons/src/user/commons/configuration/SystemConfiguration.java +++ b/server/user.jobengine.osgi.commons/src/user/commons/configuration/SystemConfiguration.java @@ -28,7 +28,7 @@ public class SystemConfiguration implements IConfiguration { public SystemConfiguration() { try { - load(getConfig("configuration/application.yaml")); + load(getConfig("settings/application.yaml")); } catch (Exception e) { logger.catching(e); } diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java index f04e9f8d..e3cfaccf 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java @@ -36,8 +36,8 @@ import user.jobengine.server.steps.IJobStep; public class JobEngineConfiguration implements IJobEngineConfiguration { private static final Logger logger = LogManager.getLogger(); - public static final String CONF_MEDIACUBE = "configuration/mediacube.json"; - public static final String CONF_MAESTRO = "configuration/maestro.json"; + public static final String CONF_MEDIACUBE = "settings/mediacube.json"; + public static final String CONF_MAESTRO = "settings/maestro.json"; public static final String CONF_EXECUTORS = "jobs/executors.xml"; public static final String CONF_SCHEDULES = "jobs/schedules.json"; public static final String DIR_STEPS = "jobs/steps"; @@ -102,6 +102,7 @@ public class JobEngineConfiguration implements IJobEngineConfiguration { else sj.setJobName(name); + sj.setJobEngine(jobEngine); sj.setTemplateName(template); sj.setCronExpressions(NoSQLUtils.asString(jobJSON, "cronexpression")); sj.setExecuteOnStartup(NoSQLUtils.asBool(jobJSON, "executeimmediate")); diff --git a/server/user.mediacube.gui/OSGI-INF/componentBinder.xml b/server/user.mediacube.gui/OSGI-INF/componentBinder.xml index 720fd418..aa9e0487 100644 --- a/server/user.mediacube.gui/OSGI-INF/componentBinder.xml +++ b/server/user.mediacube.gui/OSGI-INF/componentBinder.xml @@ -2,7 +2,7 @@ - + diff --git a/server/user.mediacube.metadata/OSGI-INF/component.xml b/server/user.mediacube.metadata/OSGI-INF/component.xml index 63a74a6f..8d68619c 100644 --- a/server/user.mediacube.metadata/OSGI-INF/component.xml +++ b/server/user.mediacube.metadata/OSGI-INF/component.xml @@ -1,5 +1,5 @@ - +