https://git.useribm.hu / mediacube.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c8c14ab)
git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorvasary.daniel <TFS\vasary.daniel>
Wed, 10 Feb 2021 14:44:25 +0000 (14:44 +0000)
committervasary.daniel <TFS\vasary.daniel>
Wed, 10 Feb 2021 14:44:25 +0000 (14:44 +0000)
server/-configuration/run-mediacube-server-hirtv.launch patch | blob | history
server/-configuration/run-mediacube-server-mv.launch patch | blob | history
server/-configuration/run-mediacube-server-test.launch patch | blob | history
server/hu.user.mediacube.executors.tests/settings/application.yaml [new file with mode: 0644] patch | blob
server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java patch | blob | history
server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java patch | blob | history
server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/octopus/OctopusRESTService.java patch | blob | history

diff --git a/server/-configuration/run-mediacube-server-hirtv.launch b/server/-configuration/run-mediacube-server-hirtv.launch
index 340263dc33fe1860b179137c3873c0d215bf8fae..48c211273ccd8fca1527ef580a261693a50bc1a7 100644 (file)
--- a/server/-configuration/run-mediacube-server-hirtv.launch
+++ b/server/-configuration/run-mediacube-server-hirtv.launch
@@ -1,30 +1,119 @@
 <?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-hirtv"/>\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;&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/bin&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.jobsteps.config=&quot;${workspace_loc}/user.jobengine.executors/config/config.xml&quot;&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.10.1.27:50000/mc&#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&#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.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;&#13;&#10;-Djobengine.mediacube.config=&quot;${workspace_loc}/-configuration/mediacube.json&quot;&#13;&#10;-Djobengine.mediacube.service.proxyroot=&quot;/opt&quot;&#13;&#10;-Djobengine.jobsteps.groovy.root=&quot;${workspace_loc}/user.jobengine.executors/src/user/jobengine/server/steps&quot;&#13;&#10;-Djobengine.randomize.archives=false&#13;&#10;-Dmediacube.simplesearch=false"/>\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.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.ibm.db2.jcc@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.jna@default:default,groovy@default:default,io.humble.video-arch-x86_64-pc-linux-gnu6@default:default,io.humble.video-arch-x86_64-w64-mingw32@default:default,io.humble.video-noarch@default:default,javax.annotation-api@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.ws.rs-api@default:default,jcifs@default:default,joda-time@default:default,junit@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.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.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@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-api@default:default,org.jboss.resteasy.jaxrs@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.mybatis.mybatis@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.omnifaces@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.commons.zk@default:default,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.gui@default:default,user.mediacube.metadata@default:default,user.tsm.client@default:default"/>\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-hirtv"/>\r
