From 8a864bf4f1bda5f856ce8c4bc86f69aa6102fc52 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= <vasary@elgekko.net>
Date: Thu, 25 Jan 2024 10:34:17 +0100
Subject: [PATCH] Project config repaired

---
 .../run-mediacube-server-hirtv.launch         | 114 ----------------
 .../run-mediacube-server-local.launch         | 126 ------------------
 .../run-mediacube-server-mv.launch            | 125 -----------------
 .../run-mediacube-server.launch               |  58 +++++++-
 .../run-mediacube-server.launch-              |  30 -----
 .../run-mediacube-server2.launch-             |  30 -----
 .../production/LOCAL/settings/mediacube.yaml  |   6 +-
 .../.classpath                                |   2 +-
 server/hu.user.theme.userdark/.classpath      |   2 +-
 server/user.jobengine.osgi.commons/.classpath |   6 +-
 server/user.jobengine.osgi.db/.classpath      |   4 +-
 server/user.jobengine.osgi.server/.classpath  |   4 +-
 .../user.jobengine.osgi.services/.classpath   |   2 +-
 server/user.mediacube.gui/.classpath          |   2 +-
 server/user.mediacube.metadata/.classpath     |   4 +-
 server/user.tsm.client/.classpath             |   2 +-
 16 files changed, 69 insertions(+), 448 deletions(-)
 delete mode 100644 server/-configuration/run-mediacube-server-hirtv.launch
 delete mode 100644 server/-configuration/run-mediacube-server-local.launch
 delete mode 100644 server/-configuration/run-mediacube-server-mv.launch
 delete mode 100644 server/-configuration/run-mediacube-server.launch-
 delete mode 100644 server/-configuration/run-mediacube-server2.launch-

