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 e4c9a562efcb9e2ff21e60e001396512a3865cd4..bd1033bd2d620deaa2032d47d50a6fec1f7edef6 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/&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.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;-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;-Dnexio.host=10.10.1.55&#13;&#10;-Djobengine.nexio.name=testnexioclips&#13;&#10;-Dnexio.useMOSGateway=true&#13;&#10;-Dnexio.disable=true&#13;&#10;-Djobengine.octopus.rundowns.name=rundowns&#13;&#10;-Djobengine.octopus.storyfolders.name=storyfolders&#13;&#10;-Djobengine.octopus.stories.name=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.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.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.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.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,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.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.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.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.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/-configuration/run-mediacube-server-slim.launch b/server/-configuration/run-mediacube-server-slim.launch
index 00a4ced426f157b24675bf945a4d923d3c0ccaab..b2543fff5ee6458ce14752b543a0c25744f48400 100644 (file)
--- a/server/-configuration/run-mediacube-server-slim.launch
+++ b/server/-configuration/run-mediacube-server-slim.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.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="true"/>\r
-<stringAttribute key="target_bundles" value="cglib@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.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.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.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,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="show_selected_only" value="false"/>\r
+<stringAttribute key="target_bundles" value="cglib@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.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.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.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@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-new.target b/server/-dependencies/jobengine-new.target
deleted file mode 100644 (file)
index ff93901..0000000
--- a/server/-dependencies/jobengine-new.target
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<?pde version="3.8"?><target name="JobEngine" 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.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.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.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="humble.video.linux"/>\r
-<plugin id="humble.video.noarch"/>\r
-<plugin id="humble.video.windows"/>\r
-<plugin id="javax.annotation-api"/>\r
-<plugin id="javax.mail" version="1.5.0.b01"/>\r
-<plugin id="javax.servlet-api"/>\r
-<plugin id="javax.servlet.jsp-api" version="2.3.0"/>\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.collections" version="3.2.2"/>\r
-<plugin id="org.apache.commons.digester"/>\r
-<plugin id="org.apache.commons.io" version="2.6.0"/>\r
-<plugin id="org.apache.commons.lang" version="2.6"/>\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" version="2.2.2.v201112011158"/>\r
-<plugin id="org.apache.logging.log4j.api"/>\r
-<plugin id="org.apache.logging.log4j.core"/>\r
-<plugin id="org.apache.logging.log4j.slf4j-impl"/>\r
-<plugin id="org.apache.servicemix.bundles.quartz"/>\r
-<plugin id="org.eclipse.equinox.common"/>\r
-<plugin id="org.eclipse.equinox.console"/>\r
-<plugin id="org.eclipse.equinox.ds"/>\r
-<plugin id="org.eclipse.equinox.util"/>\r
-<plugin id="org.eclipse.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.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.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.servlets"/>\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.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.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 f86d48adffdcf9e90eb2a68d0e195f84ca79a298..a59ba7dcee4aeaadc7f403fed93d2fdaf3ac7760 100644 (file)
--- a/server/-dependencies/jobengine.target
+++ b/server/-dependencies/jobengine.target
@@ -24,7 +24,7 @@
 <plugin id="javax.annotation-api"/>\r
 <plugin id="javax.mail" version="1.5.0.b01"/>\r
 <plugin id="javax.servlet-api"/>\r
-<plugin id="javax.servlet.jsp" version="2.2.0.v201112011158"/>\r
+<plugin id="javax.servlet.jsp"/>\r
 <plugin id="javax.servlet.jsp-api" version="2.3.0"/>\r
 <plugin id="javax.ws.rs-api"/>\r
 <plugin id="jcifs"/>\r
@@ -43,7 +43,7 @@
 <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" version="2.2.2.v201501141630"/>\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
@@ -93,9 +93,9 @@
 <plugin id="org.jmock.junit4"/>\r
 <plugin id="org.junit"/>\r
 <plugin id="org.mybatis.mybatis"/>\r
-<plugin id="org.objectweb.asm" version="5.0.1"/>\r
+<plugin id="org.objectweb.asm" version="5.0.1.v201404251740"/>\r
 <plugin id="org.objectweb.asm.commons"/>\r
-<plugin id="org.objectweb.asm.tree" version="5.0.1"/>\r
+<plugin id="org.objectweb.asm.tree" version="5.0.1.v201404251740"/>\r
 <plugin id="org.slf4j.api"/>\r
 <plugin id="slf4j.api" version="1.7.7"/>\r
 <plugin id="slf4j.simple"/>\r

diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml
index 6c72fd77ab9f5b489e9177d4bfe977c6351cfd53..168e7ba1fd8cd431d1200a71ccf5a4161bdb62fa 100644 (file)
--- a/server/-dependencies/pom.xml
+++ b/server/-dependencies/pom.xml
@@ -12,6 +12,9 @@
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
                <jetty.version>9.3.9.v20160517</jetty.version> \r
+<!-- \r
+               <jetty.version>9.3.27.v20190418</jetty.version> \r
+ -->\r
                <swagger-core-version>1.5.9</swagger-core-version>\r
                <resteasy-version>3.0.11.Final</resteasy-version>\r
                <fasterxml-jackson-core>2.4.5</fasterxml-jackson-core>\r

diff --git a/server/user.jobengine.osgi.db/sql/3-EnableJSON.db2 b/server/user.jobengine.osgi.db/sql/3-EnableJSON.db2
index 5e55ab29b93817f62d4aeabc276f1dcd213f23c1..b300c9cd718b055c5941af818336fd6cfda0c223 100644 (file)
--- a/server/user.jobengine.osgi.db/sql/3-EnableJSON.db2
+++ b/server/user.jobengine.osgi.db/sql/3-EnableJSON.db2
@@ -1,3 +1,5 @@
+--elsore elbassza: https://www.ibm.com/support/pages/551-error-when-enabling-json-environment\r
+\r
 --execute with \r
 --     cd /home/db2admin/sqllib/json/bin\r
 --     ./db2nosql.sh -db MC -user db2admin -password password -enable true\r