+    <booleanAttribute key="default" value="true"/>\r
+    <booleanAttribute key="default_auto_start" value="false"/>\r
+    <intAttribute key="default_start_level" value="4"/>\r
+    <setAttribute key="deselected_workspace_bundles"/>\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;-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;-Djava.io.tmpdir=tmp"/>\r
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:\_workspace\USER\MediaCube\server\-product\production\HIRTV"/>\r
+    <stringAttribute key="pde.version" value="3.3"/>\r
+    <setAttribute key="selected_target_bundles">\r
+        <setEntry value="cglib@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.core.jackson-annotations@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.core.jackson-core@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.core.jackson-databind@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default"/>\r
+        <setEntry value="com.ibm.db2.jcc@default:default"/>\r
+        <setEntry value="com.ibm.nosql@default:default"/>\r
+        <setEntry value="com.microsoft.sqlserver.sqljdbc@default:default"/>\r
+        <setEntry value="com.sun.jna@default:default"/>\r
+        <setEntry value="groovy@default:default"/>\r
+        <setEntry value="io.humble.video-arch-x86_64-pc-linux-gnu6@default:default"/>\r
+        <setEntry value="io.humble.video-arch-x86_64-w64-mingw32@default:default"/>\r
+        <setEntry value="io.humble.video-noarch@default:default"/>\r
+        <setEntry value="javax.annotation-api@default:default"/>\r
+        <setEntry value="javax.mail@default:default"/>\r
+        <setEntry value="javax.servlet-api@default:default"/>\r
+        <setEntry value="javax.ws.rs-api@default:default"/>\r
+        <setEntry value="jcifs@default:default"/>\r
+        <setEntry value="joda-time@default:default"/>\r
+        <setEntry value="junit@default:default"/>\r
+        <setEntry value="org.apache.aries.spifly.dynamic.bundle@default:default"/>\r
+        <setEntry value="org.apache.aries.util@default:default"/>\r
+        <setEntry value="org.apache.commons.beanutils@default:default"/>\r
+        <setEntry value="org.apache.commons.collections@default:default"/>\r
+        <setEntry value="org.apache.commons.digester@default:default"/>\r
+        <setEntry value="org.apache.commons.io@default:default"/>\r
+        <setEntry value="org.apache.commons.lang@default:default"/>\r
+        <setEntry value="org.apache.commons.net@default:default"/>\r
+        <setEntry value="org.apache.felix.gogo.command@default:default"/>\r
+        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>\r
+        <setEntry value="org.apache.felix.gogo.shell@default:default"/>\r
+        <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>\r
+        <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>\r
+        <setEntry value="org.apache.logging.log4j.api@1:true"/>\r
+        <setEntry value="org.apache.logging.log4j.core@default:default"/>\r
+        <setEntry value="org.apache.logging.log4j.slf4j-impl@default:default"/>\r
+        <setEntry value="org.apache.servicemix.bundles.quartz@default:default"/>\r
+        <setEntry value="org.eclipse.equinox.common@2:true"/>\r
+        <setEntry value="org.eclipse.equinox.console@default:default"/>\r
+        <setEntry value="org.eclipse.equinox.ds@1:true"/>\r
+        <setEntry value="org.eclipse.equinox.util@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.deploy@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.http@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.io@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.osgi.boot@default:true"/>\r
+        <setEntry value="org.eclipse.jetty.schemas@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.security@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.server@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.servlet@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.util@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.webapp@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.api@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.client@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.common@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.server@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.servlet@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.xml@default:default"/>\r
+        <setEntry value="org.eclipse.osgi.services@default:default"/>\r
+        <setEntry value="org.eclipse.osgi@-1:true"/>\r
+        <setEntry value="org.hamcrest.core@default:default"/>\r
+        <setEntry value="org.jboss.resteasy.client@default:default"/>\r
+        <setEntry value="org.jboss.resteasy.jaxrs-api@default:default"/>\r
+        <setEntry value="org.jboss.resteasy.jaxrs@default:default"/>\r
+        <setEntry value="org.jmock.junit4@default:default"/>\r
+        <setEntry value="org.jmock@default:default"/>\r
+        <setEntry value="org.mybatis.mybatis@default:default"/>\r
+        <setEntry value="org.objectweb.asm.commons@default:default"/>\r
+        <setEntry value="org.objectweb.asm.tree@default:default"/>\r
+        <setEntry value="org.objectweb.asm@default:default"/>\r
+        <setEntry value="org.omnifaces@default:default"/>\r
+        <setEntry value="slf4j.api@default:default"/>\r
+        <setEntry value="slf4j.simple@default:false"/>\r
+    </setAttribute>\r
+    <setAttribute key="selected_workspace_bundles">\r
+        <setEntry value="user.commons.log4j2@default:false"/>\r
+        <setEntry value="user.commons.zk@default:default"/>\r
+        <setEntry value="user.jobengine.osgi.commons@default:true"/>\r
+        <setEntry value="user.jobengine.osgi.db@default:default"/>\r
+        <setEntry value="user.jobengine.osgi.server@default:default"/>\r
+        <setEntry value="user.jobengine.osgi.services@default:default"/>\r
+        <setEntry value="user.mediacube.gui@default:default"/>\r
+        <setEntry value="user.mediacube.metadata@default:default"/>\r
+        <setEntry value="user.tsm.client@default:default"/>\r
+    </setAttribute>\r
+    <booleanAttribute key="show_selected_only" value="false"/>\r
+    <booleanAttribute key="tracing" value="false"/>\r
+    <booleanAttribute key="useCustomFeatures" value="false"/>\r
+    <booleanAttribute key="useDefaultConfigArea" value="true"/>\r
 </launchConfiguration>\r
diff --git a/server/-configuration/run-mediacube-server-mv.launch b/server/-configuration/run-mediacube-server-mv.launch
index 9b9b141cea16bca6c925957922e836a125fa54a1..213a562e97f239e6092f1c9219a0f583d8c6252a 100644 (file)
--- a/server/-configuration/run-mediacube-server-mv.launch
+++ b/server/-configuration/run-mediacube-server-mv.launch
@@ -1,31 +1,119 @@
 <?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-mv"/>\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;-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;-Djava.io.tmpdir=tmp"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:\_workspace\USER\MediaCube\server\-product\production\MEDIAVIVANTIS"/>\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.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.ibm.db2.jcc@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.jna@default:default,groovy@default:default,io.humble.video-arch-x86_64-pc-linux-gnu6@default:default,io.humble.video-arch-x86_64-w64-mingw32@default:default,io.humble.video-noarch@default:default,javax.annotation-api@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.ws.rs-api@default:default,jcifs@default:default,joda-time@default:default,junit@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.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.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@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-api@default:default,org.jboss.resteasy.jaxrs@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.mybatis.mybatis@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.omnifaces@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.commons.zk@default:default,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.gui@default:default,user.mediacube.metadata@default:default,user.tsm.client@default:default"/>\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-mv"/>\r