diff --git a/server/-configuration/run-mediacube-server-hirtv.launch b/server/-configuration/run-mediacube-server-hirtv.launch
deleted file mode 100644
index dc9e0b79..00000000
--- a/server/-configuration/run-mediacube-server-hirtv.launch
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
-    <booleanAttribute key="append.args" value="true"/>
-    <booleanAttribute key="automaticAdd" value="false"/>
-    <booleanAttribute key="automaticValidate" value="true"/>
-    <stringAttribute key="bootstrap" value=""/>
-    <stringAttribute key="checked" value="[NONE]"/>
-    <booleanAttribute key="clearConfig" value="true"/>
-    <stringAttribute key="configLocation" value="${workspace_loc}\-product\production\HIRTV\tmp"/>
-    <booleanAttribute key="default" value="true"/>
-    <booleanAttribute key="default_auto_start" value="false"/>
-    <intAttribute key="default_start_level" value="4"/>
-    <setAttribute key="deselected_workspace_bundles"/>
-    <booleanAttribute key="includeOptional" value="false"/>
-    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
-    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-    </listAttribute>
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <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"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
-    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcom.sun.management.jmxremote&#13;&#10;-Dcom.sun.management.jmxremote.port=9010&#13;&#10;-Dcom.sun.management.jmxremote.local.only=false&#13;&#10;-Dcom.sun.management.jmxremote.authenticate=false&#13;&#10;-Dcom.sun.management.jmxremote.ssl=false&#13;&#10;-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;-Dgosh.home=configuration&#13;&#10;-Djava.io.tmpdir=tmp&#13;&#10;-Dorg.slf4j.simpleLogger.defaultLogLevel=error"/>
-    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}\-product\production\HIRTV"/>
-    <stringAttribute key="pde.version" value="3.3"/>
-    <setAttribute key="selected_target_bundles">
-        <setEntry value="cglib@default:default"/>
-        <setEntry value="com.fasterxml.jackson.core.jackson-annotations@default:default"/>
-        <setEntry value="com.fasterxml.jackson.core.jackson-core@default:default"/>
-        <setEntry value="com.fasterxml.jackson.core.jackson-databind@default:default"/>
-        <setEntry value="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml@default:default"/>
-        <setEntry value="com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default"/>
-        <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default"/>
-        <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default"/>
-        <setEntry value="com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default"/>
-        <setEntry value="com.ibm.db2.jcc@default:default"/>
-        <setEntry value="com.ibm.nosql@default:default"/>
-        <setEntry value="com.microsoft.sqlserver.sqljdbc@default:default"/>
-        <setEntry value="com.sun.jna@default:default"/>
-        <setEntry value="groovy@default:default"/>
-        <setEntry value="javax.annotation-api@default:default"/>
-        <setEntry value="javax.mail@default:default"/>
-        <setEntry value="javax.servlet-api@default:default"/>
-        <setEntry value="javax.ws.rs-api@default:default"/>
-        <setEntry value="jcifs@default:default"/>
-        <setEntry value="joda-time@default:default"/>
-        <setEntry value="junit@default:default"/>
-        <setEntry value="org.apache.aries.spifly.dynamic.bundle@default:default"/>
-        <setEntry value="org.apache.aries.util@default:default"/>
-        <setEntry value="org.apache.commons.beanutils@default:default"/>
-        <setEntry value="org.apache.commons.collections@default:default"/>
-        <setEntry value="org.apache.commons.digester@default:default"/>
-        <setEntry value="org.apache.commons.io@default:default"/>
-        <setEntry value="org.apache.commons.lang@default:default"/>
-        <setEntry value="org.apache.commons.net@default:default"/>
-        <setEntry value="org.apache.felix.gogo.command@default:default"/>
-        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
-        <setEntry value="org.apache.felix.gogo.shell@default:default"/>
-        <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
-        <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
-        <setEntry value="org.apache.servicemix.bundles.quartz@default:default"/>
-        <setEntry value="org.eclipse.equinox.common@2:true"/>
-        <setEntry value="org.eclipse.equinox.console@default:default"/>
-        <setEntry value="org.eclipse.equinox.ds@1:true"/>
-        <setEntry value="org.eclipse.equinox.util@default:default"/>
-        <setEntry value="org.eclipse.jetty.deploy@default:default"/>
-        <setEntry value="org.eclipse.jetty.http@default:default"/>
-        <setEntry value="org.eclipse.jetty.io@default:default"/>
-        <setEntry value="org.eclipse.jetty.osgi.boot@default:true"/>
-        <setEntry value="org.eclipse.jetty.schemas@default:default"/>
-        <setEntry value="org.eclipse.jetty.security@default:default"/>
-        <setEntry value="org.eclipse.jetty.server@default:default"/>
-        <setEntry value="org.eclipse.jetty.servlet@default:default"/>
-        <setEntry value="org.eclipse.jetty.util@default:default"/>
-        <setEntry value="org.eclipse.jetty.webapp@default:default"/>
-        <setEntry value="org.eclipse.jetty.websocket.api@default:default"/>
-        <setEntry value="org.eclipse.jetty.websocket.client@default:default"/>
-        <setEntry value="org.eclipse.jetty.websocket.common@default:default"/>
-        <setEntry value="org.eclipse.jetty.websocket.server@default:default"/>
-        <setEntry value="org.eclipse.jetty.websocket.servlet@default:default"/>
-        <setEntry value="org.eclipse.jetty.xml@default:default"/>
-        <setEntry value="org.eclipse.osgi.services@default:default"/>
-        <setEntry value="org.eclipse.osgi@-1:true"/>
-        <setEntry value="org.hamcrest.core@default:default"/>
-        <setEntry value="org.jboss.resteasy.client@default:default"/>
-        <setEntry value="org.jboss.resteasy.jaxrs-api@default:default"/>
-        <setEntry value="org.jboss.resteasy.jaxrs@default:default"/>
-        <setEntry value="org.jmock.junit4@default:default"/>
-        <setEntry value="org.jmock@default:default"/>
-        <setEntry value="org.mybatis.mybatis@default:default"/>
-        <setEntry value="org.objectweb.asm.commons@default:default"/>
-        <setEntry value="org.objectweb.asm.tree@default:default"/>
-        <setEntry value="org.objectweb.asm@default:default"/>
-        <setEntry value="org.omnifaces@default:default"/>
-        <setEntry value="slf4j.api@default:default"/>
-        <setEntry value="slf4j.simple@default:false"/>
-    </setAttribute>
-    <setAttribute key="selected_workspace_bundles">
-        <setEntry value="user.commons.zk@default:default"/>
-        <setEntry value="user.jobengine.log4j@1:true"/>
-        <setEntry value="user.jobengine.osgi.commons@default:true"/>
-        <setEntry value="user.jobengine.osgi.db@default:default"/>
-        <setEntry value="user.jobengine.osgi.server@default:default"/>
-        <setEntry value="user.jobengine.osgi.services@default:default"/>
-        <setEntry value="user.mediacube.gui@default:default"/>
-        <setEntry value="user.mediacube.metadata@default:default"/>
-        <setEntry value="user.tsm.client@default:default"/>
-    </setAttribute>
-    <booleanAttribute key="show_selected_only" value="false"/>
-    <booleanAttribute key="tracing" value="false"/>
-    <booleanAttribute key="useCustomFeatures" value="false"/>
-    <booleanAttribute key="useDefaultConfigArea" value="false"/>
-</launchConfiguration>
diff --git a/server/-configuration/run-mediacube-server-local.launch b/server/-configuration/run-mediacube-server-local.launch
deleted file mode 100644
index f5f6d7dd..00000000
--- a/server/-configuration/run-mediacube-server-local.launch
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
-    <booleanAttribute key="append.args" value="true"/>
-    <booleanAttribute key="automaticAdd" value="false"/>
-    <booleanAttribute key="automaticValidate" value="true"/>
-    <stringAttribute key="bootstrap" value=""/>
-    <stringAttribute key="checked" value="[NONE]"/>
-    <booleanAttribute key="clearConfig" value="true"/>
-    <stringAttribute key="configLocation" value="${workspace_loc}\-product\production\LOCAL\tmp"/>
-    <booleanAttribute key="default" value="true"/>
-    <booleanAttribute key="default_auto_start" value="false"/>
-    <intAttribute key="default_start_level" value="4"/>
-    <setAttribute key="deselected_workspace_bundles"/>
-    <booleanAttribute key="includeOptional" value="false"/>
-    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
-    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
-        <mapEntry key="DSMI_CONFIG" value="${workspace_loc}\-product\production\LOCAL\settings\dsm.opt"/>
-        <mapEntry key="DSMI_DIR" value="c:\apps\TSM\baclient"/>
-        <mapEntry key="DSMI_LOG" value="c:\temp"/>
-        <mapEntry key="DSM_CONFIG" value="${workspace_loc}\-product\production\LOCAL\settings\dsm.opt"/>
-        <mapEntry key="DSM_DIR" value="c:\apps\TSM\baclient"/>
-        <mapEntry key="LD_LIBRARY_PATH" value="c:\apps\TSM\baclient;${workspace_loc}"/>
-        <mapEntry key="LIBPATH" value="c:\apps\TSM\baclient"/>
-        <mapEntry key="SHLIB_PATH" value="c:\apps\TSM\baclient"/>
-    </mapAttribute>
-    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-    </listAttribute>
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <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"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
-    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-    <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&#13;&#10;-Djetty.etc.config.urls=jetty.xml&#13;&#10;-Dgosh.home=configuration&#13;&#10;-Djava.io.tmpdir=tmp&#13;&#10;-Djna.library.path=${workspace_loc}&#13;&#10;-Djava.library.path=${workspace_loc}&#13;&#10;-Dorg.slf4j.simpleLogger.defaultLogLevel=error"/>
-    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}\-product\production\LOCAL"/>
-    <stringAttribute key="pde.version" value="3.3"/>
-    <setAttribute key="selected_target_bundles">
-        <setEntry value="cglib@default:default"/>
-        <setEntry value="com.fasterxml.jackson.core.jackson-annotations@default:default"/>
-        <setEntry value="com.fasterxml.jackson.core.jackson-core@default:default"/>
-        <setEntry value="com.fasterxml.jackson.core.jackson-databind@default:default"/>
-        <setEntry value="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml@default:default"/>
-        <setEntry value="com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default"/>
-        <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default"/>
-        <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default"/>
-        <setEntry value="com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default"/>
-        <setEntry value="com.ibm.db2.jcc@default:default"/>
-        <setEntry value="com.ibm.nosql@default:default"/>
-        <setEntry value="com.microsoft.sqlserver.sqljdbc@default:default"/>
-        <setEntry value="com.sun.jna.platform@default:default"/>
-        <setEntry value="com.sun.jna@default:default"/>
-        <setEntry value="groovy@default:default"/>
-        <setEntry value="javax.annotation-api@default:default"/>
-        <setEntry value="javax.mail@default:default"/>
-        <setEntry value="javax.servlet-api@default:default"/>
-        <setEntry value="javax.ws.rs-api@default:default"/>
-        <setEntry value="jcifs@default:default"/>
-        <setEntry value="joda-time@default:default"/>
-        <setEntry value="junit@default:default"/>
-        <setEntry value="org.apache.aries.spifly.dynamic.bundle@default:default"/>
-        <setEntry value="org.apache.aries.util@default:default"/>
-        <setEntry value="org.apache.commons.beanutils@default:default"/>
-        <setEntry value="org.apache.commons.collections@default:default"/>
-        <setEntry value="org.apache.commons.digester@default:default"/>
-        <setEntry value="org.apache.commons.io@default:default"/>
-        <setEntry value="org.apache.commons.lang@default:default"/>
-        <setEntry value="org.apache.commons.net@default:default"/>
-        <setEntry value="org.apache.felix.gogo.command@default:default"/>
-        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
-        <setEntry value="org.apache.felix.gogo.shell@default:default"/>
-        <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
-        <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
-        <setEntry value="org.apache.servicemix.bundles.quartz@default:default"/>
-        <setEntry value="org.eclipse.equinox.common@2:true"/>
-        <setEntry value="org.eclipse.equinox.console@default:default"/>
-        <setEntry value="org.eclipse.equinox.ds@1:true"/>
-        <setEntry value="org.eclipse.equinox.util@default:default"/>
-        <setEntry value="org.eclipse.jetty.deploy@default:default"/>
-        <setEntry value="org.eclipse.jetty.http@default:default"/>
-        <setEntry value="org.eclipse.jetty.io@default:default"/>
-        <setEntry value="org.eclipse.jetty.osgi.boot@default:true"/>
-        <setEntry value="org.eclipse.jetty.schemas@default:default"/>
-        <setEntry value="org.eclipse.jetty.security@default:default"/>
-        <setEntry value="org.eclipse.jetty.server@default:default"/>
-        <setEntry value="org.eclipse.jetty.servlet@default:default"/>
-        <setEntry value="org.eclipse.jetty.util@default:default"/>
-        <setEntry value="org.eclipse.jetty.webapp@default:default"/>
-        <setEntry value="org.eclipse.jetty.websocket.api@default:default"/>
-        <setEntry value="org.eclipse.jetty.websocket.client@default:default"/>
-        <setEntry value="org.eclipse.jetty.websocket.common@default:default"/>
-        <setEntry value="org.eclipse.jetty.websocket.server@default:default"/>
-        <setEntry value="org.eclipse.jetty.websocket.servlet@default:default"/>
-        <setEntry value="org.eclipse.jetty.xml@default:default"/>
-        <setEntry value="org.eclipse.osgi.services@default:default"/>
-        <setEntry value="org.eclipse.osgi@-1:true"/>
-        <setEntry value="org.hamcrest.core@default:default"/>
-        <setEntry value="org.jboss.resteasy.client@default:default"/>
-        <setEntry value="org.jboss.resteasy.jaxrs-api@default:default"/>
-        <setEntry value="org.jboss.resteasy.jaxrs@default:default"/>
-        <setEntry value="org.jmock.junit4@default:default"/>
-        <setEntry value="org.jmock@default:default"/>
-        <setEntry value="org.mybatis.mybatis@default:default"/>
-        <setEntry value="org.objectweb.asm.commons@default:default"/>
-        <setEntry value="org.objectweb.asm.tree@default:default"/>
-        <setEntry value="org.objectweb.asm@default:default"/>
-        <setEntry value="org.omnifaces@default:default"/>
-        <setEntry value="slf4j.api@default:default"/>
-        <setEntry value="slf4j.simple@default:false"/>
-        <setEntry value="user.theme.userdark@default:default"/>
-    </setAttribute>
-    <setAttribute key="selected_workspace_bundles">
-        <setEntry value="user.commons.zk@default:default"/>
-        <setEntry value="user.jobengine.log4j@1:true"/>
-        <setEntry value="user.jobengine.osgi.commons@default:true"/>
-        <setEntry value="user.jobengine.osgi.db@default:default"/>
-        <setEntry value="user.jobengine.osgi.server@default:default"/>
-        <setEntry value="user.jobengine.osgi.services@default:default"/>
-        <setEntry value="user.mediacube.gui@default:default"/>
-        <setEntry value="user.mediacube.metadata@default:default"/>
-        <setEntry value="user.tsm.client@default:default"/>
-    </setAttribute>
-    <booleanAttribute key="show_selected_only" value="false"/>
-    <booleanAttribute key="tracing" value="false"/>
-    <booleanAttribute key="useCustomFeatures" value="false"/>
-    <booleanAttribute key="useDefaultConfigArea" value="false"/>
-</launchConfiguration>
diff --git a/server/-configuration/run-mediacube-server-mv.launch b/server/-configuration/run-mediacube-server-mv.launch
deleted file mode 100644
index e6a4c1a4..00000000
--- a/server/-configuration/run-mediacube-server-mv.launch
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
-    <booleanAttribute key="append.args" value="true"/>
-    <booleanAttribute key="automaticAdd" value="false"/>
-    <booleanAttribute key="automaticValidate" value="true"/>
-    <stringAttribute key="bootstrap" value=""/>
-    <stringAttribute key="checked" value="[NONE]"/>
-    <booleanAttribute key="clearConfig" value="true"/>
-    <stringAttribute key="configLocation" value="${workspace_loc}\-product\production\MEDIAVIVANTIS\tmp"/>
-    <booleanAttribute key="default" value="true"/>
-    <booleanAttribute key="default_auto_start" value="false"/>
-    <intAttribute key="default_start_level" value="4"/>
-    <setAttribute key="deselected_workspace_bundles"/>
-    <booleanAttribute key="includeOptional" value="false"/>
-    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
-    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
-        <mapEntry key="DSMI_CONFIG" value="${workspace_loc}\-product\production\MEDIAVIVANTIS\settings\dsm.opt"/>
-        <mapEntry key="DSMI_DIR" value="c:\apps\TSM\baclient"/>
-        <mapEntry key="DSMI_LOG" value="c:\temp"/>
-        <mapEntry key="DSM_CONFIG" value="${workspace_loc}\-product\production\MEDIAVIVANTIS\settings\dsm.opt"/>
-        <mapEntry key="DSM_DIR" value="c:\apps\TSM\baclient"/>
-        <mapEntry key="LD_LIBRARY_PATH" value="c:\apps\TSM\baclient;${workspace_loc}"/>
-        <mapEntry key="LIBPATH" value="c:\apps\TSM\baclient"/>
-        <mapEntry key="SHLIB_PATH" value="c:\apps\TSM\baclient"/>
-    </mapAttribute>
-    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-    </listAttribute>
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <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"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
-    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-    <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&#13;&#10;-Djetty.etc.config.urls=jetty.xml&#13;&#10;-Dgosh.home=configuration&#13;&#10;-Djava.io.tmpdir=tmp"/>
-    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}\-product\production\MEDIAVIVANTIS"/>
-    <stringAttribute key="pde.version" value="3.3"/>
-    <setAttribute key="selected_target_bundles">
-        <setEntry value="cglib@default:default"/>
-        <setEntry value="com.fasterxml.jackson.core.jackson-annotations@default:default"/>
-        <setEntry value="com.fasterxml.jackson.core.jackson-core@default:default"/>
-        <setEntry value="com.fasterxml.jackson.core.jackson-databind@default:default"/>
-        <setEntry value="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml@default:default"/>
-        <setEntry value="com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default"/>
-        <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default"/>
-        <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default"/>
-        <setEntry value="com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default"/>
-        <setEntry value="com.ibm.db2.jcc@default:default"/>
-        <setEntry value="com.ibm.nosql@default:default"/>
-        <setEntry value="com.microsoft.sqlserver.sqljdbc@default:default"/>
-        <setEntry value="com.sun.jna.platform@default:default"/>
-        <setEntry value="com.sun.jna@default:default"/>
-        <setEntry value="groovy@default:default"/>
-        <setEntry value="javax.annotation-api@default:default"/>
-        <setEntry value="javax.mail@default:default"/>
-        <setEntry value="javax.servlet-api@default:default"/>
-        <setEntry value="javax.ws.rs-api@default:default"/>
-        <setEntry value="jcifs@default:default"/>
-        <setEntry value="joda-time@default:default"/>
-        <setEntry value="junit@default:default"/>
-        <setEntry value="org.apache.aries.spifly.dynamic.bundle@default:default"/>
-        <setEntry value="org.apache.aries.util@default:default"/>
-        <setEntry value="org.apache.commons.beanutils@default:default"/>
-        <setEntry value="org.apache.commons.collections@default:default"/>
-        <setEntry value="org.apache.commons.digester@default:default"/>
-        <setEntry value="org.apache.commons.io@default:default"/>
-        <setEntry value="org.apache.commons.lang@default:default"/>
-        <setEntry value="org.apache.commons.net@default:default"/>
-        <setEntry value="org.apache.felix.gogo.command@default:default"/>
-        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
-        <setEntry value="org.apache.felix.gogo.shell@default:default"/>
-        <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
-        <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
-        <setEntry value="org.apache.servicemix.bundles.quartz@default:default"/>
-        <setEntry value="org.eclipse.equinox.common@2:true"/>
-        <setEntry value="org.eclipse.equinox.console@default:default"/>
-        <setEntry value="org.eclipse.equinox.ds@1:true"/>
-        <setEntry value="org.eclipse.equinox.util@default:default"/>
-        <setEntry value="org.eclipse.jetty.deploy@default:default"/>
-        <setEntry value="org.eclipse.jetty.http@default:default"/>
-        <setEntry value="org.eclipse.jetty.io@default:default"/>
-        <setEntry value="org.eclipse.jetty.osgi.boot@default:true"/>
-        <setEntry value="org.eclipse.jetty.schemas@default:default"/>
-        <setEntry value="org.eclipse.jetty.security@default:default"/>
-        <setEntry value="org.eclipse.jetty.server@default:default"/>
-        <setEntry value="org.eclipse.jetty.servlet@default:default"/>
-        <setEntry value="org.eclipse.jetty.util@default:default"/>
-        <setEntry value="org.eclipse.jetty.webapp@default:default"/>
-        <setEntry value="org.eclipse.jetty.websocket.api@default:default"/>
-        <setEntry value="org.eclipse.jetty.websocket.client@default:default"/>
-        <setEntry value="org.eclipse.jetty.websocket.common@default:default"/>
-        <setEntry value="org.eclipse.jetty.websocket.server@default:default"/>
-        <setEntry value="org.eclipse.jetty.websocket.servlet@default:default"/>
-        <setEntry value="org.eclipse.jetty.xml@default:default"/>
-        <setEntry value="org.eclipse.osgi.services@default:default"/>
-        <setEntry value="org.eclipse.osgi@-1:true"/>
-        <setEntry value="org.hamcrest.core@default:default"/>
-        <setEntry value="org.jboss.resteasy.client@default:default"/>
-        <setEntry value="org.jboss.resteasy.jaxrs-api@default:default"/>
-        <setEntry value="org.jboss.resteasy.jaxrs@default:default"/>
-        <setEntry value="org.jmock.junit4@default:default"/>
-        <setEntry value="org.jmock@default:default"/>
-        <setEntry value="org.mybatis.mybatis@default:default"/>
-        <setEntry value="org.objectweb.asm.commons@default:default"/>
-        <setEntry value="org.objectweb.asm.tree@default:default"/>
-        <setEntry value="org.objectweb.asm@default:default"/>
-        <setEntry value="org.omnifaces@default:default"/>
-        <setEntry value="slf4j.api@default:default"/>
-        <setEntry value="slf4j.simple@default:false"/>
-    </setAttribute>
-    <setAttribute key="selected_workspace_bundles">
-        <setEntry value="user.commons.zk@default:default"/>
-        <setEntry value="user.jobengine.log4j@1:true"/>
-        <setEntry value="user.jobengine.osgi.commons@default:true"/>
-        <setEntry value="user.jobengine.osgi.db@default:default"/>
-        <setEntry value="user.jobengine.osgi.server@default:default"/>
-        <setEntry value="user.jobengine.osgi.services@default:default"/>
-        <setEntry value="user.mediacube.gui@default:default"/>
-        <setEntry value="user.mediacube.metadata@default:default"/>
-        <setEntry value="user.tsm.client@default:default"/>
-    </setAttribute>
-    <booleanAttribute key="show_selected_only" value="false"/>
-    <booleanAttribute key="tracing" value="false"/>
-    <booleanAttribute key="useCustomFeatures" value="false"/>
-    <booleanAttribute key="useDefaultConfigArea" value="false"/>
-</launchConfiguration>
diff --git a/server/-configuration/run-mediacube-server.launch b/server/-configuration/run-mediacube-server.launch
index a7e5cc81..dc9e0b79 100644
--- a/server/-configuration/run-mediacube-server.launch
+++ b/server/-configuration/run-mediacube-server.launch
@@ -6,61 +6,109 @@
     <stringAttribute key="bootstrap" value=""/>
     <stringAttribute key="checked" value="[NONE]"/>
     <booleanAttribute key="clearConfig" value="true"/>
