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 66d960cbc9fb9f19704736729f062eb84fca81ad..b004926bea9f9a6fed2b35a1ab0ed707b6d7f5cc 100644 (file)
--- a/server/-configuration/run-mediacube-server-bsh.launch
+++ b/server/-configuration/run-mediacube-server-bsh.launch
@@ -19,7 +19,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>\r
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>\r
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/config&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.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=rundowns190708&#13;&#10;-Djobengine.octopus.storyfolders.name=storyfolders190708&#13;&#10;-Djobengine.octopus.stories.name=stories190708&#13;&#10;-Dmediacube.auth.location=&quot;${workspace_loc}/-configuration/mediacube-auth.properties&quot;"/>\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="false"/>\r
 <stringAttribute key="target_bundles" value="cglib@default:default,com.auth0.java-jwt@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default,com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,com.google.guava@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.el.javax.el@default:default,commons-logging@default:default,humble.video.noarch@default:default,humble.video.windows@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.servlet.jsp-api@default:default,javax.validation.api@default:default,javax.ws.rs-api@default:default,jcifs@default:default,joda-time@default:default,org.apache.aries.spifly.dynamic.bundle@default:default,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.logging.log4j.api@1:true,org.apache.logging.log4j.core@default:default,org.apache.logging.log4j.slf4j-impl@default:default,org.apache.servicemix.bundles.quartz@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jsp@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.schemas@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jboss.resteasy.client@default:default,org.jboss.resteasy.jaxrs@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.junit@default:default,org.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

diff --git a/server/-configuration/run-mediacube-server-localhost.launch b/server/-configuration/run-mediacube-server-localhost.launch
deleted file mode 100644 (file)
index 75a5031..0000000
--- a/server/-configuration/run-mediacube-server-localhost.launch
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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-localhost"/>\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.equinox.http.jetty.http.port=8080&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/config&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=salabakter&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/user/jobengine/server/steps&quot;&#13;&#10;-Djobengine.transcoder.source=c:\_Movie\hires\&#13;&#10;-Djetty.home=&quot;${workspace_loc:-configuration}/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.11/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=salabakter&#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_v4.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Dnexio.host=10.10.1.56&#13;&#10;-Dnexio.disable=true"/>\r
-<stringAttribute key="pde.version" value="3.3"/>\r
-<booleanAttribute key="show_selected_only" value="false"/>\r
-<stringAttribute key="target_bundles" value="cglib@default:default,com.auth0.java-jwt@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default,com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,com.google.guava@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.el.javax.el@default:default,commons-logging@default:default,javax.annotation-api@default:default,javax.inject@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.servlet.jsp-api@default:default,javax.validation.api@default:default,javax.ws.rs-api@default:default,jcifs@default:default,joda-time@default:default,org.apache.aries.spifly.dynamic.bundle@default:default,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.logging.log4j.api@1:true,org.apache.logging.log4j.core@default:default,org.apache.logging.log4j.slf4j-impl@default:default,org.apache.servicemix.bundles.quartz@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jdt.core.compiler.batch@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jsp@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.schemas@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jboss.resteasy.client@default:default,org.jboss.resteasy.jaxrs@default:true,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="tracing" value="false"/>\r
-<booleanAttribute key="useCustomFeatures" value="false"/>\r
-<booleanAttribute key="useDefaultConfigArea" value="true"/>\r
-<stringAttribute key="workspace_bundles" value="user.commons.log4j2@default:false,user.jobengine.osgi.commons@default:true,user.jobengine.osgi.db@default:default,user.jobengine.osgi.server@default:default,user.jobengine.osgi.services@default:default,user.tsm.client@default:default"/>\r
-</launchConfiguration>\r

