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

diff --git a/server/-configuration/run-mediacube-server-bsh.launch b/server/-configuration/run-mediacube-server-bsh.launch
index 46cd03f816eea70319660934e009cfd789d66c64..24097d5acbec4c64c1030357376ab7d7fc428809 100644 (file)
--- a/server/-configuration/run-mediacube-server-bsh.launch
+++ b/server/-configuration/run-mediacube-server-bsh.launch
@@ -21,8 +21,8 @@
 <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.10.1.27:50000/mc: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/user/jobengine/server/steps&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;-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.10.1.27:50000/mc: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;-Dnexio.host=10.10.1.55&#13;&#10;-Dnexio.disable=true&#13;&#10;-Djobengine.octopus.rundowns.name=test_rundowns&#13;&#10;-Djobengine.octopus.storyfolders.name=test_storyfolders&#13;&#10;-Djobengine.octopus.stories.name=test_stories&#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="true"/>\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,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.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.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.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"/>\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,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.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.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.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"/>\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.target b/server/-dependencies/jobengine.target
index 66031d530c504922266252fa31c5ad0ff1ed2e77..8b913dd5243eb3b2cd38e0ac2493c8c1219bb58a 100644 (file)
--- a/server/-dependencies/jobengine.target
+++ b/server/-dependencies/jobengine.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<?pde version="3.8"?><target name="JobEngine" sequenceNumber="253">\r
+<?pde version="3.8"?><target name="JobEngine" sequenceNumber="281">\r
 <locations>\r
 <location path="${eclipse_home}" type="Profile"/>\r
 <location path="${workspace_loc}/-dependencies/target/repository/plugins" type="Directory"/>\r
@@ -10,7 +10,6 @@
 <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-xml"/>\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
@@ -106,12 +105,6 @@
 <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.hk2.api" version="2.5.0.b42"/>\r
-<plugin id="org.glassfish.hk2.external.aopalliance-repackaged" version="2.5.0.b42"/>\r
-<plugin id="org.glassfish.hk2.external.javax.inject" version="2.5.0.b42"/>\r
-<plugin id="org.glassfish.hk2.locator" version="2.5.0.b42"/>\r
-<plugin id="org.glassfish.hk2.utils" version="2.5.0.b42"/>\r
-<plugin id="org.glassfish.jersey.core.jersey-common" version="2.23.2"/>\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
@@ -125,7 +118,6 @@
 <plugin id="org.jmock"/>\r
 <plugin id="org.jmock.junit4"/>\r
 <plugin id="org.junit"/>\r
-<plugin id="org.jvnet.mimepull" version="1.9.6"/>\r
 <plugin id="org.mortbay.jasper.apache-jsp"/>\r
 <plugin id="org.mortbay.jasper.apache-jsp.source"/>\r
 <plugin id="org.objectweb.asm" version="5.0.1"/>\r

diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml
index cbdab18126afd448c3ea333db67578eed6ff217d..98f32113f13b30237340b48993b23f8bf1c5ba22 100644 (file)
--- a/server/-dependencies/pom.xml
+++ b/server/-dependencies/pom.xml
@@ -14,11 +14,10 @@
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
                <jetty.version>9.3.9.v20160517</jetty.version>\r
                <!-- <jetty.version>9.4.6.v20170531</jetty.version> -->\r
-               <jersey.version>2.23.2</jersey.version>\r
                <jackson.version>2.5.5</jackson.version>\r
                <swagger-core-version>1.5.9</swagger-core-version>\r
-               <hk2.version>2.5.0-b42</hk2.version>\r
                <resteasy-version>3.0.11.Final</resteasy-version>\r
+               <fasterxml-jackson-core>2.4.5</fasterxml-jackson-core>\r
        </properties>\r
        <build>\r
                <plugins>\r
@@ -80,6 +79,30 @@
                                                <id>default-cli</id>\r
                                                <configuration>\r
                                                        <artifacts>\r