+    <booleanAttribute key="default" value="true"/>\r
+    <booleanAttribute key="default_auto_start" value="false"/>\r
+    <intAttribute key="default_start_level" value="4"/>\r
+    <setAttribute key="deselected_workspace_bundles"/>\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;-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;-Djava.io.tmpdir=tmp"/>\r
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:\_workspace\USER\MediaCube\server\-product\production\MEDIAVIVANTIS"/>\r
+    <stringAttribute key="pde.version" value="3.3"/>\r
+    <setAttribute key="selected_target_bundles">\r
+        <setEntry value="cglib@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.core.jackson-annotations@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.core.jackson-core@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.core.jackson-databind@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default"/>\r
+        <setEntry value="com.ibm.db2.jcc@default:default"/>\r
+        <setEntry value="com.ibm.nosql@default:default"/>\r
+        <setEntry value="com.microsoft.sqlserver.sqljdbc@default:default"/>\r
+        <setEntry value="com.sun.jna@default:default"/>\r
+        <setEntry value="groovy@default:default"/>\r
+        <setEntry value="io.humble.video-arch-x86_64-pc-linux-gnu6@default:default"/>\r
+        <setEntry value="io.humble.video-arch-x86_64-w64-mingw32@default:default"/>\r
+        <setEntry value="io.humble.video-noarch@default:default"/>\r
+        <setEntry value="javax.annotation-api@default:default"/>\r
+        <setEntry value="javax.mail@default:default"/>\r
+        <setEntry value="javax.servlet-api@default:default"/>\r
+        <setEntry value="javax.ws.rs-api@default:default"/>\r
+        <setEntry value="jcifs@default:default"/>\r
+        <setEntry value="joda-time@default:default"/>\r
+        <setEntry value="junit@default:default"/>\r
+        <setEntry value="org.apache.aries.spifly.dynamic.bundle@default:default"/>\r
+        <setEntry value="org.apache.aries.util@default:default"/>\r
+        <setEntry value="org.apache.commons.beanutils@default:default"/>\r
+        <setEntry value="org.apache.commons.collections@default:default"/>\r
+        <setEntry value="org.apache.commons.digester@default:default"/>\r
+        <setEntry value="org.apache.commons.io@default:default"/>\r
+        <setEntry value="org.apache.commons.lang@default:default"/>\r
+        <setEntry value="org.apache.commons.net@default:default"/>\r
+        <setEntry value="org.apache.felix.gogo.command@default:default"/>\r
+        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>\r
+        <setEntry value="org.apache.felix.gogo.shell@default:default"/>\r
+        <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>\r
+        <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>\r
+        <setEntry value="org.apache.logging.log4j.api@1:true"/>\r
+        <setEntry value="org.apache.logging.log4j.core@default:default"/>\r
+        <setEntry value="org.apache.logging.log4j.slf4j-impl@default:default"/>\r
+        <setEntry value="org.apache.servicemix.bundles.quartz@default:default"/>\r
+        <setEntry value="org.eclipse.equinox.common@2:true"/>\r
+        <setEntry value="org.eclipse.equinox.console@default:default"/>\r
+        <setEntry value="org.eclipse.equinox.ds@1:true"/>\r
+        <setEntry value="org.eclipse.equinox.util@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.deploy@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.http@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.io@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.osgi.boot@default:true"/>\r
+        <setEntry value="org.eclipse.jetty.schemas@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.security@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.server@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.servlet@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.util@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.webapp@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.api@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.client@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.common@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.server@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.servlet@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.xml@default:default"/>\r
+        <setEntry value="org.eclipse.osgi.services@default:default"/>\r
+        <setEntry value="org.eclipse.osgi@-1:true"/>\r
+        <setEntry value="org.hamcrest.core@default:default"/>\r
+        <setEntry value="org.jboss.resteasy.client@default:default"/>\r
+        <setEntry value="org.jboss.resteasy.jaxrs-api@default:default"/>\r
+        <setEntry value="org.jboss.resteasy.jaxrs@default:default"/>\r
+        <setEntry value="org.jmock.junit4@default:default"/>\r
+        <setEntry value="org.jmock@default:default"/>\r
+        <setEntry value="org.mybatis.mybatis@default:default"/>\r
+        <setEntry value="org.objectweb.asm.commons@default:default"/>\r
+        <setEntry value="org.objectweb.asm.tree@default:default"/>\r
+        <setEntry value="org.objectweb.asm@default:default"/>\r
+        <setEntry value="org.omnifaces@default:default"/>\r
+        <setEntry value="slf4j.api@default:default"/>\r
+        <setEntry value="slf4j.simple@default:false"/>\r
+    </setAttribute>\r
+    <setAttribute key="selected_workspace_bundles">\r
+        <setEntry value="user.commons.log4j2@default:false"/>\r
+        <setEntry value="user.commons.zk@default:default"/>\r
+        <setEntry value="user.jobengine.osgi.commons@default:true"/>\r
+        <setEntry value="user.jobengine.osgi.db@default:default"/>\r
+        <setEntry value="user.jobengine.osgi.server@default:default"/>\r
+        <setEntry value="user.jobengine.osgi.services@default:default"/>\r
+        <setEntry value="user.mediacube.gui@default:default"/>\r
+        <setEntry value="user.mediacube.metadata@default:default"/>\r
+        <setEntry value="user.tsm.client@default:default"/>\r
+    </setAttribute>\r
+    <booleanAttribute key="show_selected_only" value="false"/>\r
+    <booleanAttribute key="tracing" value="false"/>\r
+    <booleanAttribute key="useCustomFeatures" value="false"/>\r
+    <booleanAttribute key="useDefaultConfigArea" value="true"/>\r
 </launchConfiguration>\r