diff --git a/server/-configuration/run-mediacube-server-slim.launch b/server/-configuration/run-mediacube-server-slim.launch
index 20dec987c08b79880d837d72d51ed8b85c5063ad..bf4c9919b08e7779eeb351b3490702f144fc4080 100644 (file)
--- a/server/-configuration/run-mediacube-server-slim.launch
+++ b/server/-configuration/run-mediacube-server-slim.launch
@@ -22,7 +22,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory&#13;&#10;-Dorg.eclipse.epp.logging.aeri.skipReports=true &#13;&#10;-Declipse.ignoreApp=true &#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Djobengine.jobsteps.root=&quot;${workspace_loc}/user.jobengine.executors/config&quot;&#13;&#10;-Djobengine.jobtemplates.root=&quot;${workspace_loc}/user.jobengine.executors/jobtemplates&quot;&#13;&#10;-Djobengine.db.url=jdbc:db2://10.228.198.1:50000/mediaarc:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.db.user=db2admin&#13;&#10;-Djobengine.db.password=password&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&quot;&#13;&#10;-Djobengine.jobsteps.alternate.root=&quot;${workspace_loc}/user.jobengine.executors/bin/&quot;&#13;&#10;-Djetty.home=&quot;${workspace_loc:}/-configuration/jetty&quot;&#13;&#10;-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,,etc/user-jetty-http.xml,etc/user-jetty-https.xml&#13;&#10;-Dorg.eclipse.jetty.webapp.basetempdir=c:\temp\jetty&#13;&#10;-Djava.io.tmpdir=c:\temp\jetty&#13;&#10;-Djobengine.octopus.api.address=http://10.10.1.11/api/v1&#13;&#10;-Djobengine.octopus.api.user=mam&#13;&#10;-Djobengine.octopus.api.password=napocska&#13;&#10;-Djobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache:retrieveMessagesFromServerOnGetMessage=true;&#13;&#10;-Djobengine.nosql.db.user=db2admin&#13;&#10;-Djobengine.nosql.db.password=password&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl&#13;&#10;-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC.zenium&#13;&#10;-Djobengine.jobscheduling.config=&quot;${workspace_loc}/-configuration/scheduledjobs.json&quot;&#13;&#10;-Djobengine.maestro.config=&quot;${workspace_loc}/-configuration/maestro.json&quot;&#13;&#10;-Djobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;&#13;&#10;-Djobengine.nexio.db.user=sa&#13;&#10;-Djobengine.nexio.db.password=resolve&#13;&#10;-Djobengine.planair.db.url=jdbc:sqlserver://10.10.1.45;databaseName=PA_Echo;&#13;&#10;-Djobengine.planair.db.user=MAM&#13;&#10;-Djobengine.planair.db.password=Echotv.hu&#13;&#10;-Dnexio.host=192.168.0.12&#13;&#10;-Djobengine.nexio.name=testnexioclips&#13;&#10;-Dnexio.useMOSGateway=false&#13;&#10;-Dnexio.disable=true&#13;&#10;-Djobengine.octopus.rundowns.name=rundowns181026&#13;&#10;-Djobengine.octopus.storyfolders.name=storyfolders181026&#13;&#10;-Djobengine.octopus.stories.name=stories181026&#13;&#10;-Dmediacube.auth.location=&quot;${workspace_loc}/-configuration/mediacube-auth.properties&quot;"/>\r
 <stringAttribute key="pde.version" value="3.3"/>\r
 <booleanAttribute key="show_selected_only" value="false"/>\r