-    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/run-mediacube-server"/>
+    <stringAttribute key="configLocation" value="${workspace_loc}\-product\production\HIRTV\tmp"/>
     <booleanAttribute key="default" value="true"/>
     <booleanAttribute key="default_auto_start" value="false"/>
     <intAttribute key="default_start_level" value="4"/>
     <setAttribute key="deselected_workspace_bundles"/>
     <booleanAttribute key="includeOptional" value="false"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
     <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
         <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
     </listAttribute>
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <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"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-    <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;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/config&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.228.198.1:50000/mediaarc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=password&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:}/-configuration/jetty&quot;&#13;&#10;-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&#13;&#10;-Dorg.eclipse.jetty.webapp.basetempdir=c:\temp\jetty&#13;&#10;-Djava.io.tmpdir=c:\temp\jetty&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.11/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=password&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Djobengine.mediacube.config=&quot;${workspace_loc}/-configuration/mediacube.json&quot;&#13;&#10;-Djobengine.maestro.config=&quot;${workspace_loc}/-configuration/maestro.json&quot;&#13;&#10;-Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;&#13;&#10;-Djobengine.nexio.db.user=sa&#13;&#10;-Djobengine.nexio.db.password=resolve&#13;&#10;-Djobengine.planair.db.url=jdbc:sqlserver://10.10.1.45;databaseName=PA_Echo;&#13;&#10;-Djobengine.planair.db.user=MAM&#13;&#10;-Djobengine.planair.db.password=Echotv.hu&#13;&#10;-Dnexio.host=192.168.0.12&#13;&#10;-Djobengine.nexio.name=testnexioclips&#13;&#10;-Dnexio.useMOSGateway=false&#13;&#10;-Dnexio.disable=true&#13;&#10;-Dgui.statistics.disable=true&#13;&#10;-Dgui.help.disable=true&#13;&#10;-Dgui.editor.disable=true&#13;&#10;-Djobengine.octopus.rundowns.name=rundowns181026&#13;&#10;-Djobengine.octopus.storyfolders.name=storyfolders181026&#13;&#10;-Djobengine.octopus.stories.name=stories181026&#13;&#10;-Djobengine.mediafinder.external=false&#13;&#10;-Djobengine.mediafinder.external.url=localhost&#13;&#10;-Dmediacube.auth.location=&quot;${workspace_loc}/-configuration/mediacube-auth.properties&quot;"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcom.sun.management.jmxremote&#13;&#10;-Dcom.sun.management.jmxremote.port=9010&#13;&#10;-Dcom.sun.management.jmxremote.local.only=false&#13;&#10;-Dcom.sun.management.jmxremote.authenticate=false&#13;&#10;-Dcom.sun.management.jmxremote.ssl=false&#13;&#10;-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;-Dgosh.home=configuration&#13;&#10;-Djava.io.tmpdir=tmp&#13;&#10;-Dorg.slf4j.simpleLogger.defaultLogLevel=error"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}\-product\production\HIRTV"/>
     <stringAttribute key="pde.version" value="3.3"/>
     <setAttribute key="selected_target_bundles">