diff --git a/server/-configuration/run-mediacube-server-test.launch b/server/-configuration/run-mediacube-server-test.launch
index e4391816c2d906a995eaf2263b46af40e8ac9a2d..f930cb2e82dd7f0540c870f16c2599e23d468fac 100644 (file)
--- a/server/-configuration/run-mediacube-server-test.launch
+++ b/server/-configuration/run-mediacube-server-test.launch
@@ -1,30 +1,118 @@
 <?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-test"/>\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.db.url=jdbc:db2://10.11.1.90:50000/mc&#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.11.1.90:50000/mc&#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.transcoder.address=http://10.11.1.111:65445/api/json/v1/&#13;&#10;-Djobengine.transcoder.template=MP4&#13;&#10;-Djobengine.transcoder.version=1&#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.11.254.86;databaseName=PA_Vivantis;&#13;&#10;-Djobengine.planair.db.user=MAM&#13;&#10;-Djobengine.planair.db.password=VDani&#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;-Djobengine.maestro.config=&quot;${workspace_loc}/-configuration/maestro.json&quot;&#13;&#10;-Djobengine.mediacube.config=&quot;${workspace_loc}/-configuration/mediacube.json&quot;&#13;&#10;-Dgui.statistics.disable=true&#13;&#10;-Dgui.help.disable=true&#13;&#10;-Dgui.editor.disable=true&#13;&#10;-Djobengine.mediafinder.external=false&#13;&#10;-Djobengine.mediacube.service.proxyroot=&quot;/opt&quot;&#13;&#10;-Djobengine.randomize.archives=true&#13;&#10;-Dmediacube.simplesearch=true&#13;&#10;&#13;&#10;-Djobengine.jobscheduling.config=&quot;/opt/steps/scheduledjobs.json&quot;&#13;&#10;-Djobengine.jobsteps.config=&quot;/opt/steps/executors.xml&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;/opt/steps/jobtemplates&quot;&#13;&#10;-Djobengine.jobsteps.groovy.root=&quot;/opt/steps&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.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.ibm.db2.jcc@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.jna@default:default,groovy@default:default,io.humble.video-arch-x86_64-pc-linux-gnu6@default:default,io.humble.video-arch-x86_64-w64-mingw32@default:default,io.humble.video-noarch@default:default,javax.annotation-api@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.ws.rs-api@default:default,jcifs@default:default,joda-time@default:default,junit@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.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.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@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-api@default:default,org.jboss.resteasy.jaxrs@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.mybatis.mybatis@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.omnifaces@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.commons.zk@default:default,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.gui@default:default,user.mediacube.metadata@default:default,user.tsm.client@default:default"/>\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-test"/>\r
