From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Fri, 6 Oct 2017 10:29:41 +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=16495c5fd3ceb920340a34b30cf7889dffc05fb5;p=mediacube.git

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

diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product
index 69f1774b..28c4d974 100644
--- a/server/-product/mediacube.product
+++ b/server/-product/mediacube.product
@@ -9,21 +9,21 @@
    <launcherArgs>
       <programArgs>-consoleLog -console 5555
       </programArgs>
-      <vmArgs>-Dfile.encoding=UTF-8
--agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888
--Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory
-
-#System
--Dorg.eclipse.equinox.http.jetty.http.port=8080
--Dorg.eclipse.epp.logging.aeri.skipReports=true 
--Declipse.ignoreApp=true 
--Dosgi.noShutdown=true
--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
--Djobengine.loglevel=INFO
--Djobengine.jobsteps.root=./configuration/executors
--Djobengine.jobtemplates.root=./configuration/jobtemplates
+      <vmArgs>-Dfile.encoding=UTF-8
+-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888
+-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory
+
+#System
+-Dorg.eclipse.equinox.http.jetty.http.port=8080
+-Dorg.eclipse.epp.logging.aeri.skipReports=true 
+-Declipse.ignoreApp=true 
+-Dosgi.noShutdown=true
+-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
+-Djobengine.loglevel=INFO
+-Djobengine.jobsteps.root=./configuration/executors
+-Djobengine.jobtemplates.root=./configuration/jobtemplates
 -Djobengine.jobscheduling.config=./configuration/scheduledjobs.json
       </vmArgs>
       <vmArgsLin>#Database
@@ -89,7 +89,6 @@
       <plugin id="com.fasterxml.jackson.core.jackson-annotations"/>
       <plugin id="com.fasterxml.jackson.core.jackson-core"/>
       <plugin id="com.fasterxml.jackson.core.jackson-databind"/>
-      <plugin id="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml"/>
       <plugin id="com.fasterxml.jackson.datatype.jackson-datatype-joda"/>
       <plugin id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base"/>
       <plugin id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