-<stringAttribute key="target_bundles" value="cglib@default:default,com.auth0.java-jwt@default:default,com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.fasterxml.jackson.datatype.jackson-datatype-joda@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-base@default:default,com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider@default:default,com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,com.google.guava@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.el.javax.el@default:default,humble.video.noarch@default:default,humble.video.windows@default:default,javax.annotation-api@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.servlet.jsp-api@default:default,javax.ws.rs-api@default:default,jcifs@default:default,joda-time@default:default,org.apache.aries.spifly.dynamic.bundle@default:default,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.logging.log4j.api@1:true,org.apache.logging.log4j.core@default:default,org.apache.logging.log4j.slf4j-impl@default:default,org.apache.servicemix.bundles.quartz@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jsp@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.schemas@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jboss.resteasy.client@default:default,org.jboss.resteasy.jaxrs@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.junit@default:default,org.mybatis.mybatis@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r
+<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.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default,com.google.guava@default:default,com.ibm.db2jcc4@default:default,com.ibm.nosql@default:default,com.microsoft.sqlserver.sqljdbc@default:default,com.sun.el.javax.el@default:default,humble.video.noarch@default:default,humble.video.windows@default:default,javax.annotation-api@default:default,javax.mail@default:default,javax.servlet-api@default:default,javax.servlet.jsp-api@default:default,javax.ws.rs-api@default:default,jcifs@default:default,joda-time@default:default,org.apache.aries.spifly.dynamic.bundle@default:default,org.apache.aries.util@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.digester@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.logging.log4j.api@1:true,org.apache.logging.log4j.core@default:default,org.apache.logging.log4j.slf4j-impl@default:default,org.apache.servicemix.bundles.quartz@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jsp@default:default,org.eclipse.jetty.osgi.boot.jsp@default:false,org.eclipse.jetty.osgi.boot@default:true,org.eclipse.jetty.schemas@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.websocket.server@default:default,org.eclipse.jetty.websocket.servlet@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.jboss.resteasy.client@default:default,org.jboss.resteasy.jaxrs@default:default,org.jmock.junit4@default:default,org.jmock@default:default,org.junit@default:default,org.mybatis.mybatis@default:default,org.objectweb.asm.commons@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,slf4j.api@default:default,slf4j.simple@default:false"/>\r
 <booleanAttribute key="tracing" value="false"/>\r
 <booleanAttribute key="useCustomFeatures" value="false"/>\r
 <booleanAttribute key="useDefaultConfigArea" value="true"/>\r

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

diff --git a/server/-dependencies/libs/solr-solrj-7.5.0.jar b/server/-dependencies/libs/solr-solrj-7.5.0.jar
deleted file mode 100644 (file)
index 33c194c..0000000
Binary files a/server/-dependencies/libs/solr-solrj-7.5.0.jar and /dev/null differ

diff --git a/server/-dependencies/libs/solr-solrj-8.2.0.jar b/server/-dependencies/libs/solr-solrj-8.2.0.jar
new file mode 100644 (file)
index 0000000..b357a80
Binary files /dev/null and b/server/-dependencies/libs/solr-solrj-8.2.0.jar differ

diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml
index 4b89aaca30099dbfe40c8700a647ff9bda174bc2..2900b7adc3f9a8dae6729a79445db534a64e8585 100644 (file)
--- a/server/-dependencies/pom.xml
+++ b/server/-dependencies/pom.xml
@@ -107,6 +107,20 @@
                                                        <packaging>jar</packaging>\r
                                                </configuration>\r
                                        </execution>\r
+                                       <execution>\r
+                                               <id>install6</id>\r
+                                               <phase>package</phase>\r
+                                               <goals>\r
+                                                       <goal>install-file</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <file>libs/solr-solrj-8.2.0.jar</file>\r
+                                                       <groupId>org.apache.solr</groupId>\r
+                                                       <artifactId>solrj</artifactId>\r
+                                                       <version>8.2.0</version>\r
+                                                       <packaging>jar</packaging>\r
+                                               </configuration>\r
+                                       </execution>\r
                                </executions>\r
                        </plugin>\r
                        <plugin>\r

diff --git a/server/-modules/pom.xml b/server/-modules/pom.xml
index 7dc37ce90d55a775b2ec050d04892a4574af5bdc..ebf9f9bb9d685786b67be5eb96c2b013ab5ad512 100644 (file)
--- a/server/-modules/pom.xml
+++ b/server/-modules/pom.xml
@@ -19,8 +19,8 @@
        </modules>\r
 \r
        <properties>\r
-               <remote.hostkey>ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4</remote.hostkey>\r
-<!--           <remote.hostkey>ssh-ed25519 256 ea:58:1c:d3:b8:d5:7a:92:4c:a3:a5:8d:e2:7b:07:fd</remote.hostkey> -->\r
+               <remote.hostkey>ssh-ed25519 256 ea:ab:67:70:79:63:2f:6a:34:81:48:e2:b9:dd:ca:d4</remote.hostkey>\r
+               <!-- <remote.hostkey>ssh-ed25519 256 ea:58:1c:d3:b8:d5:7a:92:4c:a3:a5:8d:e2:7b:07:fd</remote.hostkey> -->\r
                <project.version>1.0.0</project.version>\r
                <tycho.version>1.0.0</tycho.version>\r
                <maven.compiler.source>1.8</maven.compiler.source>\r