+        <setEntry value="cglib@default:default"/>
+        <setEntry value="com.fasterxml.jackson.core.jackson-annotations@default:default"/>
+        <setEntry value="com.fasterxml.jackson.core.jackson-core@default:default"/>
+        <setEntry value="com.fasterxml.jackson.core.jackson-databind@default:default"/>
+        <setEntry value="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml@default:default"/>
+        <setEntry value="com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default"/>
+        <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default"/>
+        <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default"/>
+        <setEntry value="com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default"/>
+        <setEntry value="com.ibm.db2.jcc@default:default"/>
+        <setEntry value="com.ibm.nosql@default:default"/>
+        <setEntry value="com.microsoft.sqlserver.sqljdbc@default:default"/>
         <setEntry value="com.sun.jna@default:default"/>
+        <setEntry value="groovy@default:default"/>
+        <setEntry value="javax.annotation-api@default:default"/>
         <setEntry value="javax.mail@default:default"/>
+        <setEntry value="javax.servlet-api@default:default"/>
+        <setEntry value="javax.ws.rs-api@default:default"/>
+        <setEntry value="jcifs@default:default"/>
+        <setEntry value="joda-time@default:default"/>
+        <setEntry value="junit@default:default"/>
+        <setEntry value="org.apache.aries.spifly.dynamic.bundle@default:default"/>
+        <setEntry value="org.apache.aries.util@default:default"/>
+        <setEntry value="org.apache.commons.beanutils@default:default"/>
         <setEntry value="org.apache.commons.collections@default:default"/>
