git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

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 0c9655b796d6946f60dc6dc3a23eaec24b8346af..e3220dfda5a98c5cf77f5333e27ad76101167ea9 100644 (file)
--- 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;\r
 import user.commons.remotestore.RemoteStoreProtocol;\r
 import user.jobengine.db.IItemManager;\r
-import user.jobengine.server.steps.EscortFiles;\r
 import user.jobengine.server.steps.FileArchive;\r
 import user.jobengine.server.steps.RundownArchive;\r
 import user.jobengine.server.steps.StoryArchive;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class RescueNEXIOMaterials {\r
        private static final String SCHEDULED_FORMAT = "yyyy.MM.dd HH:mm";\r

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 63de728ebfe2e2b9571fd0b6422ac694b00190e2..1118cd285b39614b063274895286b5be5e13789f 100644 (file)
--- a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java
+++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SmallTests.java
@@ -69,11 +69,11 @@ import user.commons.octopus.OctopusAPI;
 import user.commons.remotestore.RemoteStoreProtocol;\r
 import user.jobengine.db.Media;\r
 import user.jobengine.server.steps.ArchiveItem;\r
-import user.jobengine.server.steps.EscortFiles;\r
-import user.jobengine.server.steps.FFMpeg;\r
-import user.jobengine.server.steps.MediaCubeClient;\r
 import user.jobengine.server.steps.TSMExtendedRetrieveStep;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 import user.jobengine.server.steps.shared.ExternalCommandExecutor;\r
+import user.jobengine.server.steps.shared.FFMpeg;\r
+import user.jobengine.server.steps.shared.MediaCubeClient;\r
 \r
 public class SmallTests {\r
        class Pojo extends PojoRoot {\r

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 90a275c7010ac61193523d9235006ef9a3f6778b..3430469dc684b633705d858dc11aabc99f6be6fa 100644 (file)
--- 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;\r
 import user.jobengine.server.JobRuntime;\r
 import user.jobengine.server.steps.ItemManagerExtensions;\r
-import user.jobengine.server.steps.PlanAirExtensions;\r
 import user.jobengine.server.steps.ProjectCleanupMountedLocationStep;\r
 import user.jobengine.server.steps.RundownArchive;\r
+import user.jobengine.server.steps.shared.PlanAirExtensions;\r
 import user.tsm.client.TSMBackupFileObject;\r
 import user.tsm.client.TSMClient;\r
 import user.tsm.client.TSMException;\r

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 af14c948939d0433744375ebbc14fb24a15feaec..9fcab493edeaf9fe7f181316d5a0952de236243f 100644 (file)
--- 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;\r
 import user.jobengine.db.ItemManager;\r
 import user.jobengine.db.Media;\r
-import user.jobengine.server.steps.MetadataType;\r
-import user.jobengine.server.steps.MetadataTypeDetector;\r
-import user.jobengine.server.steps.PlanAirExtensions;\r
+import user.jobengine.server.steps.shared.MetadataType;\r
+import user.jobengine.server.steps.shared.MetadataTypeDetector;\r
+import user.jobengine.server.steps.shared.PlanAirExtensions;\r
 \r
 public class SupportCheckItem {\r
        class PlanAirProcessor implements IStatementDecorator, IResultSetConsumer {\r

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 e9153071829258b639e305b75d2e53d9371c9170..14cf7f0379cca22c73a46f00948592f986b29c14 100644 (file)
--- 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;\r
 import user.jobengine.db.MediaFile;\r
 import user.jobengine.db.Store;\r
-import user.jobengine.server.steps.MetadataType;\r
-import user.jobengine.server.steps.MetadataTypeDetector;\r
-import user.jobengine.server.steps.PlanAirExtensions;\r
+import user.jobengine.server.steps.shared.MetadataType;\r
+import user.jobengine.server.steps.shared.MetadataTypeDetector;\r
+import user.jobengine.server.steps.shared.PlanAirExtensions;\r
 \r
 public class SupportCleanMissingTSM {\r
        class PlanAirProcessor implements IStatementDecorator, IResultSetConsumer {\r

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 6a65d5fa85489c10148204980deb0a6d0e0d0790..6a580e0fec4b64345b9ccf1bd124954195ca4de1 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 import user.mediacube.metadata.interfaces.IMetadata;\r
 import user.mediacube.metadata.interfaces.IMetadataProvider;\r
 import user.mediacube.metadata.interfaces.IMetadataProviderFactory;\r

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 40c5c321622acc78797bb4cff260285bf3362e49..7b1d15a9753196e535c14d64f53cb8198374eeb8 100644 (file)
--- 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;\r
 import user.jobengine.db.MediaFile;\r
 import user.jobengine.db.Store;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class AttachLowresStep extends JobStep {\r
        private static final int POLL_INTERVALL = 3000;\r

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 bf32a0e8e985c5111e2c756acc655add13865c7f..f90415ce5ee3eb0b779923fca6065da4c705eaf2 100644 (file)
--- 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;\r
 import user.commons.remotestore.FtpDirectoryLister;\r
 import user.commons.remotestore.RemoteStoreProtocol;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class CancelableStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 4a4a5cf2f84bffb7d64cc1261fcf17885021af3c..ffca5d765dd51d28f9def22ce01a2da0f680c8d4 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
+import user.jobengine.server.steps.shared.MetadataType;\r
+import user.jobengine.server.steps.shared.MetadataTypeDetector;\r
 \r
 public class CopyForArchiveNEXIOMaterialsStep extends JobStep {\r
        private static final String SCHEDULED_FORMAT = "yyyy.MM.dd HH:mm";\r

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 5413fc5c3d3f7b6d440823bfa670b68318198663..c7b2f5990f5e416cfee933da916bc50a673cbf60 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class CopyForArchiveNEXIORecordingsStep extends JobStep {\r
        private static final String MEDIATYPE = "Visszarögzített";\r

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 132fa3cc17fde40bac3c7ec07e739a16ee0fcd04..6aed5a0061693355b3a3756e476b0f03ad876261 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class DuplicateRemoverStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 7c148216511a9672ea0f43921bc67042bad4009c..410bfe927d36de2abef53729ea3b522d69f749d4 100644 (file)
--- 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;
 \r
 import user.commons.StoreUri;\r
 import user.commons.remotestore.RemoteStoreProtocol;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class EnsureProxyPathExistanceStep extends JobStep {\r
        @StepEntry\r

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 505526cfb55f439b6a4462d9b1f4216828364b57..8e1a6f4cbcb0b648f55bcdc23fb5017e87e57c97 100644 (file)
--- 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;\r
 \r
 import user.commons.StoreUri;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class FileCleanupStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 c4172550a467dba4f9dab80b3c6b82dbf5169b45..a6b985f54d93080fa941534e1bc1d059f5c4774c 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class FileCopyStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 178c38ed521230b88bb49c880d5d70671f54acd7..362155f579e297f384f30a21e293164281ae8465 100644 (file)
--- 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;\r
 import user.commons.remotestore.RemoteStoreProtocol;\r
 import user.jobengine.db.Media;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class FileValidatorStep extends JobStep {\r
        private static final String COLORSPACE = "COLORSPACE";\r

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 36dbddb5df53e5bd60284f392eb35c5075a71386..fda90b6be34d23e85d47c52c5283598945bf9f28 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class ForkDownloadStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 df1707a6ae8f2703a598cb759becaa58a0de9649..92eff37abd0ee49dbcfb0f97630701fbe6bd4349 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class ForkUploadStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 549c6c9750f26d41953e6326fdd6dce8e683dbaf..f27dd07b6d6d3884511c3ccaf4d39c1e8d4ee091 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
+import user.jobengine.server.steps.shared.PlanAirExtensions;\r
 \r
 public class GenerateMorpheusMetadataStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 1e6078ecf1aad4cd60ca22a21eeac3d2d387fdda..60858b2c2eb6e73aaa8d58db2ada8584b9deef0a 100644 (file)
--- 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;\r
 import user.commons.remotestore.RemoteStoreProtocol;\r
 import user.jobengine.db.Media;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class GenericArchiveCheckerStep extends JobStep {\r
        private static final String DOT_MXF = ".MXF";\r

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 e18ca0cfe63965d2d6061887c5c82481a0d1d7eb..ecb1a53b3008d28abf274fe7f104362804875d68 100644 (file)
--- 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;\r
 import user.jobengine.db.MediaFile;\r
 import user.jobengine.db.Store;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
+import user.jobengine.server.steps.shared.FFMpeg;\r
 \r
 public class HLSProxyStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 6b85f1d7bf300c7914240873494423c7ec9f1050..39106b39f35fd58885e88db8aaa31da11a6b32ae 100644 (file)
--- 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;\r
 import user.jobengine.db.MediaFile;\r
 import user.jobengine.db.MediaFileDAO;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 import user.mediacube.metadata.interfaces.IMetadata;\r
 import user.mediacube.metadata.interfaces.IMetadataProvider;\r
 import user.mediacube.metadata.interfaces.IMetadataProviderFactory;\r

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 4f00ae29fddcaa25eabb1e2fde585b6dcc0d3a31..ea838cf58d325ddd52e01bf95edb877bed1b40d9 100644 (file)
--- 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;\r
 import user.commons.remotestore.RemoteStoreProtocol;\r
 import user.jobengine.db.Media;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class HarrisMissingMaterialCheckerStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger(HarrisMissingMaterialCheckerStep.class);\r

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 e5170194e3cec259c731067a26bd4dda4d5487d0..f1df9e946a8ecb08a9c9e8c292ffbf21e30705e8 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class ImportMORPHEUSMissingMaterialsStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 bf8077918ae5abb0de4489c1ba4ab4cff3435b30..2b2b0a2e3fe9195044cdb5a997bd34aafd9b40ca 100644 (file)
--- 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;
 \r
 import user.jobengine.db.IItemManager;\r
 import user.jobengine.db.IResultSetConsumer;\r
+import user.jobengine.server.steps.shared.MetadataType;\r
+import user.jobengine.server.steps.shared.MetadataTypeDetector;\r
 \r
 public class ItemManagerExtensions {\r
 \r

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 db327dff9bfde3b6e8081dee0fe23f50add7be89..8c094d809a06ae844a26c7d4487056884f26e09e 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class MXFCutterStep extends JobStep {\r
        private static final String TARGETNAMEPATTERN = "-ARCH-%s";\r

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 53d253d707302825e5d4cf46bc5a32f21ef5136a..2a04cc479ba6b693843014e68ac569a95f60952e 100644 (file)
--- 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;\r
 import user.jobengine.db.Media;\r
 import user.jobengine.db.MediaFile;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class MetadataPersisterStep extends JobStep {\r
        private static final String GENERIC = "Generic";\r

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 8beafb239f03d6dd80fcf257bdb25729b49dff44..fbd88ba3887c06629955c63618784e228b7538fc 100644 (file)
--- 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;\r
 import user.jobengine.db.Media;\r
 import user.jobengine.db.MediaFile;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class NEXIOArchiveCheckerStep extends JobStep {\r
        private static final String DOT_MXF = ".mxf";\r

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 ec9565f193fdcf75d921d21b40ee8d6ce9a9dead..ffaf54a33e6c79115ea6f04d783cbda583baadee 100644 (file)
--- 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;\r
 import user.jobengine.db.Media;\r
 import user.jobengine.db.MediaFile;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class NEXIOMetadataPersisterStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 7148df4c366c70d84b8c31584c2663ea9111bfb3..f0203ca5f5c925b14f7f187810f0bce5b315d5a4 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
+import user.jobengine.server.steps.shared.MetadataType;\r
+import user.jobengine.server.steps.shared.MetadataTypeDetector;\r
 \r
 public class OutputPathAndNameSelectorStep extends JobStep {\r
 \r

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 10d01dbe3aec1fea4f4b8b73d90949f278da091b..f171cdf9f15a6c5209c9b25226b220758a56f198 100644 (file)
--- 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;\r
 import user.commons.remotestore.RemoteStoreProtocol;\r
 import user.jobengine.db.Media;\r
-import user.jobengine.server.steps.PBQuery.MMMedia;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
+import user.jobengine.server.steps.shared.PBQuery;\r
+import user.jobengine.server.steps.shared.PBQuery.MMMedia;\r
 \r
 public class PeableBeachMissingMaterialCheckerStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 3fdc396a8fb66102deb8e7952cb04c28ac5a3f6a..53748c65745a57803e3a99f81323ad136e9d0341 100644 (file)
--- 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;
 \r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.MetadataType;\r
+import user.jobengine.server.steps.shared.MetadataTypeDetector;\r
 \r
 public class ProjectCleanupMountedLocationStep extends JobStep implements FileVisitor<Path> {\r
 \r

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 39b714e8d147df8c4f39450e894df6c499721bd1..a543b60a71f26cf7b1700583f7c9a90d61726431 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class RecordingsArchiveItemBuilderStep extends JobStep {\r
        private static final String MEDIATYPE = "Visszarögzített";\r

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 a8d4a0696596dce44d8cead4cc081e9548c9f75e..e387e5034f843d7b341abb819eb24cad2e8879e6 100644 (file)
--- 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;\r
 import user.jobengine.db.ArchivedMedia;\r
 import user.jobengine.db.Media;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class RegisterUserRestoreStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 845744cc5440fdde6a1970fe2ab7c2aef6e50ffa..b6d536b52539cafa73ec19dcd45e13da87efe028 100644 (file)
--- 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;\r
 import user.commons.remotestore.RemoteStoreProtocol;\r
 import user.jobengine.db.Media;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class RegisterVODRestoreStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 b215c27bc67644d915fe635c0ce50b482e68ec29..de392cf33b2e8dbcd344a90649339b3fdd3a940b 100644 (file)
--- 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;
 \r
 import com.ibm.nosql.json.api.BasicDBObject;\r
 \r
+import user.jobengine.server.steps.shared.MediaCubeClient;\r
+\r
 /*\r
 import user.jobengine.server.steps.MediaCubeClient;\r
 */\r

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 64622951655374b808fc4370de75c779fe6cbce1..a7a0832fe6998d013ffe7507dab7137e2633695b 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.OctopusDataMiner;\r
 \r
 public class SyncOCTOPUSDataStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 3f6f5f0c46fd45d23d3a380862b6d3a220e7d396..9ed541a4b3b188cef0352be16cc65f8765ec7d0d 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobRuntime;\r
 import user.jobengine.server.JobEngineException;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class TSMBackupStep extends JobStep {\r
        private static final String MXFEXT = ".MXF";\r

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 79a601ca36623c2a008e5fb0d0b2855e9b5b42ff..8f81dde87e955b8cf36d32432b0840c064534345 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class TSMExtendedRetrieveStep extends TSMRestoreStep {\r
        private static String NEXIO_HOST = System.getProperty("nexio.host");\r

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 6b40e3b74c5ac2130db10e97415223e4ba20665a..56b522d368af69e546b261115cecdb6ed61aeba4 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class TSMRestoreStep extends JobStep {\r
        private static final String DOT = ".";\r

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 fd564a7cdf24bb35bf32fba406868e4a755a1c57..fa8ab3fef68f3b83bd20712bfdecc9437b4e40fe 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class TSMSystemRestoreStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 47dd8f4710cbe045d0ce5d12d4e8ae73ebf1b1d9..c41f0fe575563a44ace9f038d6971275ab67a635 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobRuntime;\r
 import user.jobengine.server.JobEngineException;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class TSMWriterStep extends JobStep {\r
        private static final String MXFEXT = ".MXF";\r

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 a73ff663a339f832b453e9fcaa5623dda6ecae9d..87415892ab98e5db413fa9974860fefd7758035c 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class TranscodeFFAStranStep extends JobStep {\r
        private static final int POLL_INTERVALL = 3000;\r

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 8c6f1835b52ecd7ab9e459189c7250bf16338225..328f1bc893146a6dad12b7d1408d7eb0c68662d1 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.EscortFiles;\r
 \r
 public class TranscodeSELENIOStep extends JobStep {\r
 \r

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 1edbda88b77de27c9b7d97e4353d93142d9e154f..39cb7b30a649ac66f29d1ee9e4459a642bc3b308 100644 (file)
--- 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;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.shared.MetadataType;\r
+import user.jobengine.server.steps.shared.MetadataTypeDetector;\r
 \r
 public class UpdateGhostMediaDataStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 1950651184f1b3dd7a71704f6c833247a3fd2417..6aaff0e9102c27bbbc96628184928ba41b155d05 100644 (file)
--- 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;\r
+package user.jobengine.server.steps.shared;\r
 \r
 import java.io.BufferedReader;\r
 import java.io.InputStreamReader;\r

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 077ce60ddf6751817f5e554ff6afb72b2b8c0048..6057078d0ef8ea19c5c53bc35cbe933098f9cb46 100644 (file)
--- 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;\r
+package user.jobengine.server.steps.shared;\r
 \r
 import java.io.ByteArrayInputStream;\r
 import java.io.File;\r

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 ae646308e2d2be151e3dac321e3043eae5881e0c..206796dd320ce1c1b39fe0f3db1dfc18d1622e50 100644 (file)
--- 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;\r
+package user.jobengine.server.steps.shared;\r
 \r
 import java.io.FileNotFoundException;\r
 import java.nio.file.Files;\r

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 840925e4444b02ca9f68bf80fdee04cdff50bf8b..0915cc33597090af560c78afb279ac934000ae1f 100644 (file)
--- 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;\r
+package user.jobengine.server.steps.shared;\r
 \r
 import javax.ws.rs.client.Entity;\r
 import javax.ws.rs.client.Invocation.Builder;\r

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 12e166cc91ef5c1d818084c5e0aee1e2f0ba8d25..0e27bf34d05206f11615a3689e2518000c40bbdc 100644 (file)
--- 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;\r
+package user.jobengine.server.steps.shared;\r
 \r
 public enum MetadataType {\r
        TrafficMaterial, TrafficPromo, TrafficAD, OctopusStory, OctopusPlaceholder, Generic\r

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 0bb6992343549cd816c95c24f0d9ca386e41daea..c221f8842c2e60e7e9475834fdc3c9b73fc66d0a 100644 (file)
--- 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;\r
+package user.jobengine.server.steps.shared;\r
 \r
 import org.apache.commons.lang.StringUtils;\r
 \r

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 56e40e5910b5bb159ee7fc5e98453732d1b12543..8d12f04f59cf8a4aefc78428d68fa9088a4c7061 100644 (file)
--- 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;\r
+package user.jobengine.server.steps.shared;\r
 \r
 import java.util.Calendar;\r
 import java.util.Date;\r

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 3632868f2d84f17ca0c8e8dfa23d5f5352a975be..70cfd1ed051712c6f11fcbb101300e0896417008 100644 (file)
--- 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;\r
+package user.jobengine.server.steps.shared;\r
 \r
 import java.io.DataInputStream;\r
 import java.io.FileNotFoundException;\r

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 8e7cef260bbc145d435fb994c3f1f9b32e7b48db..50a32812bb7e869c02795834afaf81165c881fa3 100644 (file)
--- 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;\r
+package user.jobengine.server.steps.shared;\r
 \r
 import java.io.StringWriter;\r
 import java.sql.Connection;\r