diff --git a/server/-product/test1.product1 b/server/-product/test1.product1
deleted file mode 100644
index 51f35774..00000000
--- a/server/-product/test1.product1
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product application="org.eclipse.ui.ide.workbench" useFeatures="false" includeLaunchers="true">
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <programArgs>-consoleLog -console
-      </programArgs>
-      <vmArgs>-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory
--Dorg.eclipse.equinox.http.jetty.http.port=8080
--Dorg.eclipse.epp.logging.aeri.skipReports=true 
--Declipse.ignoreApp=true 
--Dosgi.noShutdown=true
--Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/config&quot;
--Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;
--Djobengine.db.url=jdbc:db2://10.10.1.28:50000/mc:retrieveMessagesFromServerOnGetMessage=true;
--Djobengine.db.user=db2admin
--Djobengine.db.password=password
--Djobengine.loglevel=INFO
--Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;
--Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/user/jobengine/server/steps&quot;
--Djetty.home=&quot;${workspace_loc:}/-configuration/jetty&quot;
--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
--Djobengine.octopus.api.address=http://10.10.1.11/api/v1
--Djobengine.octopus.api.user=mam
--Djobengine.octopus.api.password=napocska
--Djobengine.nosql.db.url=jdbc:db2://10.10.1.28:50000/mc:retrieveMessagesFromServerOnGetMessage=true;
--Djobengine.nosql.db.user=db2admin
--Djobengine.nosql.db.password=password
--Djobengine.nosql.db.schema=test
--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=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;
--Dnexio.host=10.10.1.555
-      </vmArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
-      </vmArgsMac>
-   </launcherArgs>
-
-   <vm>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>
-   </vm>
-
-   <plugins>
-      <plugin id="cglib"/>
-      <plugin id="com.auth0.java-jwt"/>
-      <plugin id="com.fasterxml.jackson.core.jackson-annotations"/>
-      <plugin id="com.fasterxml.jackson.core.jackson-core"/>
-      <plugin id="com.fasterxml.jackson.core.jackson-databind"/>
-      <plugin id="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml"/>
-      <plugin id="com.fasterxml.jackson.datatype.jackson-datatype-joda"/>
-      <plugin id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base"/>
-      <plugin id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
-      <plugin id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations"/>
-      <plugin id="com.google.guava"/>
-      <plugin id="com.ibm.db2jcc4"/>
-      <plugin id="com.ibm.nosql"/>
-      <plugin id="com.microsoft.sqlserver.sqljdbc"/>
-      <plugin id="com.sun.el.javax.el"/>
-      <plugin id="commons-logging"/>
-      <plugin id="javassist"/>
-      <plugin id="javax.annotation-api"/>
-      <plugin id="javax.inject"/>
-      <plugin id="javax.mail"/>
-      <plugin id="javax.servlet-api"/>
-      <plugin id="javax.servlet.jsp-api"/>
-      <plugin id="javax.validation.api"/>
-      <plugin id="javax.ws.rs-api"/>
-      <plugin id="jcifs"/>
-      <plugin id="joda-time"/>
-      <plugin id="org.apache.aries.spifly.dynamic.bundle"/>
-      <plugin id="org.apache.aries.util"/>
-      <plugin id="org.apache.commons.beanutils"/>
-      <plugin id="org.apache.commons.codec"/>
-      <plugin id="org.apache.commons.collections"/>
-      <plugin id="org.apache.commons.digester"/>
-      <plugin id="org.apache.commons.io"/>
-      <plugin id="org.apache.commons.lang"/>
-      <plugin id="org.apache.commons.lang3"/>
-      <plugin id="org.apache.commons.logging"/>
-      <plugin id="org.apache.commons.net"/>
-      <plugin id="org.apache.felix.gogo.command"/>
-      <plugin id="org.apache.felix.gogo.runtime"/>
-      <plugin id="org.apache.felix.gogo.shell"/>
-      <plugin id="org.apache.httpcomponents.httpclient"/>
-      <plugin id="org.apache.httpcomponents.httpcore"/>
-      <plugin id="org.apache.jasper.glassfish"/>
-      <plugin id="org.apache.logging.log4j.api"/>
-      <plugin id="org.apache.logging.log4j.core"/>
-      <plugin id="org.apache.logging.log4j.slf4j-impl"/>
-      <plugin id="org.apache.servicemix.bundles.quartz"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.console"/>
-      <plugin id="org.eclipse.equinox.ds"/>
-      <plugin id="org.eclipse.equinox.util"/>
-      <plugin id="org.eclipse.jdt.core.compiler.batch"/>
-      <plugin id="org.eclipse.jetty.client"/>
-      <plugin id="org.eclipse.jetty.deploy"/>
-      <plugin id="org.eclipse.jetty.http"/>
-      <plugin id="org.eclipse.jetty.io"/>
-      <plugin id="org.eclipse.jetty.jsp"/>
-      <plugin id="org.eclipse.jetty.osgi.boot"/>
-      <plugin id="org.eclipse.jetty.osgi.boot.jsp" fragment="true"/>
-      <plugin id="org.eclipse.jetty.schemas"/>
-      <plugin id="org.eclipse.jetty.security"/>
-      <plugin id="org.eclipse.jetty.server"/>
-      <plugin id="org.eclipse.jetty.servlet"/>
-      <plugin id="org.eclipse.jetty.util"/>
-      <plugin id="org.eclipse.jetty.webapp"/>
-      <plugin id="org.eclipse.jetty.websocket.api"/>
-      <plugin id="org.eclipse.jetty.websocket.client"/>
-      <plugin id="org.eclipse.jetty.websocket.common"/>
-      <plugin id="org.eclipse.jetty.websocket.server"/>
-      <plugin id="org.eclipse.jetty.websocket.servlet"/>
-      <plugin id="org.eclipse.jetty.xml"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.services"/>
-      <plugin id="org.hamcrest.core"/>
-      <plugin id="org.jboss.resteasy.client"/>
-      <plugin id="org.jboss.resteasy.jaxrs"/>
-      <plugin id="org.jmock"/>
-      <plugin id="org.jmock.junit4"/>
-      <plugin id="org.junit"/>
-      <plugin id="org.jvnet.mimepull"/>
-      <plugin id="org.objectweb.asm"/>
-      <plugin id="org.objectweb.asm.commons"/>
-      <plugin id="org.objectweb.asm.tree"/>
-      <plugin id="org.reflections"/>
-      <plugin id="slf4j.api"/>
-      <plugin id="slf4j.simple" fragment="true"/>
-      <plugin id="user.commons.log4j2" fragment="true"/>
-      <plugin id="user.jobengine.osgi.commons"/>
-      <plugin id="user.jobengine.osgi.db"/>
-      <plugin id="user.jobengine.osgi.server"/>
-      <plugin id="user.jobengine.osgi.services"/>
-      <plugin id="user.tsm.client"/>
-   </plugins>
-
-   <configurations>
-      <plugin id="org.apache.logging.log4j.api" autoStart="true" startLevel="1" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="1" />
-      <plugin id="org.eclipse.jetty.osgi.boot" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
-      <plugin id="user.jobengine.osgi.commons" autoStart="true" startLevel="0" />
-   </configurations>
-
-</product>