+    <booleanAttribute key="default" value="true"/>\r
+    <booleanAttribute key="default_auto_start" value="false"/>\r
+    <intAttribute key="default_start_level" value="4"/>\r
+    <setAttribute key="deselected_workspace_bundles"/>\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.db.url=jdbc:db2://10.11.1.90:50000/mc&#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.11.1.90:50000/mc&#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.transcoder.address=http://10.11.1.111:65445/api/json/v1/&#13;&#10;-Djobengine.transcoder.template=MP4&#13;&#10;-Djobengine.transcoder.version=1&#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.11.254.86;databaseName=PA_Vivantis;&#13;&#10;-Djobengine.planair.db.user=MAM&#13;&#10;-Djobengine.planair.db.password=VDani&#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;-Djobengine.maestro.config=&quot;${workspace_loc}/-configuration/maestro.json&quot;&#13;&#10;-Djobengine.mediacube.config=&quot;${workspace_loc}/-configuration/mediacube.json&quot;&#13;&#10;-Dgui.statistics.disable=true&#13;&#10;-Dgui.help.disable=true&#13;&#10;-Dgui.editor.disable=true&#13;&#10;-Djobengine.mediafinder.external=false&#13;&#10;-Djobengine.mediacube.service.proxyroot=&quot;/opt&quot;&#13;&#10;-Djobengine.randomize.archives=true&#13;&#10;-Dmediacube.simplesearch=true&#13;&#10;&#13;&#10;-Djobengine.jobscheduling.config=&quot;/opt/steps/scheduledjobs.json&quot;&#13;&#10;-Djobengine.jobsteps.config=&quot;/opt/steps/executors.xml&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;/opt/steps/jobtemplates&quot;&#13;&#10;-Djobengine.jobsteps.groovy.root=&quot;/opt/steps&quot;"/>\r
+    <stringAttribute key="pde.version" value="3.3"/>\r
+    <setAttribute key="selected_target_bundles">\r
+        <setEntry value="cglib@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.core.jackson-annotations@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.core.jackson-core@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.core.jackson-databind@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default"/>\r
+        <setEntry value="com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default"/>\r
+        <setEntry value="com.ibm.db2.jcc@default:default"/>\r
+        <setEntry value="com.ibm.nosql@default:default"/>\r
+        <setEntry value="com.microsoft.sqlserver.sqljdbc@default:default"/>\r
+        <setEntry value="com.sun.jna@default:default"/>\r
+        <setEntry value="groovy@default:default"/>\r
+        <setEntry value="io.humble.video-arch-x86_64-pc-linux-gnu6@default:default"/>\r
+        <setEntry value="io.humble.video-arch-x86_64-w64-mingw32@default:default"/>\r
+        <setEntry value="io.humble.video-noarch@default:default"/>\r
+        <setEntry value="javax.annotation-api@default:default"/>\r
+        <setEntry value="javax.mail@default:default"/>\r
+        <setEntry value="javax.servlet-api@default:default"/>\r
+        <setEntry value="javax.ws.rs-api@default:default"/>\r
+        <setEntry value="jcifs@default:default"/>\r
+        <setEntry value="joda-time@default:default"/>\r
+        <setEntry value="junit@default:default"/>\r
+        <setEntry value="org.apache.aries.spifly.dynamic.bundle@default:default"/>\r
+        <setEntry value="org.apache.aries.util@default:default"/>\r
+        <setEntry value="org.apache.commons.beanutils@default:default"/>\r
+        <setEntry value="org.apache.commons.collections@default:default"/>\r
+        <setEntry value="org.apache.commons.digester@default:default"/>\r
+        <setEntry value="org.apache.commons.io@default:default"/>\r
+        <setEntry value="org.apache.commons.lang@default:default"/>\r
+        <setEntry value="org.apache.commons.net@default:default"/>\r
+        <setEntry value="org.apache.felix.gogo.command@default:default"/>\r
+        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>\r
+        <setEntry value="org.apache.felix.gogo.shell@default:default"/>\r
+        <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>\r
+        <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>\r
+        <setEntry value="org.apache.logging.log4j.api@1:true"/>\r
+        <setEntry value="org.apache.logging.log4j.core@default:default"/>\r
+        <setEntry value="org.apache.logging.log4j.slf4j-impl@default:default"/>\r
+        <setEntry value="org.apache.servicemix.bundles.quartz@default:default"/>\r
+        <setEntry value="org.eclipse.equinox.common@2:true"/>\r
+        <setEntry value="org.eclipse.equinox.console@default:default"/>\r
+        <setEntry value="org.eclipse.equinox.ds@1:true"/>\r
+        <setEntry value="org.eclipse.equinox.util@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.deploy@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.http@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.io@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.osgi.boot@default:true"/>\r
+        <setEntry value="org.eclipse.jetty.schemas@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.security@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.server@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.servlet@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.util@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.webapp@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.api@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.client@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.common@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.server@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.websocket.servlet@default:default"/>\r
+        <setEntry value="org.eclipse.jetty.xml@default:default"/>\r
+        <setEntry value="org.eclipse.osgi.services@default:default"/>\r
+        <setEntry value="org.eclipse.osgi@-1:true"/>\r
+        <setEntry value="org.hamcrest.core@default:default"/>\r
+        <setEntry value="org.jboss.resteasy.client@default:default"/>\r
+        <setEntry value="org.jboss.resteasy.jaxrs-api@default:default"/>\r
+        <setEntry value="org.jboss.resteasy.jaxrs@default:default"/>\r
+        <setEntry value="org.jmock.junit4@default:default"/>\r
+        <setEntry value="org.jmock@default:default"/>\r
+        <setEntry value="org.mybatis.mybatis@default:default"/>\r
+        <setEntry value="org.objectweb.asm.commons@default:default"/>\r
+        <setEntry value="org.objectweb.asm.tree@default:default"/>\r
+        <setEntry value="org.objectweb.asm@default:default"/>\r
+        <setEntry value="org.omnifaces@default:default"/>\r
+        <setEntry value="slf4j.api@default:default"/>\r
+        <setEntry value="slf4j.simple@default:false"/>\r
+    </setAttribute>\r
+    <setAttribute key="selected_workspace_bundles">\r
+        <setEntry value="user.commons.log4j2@default:false"/>\r
+        <setEntry value="user.commons.zk@default:default"/>\r
+        <setEntry value="user.jobengine.osgi.commons@default:true"/>\r
+        <setEntry value="user.jobengine.osgi.db@default:default"/>\r
+        <setEntry value="user.jobengine.osgi.server@default:default"/>\r
+        <setEntry value="user.jobengine.osgi.services@default:default"/>\r
+        <setEntry value="user.mediacube.gui@default:default"/>\r
+        <setEntry value="user.mediacube.metadata@default:default"/>\r
+        <setEntry value="user.tsm.client@default:default"/>\r
+    </setAttribute>\r
+    <booleanAttribute key="show_selected_only" value="false"/>\r
+    <booleanAttribute key="tracing" value="false"/>\r
+    <booleanAttribute key="useCustomFeatures" value="false"/>\r
+    <booleanAttribute key="useDefaultConfigArea" value="true"/>\r
 </launchConfiguration>\r
