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

diff --git a/server/-configuration/run-mediacube-server-slim.launch b/server/-configuration/run-mediacube-server-slim.launch
new file mode 100644 (file)
index 0000000..20dec98
--- /dev/null
+++ b/server/-configuration/run-mediacube-server-slim.launch
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">\r
+<booleanAttribute key="append.args" value="true"/>\r
+<booleanAttribute key="automaticAdd" value="false"/>\r
+<booleanAttribute key="automaticValidate" value="true"/>\r
+<stringAttribute key="bootstrap" value=""/>\r
+<stringAttribute key="checked" value="[NONE]"/>\r
+<booleanAttribute key="clearConfig" value="true"/>\r
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/run-mediacube-server-slim"/>\r
+<booleanAttribute key="default" value="true"/>\r
+<booleanAttribute key="default_auto_start" value="false"/>\r
+<intAttribute key="default_start_level" value="4"/>\r
+<booleanAttribute key="includeOptional" value="false"/>\r
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>\r
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
+</listAttribute>\r
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>\r
+<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;-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.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;-Djobengine.octopus.rundowns.name=rundowns181026&#13;&#10;-Djobengine.octopus.storyfolders.name=storyfolders181026&#13;&#10;-Djobengine.octopus.stories.name=stories181026&#13;&#10;-Dmediacube.auth.location=&quot;${workspace_loc}/-configuration/mediacube-auth.properties&quot;"/>\r
+<stringAttribute key="pde.version" value="3.3"/>\r
+<booleanAttribute key="show_selected_only" value="false"/>\r
+<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.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,humble.video.noarch@default:default,humble.video.windows@default:default,javax.annotation-api@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.servlet.jsp-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.lang@default:default,org.apache.commons.logging@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.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@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.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.hamcrest.core@default:default,org.jboss.resteasy.client@default:default,org.jboss.resteasy.jaxrs@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.junit@default:default,org.mybatis.mybatis@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r
+<booleanAttribute key="tracing" value="false"/>\r
+<booleanAttribute key="useCustomFeatures" value="false"/>\r
+<booleanAttribute key="useDefaultConfigArea" value="true"/>\r
+<stringAttribute key="workspace_bundles" value="user.commons.log4j2@default:false,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.mediacube.metadata@default:default,user.tsm.client@default:default"/>\r
+</launchConfiguration>\r

diff --git a/server/-configuration/run-mediacube-server.launch b/server/-configuration/run-mediacube-server.launch
index c4e4b391323318539f8a37ced701b4915b09e1a0..c063789453f5f8bbf0be1127b145805baa042914 100644 (file)
--- a/server/-configuration/run-mediacube-server.launch
+++ b/server/-configuration/run-mediacube-server.launch
@@ -22,7 +22,7 @@
 <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.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;-Djobengine.octopus.rundowns.name=rundowns181026&#13;&#10;-Djobengine.octopus.storyfolders.name=storyfolders181026&#13;&#10;-Djobengine.octopus.stories.name=stories181026&#13;&#10;-Dmediacube.auth.location=&quot;${workspace_loc}/-configuration/mediacube-auth.properties&quot;"/>\r
 <stringAttribute key="pde.version" value="3.3"/>\r
 <booleanAttribute key="show_selected_only" value="false"/>\r
-<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.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,humble.video.noarch@default:default,humble.video.windows@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.mail@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.logging@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.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@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.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.hamcrest.core@default:default,org.jboss.resteasy.client@default:default,org.jboss.resteasy.jaxrs@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.junit@default:default,org.mybatis.mybatis@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r
+<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.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,humble.video.noarch@default:default,humble.video.windows@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.mail@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.lang@default:default,org.apache.commons.logging@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.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@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.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.hamcrest.core@default:default,org.jboss.resteasy.client@default:default,org.jboss.resteasy.jaxrs@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.junit@default:default,org.mybatis.mybatis@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r
 <booleanAttribute key="tracing" value="false"/>\r
 <booleanAttribute key="useCustomFeatures" value="false"/>\r
 <booleanAttribute key="useDefaultConfigArea" value="true"/>\r

