git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/-configuration/run-mediacube-server-mv.launch b/server/-configuration/run-mediacube-server-mv.launch
index eab8ccfd83e23e0ce47dd2187e8aad063bd1c33e..9b9b141cea16bca6c925957922e836a125fa54a1 100644 (file)
--- a/server/-configuration/run-mediacube-server-mv.launch
+++ b/server/-configuration/run-mediacube-server-mv.launch
@@ -19,7 +19,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dlog4j.configurationFile=configuration/log4j2.xml&#13;&#10;-Djetty.home=configuration/jetty&#13;&#10;-Djetty.etc.config.urls=jetty.xml,jetty-ssl.xml,jetty-ssl-context.xml,jetty-http.xml,jetty-https.xml&#13;&#10;-Djava.io.tmpdir=tmp"/>\r
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dlog4j.configurationFile=settings/log4j2.xml&#13;&#10;-Djetty.home=settings/jetty&#13;&#10;-Djetty.etc.config.urls=jetty.xml,jetty-ssl.xml,jetty-ssl-context.xml,jetty-http.xml,jetty-https.xml&#13;&#10;-Djava.io.tmpdir=tmp"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:\_workspace\USER\MediaCube\server\-product\production\MEDIAVIVANTIS"/>\r
 <stringAttribute key="pde.version" value="3.3"/>\r
 <booleanAttribute key="show_selected_only" value="false"/>\r

diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target
index 8a7d24cab61ca396c15fb1cd0fa9e69f83098b86..7b9d8e417b5580125ec352d6cb9feb423db76106 100644 (file)
--- a/server/-dependencies/jobengine.target
+++ b/server/-dependencies/jobengine.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<?pde version="3.8"?><target name="JobEngine" sequenceNumber="478">\r
+<?pde version="3.8"?><target name="JobEngine" sequenceNumber="486">\r
 <locations>\r
 <location path="${workspace_loc}/-dependencies/target/repository/plugins" type="Directory"/>\r
 </locations>\r
@@ -37,8 +37,8 @@
 <plugin id="org.apache.commons.lang"/>\r
 <plugin id="org.apache.commons.net"/>\r
 <plugin id="org.apache.felix.gogo.command"/>\r
-<plugin id="org.apache.felix.gogo.runtime" version="0.10.0.v201209301036"/>\r
-<plugin id="org.apache.felix.gogo.shell" version="0.10.0.v201212101605"/>\r
+<plugin id="org.apache.felix.gogo.runtime" version="0.12.0"/>\r
+<plugin id="org.apache.felix.gogo.shell" version="0.12.0"/>\r
 <plugin id="org.apache.httpcomponents.httpclient"/>\r
 <plugin id="org.apache.httpcomponents.httpcore"/>\r
 <plugin id="org.apache.logging.log4j.api"/>\r

diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml
index dcaa5f7a44fab170a8fe2ddc0587927700f7fb00..20945306e8bb1899789f4d7ebbfc988dbbe77cf2 100644 (file)
--- a/server/-dependencies/pom.xml
+++ b/server/-dependencies/pom.xml
@@ -103,6 +103,24 @@
                                                <id>default-cli</id>\r
                                                <configuration>\r
                                                        <artifacts>\r
+                                                               <artifact>\r
+                                                                       <id>org.apache.felix:org.apache.felix.gogo.command:0.12.0</id>\r
+                                                               </artifact>\r
+                                                               <artifact>\r
+                                                                       <id>org.apache.felix:org.apache.felix.gogo.shell:0.12.0</id>\r
+                                                               </artifact>\r
+                                                               <artifact>\r
+                                                                       <id>org.apache.felix:org.apache.felix.gogo.runtime:0.12.0</id>\r
+                                                               </artifact>\r
+<!--                                                           <artifact> -->\r
+<!--                                                                   <id>org.apache.felix:org.apache.felix.gogo.command:0.10.0.v201209301215</id> -->\r
+<!--                                                           </artifact> -->\r
+<!--                                                           <artifact> -->\r
+<!--                                                                   <id>org.apache.felix:org.apache.felix.gogo.shell:0.10.0</id> -->\r
+<!--                                                           </artifact> -->\r
+<!--                                                           <artifact> -->\r
+<!--                                                                   <id>org.apache.felix:org.apache.felix.gogo.runtime:0.10.0</id> -->\r
+<!--                                                           </artifact> -->\r
                                                                <artifact>\r
                                                                        <id>org.eclipse.platform:org.eclipse.equinox.launcher:1.3.201</id>\r
                                                                </artifact>\r
