git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorvasary.daniel <TFS\vasary.daniel>
Fri, 4 Mar 2022 15:50:35 +0000 (15:50 +0000)
committervasary.daniel <TFS\vasary.daniel>
Fri, 4 Mar 2022 15:50:35 +0000 (15:50 +0000)
38 files changed:
server/-configuration/run-mediacube-server-hirtv (1).launch [deleted file]
server/-configuration/run-mediacube-server-hirtv.launch
server/-configuration/run-mediacube-server-local.launch
server/-configuration/run-mediacube-server-mv.launch
server/-configuration/run-mediacube-server-omar.launch
server/-configuration/run-mediacube-server-test.launch [deleted file]
server/-configuration/run-mediacube-server-user.launch [deleted file]
server/-product/mediacube.product
server/-product/production/LOCAL/jobs/steps/ArchiveRecursive.java
server/-product/production/LOCAL/jobs/steps/BatchRetrieveForkStep.java
server/-product/production/LOCAL/jobs/steps/CreateMissingLowresStep.java
server/-product/production/LOCAL/jobs/steps/HSMMigrateStep.java
server/-product/production/LOCAL/jobs/steps/QueryMissingProxyMediaStep.java
server/-product/production/LOCAL/jobs/steps/shared/EscortFiles.java
server/user.jobengine.executors/META-INF/MANIFEST.MF
server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java
server/user.jobengine.executors/src/user/jobengine/server/steps/BatchRetrieveForkStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/CreateMissingLowresStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/HSMMigrateStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/QueryMissingProxyMediaStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/ReportServerStatusStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/ServerStatusReportStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/TSMSystemRestoreStep.java
server/user.jobengine.executors/src/user/jobengine/server/steps/shared/EscortFiles.java
server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF
server/user.jobengine.osgi.commons/src/user/commons/MediaCubeFinishMarker.java [deleted file]
server/user.jobengine.osgi.commons/src/user/commons/MediaCubeMarker.java [deleted file]
server/user.jobengine.osgi.commons/src/user/commons/MediaCubeUndoMarker.java [deleted file]
server/user.jobengine.osgi.commons/src/user/commons/nexio/NexioDispatcher.java
server/user.jobengine.osgi.commons/test/user/commons/TestMediaCubeMarker.java [deleted file]
server/user.jobengine.osgi.db/META-INF/MANIFEST.MF
server/user.jobengine.osgi.server/META-INF/MANIFEST.MF
server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java
server/user.jobengine.osgi.server/src/user/jobengine/server/steps/JobStep.java
server/user.jobengine.osgi.services/META-INF/MANIFEST.MF
server/user.jobengine.osgi.services/src/user/jobengine/osgi/mediacube/MediaCubeService.java
server/user.mediacube.gui/META-INF/MANIFEST.MF
server/user.mediacube.metadata/META-INF/MANIFEST.MF

diff --git a/server/-configuration/run-mediacube-server-hirtv (1).launch b/server/-configuration/run-mediacube-server-hirtv (1).launch
deleted file mode 100644 (file)
index 5d43336..0000000
+++ /dev/null
@@ -1,44 +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}\-product\production\HIRTV\tmp"/>\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="-Dcom.sun.management.jmxremote&#13;&#10;-Dcom.sun.management.jmxremote.port=9010&#13;&#10;-Dcom.sun.management.jmxremote.local.only=false&#13;&#10;-Dcom.sun.management.jmxremote.authenticate=false&#13;&#10;-Dcom.sun.management.jmxremote.ssl=false&#13;&#10;-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;-Dgosh.home=configuration&#13;&#10;-Djava.io.tmpdir=tmp"/>\r
-    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}\-product\production\HIRTV"/>\r
-    <stringAttribute key="pde.version" value="3.3"/>\r
-    <setAttribute key="selected_target_bundles">\r
-        <setEntry value="org.apache.commons.logging@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.logging.log4j.api@default:default"/>\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.eclipse.equinox.console@default:default"/>\r
-        <setEntry value="org.eclipse.osgi@-1:true"/>\r
-        <setEntry value="slf4j.api@default:default"/>\r
-        <setEntry value="slf4j.simple@default:default"/>\r
-    </setAttribute>\r
-    <setAttribute key="selected_workspace_bundles"/>\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="false"/>\r
-</launchConfiguration>\r
index 2716732a343176e81b55249b77f52f2feef9fa16..3c9d8e684a65f3a1e1e99ada0dcbf67b7fc11efe 100644 (file)
@@ -61,9 +61,6 @@
         <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="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.log4j@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
index 1cb817b18ddfe846cd18752373eaa6b46bd39589..a479b5ddb504ec5be9adb683e384f3f40620e984 100644 (file)
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<!DOCTYPE xml>\r
-\r
 <launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">\r
     <booleanAttribute key="append.args" value="true"/>\r
     <booleanAttribute key="automaticAdd" value="false"/>\r
@@ -74,8 +72,6 @@
         <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.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.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.log4j@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
index a4790c9609eeba870ed5e35d49d2d28614457cf7..8efb4093e75e21725d61be1df4beb427e0c03e37 100644 (file)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-\r
 <launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">\r
     <booleanAttribute key="append.args" value="true"/>\r
     <booleanAttribute key="automaticAdd" value="false"/>\r
@@ -73,9 +72,6 @@
         <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="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.log4j@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
index f659508c3946cbb833750fc7f05217c6aab1cd2d..4ebacff2a7546ae2acc27cc3a0d72332a58ccdca 100644 (file)
@@ -72,9 +72,6 @@
         <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="slf4j.simple@default:false"/>\r
     </setAttribute>\r
     <setAttribute key="selected_workspace_bundles">\r
-        <setEntry value="hu.user.mediacube.indexer@default:default"/>\r
-        <setEntry value="user.commons.log4j2@default:false"/>\r
         <setEntry value="user.commons.zk@default:default"/>\r
+        <setEntry value="user.jobengine.log4j@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
diff --git a/server/-configuration/run-mediacube-server-test.launch b/server/-configuration/run-mediacube-server-test.launch
deleted file mode 100644 (file)
index f930cb2..0000000
+++ /dev/null
@@ -1,118 +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-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/-configuration/run-mediacube-server-user.launch b/server/-configuration/run-mediacube-server-user.launch
deleted file mode 100644 (file)
index c28bb92..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-\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-user"/>\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.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.db.url=jdbc:db2://10.228.212.42:50000/mc&#13;&#10;-Djobengine.db.user=blobtest&#13;&#10;-Djobengine.db.password=blobtest&#13;&#10;-Djobengine.db.loginTimeout=3&#13;&#10;-Djobengine.loglevel=INFO&#13;&#10;-Dlog4j.configurationFile=&quot;${workspace_loc}/-configuration/log4j2.xml&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.212.42:50000/mccache&#13;&#10;-Djobengine.nosql.db.user=blobtest&#13;&#10;-Djobengine.nosql.db.password=blobtest&#13;&#10;-Djobengine.nosql.db.schema=test&#13;&#10;-Djobengine.nosql.db.loginTimeout=3&#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.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;-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;-Dgui.maestro.disable=true&#13;&#10;-Djobengine.mediafinder.external=false&#13;&#10;-Djobengine.mediacube.service.proxyroot=&quot;/opt&quot;&#13;&#10;-Djobengine.scheduledexecution.disabled=false&#13;&#10;-Djobengine.randomize.archives=false&#13;&#10;-Djobengine.jobsteps.config=&quot;${workspace_loc}/user.jobengine.executors/config/config.xml&quot;&#13;&#10;-Djobengine.jobsteps.groovy.root=&quot;${workspace_loc}/user.jobengine.executors/src/user/jobengine/server/steps&quot;&#13;&#10;-Dgui.jobs.alternate.selector=true&#13;&#10;-Dmediacube.simplesearch=true"/>\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@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:true"/>\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
index d61a7e99c4069c4021ea6c68bcfb584918560d11..14d38d5841e30a23753aca1c48e5d026ee85077c 100644 (file)
@@ -70,7 +70,6 @@
       <plugin id="org.eclipse.equinox.ds"/>\r
       <plugin id="org.eclipse.equinox.launcher"/>\r
       <plugin id="org.eclipse.equinox.util"/>\r