@@ -46,15 +46,15 @@
 \r
        <build>\r
                <plugins>\r
-<!--                   <plugin> -->\r
-<!--                           <groupId>org.apache.maven.plugins</groupId> -->\r
-<!--                           <artifactId>maven-compiler-plugin</artifactId> -->\r
-<!--                           <version>3.7.0</version> -->\r
-<!--                           <configuration> -->\r
-<!--                                   <source>1.8</source> -->\r
-<!--                                   <target>1.8</target> -->\r
-<!--                           </configuration> -->\r
-<!--                   </plugin> -->\r
+                       <!-- <plugin> -->\r
+                       <!-- <groupId>org.apache.maven.plugins</groupId> -->\r
+                       <!-- <artifactId>maven-compiler-plugin</artifactId> -->\r
+                       <!-- <version>3.7.0</version> -->\r
+                       <!-- <configuration> -->\r
+                       <!-- <source>1.8</source> -->\r
+                       <!-- <target>1.8</target> -->\r
+                       <!-- </configuration> -->\r
+                       <!-- </plugin> -->\r
 \r
                        <plugin>\r
                                <groupId>org.apache.maven.plugins</groupId>\r
@@ -109,11 +109,11 @@
                                                        <ws>gtk</ws>\r
                                                        <arch>x86_64</arch>\r
                                                </environment>\r
-                                               <!-- <environment> -->\r
-                                               <!-- <os>win32</os> -->\r
-                                               <!-- <ws>win32</ws> -->\r
-                                               <!-- <arch>x86_64</arch> -->\r
-                                               <!-- </environment> -->\r
+                                               <environment>\r
+                                                       <os>win32</os>\r
+                                                       <ws>win32</ws>\r
+                                                       <arch>x86_64</arch>\r
+                                               </environment>\r
                                                <!-- <environment> -->\r
                                                <!-- <os>aix</os> -->\r
                                                <!-- <ws>gtk</ws> -->\r

diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product
index 87c59aaadd81c3e927f2c8484c51f6a5d30d2a57..2087b6057c5be2c46b7af204691277587aa26fa4 100644 (file)
--- a/server/-product/mediacube.product
+++ b/server/-product/mediacube.product
@@ -115,11 +115,9 @@
       <plugin id="humble.video.noarch"/>\r
       <plugin id="humble.video.windows"/>\r
       <plugin id="javax.annotation-api"/>\r
-      <plugin id="javax.inject"/>\r
       <plugin id="javax.mail"/>\r
       <plugin id="javax.servlet-api"/>\r
       <plugin id="javax.servlet.jsp-api"/>\r
-      <plugin id="javax.validation.api"/>\r
       <plugin id="javax.ws.rs-api"/>\r
       <plugin id="jcifs"/>\r
       <plugin id="joda-time"/>\r
@@ -131,7 +129,6 @@
       <plugin id="org.apache.commons.digester"/>\r
       <plugin id="org.apache.commons.io"/>\r
       <plugin id="org.apache.commons.lang"/>\r
-      <plugin id="org.apache.commons.lang3"/>\r
       <plugin id="org.apache.commons.logging"/>\r
       <plugin id="org.apache.commons.net"/>\r
       <plugin id="org.apache.felix.gogo.command"/>\r
@@ -169,7 +166,6 @@
       <plugin id="org.eclipse.jetty.xml"/>\r
       <plugin id="org.eclipse.osgi" version="3.11.2.v20161107-1947"/>\r
       <plugin id="org.eclipse.osgi.services" version="3.2.100.v20100503"/>\r
-      <plugin id="org.eclipse.update.configurator"/>\r
       <plugin id="org.hamcrest.core"/>\r
       <plugin id="org.jboss.resteasy.client"/>\r
       <plugin id="org.jboss.resteasy.jaxrs"/>\r
@@ -186,6 +182,7 @@
       <plugin id="user.jobengine.osgi.db"/>\r
       <plugin id="user.jobengine.osgi.server"/>\r
       <plugin id="user.jobengine.osgi.services"/>\r
