From: vasary.daniel Date: Tue, 4 May 2021 18:27:24 +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=4dd4a521305004d41b15e3b600c46203b8f3d906;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32227 --- 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 3430469d..1797e98c 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 @@ -36,9 +36,9 @@ import user.jobengine.db.ItemManager; 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.ProjectCleanupMountedLocationStep; import user.jobengine.server.steps.RundownArchive; +import user.jobengine.server.steps.shared.ItemManagerExtensions; import user.jobengine.server.steps.shared.PlanAirExtensions; import user.tsm.client.TSMBackupFileObject; import user.tsm.client.TSMClient; 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 ffca5d76..5b0fdd96 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 @@ -36,6 +36,7 @@ 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.ItemManagerExtensions; import user.jobengine.server.steps.shared.MetadataType; import user.jobengine.server.steps.shared.MetadataTypeDetector; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportStatisticsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportStatisticsStep.java index beb9ded5..d0978b1d 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportStatisticsStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportStatisticsStep.java @@ -25,6 +25,7 @@ import user.commons.octopus.OctopusAPI; import user.jobengine.db.IItemManager; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.shared.ItemManagerExtensions; public class ImportStatisticsStep 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 9ed541a4..98ea8cd0 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 @@ -34,6 +34,7 @@ import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; import user.jobengine.server.JobEngineException; import user.jobengine.server.steps.shared.EscortFiles; +import user.jobengine.server.steps.shared.ItemManagerExtensions; public class TSMBackupStep extends JobStep { private static final String MXFEXT = ".MXF"; 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 c41f0fe5..bf57f390 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 @@ -32,6 +32,7 @@ import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; import user.jobengine.server.JobEngineException; import user.jobengine.server.steps.shared.EscortFiles; +import user.jobengine.server.steps.shared.ItemManagerExtensions; public class TSMWriterStep extends JobStep { private static final String MXFEXT = ".MXF"; 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 328f1bc8..ebe2ce9c 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 @@ -42,6 +42,7 @@ import user.jobengine.db.Store; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; import user.jobengine.server.steps.shared.EscortFiles; +import user.jobengine.server.steps.shared.ItemManagerExtensions; public class TranscodeSELENIOStep extends JobStep { diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ItemManagerExtensions.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/ItemManagerExtensions.java similarity index 90% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/ItemManagerExtensions.java rename to server/user.jobengine.executors/src/user/jobengine/server/steps/shared/ItemManagerExtensions.java index 2b2b0a2e..9e6d4a2f 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ItemManagerExtensions.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/ItemManagerExtensions.java @@ -1,11 +1,9 @@ -package user.jobengine.server.steps; +package user.jobengine.server.steps.shared; 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 {