+        <setEntry value="org.apache.commons.digester@default:default"/>
         <setEntry value="org.apache.commons.io@default:default"/>
         <setEntry value="org.apache.commons.lang@default:default"/>
+        <setEntry value="org.apache.commons.net@default:default"/>
         <setEntry value="org.apache.felix.gogo.command@default:default"/>
         <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
         <setEntry value="org.apache.felix.gogo.shell@default:default"/>
         <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
         <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
+        <setEntry value="org.apache.servicemix.bundles.quartz@default:default"/>
         <setEntry value="org.eclipse.equinox.common@2:true"/>
         <setEntry value="org.eclipse.equinox.console@default:default"/>
+        <setEntry value="org.eclipse.equinox.ds@1:true"/>
+        <setEntry value="org.eclipse.equinox.util@default:default"/>
+        <setEntry value="org.eclipse.jetty.deploy@default:default"/>
         <setEntry value="org.eclipse.jetty.http@default:default"/>
         <setEntry value="org.eclipse.jetty.io@default:default"/>
+        <setEntry value="org.eclipse.jetty.osgi.boot@default:true"/>
+        <setEntry value="org.eclipse.jetty.schemas@default:default"/>
         <setEntry value="org.eclipse.jetty.security@default:default"/>
         <setEntry value="org.eclipse.jetty.server@default:default"/>
         <setEntry value="org.eclipse.jetty.servlet@default:default"/>
         <setEntry value="org.eclipse.jetty.util@default:default"/>
         <setEntry value="org.eclipse.jetty.webapp@default:default"/>
