From: vasary.daniel Date: Wed, 10 Feb 2021 09:18:36 +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=766ec4c371897b0ab4bb5281087fc3b7e5a8030a;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32143 --- diff --git a/server/-configuration/run-mediacube-server-mv.launch b/server/-configuration/run-mediacube-server-mv.launch index eab8ccfd..9b9b141c 100644 --- a/server/-configuration/run-mediacube-server-mv.launch +++ b/server/-configuration/run-mediacube-server-mv.launch @@ -19,7 +19,7 @@ - + diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target index 8a7d24ca..7b9d8e41 100644 --- a/server/-dependencies/jobengine.target +++ b/server/-dependencies/jobengine.target @@ -1,5 +1,5 @@ - + @@ -37,8 +37,8 @@ - - + + diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml index dcaa5f7a..20945306 100644 --- a/server/-dependencies/pom.xml +++ b/server/-dependencies/pom.xml @@ -103,6 +103,24 @@ default-cli + + org.apache.felix:org.apache.felix.gogo.command:0.12.0 + + + org.apache.felix:org.apache.felix.gogo.shell:0.12.0 + + + org.apache.felix:org.apache.felix.gogo.runtime:0.12.0 + + + + + + + + + + org.eclipse.platform:org.eclipse.equinox.launcher:1.3.201 @@ -154,19 +172,6 @@ org.eclipse.jetty:jetty-server:9.3.9.v20160517 - - org.apache.felix:org.apache.felix.gogo.command:0.10.0.v201209301215 - - - org.apache.felix:org.apache.felix.gogo.shell:0.10.0 - - - org.apache.felix:org.apache.felix.gogo.runtime:0.10.0 - - - - - commons-io:commons-io:2.2 diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product index 56eb52f9..d5d522e3 100644 --- a/server/-product/mediacube.product +++ b/server/-product/mediacube.product @@ -12,7 +12,6 @@ - @@ -57,9 +56,9 @@ - - - + + + diff --git a/server/-product/pom.xml b/server/-product/pom.xml index 50348368..3a81fbec 100644 --- a/server/-product/pom.xml +++ b/server/-product/pom.xml @@ -35,6 +35,107 @@ + + org.apache.maven.plugins + maven-resources-plugin + 2.7 + + + copy-resources-1 + install + + copy-resources + + + ${basedir}/production/MEDIAVIVANTIS/plugins + + + ${project.build.directory}/products/MediaCube/linux/gtk/x86_64/plugins + + + + + + copy-resources-2 + install + + copy-resources + + + ${basedir}/production/MEDIAVIVANTIS/configuration + + + ${project.build.directory}/products/MediaCube/linux/gtk/x86_64/configuration + config.ini + + + + + + copy-resources-3 + install + + copy-resources + + + ${basedir}/production/AMC/plugins + + + ${project.build.directory}/products/MediaCube/linux/gtk/x86_64/plugins + + + + + + copy-resources-4 + install + + copy-resources + + + ${basedir}/production/AMC/configuration + + + ${project.build.directory}/products/MediaCube/linux/gtk/x86_64/configuration + config.ini + + + + + + copy-resources-5 + install + + copy-resources + + + ${basedir}/production/HIRTV/plugins + + + ${project.build.directory}/products/MediaCube/linux/gtk/x86_64/plugins + + + + + + copy-resources-6 + install + + copy-resources + + + ${basedir}/production/HIRTV/configuration + + + ${project.build.directory}/products/MediaCube/linux/gtk/x86_64/configuration + config.ini + + + + + + + diff --git a/server/hu.user.mediacube.indexer/.settings/org.eclipse.jdt.core.prefs b/server/hu.user.mediacube.indexer/.settings/org.eclipse.jdt.core.prefs index 991da2c9..980631a7 100644 --- a/server/hu.user.mediacube.indexer/.settings/org.eclipse.jdt.core.prefs +++ b/server/hu.user.mediacube.indexer/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,12 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/server/user.jobengine.executors/amc/user/jobengine/server/steps/PBQuery.java b/server/user.jobengine.executors/amc/user/jobengine/server/steps/PBQuery.java index 9c28fe31..3a09395f 100644 --- a/server/user.jobengine.executors/amc/user/jobengine/server/steps/PBQuery.java +++ b/server/user.jobengine.executors/amc/user/jobengine/server/steps/PBQuery.java @@ -67,7 +67,6 @@ public class PBQuery { private static final int SOCKET_TIMEOUT = 5000; public static final String GETMEDIAUSAGEBYUTRANGE = "/getMediaUsageByUTRange"; public static final String GETCUSTOMVIEW = "/getCustomView"; - public static final String SOAP_TEMPLATE_ROOT = SystemConfiguration.getInstance().value("services.peablebeach.template-root", "configuration/soap"); private static Document toDocument(String xml) { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); @@ -198,7 +197,9 @@ public class PBQuery { public void queryOtherMedias(List poolContent, Map result) throws Exception { String xml = null; String soap = null; - Path template = Paths.get(SOAP_TEMPLATE_ROOT, GETCUSTOMVIEW); + + String configDir = SystemConfiguration.getInstance().getConfig("settings/soap"); + Path template = Paths.get(configDir, GETCUSTOMVIEW); if (!template.toFile().exists()) throw new FileNotFoundException(template.toString()); @@ -248,7 +249,8 @@ public class PBQuery { String xml = null; String soap = null; - Path template = Paths.get(SOAP_TEMPLATE_ROOT, GETMEDIAUSAGEBYUTRANGE); + String configDir = SystemConfiguration.getInstance().getConfig("settings/soap"); + Path template = Paths.get(configDir, GETMEDIAUSAGEBYUTRANGE); if (!template.toFile().exists()) throw new FileNotFoundException(template.toString());