From b923d367d84c50282c622bd4ee6fe57d63cee070 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Thu, 28 Sep 2017 11:51:41 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30480 --- .../deploy-mediacube-product.launch | 2 +- server/-product/mediacube.product | 39 ++++++++++++++----- server/-product/pom.xml | 3 -- .../config/config.xml | 11 ++---- 4 files changed, 34 insertions(+), 21 deletions(-) diff --git a/server/-configuration/deploy-mediacube-product.launch b/server/-configuration/deploy-mediacube-product.launch index 5436117e..acea32c8 100644 --- a/server/-configuration/deploy-mediacube-product.launch +++ b/server/-configuration/deploy-mediacube-product.launch @@ -1,7 +1,7 @@ - + diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product index e83589c6..67ff3587 100644 --- a/server/-product/mediacube.product +++ b/server/-product/mediacube.product @@ -17,30 +17,49 @@ -Djetty.home=./configuration/jetty -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 -Dlog4j.configurationFile=./configuration/log4j2.xml - -#JobEngine -Djobengine.loglevel=INFO -Djobengine.jobsteps.root=./configuration/executors -Djobengine.jobtemplates.root=./configuration/templates --Djobengine.db.url=jdbc:db2://10.228.198.1:50000/mediaarc:retrieveMessagesFromServerOnGetMessage=true; +-Djobengine.jobscheduling.config=./configuration/scheduledjobs.json + + #Database +-Djobengine.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true; -Djobengine.db.user=db2admin -Djobengine.db.password=password +-Djobengine.nosql.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true; +-Djobengine.nosql.db.user=db2admin +-Djobengine.nosql.db.password=password +-Djobengine.nosql.db.schema=test + +#Octopus -Djobengine.octopus.api.address=http://10.10.1.21/api/v1 -Djobengine.octopus.api.user=mam -Djobengine.octopus.api.password=napocska + +#Selenio +-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl +-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium + + -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts + + #Database +-Djobengine.db.url=jdbc:db2://10.228.198.1:50000/mediaarc:retrieveMessagesFromServerOnGetMessage=true; +-Djobengine.db.user=db2admin +-Djobengine.db.password=password -Djobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache:retrieveMessagesFromServerOnGetMessage=true; -Djobengine.nosql.db.user=db2admin -Djobengine.nosql.db.password=password -Djobengine.nosql.db.schema=test --Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB; --Djobengine.nexio.db.user=sa --Djobengine.nexio.db.password=resolve + +#Octopus +-Djobengine.octopus.api.address=http://10.10.1.21/api/v1 +-Djobengine.octopus.api.user=mam +-Djobengine.octopus.api.password=napocska + +#Selenio -Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl -Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium --Djobengine.jobscheduling.config=./configuration/scheduledjobs.json - - -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts - + diff --git a/server/-product/pom.xml b/server/-product/pom.xml index a1747f03..eb5d55d3 100644 --- a/server/-product/pom.xml +++ b/server/-product/pom.xml @@ -237,9 +237,6 @@ - scp://root:password@10.10.1.26 - ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4 - ${project.build.directory}/products/MediaCube/linux/gtk/x86_64 /opt/mediacube diff --git a/server/user.jobengine.executors/config/config.xml b/server/user.jobengine.executors/config/config.xml index 1662a216..9ac90b92 100644 --- a/server/user.jobengine.executors/config/config.xml +++ b/server/user.jobengine.executors/config/config.xml @@ -1,13 +1,10 @@ + + - - - + + - - - - \ No newline at end of file -- 2.54.0