+        <setEntry value="org.eclipse.jetty.websocket.api@default:default"/>
+        <setEntry value="org.eclipse.jetty.websocket.client@default:default"/>
+        <setEntry value="org.eclipse.jetty.websocket.common@default:default"/>
+        <setEntry value="org.eclipse.jetty.websocket.server@default:default"/>
+        <setEntry value="org.eclipse.jetty.websocket.servlet@default:default"/>
         <setEntry value="org.eclipse.jetty.xml@default:default"/>
         <setEntry value="org.eclipse.osgi.services@default:default"/>
         <setEntry value="org.eclipse.osgi@-1:true"/>
         <setEntry value="org.hamcrest.core@default:default"/>
+        <setEntry value="org.jboss.resteasy.client@default:default"/>
+        <setEntry value="org.jboss.resteasy.jaxrs-api@default:default"/>
+        <setEntry value="org.jboss.resteasy.jaxrs@default:default"/>
+        <setEntry value="org.jmock.junit4@default:default"/>
+        <setEntry value="org.jmock@default:default"/>
+        <setEntry value="org.mybatis.mybatis@default:default"/>
         <setEntry value="org.objectweb.asm.commons@default:default"/>
         <setEntry value="org.objectweb.asm.tree@default:default"/>
         <setEntry value="org.objectweb.asm@default:default"/>