diff --git a/server/hu.user.mediacube.executors.tests/settings/application.yaml b/server/hu.user.mediacube.executors.tests/settings/application.yaml
new file mode 100644 (file)
index 0000000..39e7b95
--- /dev/null
+++ b/server/hu.user.mediacube.executors.tests/settings/application.yaml
@@ -0,0 +1,49 @@
+datasource:\r
+   mediacube:\r
+      url: jdbc:db2://10.10.1.27:50000/mc\r
+      user: db2admin\r
+      password: password\r
+      external-indexer: false\r
+      simple-search: true\r
+      login-timeout: 3\r
+      pool-size: 10\r
+   mediacube-nosql:\r
+      url: jdbc:db2://10.10.1.27:50000/mc\r
+      user: db2admin\r
+      password: password\r
+      schema: test\r
+      login-timeout: 3\r
+   nexio: \r
+      url: jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;\r
+      user: sa\r
+      password: resolve\r
+services:\r
+   ffmpeg:\r
+      execurable-location: /opt/ffmpeg/ffmpeg \r
+   mediacube:\r
+      proxy-root: /mediacube/data/lowres/www/video\r
+   nexio:\r
+      host: 10.10.1.55\r
+      collection-name: nexioclips\r
+      use-mos-gateway: true\r
+      disabled: true\r
+   octopus:\r
+      api:\r
+         address: http://10.10.1.11/api/v1\r
+         user: mama\r
+         password: napocska\r
+      rundowns-collection-name: rundowns\r
+      stories-collection-name: stories\r
+      folders-collection-name: storyfolders\r
+jobs:\r
+   validate-transfers: false\r
+   copy-buffer-size: 32768\r
+   scheduled-execution-disabled: true\r
+tsm:\r
+   randomize-archives: false \r
+   delimiter: /\r
+   node-name: JOBENGINE\r
+   fs-name: /JOBENGINE\r
+   alternate-fs-name: /JOBENGINE\r
+   hl-name: /JOBENGINE\r
+   
\ No newline at end of file
diff --git a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java
index f078e65d7f87b01df9d300c72ca8b9be1c8e9151..818af0452e54c0a92e39871b149cfc97975a7c8e 100644 (file)
--- a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java
+++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java
@@ -47,6 +47,7 @@ import org.junit.Test;
 \r
 import com.ibm.nosql.json.api.BasicDBList;\r
 import com.ibm.nosql.json.api.BasicDBObject;\r
+import com.ibm.nosql.json.api.DBObject;\r
 \r
 import groovy.lang.GroovyClassLoader;\r
 import user.commons.RemoteFile;\r
@@ -56,6 +57,8 @@ import user.commons.configuration.SystemConfiguration;
 import user.commons.mediaarea.StreamKind;\r
 import user.commons.mediatool.Timecode;\r
 import user.commons.mediatool.Timecode.Type;\r
+import user.commons.octopus.IOctopusAPI;\r
+import user.commons.octopus.OctopusAPI;\r
 import user.commons.remotestore.RemoteStoreProtocol;\r
 import user.jobengine.db.Media;\r
 import user.jobengine.server.steps.ArchiveItem;\r
@@ -898,11 +901,12 @@ public class SmallTests {
                                return id.split(" / ")[0];\r
                        else\r
                                return id;\r
-               }).forEach(id1 -> {\r
-                       //System.out.println(id1.toString());\r
-                       mcjob.add(id1.toString());\r
+               })\r
+                               .forEach(id1 -> {\r
+                                       //System.out.println(id1.toString());\r
+                                       mcjob.add(id1.toString());\r
 \r
-               });\r
+                               });\r
 \r
                //              List<String> mc = Files.readAllLines(Paths.get("/opt/AMC/mc-all-modified.txt"));\r
                Map<String, String> tsmmap = new HashMap<>();\r
@@ -1224,4 +1228,13 @@ public class SmallTests {
                List<String> k = conf.value("k");\r
                List<Integer> l = conf.value("l");\r
        }\r
+\r
+       @Test\r
+       public void test99999() throws Exception {\r
+               IOctopusAPI octopusAPI = new OctopusAPI();\r
+               for (int i = 0; i < 100000; i++) {\r
+                       List<DBObject> rundowns = octopusAPI.getRundowns(null);\r
+                       System.out.println(rundowns.size());\r
+               }\r
+       }\r
 }\r