diff --git a/server/-dependencies/jobengine-old.target b/server/-dependencies/jobengine-old.target
new file mode 100644 (file)
index 0000000..0c77ae3
--- /dev/null
+++ b/server/-dependencies/jobengine-old.target
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<?pde version="3.8"?><target name="JobEngine old" sequenceNumber="293">\r
+<locations>\r
+<location path="${eclipse_home}" type="Profile"/>\r
+<location path="${workspace_loc}/-dependencies/target/repository/plugins" type="Directory"/>\r
+</locations>\r
+<includeBundles>\r
+<plugin id="cglib"/>\r
+<plugin id="com.auth0.java-jwt"/>\r
+<plugin id="com.fasterxml.jackson.core.jackson-annotations" version="2.4.5"/>\r
+<plugin id="com.fasterxml.jackson.core.jackson-core" version="2.4.5"/>\r
+<plugin id="com.fasterxml.jackson.core.jackson-databind" version="2.4.5"/>\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" version="2.4.5"/>\r
+<plugin id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.4.5"/>\r
+<plugin id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.4.5"/>\r
+<plugin id="com.google.guava" version="18.0.0"/>\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="com.sun.org.apache.jaxp-ri"/>\r
+<plugin id="commons-logging"/>\r
+<plugin id="humble.video.linux"/>\r
+<plugin id="humble.video.noarch"/>\r
+<plugin id="humble.video.windows"/>\r
+<plugin id="javax.activation" version="1.1.0.v201211130549"/>\r
+<plugin id="javax.annotation"/>\r
+<plugin id="javax.annotation-api"/>\r
+<plugin id="javax.inject"/>\r
+<plugin id="javax.mail" version="1.5.0.b01"/>\r
+<plugin id="javax.servlet-api"/>\r
+<plugin id="javax.servlet.jsp"/>\r
+<plugin id="javax.servlet.jsp-api" version="2.3.0"/>\r
+<plugin id="javax.servlet.jsp.jstl"/>\r
+<plugin id="javax.transaction-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" version="1.1.3"/>\r
+<plugin id="org.apache.commons.beanutils"/>\r
+<plugin id="org.apache.commons.codec" version="1.10.0"/>\r
+<plugin id="org.apache.commons.collections"/>\r
+<plugin id="org.apache.commons.digester"/>\r
+<plugin id="org.apache.commons.io" version="2.2.0.v201405211200"/>\r
+<plugin id="org.apache.commons.lang"/>\r
+<plugin id="org.apache.commons.lang3"/>\r
+<plugin id="org.apache.commons.logging" version="1.1.1.v201101211721"/>\r
+<plugin id="org.apache.commons.net" version="3.6.0"/>\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" version="4.2.6"/>\r
+<plugin id="org.apache.httpcomponents.httpcore" version="4.2.5"/>\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.jasper"/>\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.http.jetty"/>\r
+<plugin id="org.eclipse.equinox.http.registry"/>\r
+<plugin id="org.eclipse.equinox.http.servlet"/>\r
+<plugin id="org.eclipse.equinox.jsp.jasper"/>\r
+<plugin id="org.eclipse.equinox.jsp.jasper.registry"/>\r
+<plugin id="org.eclipse.equinox.launcher"/>\r
+<plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>\r
+<plugin id="org.eclipse.equinox.registry"/>\r
+<plugin id="org.eclipse.equinox.util"/>\r
+<plugin id="org.eclipse.jdt.core.compiler.batch" version="3.10.2.v20150120-1634"/>\r
+<plugin id="org.eclipse.jetty.annotations"/>\r
+<plugin id="org.eclipse.jetty.apache-jsp"/>\r
+<plugin id="org.eclipse.jetty.client"/>\r
+<plugin id="org.eclipse.jetty.continuation" version="9.3.9.v20160517"/>\r
+<plugin id="org.eclipse.jetty.deploy"/>\r
+<plugin id="org.eclipse.jetty.http" version="9.3.9.v20160517"/>\r
+<plugin id="org.eclipse.jetty.io" version="9.3.9.v20160517"/>\r
+<plugin id="org.eclipse.jetty.jndi"/>\r
+<plugin id="org.eclipse.jetty.jsp"/>\r
+<plugin id="org.eclipse.jetty.osgi.boot"/>\r
+<plugin id="org.eclipse.jetty.osgi.boot.jsp"/>\r
+<plugin id="org.eclipse.jetty.osgi.boot.jsp.source"/>\r
+<plugin id="org.eclipse.jetty.plus"/>\r
+<plugin id="org.eclipse.jetty.schemas" version="3.1.0"/>\r
+<plugin id="org.eclipse.jetty.security" version="9.3.9.v20160517"/>\r
+<plugin id="org.eclipse.jetty.server" version="9.3.9.v20160517"/>\r
+<plugin id="org.eclipse.jetty.servlet" version="9.3.9.v20160517"/>\r
+<plugin id="org.eclipse.jetty.servlet.source"/>\r
+<plugin id="org.eclipse.jetty.util" version="9.3.9.v20160517"/>\r
+<plugin id="org.eclipse.jetty.webapp" version="9.3.9.v20160517"/>\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" version="9.3.9.v20160517"/>\r
+<plugin id="org.eclipse.osgi" version="3.11.2.v20161107-1947"/>\r
+<plugin id="org.eclipse.osgi.services" version="3.2.100.v20100503"/>\r
+<plugin id="org.eclipse.osgi.util"/>\r
+<plugin id="org.eclipse.update.configurator"/>\r
+<plugin id="org.glassfish.web.javax.servlet.jsp"/>\r
+<plugin id="org.glassfish.web.javax.servlet.jsp.jstl"/>\r
+<plugin id="org.hamcrest.core" version="1.3.0.v201303031735"/>\r
+<plugin id="org.jboss.resteasy.client"/>\r
+<plugin id="org.jboss.resteasy.jackson2-provider"/>\r
+<plugin id="org.jboss.resteasy.jaxb-provider"/>\r
+<plugin id="org.jboss.resteasy.jaxrs"/>\r
+<plugin id="org.jboss.resteasy.jaxrs-api"/>\r
+<plugin id="org.jboss.resteasy.multipart-provider"/>\r
+<plugin id="org.jboss.resteasy.validator-provider-11"/>\r
+<plugin id="org.jmock"/>\r
+<plugin id="org.jmock.junit4"/>\r
+<plugin id="org.junit"/>\r
+<plugin id="org.mortbay.jasper.apache-jsp"/>\r
+<plugin id="org.mortbay.jasper.apache-jsp.source"/>\r
+<plugin id="org.mybatis.mybatis"/>\r
+<plugin id="org.objectweb.asm" version="5.0.1"/>\r
+<plugin id="org.objectweb.asm.commons"/>\r
+<plugin id="org.objectweb.asm.tree" version="5.0.1"/>\r
+<plugin id="org.slf4j.api"/>\r
+<plugin id="slf4j.api" version="1.7.7"/>\r
+<plugin id="slf4j.simple"/>\r
+<plugin id="stax2-api"/>\r
+</includeBundles>\r
+<environment>\r
+<os>win32</os>\r
+<ws>win32</ws>\r
+<arch>x86_64</arch>\r
+<nl>en_US</nl>\r
+</environment>\r
+<launcherArgs>\r
+<vmArgs>-Dosgi.requiredJavaVersion=1.8 -XX:+UseG1GC -XX:+UseStringDeduplication -Dosgi.requiredJavaVersion=1.8 -Xms256m -Xmx1024m -Dorg.eclipse.epp.logging.aeri.skipReports=true</vmArgs>\r
+</launcherArgs>\r
+</target>\r

diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target
index 9d95d521790bc8201ec43fdab54a9741a52646bd..e6a071f8fecb715241844a8659467448fade090d 100644 (file)
--- a/server/-dependencies/jobengine.target
+++ b/server/-dependencies/jobengine.target
@@ -25,17 +25,11 @@
 <plugin id="humble.video.linux"/>\r
 <plugin id="humble.video.noarch"/>\r
 <plugin id="humble.video.windows"/>\r
-<plugin id="javax.activation" version="1.1.0.v201211130549"/>\r
-<plugin id="javax.annotation"/>\r
 <plugin id="javax.annotation-api"/>\r
-<plugin id="javax.inject"/>\r
 <plugin id="javax.mail" version="1.5.0.b01"/>\r
 <plugin id="javax.servlet-api"/>\r
-<plugin id="javax.servlet.jsp"/>\r
 <plugin id="javax.servlet.jsp-api" version="2.3.0"/>\r
-<plugin id="javax.servlet.jsp.jstl"/>\r
 <plugin id="javax.transaction-api"/>\r
-<plugin id="javax.validation.api"/>\r
 <plugin id="javax.ws.rs-api"/>\r
 <plugin id="jcifs"/>\r
 <plugin id="joda-time"/>\r
@@ -47,7 +41,6 @@
 <plugin id="org.apache.commons.digester"/>\r
 <plugin id="org.apache.commons.io" version="2.2.0.v201405211200"/>\r
 <plugin id="org.apache.commons.lang"/>\r