+        <setEntry value="org.omnifaces@default:default"/>
+        <setEntry value="slf4j.api@default:default"/>
+        <setEntry value="slf4j.simple@default:false"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
+        <setEntry value="user.commons.zk@default:default"/>
+        <setEntry value="user.jobengine.log4j@1:true"/>
         <setEntry value="user.jobengine.osgi.commons@default:true"/>
         <setEntry value="user.jobengine.osgi.db@default:default"/>
         <setEntry value="user.jobengine.osgi.server@default:default"/>
         <setEntry value="user.jobengine.osgi.services@default:default"/>
+        <setEntry value="user.mediacube.gui@default:default"/>
         <setEntry value="user.mediacube.metadata@default:default"/>
         <setEntry value="user.tsm.client@default:default"/>
     </setAttribute>
     <booleanAttribute key="show_selected_only" value="false"/>
     <booleanAttribute key="tracing" value="false"/>
     <booleanAttribute key="useCustomFeatures" value="false"/>
-    <booleanAttribute key="useDefaultConfigArea" value="true"/>
+    <booleanAttribute key="useDefaultConfigArea" value="false"/>
 </launchConfiguration>
diff --git a/server/-configuration/run-mediacube-server.launch- b/server/-configuration/run-mediacube-server.launch-
deleted file mode 100644
index c38aef75..00000000
--- a/server/-configuration/run-mediacube-server.launch-
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/run-mediacube-server"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="default_auto_start" value="false"/>
-<intAttribute key="default_start_level" value="4"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<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"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.http.jetty.http.port=8080&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.osgi.server/resources/executors&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.osgi.server/resources/templates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.228.198.1:50000/mediaarc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=password&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Djobengine.rcc.host=localhost&#13;&#10;-Djobengine.rcc.defaultlowresprofile=&quot;WindowsMedia - Web Streaming - DSL or Cable Modem&quot;&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/user/jobengine/server/steps&quot;&#13;&#10;-Djobengine.transcoder.source=c:\_Movie\hires\&#13;&#10;-Djetty.home=&quot;${workspace_loc:user.jobengine.osgi.rest}&quot;&#13;&#10;-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&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.21/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=password&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;&#13;&#10;-Djobengine.nexio.db.user=sa&#13;&#10;-Djobengine.nexio.db.password=resolve&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<booleanAttribute key="show_selected_only" value="true"/>
-<stringAttribute key="target_bundles" value="cglib@default:default,com.auth0.java-jwt@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.fasterxml.jackson.dataformat.jackson-dataformat-yaml@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default,com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,com.google.guava@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.el.javax.el@default:default,commons-logging@default:default,io.swagger.annotations@default:default,io.swagger.core@default:default,io.swagger.jaxrs@default:default,io.swagger.jersey2-jaxrs@default:default,io.swagger.models@default:default,javassist@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.servlet-api@default:default,javax.servlet.jsp-api@default:default,javax.validation.api@default:default,javax.ws.rs-api@default:default,jcifs@default:default,joda-time@default:default,org.apache.aries.spifly.dynamic.bundle@default:default,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.jasper.glassfish@default:default,org.apache.logging.log4j.api@1:true,org.apache.logging.log4j.core@default:default,org.apache.logging.log4j.slf4j-impl@default:default,org.apache.servicemix.bundles.quartz@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jsp@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.glassfish.hk2.api@default:default,org.glassfish.hk2.external.aopalliance-repackaged@default:default,org.glassfish.hk2.external.javax.inject@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.bundles.repackaged.jersey-guava@default:default,org.glassfish.jersey.containers.jersey-container-servlet-core@default:default,org.glassfish.jersey.core.jersey-client@default:default,org.glassfish.jersey.core.jersey-common@default:default,org.glassfish.jersey.core.jersey-server@default:default,org.glassfish.jersey.media.jersey-media-jaxb@default:default,org.glassfish.jersey.media.jersey-media-multipart@default:default,org.hamcrest.core@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.junit@default:default,org.jvnet.mimepull@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.reflections@default:default,slf4j.api@default:default"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="user.jobengine.osgi.commons@default:true,user.jobengine.osgi.db@default:default,user.jobengine.osgi.rest@default:true,user.jobengine.osgi.server@default:default,user.tsm.client@default:default"/>
-</launchConfiguration>
diff --git a/server/-configuration/run-mediacube-server2.launch- b/server/-configuration/run-mediacube-server2.launch-
deleted file mode 100644
index 655f7c41..00000000
--- a/server/-configuration/run-mediacube-server2.launch-
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/run-mediacube-server2"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="default_auto_start" value="false"/>
-<intAttribute key="default_start_level" value="4"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<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"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.http.jetty.http.port=8080&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.osgi.server/resources/executors&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.osgi.server/resources/templates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.228.198.1:50000/mediaarc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=password&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Djobengine.rcc.host=localhost&#13;&#10;-Djobengine.rcc.defaultlowresprofile=&quot;WindowsMedia - Web Streaming - DSL or Cable Modem&quot;&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/user/jobengine/server/steps&quot;&#13;&#10;-Djobengine.transcoder.source=c:\_Movie\hires\&#13;&#10;-Djetty.home=&quot;${workspace_loc:user.jobengine.osgi.rest}&quot;&#13;&#10;-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&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.21/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=password&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;&#13;&#10;-Djobengine.nexio.db.user=sa&#13;&#10;-Djobengine.nexio.db.password=resolve&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="target_bundles" value="cglib@default:default,com.auth0.java-jwt@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.fasterxml.jackson.dataformat.jackson-dataformat-yaml@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default,com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,com.google.guava@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.el.javax.el@default:default,commons-logging@default:default,javassist@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.servlet-api@default:default,javax.servlet.jsp-api@default:default,javax.validation.api@default:default,javax.ws.rs-api@default:default,jcifs@default:default,joda-time@default:default,org.apache.aries.spifly.dynamic.bundle@default:default,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.jasper.glassfish@default:default,org.apache.logging.log4j.api@1:true,org.apache.logging.log4j.core@default:default,org.apache.logging.log4j.slf4j-impl@default:default,org.apache.servicemix.bundles.quartz@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jsp@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.schemas@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.glassfish.hk2.api@default:default,org.glassfish.hk2.external.aopalliance-repackaged@default:default,org.glassfish.hk2.external.javax.inject@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.bundles.repackaged.jersey-guava@default:default,org.glassfish.jersey.core.jersey-client@default:default,org.glassfish.jersey.core.jersey-common@default:default,org.hamcrest.core@default:default,org.jboss.resteasy.jaxrs@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.junit@default:default,org.jvnet.mimepull@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.reflections@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="user.jobengine.osgi.commons@default:true,user.jobengine.osgi.db@default:default,user.jobengine.osgi.server@default:default,user.jobengine.osgi.services@default:default,user.tsm.client@default:default"/>
-</launchConfiguration>
diff --git a/server/-product/production/LOCAL/settings/mediacube.yaml b/server/-product/production/LOCAL/settings/mediacube.yaml
index 05ac5999..3861350f 100644
--- a/server/-product/production/LOCAL/settings/mediacube.yaml
+++ b/server/-product/production/LOCAL/settings/mediacube.yaml
@@ -1,4 +1,4 @@
-#theme: userdark
+theme: userdark
 jobQueuePollInterval: 1000
 searchResultsListCacheSize: 200
 disableHelp: true