-      <plugin id="org.eclipse.jetty.client"/>\r
       <plugin id="org.eclipse.jetty.deploy"/>\r
       <plugin id="org.eclipse.jetty.http"/>\r
       <plugin id="org.eclipse.jetty.io"/>\r
       <plugin id="org.omnifaces"/>\r
       <plugin id="slf4j.api"/>\r
       <plugin id="slf4j.simple" fragment="true"/>\r
-      <plugin id="user.commons.log4j2" fragment="true"/>\r
       <plugin id="user.commons.zk"/>\r
+      <plugin id="user.jobengine.log4j"/>\r
       <plugin id="user.jobengine.osgi.commons"/>\r
       <plugin id="user.jobengine.osgi.db"/>\r
       <plugin id="user.jobengine.osgi.server"/>\r
index 2ba1b39e617f3d1229eb6448c70dc4d1e9969176..3f01f32bf63ce57d504f0b093866a7e673fa1e4f 100644 (file)
@@ -26,7 +26,7 @@ import com.ibm.nosql.json.api.BasicDBObject;
 \r
 import user.commons.JobStatus;\r
 import user.commons.ListUtils;\r
-import user.commons.MediaCubeMarker;\r
+import user.commons.log4j2.marker.MediaCubeMarker;\r
 import user.commons.mediatool.MediaInfo;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
index 15cf36c1a47f0d3bcb0bdeb9b627e5642162c81a..4f6b130b48322cb2a1d8f78a796251d7ff209b30 100644 (file)
@@ -6,8 +6,8 @@ import java.util.Map;
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
 \r
-import user.commons.MediaCubeFinishMarker;\r
-import user.commons.MediaCubeMarker;\r
+import user.commons.log4j2.marker.MediaCubeFinishMarker;\r
+import user.commons.log4j2.marker.MediaCubeMarker;\r
 import user.jobengine.db.ArchivedMedia;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
index b549e59e97051ce256c365cc6e6e3f60a47b67c4..72b4cfb19162c803437655a97caf1076f109cc59 100644 (file)
@@ -9,7 +9,7 @@ import com.ibm.nosql.json.api.BasicDBObject;
 import com.ibm.nosql.json.api.DB;\r
 import com.ibm.nosql.json.api.DBCollection;\r
 \r
-import user.commons.MediaCubeUndoMarker;\r
+import user.commons.log4j2.marker.MediaCubeUndoMarker;\r
 import user.commons.nosql.NoSQLUtils;\r
 import user.jobengine.db.IItemManager;\r
 import user.jobengine.db.Media;\r
index 6b85f1d7bf300c7914240873494423c7ec9f1050..895b1411f3d0e5d41143485c2a809d56b34e847f 100644 (file)
@@ -29,7 +29,7 @@ import com.ibm.nosql.json.api.DBCollection;
 import com.ibm.nosql.json.api.QueryBuilder;\r
 \r
 import user.commons.IEntityBase;\r
-import user.commons.MediaCubeMarker;\r
+import user.commons.log4j2.marker.MediaCubeMarker;\r
 import user.commons.nosql.NoSQLUtils;\r
 import user.jobengine.db.IItemManager;\r
 import user.jobengine.db.MediaFile;\r
index a91f9e97bf8794a8b7c443506dba105bca42359f..7df2bed03b20a9ca4786c20f933a50085d96adf7 100644 (file)
@@ -7,7 +7,7 @@ import com.ibm.nosql.json.api.BasicDBObject;
 import com.ibm.nosql.json.api.DB;\r
 import com.ibm.nosql.json.api.DBCollection;\r
 \r
-import user.commons.MediaCubeUndoMarker;\r
+import user.commons.log4j2.marker.MediaCubeUndoMarker;\r
 import user.commons.nosql.NoSQLUtils;\r
 import user.jobengine.db.IItemManager;\r
 import user.jobengine.db.Media;\r
index d872f6b9f2bc31a427637587e2d41b6f42e71549..406d90f14f97906df2f793e9745e23658d66f4d4 100644 (file)
@@ -43,7 +43,7 @@ import com.ibm.nosql.json.api.BasicDBObject;
 import com.ibm.nosql.json.util.JSON;\r
 \r
 import user.commons.CalendarUtils;\r
-import user.commons.MediaCubeMarker;\r
+import user.commons.log4j2.marker.MediaCubeMarker;\r
 import user.commons.StoreUri;\r
 import user.commons.remotestore.FtpDirectoryLister;\r
 \r
index 7dd0961f635ae8309687d88b20e34556d21b5e5c..f5af6b8cb915802d9afa9eec954265bfff1e260d 100644 (file)
@@ -48,5 +48,6 @@ Import-Package: groovy.lang;version="3.0.3",
  org.joda.time;version="2.2.0",
  org.joda.time.base;version="2.2.0",
  sqlj.runtime.ref,
+ user.commons.log4j2.marker,
  user.mediacube.metadata,
  user.mediacube.metadata.hsm
index 6b8f6c53e65a2a8f0f5be1c4e0262e6fe45f4ef6..1f320e48f206891a347bac0ff84f96b6a848d856 100644 (file)
@@ -23,7 +23,7 @@ import com.ibm.nosql.json.api.BasicDBObject;
 \r
 import user.commons.JobStatus;\r
 import user.commons.ListUtils;\r
-import user.commons.MediaCubeMarker;\r
+import user.commons.log4j2.marker.MediaCubeMarker;\r
 import user.commons.mediatool.MediaInfo;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
