From a650ed37cb3de84681819f1a5437e21cecdba9e0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Tue, 3 Oct 2017 08:46:50 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30508 --- .../Maestro/Resources/configuration-unc.json | 10 +++---- server/-configuration/log4j2.xml | 2 +- .../run-mediacube-server-bsh.launch | 2 +- .../run-mediacube-server-localhost.launch | 2 +- .../run-mediacube-server.launch | 2 +- .../run-mediacube-server2_adam.launch | 2 +- server/-configuration/scheduledjobs.json | 4 +-- .../retrieve-traffic-missing-materials.xml | 28 +++++++++++++------ 8 files changed, 32 insertions(+), 20 deletions(-) diff --git a/client/Maestro/Resources/configuration-unc.json b/client/Maestro/Resources/configuration-unc.json index 2ef89f6e..55ef422c 100644 --- a/client/Maestro/Resources/configuration-unc.json +++ b/client/Maestro/Resources/configuration-unc.json @@ -23,7 +23,7 @@ { "$type": "OctopusMetadata", "server": { - "address": "http://localhost:8080/services/rest/octopus/", + "address": "http://10.10.1.28:8080/services/rest/octopus/", "userName": "dani", "password": "dani", "timeout": 1000 @@ -41,7 +41,7 @@ { "$type": "MediaCubeMetadata", "server": { - "address": "http://localhost:8080/services/rest/jobengine/", + "address": "http://10.10.1.28:8080/services/rest/jobengine/", "userName": "dani", "password": "dani" } @@ -50,13 +50,13 @@ "targets": [ { "label": "Archive", - "processor": "FTPTargetProcessor", + "processor": "FXPTargetProcessor", "outputFormat": "{0}-{1}", "killDateDays": 1, "remote": { "address": "ftp://10.10.1.100:21/ARCHIVE", - "userName": "dani", - "password": "dani" + "userName": "mediacube", + "password": "Broadca5T" } }, { diff --git a/server/-configuration/log4j2.xml b/server/-configuration/log4j2.xml index b7eb36e6..a848af97 100644 --- a/server/-configuration/log4j2.xml +++ b/server/-configuration/log4j2.xml @@ -61,6 +61,6 @@ - + \ No newline at end of file diff --git a/server/-configuration/run-mediacube-server-bsh.launch b/server/-configuration/run-mediacube-server-bsh.launch index ed3b2013..0cef7afc 100644 --- a/server/-configuration/run-mediacube-server-bsh.launch +++ b/server/-configuration/run-mediacube-server-bsh.launch @@ -19,7 +19,7 @@ - + diff --git a/server/-configuration/run-mediacube-server-localhost.launch b/server/-configuration/run-mediacube-server-localhost.launch index 810aaaf9..7b223a19 100644 --- a/server/-configuration/run-mediacube-server-localhost.launch +++ b/server/-configuration/run-mediacube-server-localhost.launch @@ -19,7 +19,7 @@ - + diff --git a/server/-configuration/run-mediacube-server.launch b/server/-configuration/run-mediacube-server.launch index e1005b1c..ac2b9795 100644 --- a/server/-configuration/run-mediacube-server.launch +++ b/server/-configuration/run-mediacube-server.launch @@ -19,7 +19,7 @@ - + diff --git a/server/-configuration/run-mediacube-server2_adam.launch b/server/-configuration/run-mediacube-server2_adam.launch index e4400e2a..16b49366 100644 --- a/server/-configuration/run-mediacube-server2_adam.launch +++ b/server/-configuration/run-mediacube-server2_adam.launch @@ -19,7 +19,7 @@ - + diff --git a/server/-configuration/scheduledjobs.json b/server/-configuration/scheduledjobs.json index 72cb21d4..fa37b2a7 100644 --- a/server/-configuration/scheduledjobs.json +++ b/server/-configuration/scheduledjobs.json @@ -16,8 +16,8 @@ "template": "retrieve-traffic-missing-materials.xml", "executeimmediate": true, "cronexpression": "0 0 0/1 1/1 * ? *", - "parameters": [ - {"name": "dbUrl", "value": "", "type": "java.lang.String"}, + "parameters": [ + {"name": "dbUrl", "value": "jdbc:sqlserver://folkloredb.hu\\sql08:33860;databaseName=CLArchiveTF_0;", "type": "java.lang.String"}, {"name": "userName", "value": "MAM", "type": "java.lang.String"}, {"name": "password", "value": "Echotv.hu", "type": "java.lang.String"}, {"name": "lookupDays", "value": 7, "type": "java.lang.Integer"}, diff --git a/server/user.jobengine.executors/jobtemplates/retrieve-traffic-missing-materials.xml b/server/user.jobengine.executors/jobtemplates/retrieve-traffic-missing-materials.xml index 20a07869..8579faf2 100644 --- a/server/user.jobengine.executors/jobtemplates/retrieve-traffic-missing-materials.xml +++ b/server/user.jobengine.executors/jobtemplates/retrieve-traffic-missing-materials.xml @@ -1,19 +1,31 @@ - - - - - - - + + + + + + + - + + + + + + + + + + + + + -- 2.54.0