@@ -25,8 +25,8 @@ bottomTypeFilters:
 - name: Reklám nyers
 authentication:
   authEnabled: true
-#  defaultUser: root
-#  defaultPassword: password
+  defaultUser: root
+  defaultPassword: password
   adHost: localhost
   adNonSecurePort: 3268
   adBaseDn: DC=intra,DC=mediavivantis,DC=hu
diff --git a/server/hu.user.mediacube.executors.tests/.classpath b/server/hu.user.mediacube.executors.tests/.classpath
index b862a296..54f561c7 100644
--- a/server/hu.user.mediacube.executors.tests/.classpath
+++ b/server/hu.user.mediacube.executors.tests/.classpath
@@ -3,5 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/server/hu.user.theme.userdark/.classpath b/server/hu.user.theme.userdark/.classpath
index 05f70db3..a7fe5f1f 100644
--- a/server/hu.user.theme.userdark/.classpath
+++ b/server/hu.user.theme.userdark/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
+	<classpathentry including="**/*.java" kind="src" path="src">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/server/user.jobengine.osgi.commons/.classpath b/server/user.jobengine.osgi.commons/.classpath
index fe500b89..9fcff48b 100644
--- a/server/user.jobengine.osgi.commons/.classpath
+++ b/server/user.jobengine.osgi.commons/.classpath
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xml>
-
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test"/>
+	<classpathentry kind="src" output="target/test-classes" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/server/user.jobengine.osgi.db/.classpath b/server/user.jobengine.osgi.db/.classpath
index ff5393b6..164d4365 100644
--- a/server/user.jobengine.osgi.db/.classpath
+++ b/server/user.jobengine.osgi.db/.classpath
@@ -2,8 +2,8 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry excluding="user/jobengine/remotefiles/jcifs/smb/" kind="src" path="src"/>
-	<classpathentry kind="src" path="test"/>
+	<classpathentry kind="src" output="target/test-classes" path="test"/>
 	<classpathentry kind="src" path="generated"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/server/user.jobengine.osgi.server/.classpath b/server/user.jobengine.osgi.server/.classpath
index d362556c..e9e1ff45 100644
--- a/server/user.jobengine.osgi.server/.classpath
+++ b/server/user.jobengine.osgi.server/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" output="target/test-classes" path="test"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/server/user.jobengine.osgi.services/.classpath b/server/user.jobengine.osgi.services/.classpath
index 6e16b23d..4b1d60cb 100644
--- a/server/user.jobengine.osgi.services/.classpath
+++ b/server/user.jobengine.osgi.services/.classpath
@@ -3,5 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/server/user.mediacube.gui/.classpath b/server/user.mediacube.gui/.classpath
index 2dfbbd1b..619e72b0 100644
--- a/server/user.mediacube.gui/.classpath
+++ b/server/user.mediacube.gui/.classpath
@@ -5,5 +5,5 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/classes" sourcepath="WEB-INF/classes"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/server/user.mediacube.metadata/.classpath b/server/user.mediacube.metadata/.classpath
index 069739a5..043f5dd0 100644
--- a/server/user.mediacube.metadata/.classpath
+++ b/server/user.mediacube.metadata/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" output="target/test-classes" path="test"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/server/user.tsm.client/.classpath b/server/user.tsm.client/.classpath
index 6e16b23d..4b1d60cb 100644
--- a/server/user.tsm.client/.classpath
+++ b/server/user.tsm.client/.classpath
@@ -3,5 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
-- 
2.54.0