diff --git a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java
index 9183daa587fbe3ea1e10371dbd13215303c808b5..703d04133b43152942eff51aee37d0aa2148a89b 100644 (file)
--- a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusAPI.java
@@ -20,7 +20,6 @@ import user.commons.nosql.NoSQLUtils;
 \r
 public class OctopusAPI implements IOctopusAPI {\r
        //private static final Logger logger = LogManager.getLogger();\r
-       private DB db;\r
 \r
        public OctopusAPI() throws SQLException {\r
 \r
@@ -42,11 +41,6 @@ public class OctopusAPI implements IOctopusAPI {
                }\r
        }\r
 \r
-       private void ensureDB() {\r
-               if (db == null)\r
-                       db = NoSQLUtils.getNoSQLDB();\r
-       }\r
-\r
        private List<DBObject> getReferencedObjects(List<DBObject> stories, String referenceCollectionName, String referenceField) {\r
                List<Long> ids = null;\r
                for (DBObject story : stories) {\r
@@ -67,7 +61,7 @@ public class OctopusAPI implements IOctopusAPI {
                if (ids == null)\r
                        return null;\r
                List<DBObject> result = null;\r
-               ensureDB();\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection rundownCollection = db.getCollection(referenceCollectionName);\r
                BasicDBObject query = (BasicDBObject) QueryBuilder.start().put(ID).in(ids).get();\r
                DBCursor findParents = rundownCollection.find(query);\r
@@ -80,7 +74,7 @@ public class OctopusAPI implements IOctopusAPI {
        @Override\r
        public DBObject getRundown(Date scheduledDate) {\r
                DBObject result = null;\r
-               ensureDB();\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection collection = db.getCollection(RUNDOWN_COLLECTION);\r
                DBCursor find = collection.find(new BasicDBObject(SCHEDULED_START, scheduledDate));\r
                if (find.hasNext())\r
@@ -91,7 +85,7 @@ public class OctopusAPI implements IOctopusAPI {
        @Override\r
        public DBObject getRundownByID(long rundownID) {\r
                DBObject result = null;\r
-               ensureDB();\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection collection = db.getCollection(RUNDOWN_COLLECTION);\r
                DBCursor find = collection.find(new BasicDBObject(ID, rundownID));\r
                if (find.hasNext())\r
@@ -148,7 +142,7 @@ public class OctopusAPI implements IOctopusAPI {
        @Override\r
        public List<DBObject> getRundownFullStories(long id) {\r
                List<DBObject> result = null;\r
-               ensureDB();\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection collection = db.getCollection(STORY_COLLECTION);\r
                DBCursor find = collection.find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id))))\r
                                .sort(new BasicDBObject("name", 1));\r
@@ -175,8 +169,10 @@ public class OctopusAPI implements IOctopusAPI {
        @Override\r
        public List<DBObject> getRundowns(Date scheduledDate) {\r
                List<DBObject> result = null;\r
-               ensureDB();\r
-               DBCollection collection = db.getCollection(RUNDOWN_COLLECTION);\r
+               //ensureDB();\r
+               DB db1 = NoSQLUtils.getNoSQLDB();\r
+\r
+               DBCollection collection = db1.getCollection(RUNDOWN_COLLECTION);\r
                Calendar calStart = CalendarUtils.createZeroCalendar(scheduledDate);\r
                Calendar calStop = CalendarUtils.createZeroCalendar(scheduledDate);\r
                calStop.add(Calendar.DAY_OF_MONTH, 1);\r
@@ -186,8 +182,10 @@ public class OctopusAPI implements IOctopusAPI {
                if (scheduledDate == null) {\r
                        query = builder.get();\r
                } else {\r
-                       query = builder.and(QueryBuilder.start(SCHEDULED_START).greaterThanEquals(calStart.getTime()).get(),\r
-                                       QueryBuilder.start(SCHEDULED_START).lessThan(calStop.getTime()).get()).get();\r
+                       query = builder\r
+                                       .and(QueryBuilder.start(SCHEDULED_START).greaterThanEquals(calStart.getTime()).get(),\r
+                                                       QueryBuilder.start(SCHEDULED_START).lessThan(calStop.getTime()).get())\r
+                                       .get();\r
                }\r
 \r
                //logger.info(query);\r
@@ -199,7 +197,7 @@ public class OctopusAPI implements IOctopusAPI {
 \r
        @Override\r
        public List<DBObject> getRundownsByParentStoryID(String id) {\r
-               ensureDB();\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection storyCollection = db.getCollection(STORY_COLLECTION);\r
                DBCursor find = storyCollection.find(new BasicDBObject(PARENT_STORY_ID, id), new BasicDBObject(REF_RUNDOWN, 1));\r
                if (!find.hasNext())\r
@@ -210,7 +208,7 @@ public class OctopusAPI implements IOctopusAPI {
        @Override\r
        public List<DBObject> getRundownsByPlaceHolderID(String id) {\r
                //db.testStoryCollection.find({"mosObjects": {$elemMatch: {"globalId": "OCTOPUS-ECHOTV-2429902"}}})\r
-               ensureDB();\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection storyCollection = db.getCollection(STORY_COLLECTION);\r
                BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS, new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id)));\r
                DBCursor find = storyCollection.find(criteria, new BasicDBObject(REF_RUNDOWN, 1));\r
@@ -229,7 +227,7 @@ public class OctopusAPI implements IOctopusAPI {
                // db.stories.find({ rundown: { $elemMatch: { id: 92950867 } }})\r
                // { rundown: { $elemMatch: { id: 44622396 } }}\r
                List<DBObject> result = null;\r
-               ensureDB();\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection collection = db.getCollection(STORY_COLLECTION);\r
                DBCursor find = collection\r
                                .find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id))),\r
@@ -249,7 +247,7 @@ public class OctopusAPI implements IOctopusAPI {
        @Override\r
        public List<DBObject> getRundownStories(long id, BasicDBObject fields) {\r
                List<DBObject> result = null;\r
-               ensureDB();\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection collection = db.getCollection(STORY_COLLECTION);\r
                DBCursor find = collection.find(new BasicDBObject(REF_RUNDOWN, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, id))))\r
                                .sort(new BasicDBObject("name", 1));\r
@@ -283,7 +281,7 @@ public class OctopusAPI implements IOctopusAPI {
        @Override\r
        public List<DBObject> getStories() {\r
                List<DBObject> result = null;\r
-               ensureDB();\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection collection = db.getCollection(STORY_COLLECTION);\r
                DBCursor find = collection.find(new BasicDBObject(), new BasicDBObject("mosObjects", 1).append("_id", 0)).limit(1000);\r
                if (find.hasNext())\r
@@ -294,7 +292,7 @@ public class OctopusAPI implements IOctopusAPI {
        @Override\r
        public List<DBObject> getStoriesByID(String id) {\r
                List<DBObject> result = null;\r
-               ensureDB();\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection collection = db.getCollection(STORY_COLLECTION);\r
                DBCursor find = collection.find(new BasicDBObject(ID, id));\r
                if (find.hasNext()) {\r
@@ -309,7 +307,7 @@ public class OctopusAPI implements IOctopusAPI {
                //Pattern regex = Pattern.compile(id, Pattern.CASE_INSENSITIVE);\r
                //BasicDBObject query = new BasicDBObject("id", Pattern.compile(id));\r
                List<DBObject> result = null;\r
-               ensureDB();\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection collection = db.getCollection(STORY_COLLECTION);\r
                DBCursor find = collection.find(new BasicDBObject(PARENT_STORY_ID, id));\r
                if (find.hasNext()) {\r
@@ -322,7 +320,7 @@ public class OctopusAPI implements IOctopusAPI {
        @Override\r
        public List<DBObject> getStoriesByPlaceHolderID(String id) {\r
                List<DBObject> result = new ArrayList<>();\r
-               ensureDB();\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection storyCollection = db.getCollection(STORY_COLLECTION);\r
                BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS, new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id)));\r
                DBCursor find = storyCollection.find(criteria);\r
@@ -336,7 +334,7 @@ public class OctopusAPI implements IOctopusAPI {
        @Override\r
        public List<DBObject> getStoryFolders() {\r
                List<DBObject> result = null;\r
-               ensureDB();\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection collection = db.getCollection(FOLDER_COLLECTION);\r
                DBCursor find = collection.find();\r
                if (find.hasNext())\r
@@ -346,7 +344,7 @@ public class OctopusAPI implements IOctopusAPI {
 \r
        @Override\r
        public List<DBObject> getStoryFoldersByParentStoryID(String id) {\r
-               ensureDB();\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection storyCollection = db.getCollection(STORY_COLLECTION);\r
                DBCursor find = storyCollection.find(new BasicDBObject(PARENT_STORY_ID, id), new BasicDBObject(REF_STORYFOLDER, 1));\r
                if (!find.hasNext())\r
@@ -356,7 +354,7 @@ public class OctopusAPI implements IOctopusAPI {
 \r
        @Override\r
        public List<DBObject> getStoryFoldersByPlaceHolderID(String id) {\r
-               ensureDB();\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection storyCollection = db.getCollection(STORY_COLLECTION);\r
                BasicDBObject criteria = new BasicDBObject(MOS_OBJECTS, new BasicDBObject($ELEMMATCH, new BasicDBObject(OBJ_ID, id)));\r
                DBCursor find = storyCollection.find(criteria, new BasicDBObject(REF_STORYFOLDER, 1));\r
@@ -368,7 +366,7 @@ public class OctopusAPI implements IOctopusAPI {
        @Override\r
        public List<DBObject> getStoryFolderStories(long storyFolderId) {\r
                List<DBObject> result = null;\r
-               ensureDB();\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection collection = db.getCollection(STORY_COLLECTION);\r
                DBCursor find = collection\r
                                .find(new BasicDBObject(REF_STORYFOLDER, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, storyFolderId))),\r
@@ -387,7 +385,7 @@ public class OctopusAPI implements IOctopusAPI {
        @Override\r
        public List<DBObject> getStoryFolderStories(long storyFolderId, BasicDBObject fields) {\r
                List<DBObject> result = null;\r
-               ensureDB();\r
+               DB db = NoSQLUtils.getNoSQLDB();\r
                DBCollection collection = db.getCollection(STORY_COLLECTION);\r
                DBCursor find = collection.find(new BasicDBObject(REF_STORYFOLDER, new BasicDBObject($ELEMMATCH, new BasicDBObject(ID, storyFolderId))), fields)\r
                                .sort(new BasicDBObject(NAME, 1));\r
diff --git a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/octopus/OctopusRESTService.java b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/octopus/OctopusRESTService.java
index 81f73ad402a2455ab19fd59911216110a1881f78..20e358323600334289d250c7a709c0ee4b327d37 100644 (file)
--- a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/octopus/OctopusRESTService.java
+++ b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/octopus/OctopusRESTService.java
@@ -112,6 +112,7 @@ public class OctopusRESTService {
                logger.trace("Entry {}", scheduledDate);
                Response result = null;
                try {
+                       logger.info("Query rundowns");
                        Date calendar = null;
 
                        if (scheduledDate != null) {
mediacube repository