From: vasary.daniel Date: Tue, 4 May 2021 18:26:20 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=fece4f1febc466989350a1163acd208bb9cbc277;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32226 --- diff --git a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/RescueNEXIOMaterials.java b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/RescueNEXIOMaterials.java index 0c9655b7..e3220dfd 100644 --- a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/RescueNEXIOMaterials.java +++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/RescueNEXIOMaterials.java @@ -29,10 +29,10 @@ import user.commons.octopus.OctopusAPI; import user.commons.remotestore.FtpDirectoryLister; import user.commons.remotestore.RemoteStoreProtocol; import user.jobengine.db.IItemManager; -import user.jobengine.server.steps.EscortFiles; import user.jobengine.server.steps.FileArchive; import user.jobengine.server.steps.RundownArchive; import user.jobengine.server.steps.StoryArchive; +import user.jobengine.server.steps.shared.EscortFiles; public class RescueNEXIOMaterials { private static final String SCHEDULED_FORMAT = "yyyy.MM.dd HH:mm"; diff --git a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java index 63de728e..1118cd28 100644 --- a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java +++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java @@ -69,11 +69,11 @@ import user.commons.octopus.OctopusAPI; import user.commons.remotestore.RemoteStoreProtocol; import user.jobengine.db.Media; import user.jobengine.server.steps.ArchiveItem; -import user.jobengine.server.steps.EscortFiles; -import user.jobengine.server.steps.FFMpeg; -import user.jobengine.server.steps.MediaCubeClient; import user.jobengine.server.steps.TSMExtendedRetrieveStep; +import user.jobengine.server.steps.shared.EscortFiles; import user.jobengine.server.steps.shared.ExternalCommandExecutor; +import user.jobengine.server.steps.shared.FFMpeg; +import user.jobengine.server.steps.shared.MediaCubeClient; public class SmallTests { class Pojo extends PojoRoot { diff --git a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/Support.java b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/Support.java index 90a275c7..3430469d 100644 --- a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/Support.java +++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/Support.java @@ -37,9 +37,9 @@ import user.jobengine.db.Media; import user.jobengine.db.MediaFile; import user.jobengine.server.JobRuntime; import user.jobengine.server.steps.ItemManagerExtensions; -import user.jobengine.server.steps.PlanAirExtensions; import user.jobengine.server.steps.ProjectCleanupMountedLocationStep; import user.jobengine.server.steps.RundownArchive; +import user.jobengine.server.steps.shared.PlanAirExtensions; import user.tsm.client.TSMBackupFileObject; import user.tsm.client.TSMClient; import user.tsm.client.TSMException; diff --git a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SupportCheckItem.java b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SupportCheckItem.java index af14c948..9fcab493 100644 --- a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SupportCheckItem.java +++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SupportCheckItem.java @@ -15,9 +15,9 @@ import user.jobengine.db.IStatementDecorator; import user.jobengine.db.Item; import user.jobengine.db.ItemManager; import user.jobengine.db.Media; -import user.jobengine.server.steps.MetadataType; -import user.jobengine.server.steps.MetadataTypeDetector; -import user.jobengine.server.steps.PlanAirExtensions; +import user.jobengine.server.steps.shared.MetadataType; +import user.jobengine.server.steps.shared.MetadataTypeDetector; +import user.jobengine.server.steps.shared.PlanAirExtensions; public class SupportCheckItem { class PlanAirProcessor implements IStatementDecorator, IResultSetConsumer { diff --git a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SupportCleanMissingTSM.java b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SupportCleanMissingTSM.java index e9153071..14cf7f03 100644 --- a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SupportCleanMissingTSM.java +++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SupportCleanMissingTSM.java @@ -22,9 +22,9 @@ import user.jobengine.db.Item; import user.jobengine.db.ItemManager; import user.jobengine.db.MediaFile; import user.jobengine.db.Store; -import user.jobengine.server.steps.MetadataType; -import user.jobengine.server.steps.MetadataTypeDetector; -import user.jobengine.server.steps.PlanAirExtensions; +import user.jobengine.server.steps.shared.MetadataType; +import user.jobengine.server.steps.shared.MetadataTypeDetector; +import user.jobengine.server.steps.shared.PlanAirExtensions; public class SupportCleanMissingTSM { class PlanAirProcessor implements IStatementDecorator, IResultSetConsumer { diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java index 6a65d5fa..6a580e0f 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java @@ -25,6 +25,7 @@ import user.commons.ListUtils; import user.commons.mediatool.MediaInfo; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.EscortFiles; import user.mediacube.metadata.interfaces.IMetadata; import user.mediacube.metadata.interfaces.IMetadataProvider; import user.mediacube.metadata.interfaces.IMetadataProviderFactory; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/AttachLowresStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/AttachLowresStep.java index 40c5c321..7b1d15a9 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/AttachLowresStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/AttachLowresStep.java @@ -18,6 +18,7 @@ import user.jobengine.db.IItemManager; import user.jobengine.db.Media; import user.jobengine.db.MediaFile; import user.jobengine.db.Store; +import user.jobengine.server.steps.shared.EscortFiles; public class AttachLowresStep extends JobStep { private static final int POLL_INTERVALL = 3000; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CancelableStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CancelableStep.java index bf32a0e8..f90415ce 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CancelableStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CancelableStep.java @@ -9,6 +9,7 @@ import org.apache.logging.log4j.MarkerManager; import user.commons.StoreUri; import user.commons.remotestore.FtpDirectoryLister; import user.commons.remotestore.RemoteStoreProtocol; +import user.jobengine.server.steps.shared.EscortFiles; public class CancelableStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.java index 4a4a5cf2..ffca5d76 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.java @@ -35,6 +35,9 @@ import user.commons.remotestore.RemoteStoreProtocol; import user.jobengine.db.IItemManager; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.EscortFiles; +import user.jobengine.server.steps.shared.MetadataType; +import user.jobengine.server.steps.shared.MetadataTypeDetector; public class CopyForArchiveNEXIOMaterialsStep extends JobStep { private static final String SCHEDULED_FORMAT = "yyyy.MM.dd HH:mm"; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java index 5413fc5c..c7b2f599 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.java @@ -39,6 +39,7 @@ import user.commons.remotestore.RemoteStoreProtocol; import user.jobengine.db.IItemManager; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.EscortFiles; public class CopyForArchiveNEXIORecordingsStep extends JobStep { private static final String MEDIATYPE = "Visszarögzített"; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/DuplicateRemoverStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/DuplicateRemoverStep.java index 132fa3cc..6aed5a00 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/DuplicateRemoverStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/DuplicateRemoverStep.java @@ -14,6 +14,7 @@ import user.jobengine.db.IStatementDecorator; import user.jobengine.db.MediaFile; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.EscortFiles; public class DuplicateRemoverStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/EnsureProxyPathExistanceStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/EnsureProxyPathExistanceStep.java index 7c148216..410bfe92 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/EnsureProxyPathExistanceStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/EnsureProxyPathExistanceStep.java @@ -5,6 +5,7 @@ import java.nio.file.Paths; import user.commons.StoreUri; import user.commons.remotestore.RemoteStoreProtocol; +import user.jobengine.server.steps.shared.EscortFiles; public class EnsureProxyPathExistanceStep extends JobStep { @StepEntry diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/FileCleanupStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/FileCleanupStep.java index 505526cf..8e1a6f4c 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/FileCleanupStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/FileCleanupStep.java @@ -9,6 +9,7 @@ import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.ParameterizedMessage; import user.commons.StoreUri; +import user.jobengine.server.steps.shared.EscortFiles; public class FileCleanupStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/FileCopyStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/FileCopyStep.java index c4172550..a6b985f5 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/FileCopyStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/FileCopyStep.java @@ -11,6 +11,7 @@ import user.commons.remotestore.RemoteStoreProtocol; import user.jobengine.db.IItemManager; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.EscortFiles; public class FileCopyStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/FileValidatorStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/FileValidatorStep.java index 178c38ed..362155f5 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/FileValidatorStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/FileValidatorStep.java @@ -15,6 +15,7 @@ import user.commons.StoreUri; import user.commons.mediatool.MediaInfo; import user.commons.remotestore.RemoteStoreProtocol; import user.jobengine.db.Media; +import user.jobengine.server.steps.shared.EscortFiles; public class FileValidatorStep extends JobStep { private static final String COLORSPACE = "COLORSPACE"; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkDownloadStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkDownloadStep.java index 36dbddb5..fda90b6b 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkDownloadStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkDownloadStep.java @@ -20,6 +20,7 @@ import user.commons.remotestore.RemoteStoreProtocol; import user.jobengine.db.Store; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.EscortFiles; public class ForkDownloadStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkUploadStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkUploadStep.java index df1707a6..92eff37a 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkUploadStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkUploadStep.java @@ -27,6 +27,7 @@ import user.jobengine.db.MediaFile; import user.jobengine.db.Store; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.EscortFiles; public class ForkUploadStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/GenerateMorpheusMetadataStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/GenerateMorpheusMetadataStep.java index 549c6c97..f27dd07b 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/GenerateMorpheusMetadataStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/GenerateMorpheusMetadataStep.java @@ -8,6 +8,8 @@ import com.ibm.nosql.json.api.BasicDBObject; import user.commons.morpheus.MorpheusStrings; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.EscortFiles; +import user.jobengine.server.steps.shared.PlanAirExtensions; public class GenerateMorpheusMetadataStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/GenericArchiveCheckerStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/GenericArchiveCheckerStep.java index 1e6078ec..60858b2c 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/GenericArchiveCheckerStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/GenericArchiveCheckerStep.java @@ -13,6 +13,7 @@ import user.commons.RemoteFile; import user.commons.StoreUri; import user.commons.remotestore.RemoteStoreProtocol; import user.jobengine.db.Media; +import user.jobengine.server.steps.shared.EscortFiles; public class GenericArchiveCheckerStep extends JobStep { private static final String DOT_MXF = ".MXF"; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/HLSProxyStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/HLSProxyStep.java index e18ca0cf..ecb1a53b 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/HLSProxyStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/HLSProxyStep.java @@ -12,6 +12,8 @@ import user.commons.remotestore.RemoteStoreProtocol; import user.jobengine.db.Media; import user.jobengine.db.MediaFile; import user.jobengine.db.Store; +import user.jobengine.server.steps.shared.EscortFiles; +import user.jobengine.server.steps.shared.FFMpeg; public class HLSProxyStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/HSMMigrateStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/HSMMigrateStep.java index 6b85f1d7..39106b39 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/HSMMigrateStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/HSMMigrateStep.java @@ -34,6 +34,7 @@ import user.commons.nosql.NoSQLUtils; import user.jobengine.db.IItemManager; import user.jobengine.db.MediaFile; import user.jobengine.db.MediaFileDAO; +import user.jobengine.server.steps.shared.EscortFiles; import user.mediacube.metadata.interfaces.IMetadata; import user.mediacube.metadata.interfaces.IMetadataProvider; import user.mediacube.metadata.interfaces.IMetadataProviderFactory; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/HarrisMissingMaterialCheckerStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/HarrisMissingMaterialCheckerStep.java index 4f00ae29..ea838cf5 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/HarrisMissingMaterialCheckerStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/HarrisMissingMaterialCheckerStep.java @@ -20,6 +20,7 @@ import user.commons.harris.VICFileParser; import user.commons.remotestore.FtpDirectoryLister; import user.commons.remotestore.RemoteStoreProtocol; import user.jobengine.db.Media; +import user.jobengine.server.steps.shared.EscortFiles; public class HarrisMissingMaterialCheckerStep extends JobStep { private static final Logger logger = LogManager.getLogger(HarrisMissingMaterialCheckerStep.class); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportMORPHEUSMissingMaterialsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportMORPHEUSMissingMaterialsStep.java index e5170194..f1df9e94 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportMORPHEUSMissingMaterialsStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportMORPHEUSMissingMaterialsStep.java @@ -34,6 +34,7 @@ import user.jobengine.db.MediaFile; import user.jobengine.db.MediaFileDAO; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.EscortFiles; public class ImportMORPHEUSMissingMaterialsStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ItemManagerExtensions.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ItemManagerExtensions.java index bf807791..2b2b0a2e 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ItemManagerExtensions.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ItemManagerExtensions.java @@ -4,6 +4,8 @@ import com.ibm.nosql.json.api.BasicDBObject; import user.jobengine.db.IItemManager; import user.jobengine.db.IResultSetConsumer; +import user.jobengine.server.steps.shared.MetadataType; +import user.jobengine.server.steps.shared.MetadataTypeDetector; public class ItemManagerExtensions { diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/MXFCutterStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/MXFCutterStep.java index db327dff..8c094d80 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/MXFCutterStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/MXFCutterStep.java @@ -17,6 +17,7 @@ import user.jobengine.db.IItemManager; import user.jobengine.db.Store; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.EscortFiles; public class MXFCutterStep extends JobStep { private static final String TARGETNAMEPATTERN = "-ARCH-%s"; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataPersisterStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataPersisterStep.java index 53d253d7..2a04cc47 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataPersisterStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataPersisterStep.java @@ -14,6 +14,7 @@ import user.jobengine.db.IItemManager; import user.jobengine.db.Item; import user.jobengine.db.Media; import user.jobengine.db.MediaFile; +import user.jobengine.server.steps.shared.EscortFiles; public class MetadataPersisterStep extends JobStep { private static final String GENERIC = "Generic"; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/NEXIOArchiveCheckerStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/NEXIOArchiveCheckerStep.java index 8beafb23..fbd88ba3 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/NEXIOArchiveCheckerStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/NEXIOArchiveCheckerStep.java @@ -21,6 +21,7 @@ import user.commons.nexio.server.protocol.ProtocolException; import user.commons.remotestore.RemoteStoreProtocol; import user.jobengine.db.Media; import user.jobengine.db.MediaFile; +import user.jobengine.server.steps.shared.EscortFiles; public class NEXIOArchiveCheckerStep extends JobStep { private static final String DOT_MXF = ".mxf"; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/NEXIOMetadataPersisterStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/NEXIOMetadataPersisterStep.java index ec9565f1..ffaf54a3 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/NEXIOMetadataPersisterStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/NEXIOMetadataPersisterStep.java @@ -16,6 +16,7 @@ import user.commons.RemoteFile; import user.commons.StoreUri; import user.jobengine.db.Media; import user.jobengine.db.MediaFile; +import user.jobengine.server.steps.shared.EscortFiles; public class NEXIOMetadataPersisterStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java index 7148df4c..f0203ca5 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/OutputPathAndNameSelectorStep.java @@ -17,6 +17,9 @@ import org.apache.logging.log4j.Marker; import user.jobengine.db.ArchivedMedia; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.EscortFiles; +import user.jobengine.server.steps.shared.MetadataType; +import user.jobengine.server.steps.shared.MetadataTypeDetector; public class OutputPathAndNameSelectorStep extends JobStep { diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.java index 10d01dbe..f171cdf9 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.java @@ -22,7 +22,9 @@ import user.commons.StoreUri; import user.commons.remotestore.FtpDirectoryLister; import user.commons.remotestore.RemoteStoreProtocol; import user.jobengine.db.Media; -import user.jobengine.server.steps.PBQuery.MMMedia; +import user.jobengine.server.steps.shared.EscortFiles; +import user.jobengine.server.steps.shared.PBQuery; +import user.jobengine.server.steps.shared.PBQuery.MMMedia; public class PeableBeachMissingMaterialCheckerStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ProjectCleanupMountedLocationStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ProjectCleanupMountedLocationStep.java index 3fdc396a..53748c65 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ProjectCleanupMountedLocationStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ProjectCleanupMountedLocationStep.java @@ -25,6 +25,8 @@ import org.apache.logging.log4j.Marker; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.MetadataType; +import user.jobengine.server.steps.shared.MetadataTypeDetector; public class ProjectCleanupMountedLocationStep extends JobStep implements FileVisitor { diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/RecordingsArchiveItemBuilderStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/RecordingsArchiveItemBuilderStep.java index 39b714e8..a543b60a 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/RecordingsArchiveItemBuilderStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/RecordingsArchiveItemBuilderStep.java @@ -30,6 +30,7 @@ import user.commons.octopus.IOctopusAPI; import user.commons.octopus.OctopusAPI; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.EscortFiles; public class RecordingsArchiveItemBuilderStep extends JobStep { private static final String MEDIATYPE = "Visszarögzített"; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/RegisterUserRestoreStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/RegisterUserRestoreStep.java index a8d4a069..e387e503 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/RegisterUserRestoreStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/RegisterUserRestoreStep.java @@ -12,6 +12,7 @@ import user.commons.StoreUri; import user.commons.remotestore.RemoteStoreProtocol; import user.jobengine.db.ArchivedMedia; import user.jobengine.db.Media; +import user.jobengine.server.steps.shared.EscortFiles; public class RegisterUserRestoreStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/RegisterVODRestoreStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/RegisterVODRestoreStep.java index 845744cc..b6d536b5 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/RegisterVODRestoreStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/RegisterVODRestoreStep.java @@ -13,6 +13,7 @@ import user.commons.DownloadableMedia; import user.commons.StoreUri; import user.commons.remotestore.RemoteStoreProtocol; import user.jobengine.db.Media; +import user.jobengine.server.steps.shared.EscortFiles; public class RegisterVODRestoreStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/RemoteJobStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/RemoteJobStep.java index b215c27b..de392cf3 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/RemoteJobStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/RemoteJobStep.java @@ -5,6 +5,8 @@ import org.apache.logging.log4j.Logger; import com.ibm.nosql.json.api.BasicDBObject; +import user.jobengine.server.steps.shared.MediaCubeClient; + /* import user.jobengine.server.steps.MediaCubeClient; */ diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/SyncOCTOPUSDataStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/SyncOCTOPUSDataStep.java index 64622951..a7a0832f 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/SyncOCTOPUSDataStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/SyncOCTOPUSDataStep.java @@ -7,6 +7,7 @@ import user.commons.remotestore.IProgressEventListener; import user.commons.remotestore.ProgressEvent; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.OctopusDataMiner; public class SyncOCTOPUSDataStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep.java index 3f6f5f0c..9ed541a4 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep.java @@ -33,6 +33,7 @@ import user.jobengine.db.Store; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; import user.jobengine.server.JobEngineException; +import user.jobengine.server.steps.shared.EscortFiles; public class TSMBackupStep extends JobStep { private static final String MXFEXT = ".MXF"; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java index 79a601ca..8f81dde8 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMExtendedRetrieveStep.java @@ -9,6 +9,7 @@ import user.jobengine.db.ArchivedMedia; import user.jobengine.db.IItemManager; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.EscortFiles; public class TSMExtendedRetrieveStep extends TSMRestoreStep { private static String NEXIO_HOST = System.getProperty("nexio.host"); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRestoreStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRestoreStep.java index 6b40e3b7..56b522d3 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRestoreStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMRestoreStep.java @@ -28,6 +28,7 @@ import user.jobengine.db.MediaFile; import user.jobengine.db.Store; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.EscortFiles; public class TSMRestoreStep extends JobStep { private static final String DOT = "."; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMSystemRestoreStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMSystemRestoreStep.java index fd564a7c..fa8ab3fe 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMSystemRestoreStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMSystemRestoreStep.java @@ -24,6 +24,7 @@ import user.jobengine.db.MediaFile; import user.jobengine.db.Store; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.EscortFiles; public class TSMSystemRestoreStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMWriterStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMWriterStep.java index 47dd8f47..c41f0fe5 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMWriterStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMWriterStep.java @@ -31,6 +31,7 @@ import user.jobengine.db.Store; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; import user.jobengine.server.JobEngineException; +import user.jobengine.server.steps.shared.EscortFiles; public class TSMWriterStep extends JobStep { private static final String MXFEXT = ".MXF"; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeFFAStranStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeFFAStranStep.java index a73ff663..87415892 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeFFAStranStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeFFAStranStep.java @@ -25,6 +25,7 @@ import user.jobengine.db.Media; import user.jobengine.db.Store; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.EscortFiles; public class TranscodeFFAStranStep extends JobStep { private static final int POLL_INTERVALL = 3000; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeSELENIOStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeSELENIOStep.java index 8c6f1835..328f1bc8 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeSELENIOStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeSELENIOStep.java @@ -41,6 +41,7 @@ import user.jobengine.db.Media; import user.jobengine.db.Store; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.EscortFiles; public class TranscodeSELENIOStep extends JobStep { diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/UpdateGhostMediaDataStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/UpdateGhostMediaDataStep.java index 1edbda88..39cb7b30 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/UpdateGhostMediaDataStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/UpdateGhostMediaDataStep.java @@ -13,6 +13,8 @@ import user.jobengine.db.MediaFile; import user.jobengine.db.Store; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.MetadataType; +import user.jobengine.server.steps.shared.MetadataTypeDetector; public class UpdateGhostMediaDataStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/Cmd.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/Cmd.java similarity index 94% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/Cmd.java rename to server/user.jobengine.executors/src/user/jobengine/server/steps/shared/Cmd.java index 19506511..6aaff0e9 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/Cmd.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/Cmd.java @@ -1,4 +1,4 @@ -package user.jobengine.server.steps; +package user.jobengine.server.steps.shared; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/EscortFiles.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/EscortFiles.java similarity index 97% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/EscortFiles.java rename to server/user.jobengine.executors/src/user/jobengine/server/steps/shared/EscortFiles.java index 077ce60d..6057078d 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/EscortFiles.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/EscortFiles.java @@ -1,4 +1,4 @@ -package user.jobengine.server.steps; +package user.jobengine.server.steps.shared; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/FFMpeg.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/FFMpeg.java similarity index 96% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/FFMpeg.java rename to server/user.jobengine.executors/src/user/jobengine/server/steps/shared/FFMpeg.java index ae646308..206796dd 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/FFMpeg.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/FFMpeg.java @@ -1,4 +1,4 @@ -package user.jobengine.server.steps; +package user.jobengine.server.steps.shared; import java.io.FileNotFoundException; import java.nio.file.Files; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/MediaCubeClient.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/MediaCubeClient.java similarity index 95% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/MediaCubeClient.java rename to server/user.jobengine.executors/src/user/jobengine/server/steps/shared/MediaCubeClient.java index 840925e4..0915cc33 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/MediaCubeClient.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/MediaCubeClient.java @@ -1,4 +1,4 @@ -package user.jobengine.server.steps; +package user.jobengine.server.steps.shared; import javax.ws.rs.client.Entity; import javax.ws.rs.client.Invocation.Builder; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataType.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/MetadataType.java similarity index 70% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataType.java rename to server/user.jobengine.executors/src/user/jobengine/server/steps/shared/MetadataType.java index 12e166cc..0e27bf34 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataType.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/MetadataType.java @@ -1,4 +1,4 @@ -package user.jobengine.server.steps; +package user.jobengine.server.steps.shared; public enum MetadataType { TrafficMaterial, TrafficPromo, TrafficAD, OctopusStory, OctopusPlaceholder, Generic diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataTypeDetector.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/MetadataTypeDetector.java similarity index 94% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataTypeDetector.java rename to server/user.jobengine.executors/src/user/jobengine/server/steps/shared/MetadataTypeDetector.java index 0bb69923..c221f884 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataTypeDetector.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/MetadataTypeDetector.java @@ -1,4 +1,4 @@ -package user.jobengine.server.steps; +package user.jobengine.server.steps.shared; import org.apache.commons.lang.StringUtils; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/OctopusDataMiner.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java similarity index 97% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/OctopusDataMiner.java rename to server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java index 56e40e59..8d12f04f 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/OctopusDataMiner.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/OctopusDataMiner.java @@ -1,4 +1,4 @@ -package user.jobengine.server.steps; +package user.jobengine.server.steps.shared; import java.util.Calendar; import java.util.Date; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/PBQuery.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PBQuery.java similarity index 96% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/PBQuery.java rename to server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PBQuery.java index 3632868f..70cfd1ed 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/PBQuery.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PBQuery.java @@ -1,4 +1,4 @@ -package user.jobengine.server.steps; +package user.jobengine.server.steps.shared; import java.io.DataInputStream; import java.io.FileNotFoundException; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/PlanAirExtensions.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PlanAirExtensions.java similarity index 97% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/PlanAirExtensions.java rename to server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PlanAirExtensions.java index 8e7cef26..50a32812 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/PlanAirExtensions.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PlanAirExtensions.java @@ -1,4 +1,4 @@ -package user.jobengine.server.steps; +package user.jobengine.server.steps.shared; import java.io.StringWriter; import java.sql.Connection;