+                                                               <artifact>\r
+                                                                       <id>com.fasterxml.jackson.core:jackson-core:${fasterxml-jackson-core}</id>\r
+                                                               </artifact>\r
+                                                               <artifact>\r
+                                                                       <id>com.fasterxml.jackson.core:jackson-databind:${fasterxml-jackson-core}</id>\r
+                                                               </artifact>\r
+                                                               <artifact>\r
+                                                                       <id>com.fasterxml.jackson.core:jackson-annotations:${fasterxml-jackson-core}</id>\r
+                                                               </artifact>\r
+                                                               <artifact>\r
+                                                                       <id>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${fasterxml-jackson-core}</id>\r
+                                                               </artifact>\r
+                                                               <artifact>\r
+                                                                       <id>com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${fasterxml-jackson-core}</id>\r
+                                                               </artifact>\r
+                                                               <artifact>\r
+                                                                       <id>com.fasterxml.jackson.datatype:jackson-datatype-joda:${fasterxml-jackson-core}</id>\r
+                                                               </artifact>\r
+                                                               <artifact>\r
+                                                                       <id>com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:${fasterxml-jackson-core}</id>\r
+                                                               </artifact>\r
+                                                               <artifact>\r
+                                                                       <id>javax.ws.rs:javax.ws.rs-api:2.0.1</id>\r
+                                                               </artifact>\r
                                                                <artifact>\r
                                                                        <id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jasper:6.0.53_1</id>\r
                                                                </artifact>\r
@@ -131,37 +154,9 @@
                                                                <artifact>\r
                                                                        <id>com.ibm:db2jcc4:4.19.26</id>\r
                                                                </artifact>\r
-                                                               <artifact>\r
-                                                                       <id>org.glassfish.hk2:hk2-api:${hk2.version}</id>\r
-                                                               </artifact>\r
-                                                               <artifact>\r
-                                                                       <id>org.glassfish.hk2:hk2-locator:${hk2.version}</id>\r
-                                                               </artifact>\r
-                                                               <artifact>\r
-                                                                       <id>org.glassfish.hk2:osgi-resource-locator:${hk2.version}</id>\r
-                                                               </artifact>\r
-                                                               <artifact>\r
-                                                                       <id>org.glassfish.hk2.external:asm-all-repackaged:${hk2.version}</id>\r
-                                                               </artifact>\r
-                                                               <artifact>\r
-                                                                       <id>org.glassfish.hk2.external:aopalliance-repackaged:${hk2.version}</id>\r
-                                                               </artifact>\r
-                                                               <artifact>\r
-                                                                       <id>org.glassfish.hk2.external:javax.inject:${hk2.version}</id>\r
-                                                               </artifact>\r
-                                                               <artifact>\r
-                                                                       <id>org.glassfish.hk2:hk2-utils:${hk2.version}</id>\r
-                                                                       <source>true</source>\r
-                                                               </artifact>\r
                                                                <artifact>\r
                                                                        <id>io.swagger:swagger-jersey2-jaxrs:${swagger-core-version}</id>\r
                                                                </artifact>\r
-                                                               <artifact>\r
-                                                                       <id>org.glassfish.jersey.containers:jersey-container-servlet-core:${jersey.version}</id>\r
-                                                               </artifact>\r
-                                                               <artifact>\r
-                                                                       <id>org.glassfish.jersey.media:jersey-media-multipart:${jersey.version}</id>\r
-                                                               </artifact>\r
                                                                <artifact>\r
                                                                        <id>org.slf4j:slf4j-simple:1.6.3</id>\r
                                                                </artifact>\r

diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product
index d74b5cc72ff86ac07bd63783d43c52bde474cb93..222948fe6f42af224593ff53c23ec2df1810e6ba 100644 (file)
--- a/server/-product/mediacube.product
+++ b/server/-product/mediacube.product
@@ -173,7 +173,6 @@
       <plugin id="org.jmock"/>\r
       <plugin id="org.jmock.junit4"/>\r
       <plugin id="org.junit"/>\r
-      <plugin id="org.jvnet.mimepull"/>\r
       <plugin id="org.objectweb.asm"/>\r
       <plugin id="org.objectweb.asm.commons"/>\r
       <plugin id="org.objectweb.asm.tree"/>\r