@@ -154,19 +172,6 @@
                                                                <artifact>\r
                                                                        <id>org.eclipse.jetty:jetty-server:9.3.9.v20160517</id>\r
                                                                </artifact>\r
-                                                               <artifact>\r
-                                                                       <id>org.apache.felix:org.apache.felix.gogo.command:0.10.0.v201209301215</id>\r
-                                                               </artifact>\r
-                                                               <artifact>\r
-                                                                       <id>org.apache.felix:org.apache.felix.gogo.shell:0.10.0</id>\r
-                                                               </artifact>\r
-                                                               <artifact>\r
-                                                                       <id>org.apache.felix:org.apache.felix.gogo.runtime:0.10.0</id>\r
-                                                               </artifact>\r
-<!--                                                           <artifact> -->\r
-<!--                                                                   <id>org.apache.felix:org.apache.felix.gogo.command:0.10.0.v201209301215</id> -->\r
-<!--                                                           </artifact> -->\r
-                                                               \r
                                                                <artifact>\r
                                                                        <id>commons-io:commons-io:2.2</id>\r
                                                                </artifact>\r

diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product
index 56eb52f9d74e292efb52ea1072bfdf9a09628e72..d5d522e39970595669ff2aa27356d21dd7604353 100644 (file)
--- a/server/-product/mediacube.product
+++ b/server/-product/mediacube.product
@@ -12,7 +12,6 @@
 \r
    <windowImages/>\r
 \r
-\r
    <launcher name="mediacube">\r
       <solaris/>\r
       <win useIco="false">\r
@@ -57,9 +56,9 @@
       <plugin id="org.apache.commons.io"/>\r
       <plugin id="org.apache.commons.lang"/>\r
       <plugin id="org.apache.commons.net"/>\r
-      <plugin id="org.apache.felix.gogo.command" version="0.10.0.v201209301215"/>\r
-      <plugin id="org.apache.felix.gogo.runtime" version="0.10.0.v201209301036"/>\r
-      <plugin id="org.apache.felix.gogo.shell" version="0.10.0.v201212101605"/>\r
+      <plugin id="org.apache.felix.gogo.command" version="0.12.0"/>\r
+      <plugin id="org.apache.felix.gogo.runtime" version="0.12.0"/>\r
+      <plugin id="org.apache.felix.gogo.shell" version="0.12.0"/>\r
       <plugin id="org.apache.httpcomponents.httpclient"/>\r
       <plugin id="org.apache.httpcomponents.httpcore"/>\r
       <plugin id="org.apache.logging.log4j.api"/>\r

diff --git a/server/-product/pom.xml b/server/-product/pom.xml
index 50348368fc94bdf9de9685b091b385e22800e889..3a81fbecdebf30389e8f2b6f4f6839da394b1493 100644 (file)
--- a/server/-product/pom.xml
+++ b/server/-product/pom.xml
@@ -35,6 +35,107 @@
                                        </execution>\r
                                </executions>\r
                        </plugin>\r