@@ -145,8 +145,8 @@ public class ArchiveRecursive extends JobStep implements FileVisitor<Path> {
                                Files.walkFileTree(Paths.get(sourcePath), this);\r
                        }\r
                } catch (Exception e) {\r
-                       logger.error(getSessionMarker(), "A(z) '{}' mappa elérése sikertelen. A rendszer hibaüzenete: {}", sourcePath,\r
-                                       e.getMessage());\r
+                       logger.error(getSessionMarker(), "A(z) '{}' mappa elérése sikertelen. A rendszer hibaüzenete: {}",\r
+                                       sourcePath, e.getMessage());\r
                } finally {\r
                        if (submitted > 0)\r
                                getJobRuntime().forkWaitComplete();\r
index d56bb9504a778921c0eddb52104205e8ed94316c..a531a2ea10b303f27d1f913bc33ad0341a3ada57 100644 (file)
@@ -6,8 +6,8 @@ import java.util.Map;
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
 \r
-import user.commons.MediaCubeFinishMarker;\r
-import user.commons.MediaCubeMarker;\r
+import user.commons.log4j2.marker.MediaCubeFinishMarker;\r
+import user.commons.log4j2.marker.MediaCubeMarker;\r
 import user.jobengine.db.ArchivedMedia;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
@@ -65,7 +65,8 @@ public class BatchRetrieveForkStep extends JobStep {
                        parameters.put(HOUSEID, houseId);\r
                        parameters.put(RECIPIENT, recipient);\r
                        parameters.put(TARGET_PATH_TYPE, targetPathType);\r
-                       IJobRuntime child = jobEngine.submit(jobRuntime, null, CHILD_TEMPLATE, String.format("Visszatöltés %s részére", recipient), parameters);\r
+                       IJobRuntime child = jobEngine.submit(jobRuntime, null, CHILD_TEMPLATE,\r
+                                       String.format("Visszatöltés %s részére", recipient), parameters);\r
                        ((MediaCubeMarker) child.getSessionMarker()).setTo(recipient);\r
                } catch (Exception e) {\r
                        logger.catching(e);\r
index fa3151744e6f50767e9c4d2a145646999127a3c8..519b28a74c6b46186c35d39caf1d59d1f0085e2b 100644 (file)
@@ -9,7 +9,7 @@ import com.ibm.nosql.json.api.BasicDBObject;
 import com.ibm.nosql.json.api.DB;\r
 import com.ibm.nosql.json.api.DBCollection;\r
 \r
-import user.commons.MediaCubeUndoMarker;\r
+import user.commons.log4j2.marker.MediaCubeUndoMarker;\r
 import user.commons.nosql.NoSQLUtils;\r
 import user.jobengine.db.IItemManager;\r
 import user.jobengine.db.Media;\r
index 39106b39f35fd58885e88db8aaa31da11a6b32ae..fa8d65fb5af2ad5d6b9a104be7e107bf622a36b2 100644 (file)
@@ -29,7 +29,7 @@ import com.ibm.nosql.json.api.DBCollection;
 import com.ibm.nosql.json.api.QueryBuilder;\r
 \r
 import user.commons.IEntityBase;\r
-import user.commons.MediaCubeMarker;\r
+import user.commons.log4j2.marker.MediaCubeMarker;\r
 import user.commons.nosql.NoSQLUtils;\r
 import user.jobengine.db.IItemManager;\r
 import user.jobengine.db.MediaFile;\r
@@ -77,8 +77,8 @@ public class HSMMigrateStep extends JobStep {
                } catch (Exception e) {\r
 \r
                        logger.error("PlanAir metadata error", e);\r
-                       //nem latja a drivert pl.\r
-                       //throw e;\r
+                       // nem latja a drivert pl.\r
+                       // throw e;\r
                }\r
 \r
                if (result == null) {\r
@@ -99,8 +99,8 @@ public class HSMMigrateStep extends JobStep {
        @StepEntry\r
        public Object[] execute(String sourceLocation, String targetLocation) throws Exception {\r
                marker = getJobRuntime().getSessionMarker();\r
-               //remove from prod\r
-               //cleanupHistory();\r
+               // remove from prod\r
+               // cleanupHistory();\r
                hsmProvider = getMetadataProvider(MetadataProviderType.HSM);\r
                if (hsmProvider == null)\r
                        throw new NullPointerException("No HSM metadata provider available");\r
@@ -146,7 +146,7 @@ public class HSMMigrateStep extends JobStep {
 \r
                                        if (getJobRuntime().isWaitingCancel()) {\r
                                                logger.info("Job canceled by user");\r
-                                               //ne mentsuk a szalagot meg\r
+                                               // ne mentsuk a szalagot meg\r
                                                return null;\r
                                        }\r
 \r
@@ -162,7 +162,7 @@ public class HSMMigrateStep extends JobStep {
                                        }, subject);\r
                                }\r
 \r
-                               //ha mar sikerult valamit archivalni kilepunk\r
+                               // ha mar sikerult valamit archivalni kilepunk\r
                                if (oneSuccess)\r
                                        break;\r
                        }\r
@@ -210,7 +210,7 @@ public class HSMMigrateStep extends JobStep {
                return null;\r
        }\r
 \r
-       //true if need copy\r
+       // true if need copy\r
        public boolean prepareCopy(String hsmFileName, Path source, Path target) throws IOException {\r
                boolean result = true;\r
                BasicDBObject excludeResult = queryExclude(hsmFileName);\r
@@ -227,13 +227,14 @@ public class HSMMigrateStep extends JobStep {
                        return false;\r
                }\r
 \r
-               //              BasicDBObject historyResult = queryFileHistory(contentFileName);\r
-               //              if (historyResult != null)\r
-               //                      return false;\r
+               // BasicDBObject historyResult = queryFileHistory(contentFileName);\r
+               // if (historyResult != null)\r
+               // return false;\r
 \r
-               //              if (!mediaFile.getName().toLowerCase().endsWith(MOVEXT.toLowerCase()) && !mediaFile.getName().toLowerCase().endsWith(MXFEXT.toLowerCase()))\r
-               //                      return;\r
-               //              logger.info("Start copy from {} to {}", sourceFilePath, targetFilePath);\r
+               // if (!mediaFile.getName().toLowerCase().endsWith(MOVEXT.toLowerCase()) &&\r
+               // !mediaFile.getName().toLowerCase().endsWith(MXFEXT.toLowerCase()))\r
+               // return;\r
+               // logger.info("Start copy from {} to {}", sourceFilePath, targetFilePath);\r
 \r
                boolean targetExists = targetFile.exists();\r
 \r
@@ -253,14 +254,16 @@ public class HSMMigrateStep extends JobStep {
                }\r
 \r
                if (targetExists) {\r
-                       logger.warn(marker, "A fájl már létezik, a másolás folytatódik: {}, {} -> {}", target, sourceLength, targetLength);\r
+                       logger.warn(marker, "A fájl már létezik, a másolás folytatódik: {}, {} -> {}", target, sourceLength,\r
+                                       targetLength);\r
                } else\r
                        logger.warn(marker, "Migrálás: {}, {} -> {}", source, sourceLength, targetLength);\r
 \r
                return result;\r
        }\r
 \r
-       private boolean processHSMFile(String volumeName, String hsmFileName, Path sourceFilePath, Path targetFilePath) throws Exception {\r
+       private boolean processHSMFile(String volumeName, String hsmFileName, Path sourceFilePath, Path targetFilePath)\r
+                       throws Exception {\r
                int repeat = 4;\r
                boolean successCopy = false;\r
 \r
@@ -281,21 +284,24 @@ public class HSMMigrateStep extends JobStep {
                                } catch (Exception e) {\r
                                        if (Files.exists(targetFilePath) && targetFilePath.toFile().length() == 0)\r
                                                Files.delete(targetFilePath);\r
-                                       //logger.warn(marker, "Hiba a másolás során: {} ({})", sourceFilePath, e.getMessage());\r
+                                       // logger.warn(marker, "Hiba a másolás során: {} ({})", sourceFilePath,\r
+                                       // e.getMessage());\r
                                        repeat--;\r
                                }\r
                        }\r
                }\r
                String metadataFileName = sourceFilePath.getFileName() + EscortFiles.DOT_JSON;\r
-               Path metadataPath = Paths.get(targetFilePath.getParent().toString(), EscortFiles.STATUSFOLDER, metadataFileName);\r
+               Path metadataPath = Paths.get(targetFilePath.getParent().toString(), EscortFiles.STATUSFOLDER,\r
+                               metadataFileName);\r
                boolean createMetadata = Files.exists(targetFilePath) && !Files.exists(metadataPath);\r
 \r
                if (successCopy || createMetadata) {\r
                        String metadata = null;\r
                        try {\r
                                metadata = createMetadata(volumeName, hsmFileName).toPrettyString("");\r
-                               EscortFiles.createMetadata(targetFilePath.getParent().toString(), targetFilePath.getFileName().toString(), metadata);\r
-                               //saveFileHistory(contentFileName);\r
+                               EscortFiles.createMetadata(targetFilePath.getParent().toString(),\r
+                                               targetFilePath.getFileName().toString(), metadata);\r
+                               // saveFileHistory(contentFileName);\r
 \r
                        } catch (Exception e) {\r
                                logger.error(marker, "Metadata error", e);\r
index 56262737b8a90bcbf5f3bf9803e1225f1cc5fd51..94baec762e97fb5b66bb5a746cf661f64b9d839e 100644 (file)
@@ -7,7 +7,7 @@ import com.ibm.nosql.json.api.BasicDBObject;
 import com.ibm.nosql.json.api.DB;\r
 import com.ibm.nosql.json.api.DBCollection;\r
 \r
-import user.commons.MediaCubeUndoMarker;\r
+import user.commons.log4j2.marker.MediaCubeUndoMarker;\r
 import user.commons.nosql.NoSQLUtils;\r
 import user.jobengine.db.IItemManager;\r
 import user.jobengine.db.Media;\r
@@ -36,17 +36,18 @@ public class QueryMissingProxyMediaStep extends JobStep {
 \r
        private Media getFirstUntranscodedMedia(DBCollection collection) {\r
                Media[] result = new Media[] { null };\r
-               //MV\r
+               // MV\r
                String query = "SELECT mediaid FROM VW_MISSING_PROXY_IDS WHERE HOUSEID like 'M%' or HOUSEID like 'P%' or HOUSEID like 'R%' ORDER BY modified DESC";\r
 \r
-               //HTV\r
-               //String query = "SELECT mediaid FROM VW_MISSING_PROXY_IDS";\r
+               // HTV\r
+               // String query = "SELECT mediaid FROM VW_MISSING_PROXY_IDS";\r
                IItemManager manager = getManager();\r
                manager.executeQuery(query, rs -> {\r
                        try {\r
                                long mediaId = rs.getLong(1);\r
                                Media media = manager.getMedia(mediaId);\r
-                               //a nevgeneralas miatt az eredeti MediaFilesName nem jo, a pontos nev kell nekunk\r
+                               // a nevgeneralas miatt az eredeti MediaFilesName nem jo, a pontos nev kell\r
+                               // nekunk\r
                                String name = media.getMediaFileRealName();\r
                                logger.info(getSessionMarker(), "Checking {}", name);\r
                                long existing = collection.find(new BasicDBObject("name", name)).count();\r
index 3c0026b4987cea0afde15ea41bd3465ee177c50a..987988081f8c7724ed5a7eb291ee3fbbd5c0f529 100644 (file)
@@ -12,7 +12,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;\r
 \r
 import user.commons.JobStatus;\r
-import user.commons.MediaCubeMarker;\r
+import user.commons.log4j2.marker.MediaCubeMarker;\r
 import user.commons.strings.FileSizeUtils;\r
 import user.jobengine.server.IJobRuntime;\r
 \r
@@ -33,18 +33,22 @@ public class ReportServerStatusStep extends JobStep {
                for (Long key : keys) {\r
                        IJobRuntime runtime = jobs.get(key);\r
                        if (JobStatus.SUSPENDED.equals(runtime.getStatus()))\r
-                               sb.append(String.format("Felfüggesztve: %s %s %s %s %s </br>", df.format(runtime.getSubmitted()), df.format(runtime.getFinished()),\r
-                                               runtime.getStatus(), runtime.getRelated(), runtime.getDescription()));\r
+                               sb.append(String.format("Felfüggesztve: %s %s %s %s %s </br>", df.format(runtime.getSubmitted()),\r
+                                               df.format(runtime.getFinished()), runtime.getStatus(), runtime.getRelated(),\r
+                                               runtime.getDescription()));\r
                }\r
 \r
                // sb.append("</br>");\r
-               //              float cpuTime = getCPUTime();\r
-               //              sb.append(String.format("Processzor használat: %.2f %%</br>", cpuTime == 0 ? cpuTime : cpuTime * 100 / 1000000000d));\r
+               // float cpuTime = getCPUTime();\r
+               // sb.append(String.format("Processzor használat: %.2f %%</br>", cpuTime == 0 ?\r
+               // cpuTime : cpuTime * 100 / 1000000000d));\r
                sb.append("</br>");\r
-               sb.append(String.format("Szabad JVM memória: %s</br>", FileSizeUtils.sizeAsString(Runtime.getRuntime().freeMemory())));\r
+               sb.append(String.format("Szabad JVM memória: %s</br>",\r
+                               FileSizeUtils.sizeAsString(Runtime.getRuntime().freeMemory())));\r
                sb.append(String.format("Használt JVM memória: %s</br>",\r
                                FileSizeUtils.sizeAsString(Runtime.getRuntime().maxMemory() - Runtime.getRuntime().freeMemory())));\r
-               sb.append(String.format("Maximum JVM memória: %s</br>", FileSizeUtils.sizeAsString(Runtime.getRuntime().maxMemory())));\r
+               sb.append(String.format("Maximum JVM memória: %s</br>",\r
+                               FileSizeUtils.sizeAsString(Runtime.getRuntime().maxMemory())));\r
                logger.info(marker, sb.toString());\r
 \r
                return null;\r
index 787a07e8e7225b0968b81d2eb8c280d9f0aba61c..5e582bdba574c2c5bc1974b7c920b7578a89ee7f 100644 (file)
@@ -8,7 +8,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;\r
 \r
 import user.commons.JobStatus;\r
-import user.commons.MediaCubeMarker;\r
+import user.commons.log4j2.marker.MediaCubeMarker;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
 \r
index fa8ab3fef68f3b83bd20712bfdecc9437b4e40fe..a3a90be3e85d2e523b0d2ec684a4a495819b1bf8 100644 (file)
@@ -10,9 +10,9 @@ import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.message.Message;\r
 \r
 import user.commons.LogUtils;\r
-import user.commons.MediaCubeMarker;\r
 import user.commons.RemoteFile;\r
 import user.commons.StoreUri;\r
+import user.commons.log4j2.marker.MediaCubeMarker;\r
 import user.commons.remotestore.IProgressEventListener;\r
 import user.commons.remotestore.IStatusEventListener;\r
 import user.commons.remotestore.ProgressEvent;\r
@@ -34,7 +34,8 @@ public class TSMSystemRestoreStep extends JobStep {
        private String sourceFileName;\r
        private Marker marker;\r
 \r
-       protected void afterRestore(StoreUri targetUri, String targetPath, int killDateDays, String targetFileName) throws IOException, Exception {\r
+       protected void afterRestore(StoreUri targetUri, String targetPath, int killDateDays, String targetFileName)\r
+                       throws IOException, Exception {\r
                if (killDateDays > 0)\r
                        EscortFiles.createUNCKillDate(targetPath, targetFileName, killDateDays, marker);\r
        }\r
@@ -54,8 +55,8 @@ public class TSMSystemRestoreStep extends JobStep {
        }\r
 \r
        @StepEntry\r
-       public Object[] execute(Media mediaCubeMedia, String targetPath, String targetNamePattern, String successRecipient, int killDateDays, IJobEngine jobEngine,\r
-                       IJobRuntime jobRuntime) throws Exception {\r
+       public Object[] execute(Media mediaCubeMedia, String targetPath, String targetNamePattern, String successRecipient,\r
+                       int killDateDays, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {\r
                marker = jobRuntime.getSessionMarker();\r
                setAndCheck(mediaCubeMedia, targetPath, targetNamePattern, jobEngine);\r
                String targetFileName = String.format(targetNamePattern, sourceFileName);\r
@@ -76,14 +77,16 @@ public class TSMSystemRestoreStep extends JobStep {
                        });\r
                        RemoteFile result = sourceUri.transferFrom(targetUri, sourceFileName, targetFileName);\r
 \r
-                       Message msg = LogUtils.format("Az '{}' Ã¡llomány visszatöltése sikeres volt '{}' néven. ", sourceFileName, targetFileName);\r
+                       Message msg = LogUtils.format("Az '{}' Ã¡llomány visszatöltése sikeres volt '{}' néven. ", sourceFileName,\r
+                                       targetFileName);\r
                        if (StringUtils.isNotBlank(successRecipient))\r
                                logger.info(new MediaCubeMarker(successRecipient), msg);\r
                        logger.info(marker, msg);\r
                        afterRestore(targetUri, targetPath, killDateDays, targetFileName);\r
 \r
                } catch (Exception e) {\r
-                       Message msg = LogUtils.format("Az '{}' Ã¡llomány visszatöltése sikertelen. A rendszer hibaüzenete: {}", sourceFileName, e.getMessage());\r
+                       Message msg = LogUtils.format("Az '{}' Ã¡llomány visszatöltése sikertelen. A rendszer hibaüzenete: {}",\r
+                                       sourceFileName, e.getMessage());\r
                        logger.error(marker, msg);\r
                        // logger.error(jobRuntime.marker, msg);\r
                        logger.catching(e);\r
@@ -116,12 +119,14 @@ public class TSMSystemRestoreStep extends JobStep {
                }\r
                if (mediaCubeMedia == null) {\r
                        logger.error(marker, "A folyamat 'mediaCubeMedia' bemeneti paramétere Ã¼res.");\r
-                       throw new NullPointerException("System is not configured properly, 'mediaCubeMedia' input parameter missing.");\r
+                       throw new NullPointerException(\r
+                                       "System is not configured properly, 'mediaCubeMedia' input parameter missing.");\r
                }\r
                checkTargetPath(targetPath);\r
                if (StringUtils.isBlank(targetNamePattern)) {\r
                        logger.error(marker, "A folyamat 'targetNamePattern' bemeneti paramétere Ã¼res.");\r
-                       throw new NullPointerException("System is not configured properly, 'targetNamePattern' input parameter missing.");\r
+                       throw new NullPointerException(\r
+                                       "System is not configured properly, 'targetNamePattern' input parameter missing.");\r
                }\r
                Store tsmStore = manager.getSystemStore(false);\r
                if (tsmStore == null) {\r
index 2657f768e5e1d7ffe536f3f2f0245b86256931c0..beb8ed038948c7b8e2cce17c8d6e197cd4331886 100644 (file)
@@ -43,8 +43,8 @@ import com.ibm.nosql.json.api.BasicDBObject;
 import com.ibm.nosql.json.util.JSON;\r
 \r
 import user.commons.CalendarUtils;\r
-import user.commons.MediaCubeMarker;\r
 import user.commons.StoreUri;\r
+import user.commons.log4j2.marker.MediaCubeMarker;\r
 import user.commons.remotestore.FtpDirectoryLister;\r
 \r
 public class EscortFiles {\r
index d70a352449d4317410f0c96b848a8168e46856c2..7f2eb3dcf47c7e42fc97cc718babfbff2796fe78 100644 (file)
@@ -15,8 +15,8 @@ Import-Package: com.fasterxml.jackson.annotation;version="2.4.5",
  io.humble.video,
  io.humble.video.awt,
  junit.framework,
- org.apache.logging.log4j;version="2.8.2",
- org.apache.logging.log4j.message;version="2.8.2",
+ org.apache.logging.log4j,
+ org.apache.logging.log4j.message,
  org.jboss.resteasy.client.jaxrs,
  org.jboss.resteasy.plugins.providers,
  org.jboss.resteasy.spi,
diff --git a/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeFinishMarker.java b/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeFinishMarker.java
deleted file mode 100644 (file)
index d1c35c4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-package user.commons;\r
-\r
-@SuppressWarnings("serial")\r
-public class MediaCubeFinishMarker extends MediaCubeMarker {\r
-\r
-       public MediaCubeFinishMarker(MediaCubeMarker parent) {\r
-               setSessionID(parent.getSessionID());\r
-               setSessionName(parent.getSessionName());\r
-               setTo(parent.getTo());\r
-               setUseSessionLog(parent.isUseSessionLog());\r
-               setParents(parent);\r
-       }\r
-\r
-       public MediaCubeFinishMarker(MediaCubeMarker parent, String to) {\r
-               super(to);\r
-               setSessionID(parent.getSessionID());\r
-               setSessionName(parent.getSessionName());\r
-               setParents(parent);\r
-       }\r
-}\r
diff --git a/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeMarker.java b/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeMarker.java
deleted file mode 100644 (file)
index 0a1d0e3..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-package user.commons;\r
-\r
-import org.apache.logging.log4j.MarkerManager.Log4jMarker;\r
-\r
-@SuppressWarnings("serial")\r
-public class MediaCubeMarker extends Log4jMarker {\r
-       private static final String MEDIACUBE = "MEDIACUBE";\r
-       private String to;\r
-       private String subject;\r
-       private String sessionID;\r
-       private String sessionName;\r
-       private boolean useSessionLog;\r
-\r
-       public MediaCubeMarker() {\r
-               super(MEDIACUBE);\r
-       }\r
-\r
-       public MediaCubeMarker(String to) {\r
-               super(MEDIACUBE);\r
-               this.to = to;\r
-       }\r
-\r
-       public MediaCubeMarker(String to, String subject) {\r
-               super(MEDIACUBE);\r
-               this.to = to;\r
-               this.subject = subject;\r
-       }\r
-\r
-       public String getSessionID() {\r
-               return sessionID;\r
-       }\r
-\r
-       public String getSessionName() {\r
-               return sessionName;\r
-       }\r
-\r
-       public String getSubject() {\r
-               return subject;\r
-       }\r
-\r
-       public String getTo() {\r
-               return to;\r
-       }\r
-\r
-       public boolean isUseSessionLog() {\r
-               return useSessionLog;\r
-       }\r
-\r
-       public void setSessionID(String sessionID) {\r
-               this.sessionID = sessionID;\r
-       }\r
-\r
-       public void setSessionName(String sessionName) {\r
-               this.sessionName = sessionName;\r
-       }\r
-\r
-       public void setSubject(String subject) {\r
-               this.subject = subject;\r
-       }\r
-\r
-       public void setTo(String to) {\r
-               this.to = to;\r
-       }\r
-\r
-       public void setUseSessionLog(boolean useSessionLog) {\r
-               this.useSessionLog = useSessionLog;\r
-       }\r
-\r
-       //      @Override\r
-       //      public boolean equals(Object o) {\r
-       //              if (o == null || !o.getClass().equals(MediaCubeMarker.class))\r
-       //                      return false;\r
-       //\r
-       //\r
-       //              return true;\r
-       //      }\r
-\r
-}\r
diff --git a/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeUndoMarker.java b/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeUndoMarker.java
deleted file mode 100644 (file)
index 1668503..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-package user.commons;\r
-\r
-@SuppressWarnings("serial")\r
-public class MediaCubeUndoMarker extends MediaCubeMarker {\r
-       public MediaCubeUndoMarker(String sessionID) {\r
-               setSessionID(sessionID);\r
-       }\r
-}\r
index fa3871d38265c8174ced925eea0ffccc9b9255cb..c5a06f514e327e0d87db8f4f0e2cf86abcd2dc7f 100644 (file)
@@ -4,12 +4,12 @@ import java.util.Iterator;
 \r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
+import org.apache.logging.log4j.MarkerManager;\r
 \r
 import com.ibm.nosql.json.api.BasicDBObject;\r
 import com.ibm.nosql.json.api.DB;\r
 import com.ibm.nosql.json.api.DBCollection;\r
 \r
-import user.commons.MediaCubeMarker;\r
 import user.commons.configuration.SystemConfiguration;\r
 import user.commons.nexio.api.Clip;\r
 import user.commons.nexio.api.ClipEvent;\r
@@ -23,9 +23,11 @@ import user.commons.nexio.server.protocol.GetExtendedFieldCommand;
 import user.commons.nosql.NoSQLUtils;\r
 \r
 /**\r
- * NexioWSServlet hozza letre. Indulaskor betolti a teljes nexio clip listat mongodb-be. Beregisztralja magat ClipEventListener-nek. Az erkezo esemenyekkel\r
- * updateli a mongo adatbazist (es a memoriat is) Az erkezo esemenyekrol eldonti, hogy add, update, vagy delete esemeny volt e Az uj, atalakitott esemenyt\r
- * tovabbkuldi a feliratkozoknak (NexioWSServlet)\r
+ * NexioWSServlet hozza letre. Indulaskor betolti a teljes nexio clip listat\r
+ * mongodb-be. Beregisztralja magat ClipEventListener-nek. Az erkezo\r
+ * esemenyekkel updateli a mongo adatbazist (es a memoriat is) Az erkezo\r
+ * esemenyekrol eldonti, hogy add, update, vagy delete esemeny volt e Az uj,\r
+ * atalakitott esemenyt tovabbkuldi a feliratkozoknak (NexioWSServlet)\r
  *\r
  * @author robi\r
  */\r
@@ -105,17 +107,17 @@ public class NexioDispatcher implements ClipEventListener {
 \r
                this.db = NoSQLUtils.getNoSQLDB();\r
 \r
-               //              Runtime.getRuntime().addShutdownHook(new Thread() {\r
-               //                      @Override\r
-               //                      public void run() {\r
-               //                              logger.info("SHUTDOWN!!!!!");\r
-               //                      }\r
-               //              });\r
+               // Runtime.getRuntime().addShutdownHook(new Thread() {\r
+               // @Override\r
+               // public void run() {\r
+               // logger.info("SHUTDOWN!!!!!");\r
+               // }\r
+               // });\r
        }\r
 \r
        @Override\r
        public void clipEventPerformed(ClipEvent evt) {\r
-               //logger.info("ClipEvent {} {}", evt.getEventType(), evt.getClip());\r
+               // logger.info("ClipEvent {} {}", evt.getEventType(), evt.getClip());\r
                if (disabled)\r
                        return;\r
                try {\r
@@ -134,8 +136,9 @@ public class NexioDispatcher implements ClipEventListener {
                                jsClip.put(ID, evt.getClip().getId().get());\r
                                removeDeleted(jsClip);\r
                        } else if (evt.getEventType() == ClipEventType.LISTENER_RESTART_NEEDED) {\r
-                               logger.info(new MediaCubeMarker(), "In progress {}", isRestartInProgress());\r
-                               logger.info(new MediaCubeMarker(), "A kommunikácó a NEXIO eszközzel megszakadt. A szinkronizáció Ãºjraindítása szükséges.");\r
+                               logger.info(MarkerManager.getMarker("MEDIACUBE"), "In progress {}", isRestartInProgress());\r
+                               logger.info(MarkerManager.getMarker("MEDIACUBE"),\r
+                                               "A kommunikácó a NEXIO eszközzel megszakadt. A szinkronizáció Ãºjraindítása szükséges.");\r
                        }\r
                } catch (Exception e) {\r
                        logger.catching(e);\r
@@ -146,54 +149,56 @@ public class NexioDispatcher implements ClipEventListener {
                BasicDBObject jsClip = new BasicDBObject();\r
                try {\r
                        String xid = clip.getId().get();\r
-                       jsClip.put(ID, xid); //Unique internal ID\r
+                       jsClip.put(ID, xid); // Unique internal ID\r
                } catch (Exception e) {\r
-                       //                      System.out.println(e);\r
+                       // System.out.println(e);\r
                }\r
                try {\r
                        String xid = clip.getXid().get();\r
-                       jsClip.put(LONGNAMEID, xid); //Extended ID (Filename)\r
+                       jsClip.put(LONGNAMEID, xid); // Extended ID (Filename)\r
                } catch (Exception e) {\r
-                       //                      System.out.println(e);\r
+                       // System.out.println(e);\r
                }\r
                try {\r
                        jsClip.put(DURATION, clip.getDuration());\r
                } catch (Exception e) {\r
-                       //                      System.out.println(e);\r
+                       // System.out.println(e);\r
                }\r
                try {\r
                        jsClip.put(MODIFIEDTIMESTAMP, clip.getModifiedTimestamp().getTime());\r
                } catch (Exception e) {\r
-                       //                      System.out.println(e);\r
+                       // System.out.println(e);\r
                }\r
                try {\r
                        jsClip.put(RECORDDATE, clip.getRecordDateTimestamp().getTime());\r
                } catch (Exception e) {\r
-                       //                      System.out.println(e);\r
+                       // System.out.println(e);\r
                }\r
 \r
                try {\r
                        jsClip.put(KILLDATE, clip.getKillDate().getTime());\r
                } catch (Exception e) {\r
-                       //                      System.out.println(e);\r
+                       // System.out.println(e);\r
                }\r
                try {\r
                        jsClip.put(VIDEO_FORMAT, clip.getVideoFormat());\r
                } catch (Exception e) {\r
-                       //                      System.out.println(e);\r
+                       // System.out.println(e);\r
                }\r
                try {\r
                        jsClip.put(VIDEO_BITRATE, clip.getVideoBitrate());\r
                } catch (Exception e) {\r
-                       //                      System.out.println(e);\r
+                       // System.out.println(e);\r
                }\r
                try {\r
                        String agency = new String(clip.getExtendedField(GetExtendedFieldCommand.FN_AGENCY), INexioAPI.ENCODING);\r
                        jsClip.put(EXTAGENCY, agency);\r
                } catch (Exception e) {\r
-                       //                      System.out.println(e);\r
+                       // System.out.println(e);\r
                }\r
-               //System.out.println(String.format("ID = '%s'\tXID = '%s'\tDuration = '%s'\tModified = '%s'\tVideoFormat = '%s'\tVideoBitrate = '%s'", id, xid, duration, modifiedTimestamp.getTime(), videoFormat, videoBitrate));\r
+               // System.out.println(String.format("ID = '%s'\tXID = '%s'\tDuration =\r
+               // '%s'\tModified = '%s'\tVideoFormat = '%s'\tVideoBitrate = '%s'", id, xid,\r
+               // duration, modifiedTimestamp.getTime(), videoFormat, videoBitrate));\r
                return jsClip;\r
        }\r
 \r
@@ -204,7 +209,7 @@ public class NexioDispatcher implements ClipEventListener {
         */\r
        private void copyClipsIntoMongo() throws Exception {\r
                logger.info("Starting initial NEXIO metadata import.");\r
-               //              Map<String, BasicDBObject> emptyMap = new HashMap<String, BasicDBObject>();\r
+               // Map<String, BasicDBObject> emptyMap = new HashMap<String, BasicDBObject>();\r
                Iterator<Clip> clips = controller.getMediabase().getClips();\r
                while (clips.hasNext()) {\r
                        Clip clip = null;\r
@@ -222,7 +227,7 @@ public class NexioDispatcher implements ClipEventListener {
                                }\r
                        } catch (Exception e) {\r
                                logger.error(e.getMessage());\r
-                               //logger.catching(e);\r
+                               // logger.catching(e);\r
                        }\r
                }\r
                logger.info("NEXIO metadata import completed.");\r
@@ -232,7 +237,7 @@ public class NexioDispatcher implements ClipEventListener {
                db.getCollection(CLIP_COLLECTION_NAME).drop();\r
        }\r
 \r
-       //create mongo index on longnameid\r
+       // create mongo index on longnameid\r
        private void ensureIndexes() {\r
                DBCollection collection = db.getCollection(CLIP_COLLECTION_NAME);\r
                if (collection.count() == 0)\r
@@ -262,7 +267,7 @@ public class NexioDispatcher implements ClipEventListener {
 \r
                                mediaListener.startListener();\r
                                setRestartInProgress(false);\r
-                               logger.info(new MediaCubeMarker(), "Thread progress {}", isRestartInProgress());\r
+                               logger.info(MarkerManager.getMarker("MEDIACUBE"), "Thread progress {}", isRestartInProgress());\r
 \r
                        } catch (Exception e) {\r
                                logger.catching(e);\r
@@ -278,15 +283,16 @@ public class NexioDispatcher implements ClipEventListener {
        }\r
 \r
        /*\r
-               Nem foglalkozunk a clippel ha:\r
-               C8 84   Get Special ID Attributes\r
-               REQ: C8 84 + 8-byte(ID),\r
-               RESP: D284 MASK(2 byte, unsigned int, MSB first)        vagy D0 84 if no matching ID handle is found\r
-               0x0200  Not Ready to Play               Indicates the first audio buffer of the media has not yet been written to disk. A controller should wait to load and play any clips with this attribute set.\r
-               0x0400  Not Ready to Transfer   Indicates the ID is currently in record or being written to disk\r
-               0x0800  Not Ready to Archive    Indicates the ID is currently in record or being written to disk\r
-               0x1000  Transfer in Progress    Indicates the ID is currently being transferred or imported into the system\r
-       */\r
+        * Nem foglalkozunk a clippel ha: C8 84 Get Special ID Attributes REQ: C8 84 +\r
+        * 8-byte(ID), RESP: D284 MASK(2 byte, unsigned int, MSB first) vagy D0 84 if no\r
+        * matching ID handle is found 0x0200 Not Ready to Play Indicates the first\r
+        * audio buffer of the media has not yet been written to disk. A controller\r
+        * should wait to load and play any clips with this attribute set. 0x0400 Not\r
+        * Ready to Transfer Indicates the ID is currently in record or being written to\r
+        * disk 0x0800 Not Ready to Archive Indicates the ID is currently in record or\r
+        * being written to disk 0x1000 Transfer in Progress Indicates the ID is\r
+        * currently being transferred or imported into the system\r
+        */\r
        private boolean isValidClip(Clip clip) throws Exception {\r
                boolean ret = false;\r
                try {\r
@@ -300,7 +306,7 @@ public class NexioDispatcher implements ClipEventListener {
                                int c = connection.read(buffer, 0, 2);\r
                                if (c == 2) {\r
                                        int mask = ((buffer[0] << 8) & 0xFF00) | (buffer[1] & 0x00FF);\r
-                                       if ((mask & 0x1E00) == 0) { //0x0200 + 0x0400 + 0x0800 + 0x1000\r
+                                       if ((mask & 0x1E00) == 0) { // 0x0200 + 0x0400 + 0x0800 + 0x1000\r
                                                ret = true;\r
                                        }\r
 \r
@@ -311,20 +317,17 @@ public class NexioDispatcher implements ClipEventListener {
                }\r
 \r
                /*\r
-               \r
-                               int c = connection.read(buffer, 0, 2);\r
-                               //2 bytes hosszan az idokozben hozzaadott id-k szamossaga\r
-                               if (c < 2) {\r
-                                       throw new ProtocolException("c, 2, 2");\r
-                               }\r
-                               //MSB, LSB\r
-               \r
-                               return nofIds;\r
-                       */\r
+                * \r
+                * int c = connection.read(buffer, 0, 2); //2 bytes hosszan az idokozben\r
+                * hozzaadott id-k szamossaga if (c < 2) { throw new\r
+                * ProtocolException("c, 2, 2"); } //MSB, LSB\r
+                * \r
+                * return nofIds;\r
+                */\r
                return ret;\r
        }\r
 \r
-       //dispatch events to NexioWSServlet\r
+       // dispatch events to NexioWSServlet\r
        public void onCreate(BasicDBObject data) {\r
                logger.debug("onCreate clip: " + data);\r
                if (nexioChangeListener != null)\r
@@ -373,7 +376,7 @@ public class NexioDispatcher implements ClipEventListener {
                BasicDBObject clipForName = (BasicDBObject) collection.findOne(new BasicDBObject(LONGNAMEID, xid));\r
                BasicDBObject clipForID = (BasicDBObject) collection.findOne(new BasicDBObject(ID, id));\r
 \r
-               //rename-nel a clipForName null lesz de a clipForID nem ezert nem kell create\r
+               // rename-nel a clipForName null lesz de a clipForID nem ezert nem kell create\r
                if (clipForName == null && clipForID == null) {\r
                        collection.save(clip);\r
                        if (!isRestartInProgress())\r
diff --git a/server/user.jobengine.osgi.commons/test/user/commons/TestMediaCubeMarker.java b/server/user.jobengine.osgi.commons/test/user/commons/TestMediaCubeMarker.java
deleted file mode 100644 (file)
index f8b863d..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-package user.commons;\r
-\r
-import org.apache.logging.log4j.Marker;\r
-import org.junit.Test;\r
-\r
-public class TestMediaCubeMarker {\r
-       @Test\r
-       public void test() throws Exception {\r
-               MediaCubeMarker sut = new MediaCubeMarker("valami");\r
-               Marker[] parents = sut.getParents();\r
-       }\r
-\r
-}\r
index df46620f671ecf2af53c01aa3b3ccefd4c91ead5..74b2c8a0492d7eb7218a60690fa4eae2218cc09a 100644 (file)
@@ -20,7 +20,7 @@ Import-Package: com.fasterxml.jackson.annotation;version="2.4.5",
  javax.ws.rs.client,
  javax.ws.rs.core,
  org.apache.commons.io;version="2.2.0",
- org.apache.logging.log4j;version="2.8.2",
+ org.apache.logging.log4j,
  sqlj.runtime.ref
 Export-Package: user.jobengine.db,
  user.jobengine.search
index 60485d47762db1a085ba1eadbdc0c1b7a0976eca..911fcd09d7937859910d73d469ad03200a757bb4 100644 (file)
@@ -15,8 +15,8 @@ Import-Package: com.fasterxml.jackson.databind;version="2.4.5",
  javax.ws.rs.core,
  org.apache.commons.io;version="2.2.0",
  org.apache.commons.io.output;version="2.2.0",
- org.apache.logging.log4j;version="2.8.2",
- org.apache.logging.log4j.message;version="2.8.2",
+ org.apache.logging.log4j,
+ org.apache.logging.log4j.message,
  org.codehaus.groovy.ast;version="3.0.3",
  org.codehaus.groovy.classgen;version="3.0.3",
  org.codehaus.groovy.control;version="3.0.3",
@@ -30,8 +30,8 @@ Import-Package: com.fasterxml.jackson.databind;version="2.4.5",
  org.osgi.framework;version="1.5.0",
  org.osgi.framework.wiring;version="1.2.0",
  org.osgi.util.tracker;version="1.4.0",
org.slf4j;version="1.6.3",
- sqlj.runtime.ref
sqlj.runtime.ref,
+ user.commons.log4j2.marker
 Require-Bundle: user.jobengine.osgi.db;bundle-version="1.0.0",
  user.jobengine.osgi.commons;bundle-version="1.0.0",
  user.tsm.client;bundle-version="1.2.0",
index 9296a950e41f2c98432c782f80e0ea65e9e658d2..f4c2e263b16484f5243c81764ad3429dbd2c5fb0 100644 (file)
@@ -30,9 +30,9 @@ import user.commons.IEntityPersister;
 import user.commons.IJob;
 import user.commons.Job;
 import user.commons.JobStatus;
-import user.commons.MediaCubeFinishMarker;
-import user.commons.MediaCubeMarker;
 import user.commons.cluster.ClusteredJob;
+import user.commons.log4j2.marker.MediaCubeFinishMarker;
+import user.commons.log4j2.marker.MediaCubeMarker;
 import user.jobengine.db.ItemManager;
 import user.jobengine.db.ItemManagerData.SignalType;
 import user.jobengine.db.JobParameters;
index fa9cfebe903d2db5434c58ace67e3b7d6f515ec5..6969d991246ef2e5ec6f137405425e43ba1ecef4 100644 (file)
@@ -20,7 +20,7 @@ import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;\r
 \r
 import user.commons.IEntityPersister;\r
-import user.commons.MediaCubeMarker;\r
+import user.commons.log4j2.marker.MediaCubeMarker;\r
 import user.jobengine.db.IItemManager;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
index 6da52cf8bcd223761b7372719473a4257e7033ee..9e513b252d6410ab09be0a397d793d6e95a9fd1f 100644 (file)
@@ -26,7 +26,7 @@ Import-Package: com.fasterxml.jackson.annotation;version="2.4.5",
  javax.ws.rs.core;version="2.0.1",
  javax.ws.rs.ext;version="2.0.1",
  org.apache.ibatis.jdbc;version="3.5.2",
- org.apache.logging.log4j;version="2.8.2",
+ org.apache.logging.log4j,
  org.eclipse.core.runtime.adaptor,
  org.eclipse.jetty.util;version="9.3.9",
  org.eclipse.jetty.websocket.api;version="9.3.9",
@@ -38,6 +38,7 @@ Import-Package: com.fasterxml.jackson.annotation;version="2.4.5",
  user.commons,
  user.commons.cluster,
  user.commons.configuration,
+ user.commons.log4j2.marker,
  user.commons.nexio,
  user.commons.octopus,
  user.commons.rest,
index c81e7a6f85f500a836ee7c3a91bdd3324f0b46ae..c2040d8fdd754ff3a40ca4acf00b49e818c1b7e3 100644 (file)
@@ -22,7 +22,7 @@ import com.ibm.nosql.json.api.BasicDBObject;
 import com.ibm.nosql.json.util.JSON;\r
 \r
 import user.commons.Job;\r
-import user.commons.MediaCubeMarker;\r
+import user.commons.log4j2.marker.MediaCubeMarker;\r
 import user.jobengine.db.IItemManager;\r
 import user.jobengine.db.IResultSetConsumer;\r
 import user.jobengine.db.IStatementDecorator;\r
index 737fd8cddb727b42379ef118ed4dec129086c15d..13717227a43a9f070b7638a46add51f3d61c2597 100644 (file)
@@ -18,7 +18,7 @@ Web-ContextPath: /
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.servlet;version="3.1.0",
  javax.servlet.http;version="3.1.0",
- org.apache.logging.log4j;version="2.8.2",
+ org.apache.logging.log4j,
  org.junit,
  org.osgi.framework;version="1.8.0",
  org.osgi.util.tracker;version="1.5.1",
index 7528b42c9ef4f33ae2c886e70dd65b7e4c25e353..e8f4966f98e39aa617ca23140032b504099a7160 100644 (file)
@@ -18,8 +18,8 @@ Require-Bundle: org.mybatis.mybatis;bundle-version="3.5.2",
 Bundle-ActivationPolicy: lazy
 Import-Package: com.ibm.nosql.bson,
  com.ibm.nosql.json.api,
- org.apache.logging.log4j;version="2.8.2",
- org.apache.logging.log4j.core;version="2.8.2",
+ org.apache.logging.log4j,
+ org.apache.logging.log4j.core,
  org.hamcrest,
  org.junit,
  user.mediacube.metadata.interfaces