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

diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product
index 69f1774bc2139b9a7b98c25dfdcd7bbb2b21b9c0..28c4d9746d9cbadd16c2e60fd5e7774062a1ea37 100644 (file)
--- a/server/-product/mediacube.product
+++ b/server/-product/mediacube.product
@@ -9,21 +9,21 @@
    <launcherArgs>\r
       <programArgs>-consoleLog -console 5555\r
       </programArgs>\r
-      <vmArgs>-Dfile.encoding=UTF-8\r
--agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888\r
--Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory\r
-\r
-#System\r
--Dorg.eclipse.equinox.http.jetty.http.port=8080\r
--Dorg.eclipse.epp.logging.aeri.skipReports=true \r
--Declipse.ignoreApp=true \r
--Dosgi.noShutdown=true\r
--Djetty.home=./configuration/jetty\r
--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\r
--Dlog4j.configurationFile=./configuration/log4j2.xml\r
--Djobengine.loglevel=INFO\r
--Djobengine.jobsteps.root=./configuration/executors\r
--Djobengine.jobtemplates.root=./configuration/jobtemplates\r
+      <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\r
       </vmArgs>\r
       <vmArgsLin>#Database
@@ -89,7 +89,6 @@
       <plugin id="com.fasterxml.jackson.core.jackson-annotations"/>\r
       <plugin id="com.fasterxml.jackson.core.jackson-core"/>\r
       <plugin id="com.fasterxml.jackson.core.jackson-databind"/>\r
-      <plugin id="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml"/>\r
       <plugin id="com.fasterxml.jackson.datatype.jackson-datatype-joda"/>\r
       <plugin id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base"/>\r
       <plugin id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>\r

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