+                       <plugin>\r
+                               <groupId>org.apache.maven.plugins</groupId>\r
+                               <artifactId>maven-resources-plugin</artifactId>\r
+                               <version>2.7</version>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <id>copy-resources-1</id>\r
+                                               <phase>install</phase>\r
+                                               <goals>\r
+                                                       <goal>copy-resources</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <outputDirectory>${basedir}/production/MEDIAVIVANTIS/plugins</outputDirectory>\r
+                                                       <resources>\r
+                                                               <resource>\r
+                                                                       <directory>${project.build.directory}/products/MediaCube/linux/gtk/x86_64/plugins</directory>\r
+                                                               </resource>\r
+                                                       </resources>\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <execution>\r
+                                               <id>copy-resources-2</id>\r
+                                               <phase>install</phase>\r
+                                               <goals>\r
+                                                       <goal>copy-resources</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <outputDirectory>${basedir}/production/MEDIAVIVANTIS/configuration</outputDirectory>\r
+                                                       <resources>\r
+                                                               <resource>\r
+                                                                       <directory>${project.build.directory}/products/MediaCube/linux/gtk/x86_64/configuration</directory>\r
+                                                                       <include>config.ini</include>\r
+                                                               </resource>\r
+                                                       </resources>\r
+                                               </configuration>                                                \r
+                                       </execution>\r
+                                       <execution>\r
+                                               <id>copy-resources-3</id>\r
+                                               <phase>install</phase>\r
+                                               <goals>\r
+                                                       <goal>copy-resources</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <outputDirectory>${basedir}/production/AMC/plugins</outputDirectory>\r
+                                                       <resources>\r
+                                                               <resource>\r
+                                                                       <directory>${project.build.directory}/products/MediaCube/linux/gtk/x86_64/plugins</directory>\r
+                                                               </resource>\r
+                                                       </resources>\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <execution>\r
+                                               <id>copy-resources-4</id>\r
+                                               <phase>install</phase>\r
+                                               <goals>\r
+                                                       <goal>copy-resources</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <outputDirectory>${basedir}/production/AMC/configuration</outputDirectory>\r
+                                                       <resources>\r
+                                                               <resource>\r
+                                                                       <directory>${project.build.directory}/products/MediaCube/linux/gtk/x86_64/configuration</directory>\r
+                                                                       <include>config.ini</include>\r
+                                                               </resource>\r
+                                                       </resources>\r
+                                               </configuration>                                                \r
+                                       </execution>\r
+                                       <execution>\r
+                                               <id>copy-resources-5</id>\r
+                                               <phase>install</phase>\r
+                                               <goals>\r
+                                                       <goal>copy-resources</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <outputDirectory>${basedir}/production/HIRTV/plugins</outputDirectory>\r
+                                                       <resources>\r
+                                                               <resource>\r
+                                                                       <directory>${project.build.directory}/products/MediaCube/linux/gtk/x86_64/plugins</directory>\r
+                                                               </resource>\r
+                                                       </resources>\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <execution>\r
+                                               <id>copy-resources-6</id>\r
+                                               <phase>install</phase>\r
+                                               <goals>\r
+                                                       <goal>copy-resources</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <outputDirectory>${basedir}/production/HIRTV/configuration</outputDirectory>\r
+                                                       <resources>\r
+                                                               <resource>\r
+                                                                       <directory>${project.build.directory}/products/MediaCube/linux/gtk/x86_64/configuration</directory>\r
+                                                                       <include>config.ini</include>\r
+                                                               </resource>\r
+                                                       </resources>\r
+                                               </configuration>                                                \r
+                                       </execution>\r
+                               </executions>\r
+                       </plugin>\r
+                       \r
                </plugins>\r
        </build>\r
 \r

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 991da2c903069420da07737ead576aefa16181fe..980631a7259912d9d9932a035e6fffc70cd249cd 100644 (file)
--- 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\r
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
+org.eclipse.jdt.core.compiler.codegen.methodParameters=generate\r
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8\r
 org.eclipse.jdt.core.compiler.compliance=1.8\r
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled\r
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning\r
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore\r
 org.eclipse.jdt.core.compiler.release=disabled\r
 org.eclipse.jdt.core.compiler.source=1.8\r

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 9c28fe312bc680a2375b0841d36b6d8149263d08..3a09395fca0d5b8f1de3a7d27c0fa5501bb018da 100644 (file)
--- 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;\r
        public static final String GETMEDIAUSAGEBYUTRANGE = "/getMediaUsageByUTRange";\r
        public static final String GETCUSTOMVIEW = "/getCustomView";\r
-       public static final String SOAP_TEMPLATE_ROOT = SystemConfiguration.getInstance().value("services.peablebeach.template-root", "configuration/soap");\r
 \r
        private static Document toDocument(String xml) {\r
                DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();\r
@@ -198,7 +197,9 @@ public class PBQuery {
        public void queryOtherMedias(List<String> poolContent, Map<String, MMMedia> result) throws Exception {\r
                String xml = null;\r
                String soap = null;\r
-               Path template = Paths.get(SOAP_TEMPLATE_ROOT, GETCUSTOMVIEW);\r
+\r
+               String configDir = SystemConfiguration.getInstance().getConfig("settings/soap");\r
+               Path template = Paths.get(configDir, GETCUSTOMVIEW);\r
 \r
                if (!template.toFile().exists())\r
                        throw new FileNotFoundException(template.toString());\r
@@ -248,7 +249,8 @@ public class PBQuery {
                String xml = null;\r
                String soap = null;\r
 \r
-               Path template = Paths.get(SOAP_TEMPLATE_ROOT, GETMEDIAUSAGEBYUTRANGE);\r
+               String configDir = SystemConfiguration.getInstance().getConfig("settings/soap");\r
+               Path template = Paths.get(configDir, GETMEDIAUSAGEBYUTRANGE);\r
                if (!template.toFile().exists())\r
                        throw new FileNotFoundException(template.toString());\r
 \r