+      <plugin id="user.mediacube.metadata"/>\r
       <plugin id="user.tsm.client"/>\r
    </plugins>\r
 \r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
index f0206211fcb2d0d158550e917f4f6ccf0b3b0cc8..6734cd637a1246840a38ec367e926929740a9b16 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
@@ -140,8 +140,7 @@ public class SearchModel extends AsyncBaseModel {
                addTypeFilter(TypeFilter.as(GENERIC, "YELLOW200", "ic_view_quilt_black_18dp.png"));\r
                addTypeFilter(TypeFilter.as(GENERIC_ORIGINAL, "YELLOW200", "ic_view_quilt_black_18dp.png"));\r
                topTypeFilterNames = new String[] { NEWS_MATERIAL, RAW_NEWS_MATERIAL, ECHO_RECORDING, RECORDING, GENERIC };\r
-               bottomTypeFilterNames = new String[] { ECHO_MATERIAL, MATERIAL, RAW_MATERIAL, ECHO_PROMO, PROMO, RAW_PROMO,\r
-                               ECHO_AD, AD, RAW_AD };\r
+               bottomTypeFilterNames = new String[] { ECHO_MATERIAL, MATERIAL, RAW_MATERIAL, ECHO_PROMO, PROMO, RAW_PROMO, ECHO_AD, AD, RAW_AD };\r
 \r
                columnHeaders = new LinkedHashMap<>();\r
                columnHeaders.put("ID", "mediahouseid");\r
@@ -201,9 +200,7 @@ public class SearchModel extends AsyncBaseModel {
                        itemsGrid.setPageSize(SessionUtil.getUserPageSize());\r
                setSettingsPageSize(itemsGrid.getPageSize());\r
                if (!allChecked)\r
-                       Clients.showNotification(\r
-                                       String.format(\r
-                                                       "Figyelem!<br><br><span style='white-space:nowrap'> A keresési paraméterek megváltoztak! </span>"),\r
+                       Clients.showNotification(String.format("Figyelem!<br><br><span style='white-space:nowrap'> A keresési paraméterek megváltoztak! </span>"),\r
                                        "warning", searchFiltersMenu, "end_center", 3000);\r
        }\r
 \r
@@ -235,13 +232,11 @@ public class SearchModel extends AsyncBaseModel {
 \r
        @Command\r
        public void copyMediaIdToClipboard() {\r
-               String port = (Executions.getCurrent().getServerPort() == 80) ? ""\r
-                               : (":" + Executions.getCurrent().getServerPort());\r
+               String port = (Executions.getCurrent().getServerPort() == 80) ? "" : (":" + Executions.getCurrent().getServerPort());\r
                String baseURL = Executions.getCurrent().getScheme() + "://" + Executions.getCurrent().getServerName() + port\r
                                + Executions.getCurrent().getContextPath();\r
                String url = String.format("%s/?%s=%d", baseURL, MEDIA_ID, selectedObject.getMedia().getId());\r
-               String email = String.format("mailto:?subject=Média címe: %s &body=A média itt tekinthető meg: %s",\r
-                               selectedObject.getMedia().getTitle(), url);\r
+               String email = String.format("mailto:?subject=Média címe: %s &body=A média itt tekinthető meg: %s", selectedObject.getMedia().getTitle(), url);\r
                // Toolkit toolkit = Toolkit.getDefaultToolkit();\r
                // Clipboard clipboard = toolkit.getSystemClipboard();\r
                // StringSelection strSel = new StringSelection(url);\r
@@ -513,45 +508,43 @@ public class SearchModel extends AsyncBaseModel {
        }\r
 \r
        @Command\r
-       public void onTcIn(@ContextParam(ContextType.TRIGGER_EVENT) Event event) throws Exception\r
-       {\r
+       public void onTcIn(@ContextParam(ContextType.TRIGGER_EVENT) Event event) throws Exception {\r
                ////////////Végén törölni innen!!!\r
-               if (selectedObject == null) { \r
+               if (selectedObject == null) {\r
                        selectedObject = new ArchivedMedia();\r
                }\r
                ////////////Végén törölni eddig!!!\r
-               \r
-               JSONObject jsObject =  (JSONObject)event.getData();\r
-               Double doubleVar = 0.0; \r
-               if (!jsObject.get("meta").equals(0)){           \r
-                       doubleVar = (Double)jsObject.get("meta");\r
+\r
+               JSONObject jsObject = (JSONObject) event.getData();\r
+               Double doubleVar = 0.0;\r
+               if (!jsObject.get("meta").equals(0)) {\r
+                       doubleVar = (Double) jsObject.get("meta");\r
                }\r
-               \r
-               if (doubleVar.floatValue() >= ((selectedObject.getTcOut() == null)?9999999999999999999999.9:selectedObject.getTcOut())){\r
+\r
+               if (doubleVar.floatValue() >= ((selectedObject.getTcOut() == null) ? 9999999999999999999999.9 : selectedObject.getTcOut())) {\r
                        throw new Exception("A kilépés időpontjának későbbinek kell lennie mint a belépés időpontja!");\r
-               }else{\r
+               } else {\r
                        selectedObject.setTcIn(new Float(doubleVar.floatValue()));\r
                }\r
        }\r
-       \r
+\r
        @Command\r
-       public void onTcOut(@ContextParam(ContextType.TRIGGER_EVENT) Event event) throws Exception\r
-       {\r
+       public void onTcOut(@ContextParam(ContextType.TRIGGER_EVENT) Event event) throws Exception {\r
                ////////////Végén törölni innen!!!\r
-               if (selectedObject == null) { \r
+               if (selectedObject == null) {\r
                        selectedObject = new ArchivedMedia();\r
                }\r
                ////////////Végén törölni eddig!!!\r
-               \r
-               JSONObject jsObject =  (JSONObject)event.getData();\r
-               Double doubleVar = 0.0; \r
-               if (!jsObject.get("meta").equals(0)){           \r
-                       doubleVar = (Double)jsObject.get("meta");\r
+\r
+               JSONObject jsObject = (JSONObject) event.getData();\r
+               Double doubleVar = 0.0;\r
+               if (!jsObject.get("meta").equals(0)) {\r
+                       doubleVar = (Double) jsObject.get("meta");\r
                }\r
-               \r
-               if (doubleVar.floatValue() <= ((selectedObject.getTcIn() == null)?0.0:selectedObject.getTcIn())){\r
+\r
+               if (doubleVar.floatValue() <= ((selectedObject.getTcIn() == null) ? 0.0 : selectedObject.getTcIn())) {\r
                        throw new Exception("A kilépés időpontjának későbbinek kell lennie mint a belépés időpontja!");\r
-               }else{\r
+               } else {\r
                        selectedObject.setTcOut(new Float(doubleVar.floatValue()));\r
                }\r
        }\r
@@ -564,8 +557,7 @@ public class SearchModel extends AsyncBaseModel {
        @Command\r
        public void openMetaDataDialog() {\r
                String template = "/pages/metadatadetails.zul";\r
-               Window window = (Window) Executions.createComponents(template, null,\r
-                               ListUtils.asMap("selectedObject", selectedObject));\r
+               Window window = (Window) Executions.createComponents(template, null, ListUtils.asMap("selectedObject", selectedObject));\r
                window.doModal();\r
        }\r
 \r
@@ -583,8 +575,7 @@ public class SearchModel extends AsyncBaseModel {
 \r
        @Command\r
        @NotifyChange({ "selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath" })\r
-       public void select(@BindingParam("selectedObject") ArchivedMedia selectedObject,\r
-                       @ContextParam(ContextType.BIND_CONTEXT) BindContext ctx) {\r
+       public void select(@BindingParam("selectedObject") ArchivedMedia selectedObject, @ContextParam(ContextType.BIND_CONTEXT) BindContext ctx) {\r
                Event event = ctx.getTriggerEvent();\r
                // Nem mindig a row a target, ha a kepre kattintunk akkor az image\r
                // selectedRowIndex = ((Row) event.getTarget()).getIndex();\r
@@ -678,7 +669,7 @@ public class SearchModel extends AsyncBaseModel {
 \r
                        try {\r
                                String video = getLowresMediaFilePath();\r
-                               if (video.contentEquals(null)) {\r
+                               if (video == null) {\r
                                        Clients.evalJavaScript("setSource('/img/mediacube_logo_v2_50x50.png')");\r
                                } else {\r
                                        Clients.evalJavaScript("setSource('" + video + "')");\r
@@ -726,8 +717,7 @@ public class SearchModel extends AsyncBaseModel {
        private void showExternalMediaID() {\r
                String mediaID = SessionUtil.getQueryParameter(MEDIA_ID);\r
                if (mediaID != null)\r
-                       searchResult = new InitializedCachedListModel(mediaID, searchValue, new ArrayList<String>(), orderBy,\r
-                                       orderAscending);\r
+                       searchResult = new InitializedCachedListModel(mediaID, searchValue, new ArrayList<String>(), orderBy, orderAscending);\r
        }\r
 \r
        @Command\r
@@ -740,9 +730,7 @@ public class SearchModel extends AsyncBaseModel {
                // preventAfterRender = true;\r
                if (activePageIndex != itemsGrid.getActivePage()) {\r
                        itemsGrid.setActivePage(activePageIndex);\r
-                       logger.info(\r
-                                       "Selected media is shown in the results, which can be found on {} page and also it will be highlighted.",\r
-                                       activePageIndex + 1);\r
+                       logger.info("Selected media is shown in the results, which can be found on {} page and also it will be highlighted.", activePageIndex + 1);\r
                } else {\r
                        onAfterRenderGrid();\r
                        logger.info("Selected media is shown in the results, which can be found on opened page.");\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 95c4b3027339a599f00f01f1e6cd178013b5c7e9..81f73ad402a2455ab19fd59911216110a1881f78 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
@@ -63,23 +63,28 @@ public class OctopusRESTService {
                        StringBuilder sb = new StringBuilder();
 
                        List<BasicDBObject> rundowns = ListUtils.cast(octopusService.getRundowns(null));
-                       SimpleDateFormat sdt = new SimpleDateFormat("yyyy.MM.dd HH:mm");
-                       sdt.setTimeZone(TimeZone.getTimeZone("Europe/Prague"));
-                       for (BasicDBObject rundown : rundowns) {
-                               String name = rundown.getString(IOctopusAPI.NAME);
 
-                               if (name != null) {
-                                       int pos = name.lastIndexOf(" ");
-                                       pos = name.lastIndexOf(" ", pos - 1);
-                                       if (pos > 0)
-                                               name = name.substring(0, pos);
+                       if (rundowns == null) {
+                               sb.append(String.format("%s collection is empty!", IOctopusAPI.RUNDOWN_COLLECTION));
+                       } else {
+                               SimpleDateFormat sdt = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+                               sdt.setTimeZone(TimeZone.getTimeZone("Europe/Prague"));
+                               for (BasicDBObject rundown : rundowns) {
+                                       String name = rundown.getString(IOctopusAPI.NAME);
+
+                                       if (name != null) {
+                                               int pos = name.lastIndexOf(" ");
+                                               pos = name.lastIndexOf(" ", pos - 1);
+                                               if (pos > 0)
+                                                       name = name.substring(0, pos);
+                                       }
+
+                                       String date = sdt.format(rundown.getDate(IOctopusAPI.SCHEDULED_START));
+                                       long id = rundown.getLong(IOctopusAPI.ID);
+                                       sb.append(String.format("<a href='/services/rest/octopus/rundownContent/%d' target ='_blank'>[%s] %s</a></br>", id, date, name));
                                }
 
-                               String date = sdt.format(rundown.getDate(IOctopusAPI.SCHEDULED_START));
-                               long id = rundown.getLong(IOctopusAPI.ID);
-                               sb.append(String.format("<a href='/services/rest/octopus/rundownContent/%d' target ='_blank'>[%s] %s</a></br>", id, date, name));
                        }
-
                        result = Response.ok(sb.toString()).build();
                        //                      String a = TimeZone.getDefault().getDisplayName();
                        //                      String b = TimeZone.getDefault().getID();