-<plugin id="org.apache.commons.lang3"/>\r
 <plugin id="org.apache.commons.logging" version="1.1.1.v201101211721"/>\r
 <plugin id="org.apache.commons.net" version="3.6.0"/>\r
 <plugin id="org.apache.felix.gogo.command"/>\r
@@ -64,14 +57,6 @@
 <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.http.jetty"/>\r
-<plugin id="org.eclipse.equinox.http.registry"/>\r
-<plugin id="org.eclipse.equinox.http.servlet"/>\r
-<plugin id="org.eclipse.equinox.jsp.jasper"/>\r
-<plugin id="org.eclipse.equinox.jsp.jasper.registry"/>\r
-<plugin id="org.eclipse.equinox.launcher"/>\r
-<plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>\r
-<plugin id="org.eclipse.equinox.registry"/>\r
 <plugin id="org.eclipse.equinox.util"/>\r
 <plugin id="org.eclipse.jdt.core.compiler.batch" version="3.10.2.v20150120-1634"/>\r
 <plugin id="org.eclipse.jetty.annotations"/>\r
@@ -103,7 +88,6 @@
 <plugin id="org.eclipse.osgi" version="3.11.2.v20161107-1947"/>\r
 <plugin id="org.eclipse.osgi.services" version="3.2.100.v20100503"/>\r
 <plugin id="org.eclipse.osgi.util"/>\r
-<plugin id="org.eclipse.update.configurator"/>\r
 <plugin id="org.glassfish.web.javax.servlet.jsp"/>\r
 <plugin id="org.glassfish.web.javax.servlet.jsp.jstl"/>\r
 <plugin id="org.hamcrest.core" version="1.3.0.v201303031735"/>\r
@@ -123,7 +107,6 @@
 <plugin id="org.objectweb.asm" version="5.0.1"/>\r
 <plugin id="org.objectweb.asm.commons"/>\r
 <plugin id="org.objectweb.asm.tree" version="5.0.1"/>\r
-<plugin id="org.slf4j.api"/>\r
 <plugin id="slf4j.api" version="1.7.7"/>\r
 <plugin id="slf4j.simple"/>\r
 <plugin id="stax2-api"/>\r

diff --git a/server/user.mediacube.metadata/META-INF/MANIFEST.MF b/server/user.mediacube.metadata/META-INF/MANIFEST.MF
index f3711cb626f6773e84df12cfd0abff9bb147c96e..09f4c0c9f3a128f94f038ef6a1e0299195c05bd6 100644 (file)
--- a/server/user.mediacube.metadata/META-INF/MANIFEST.MF
+++ b/server/user.mediacube.metadata/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Metadata
 Bundle-SymbolicName: user.mediacube.metadata;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.0
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: user.mediabube.metadata
 Service-Component: OSGI-INF/component.xml

diff --git a/server/user.mediacube.metadata/pom.xml b/server/user.mediacube.metadata/pom.xml
index 5ceca0cfc7302577a5b1c1f2494f6c3170185d72..e8c132cf40ac2bae7ad97bd65e1e5050decb610d 100644 (file)
--- a/server/user.mediacube.metadata/pom.xml
+++ b/server/user.mediacube.metadata/pom.xml
@@ -8,7 +8,7 @@
                <version>1.0.0</version>\r
        </parent>\r
        <modelVersion>4.0.0</modelVersion>\r
-       <artifactId>user.jobengine.metadata</artifactId>\r
+       <artifactId>user.mediacube.metadata</artifactId>\r
        <packaging>eclipse-plugin</packaging>\r
        <version>1.0.0</version>\r
 \r