From db3e7647223d489d10ab68e67495bc62e3ab5e73 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Wed, 27 Sep 2017 15:05:33 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30476 --- .../{jobtemplates => obsolate}/attach.xml | 0 .../{jobtemplates => obsolate}/attachlocal.xml | 0 .../{jobtemplates => obsolate}/export.xml | 0 .../{jobtemplates => obsolate}/import.xml | 0 .../lowrestranscodemedia.xml | 0 .../{jobtemplates => obsolate}/nexio-sync.xml | 0 .../{jobtemplates => obsolate}/program1.xml | 0 .../{jobtemplates => obsolate}/template.xml | 0 .../{jobtemplates => obsolate}/teszt.xml | 0 .../{jobtemplates => obsolate}/tsmbackup.xml | 0 .../{jobtemplates => obsolate}/tsmrestore.xml | 0 .../server/steps => obsolate}/AFakeStep.java | 4 +++- .../server/steps => obsolate}/DownloadStep.java | 4 +++- .../steps => obsolate}/GetItemSourcesStep.java | 4 +++- .../steps => obsolate}/ImportWriteDataToDBStep.java | 8 +++++--- .../steps => obsolate}/MediaDBWriterStep.java | 4 +++- .../steps => obsolate}/MediaDownloadStep.java | 4 +++- .../server/steps => obsolate}/MediaUploadStep.java | 4 +++- .../user/jobengine/server/steps/TSMBackupStep.java | 13 +++++++++++-- 19 files changed, 34 insertions(+), 11 deletions(-) rename server/-configuration/{jobtemplates => obsolate}/attach.xml (100%) rename server/-configuration/{jobtemplates => obsolate}/attachlocal.xml (100%) rename server/-configuration/{jobtemplates => obsolate}/export.xml (100%) rename server/-configuration/{jobtemplates => obsolate}/import.xml (100%) rename server/-configuration/{jobtemplates => obsolate}/lowrestranscodemedia.xml (100%) rename server/-configuration/{jobtemplates => obsolate}/nexio-sync.xml (100%) rename server/-configuration/{jobtemplates => obsolate}/program1.xml (100%) rename server/-configuration/{jobtemplates => obsolate}/template.xml (100%) rename server/-configuration/{jobtemplates => obsolate}/teszt.xml (100%) rename server/-configuration/{jobtemplates => obsolate}/tsmbackup.xml (100%) rename server/-configuration/{jobtemplates => obsolate}/tsmrestore.xml (100%) rename server/user.jobengine.executors/src/{user/jobengine/server/steps => obsolate}/AFakeStep.java (75%) rename server/user.jobengine.executors/src/{user/jobengine/server/steps => obsolate}/DownloadStep.java (92%) rename server/user.jobengine.executors/src/{user/jobengine/server/steps => obsolate}/GetItemSourcesStep.java (90%) rename server/user.jobengine.executors/src/{user/jobengine/server/steps => obsolate}/ImportWriteDataToDBStep.java (82%) rename server/user.jobengine.executors/src/{user/jobengine/server/steps => obsolate}/MediaDBWriterStep.java (84%) rename server/user.jobengine.executors/src/{user/jobengine/server/steps => obsolate}/MediaDownloadStep.java (93%) rename server/user.jobengine.executors/src/{user/jobengine/server/steps => obsolate}/MediaUploadStep.java (92%) diff --git a/server/-configuration/jobtemplates/attach.xml b/server/-configuration/obsolate/attach.xml similarity index 100% rename from server/-configuration/jobtemplates/attach.xml rename to server/-configuration/obsolate/attach.xml diff --git a/server/-configuration/jobtemplates/attachlocal.xml b/server/-configuration/obsolate/attachlocal.xml similarity index 100% rename from server/-configuration/jobtemplates/attachlocal.xml rename to server/-configuration/obsolate/attachlocal.xml diff --git a/server/-configuration/jobtemplates/export.xml b/server/-configuration/obsolate/export.xml similarity index 100% rename from server/-configuration/jobtemplates/export.xml rename to server/-configuration/obsolate/export.xml diff --git a/server/-configuration/jobtemplates/import.xml b/server/-configuration/obsolate/import.xml similarity index 100% rename from server/-configuration/jobtemplates/import.xml rename to server/-configuration/obsolate/import.xml diff --git a/server/-configuration/jobtemplates/lowrestranscodemedia.xml b/server/-configuration/obsolate/lowrestranscodemedia.xml similarity index 100% rename from server/-configuration/jobtemplates/lowrestranscodemedia.xml rename to server/-configuration/obsolate/lowrestranscodemedia.xml diff --git a/server/-configuration/jobtemplates/nexio-sync.xml b/server/-configuration/obsolate/nexio-sync.xml similarity index 100% rename from server/-configuration/jobtemplates/nexio-sync.xml rename to server/-configuration/obsolate/nexio-sync.xml diff --git a/server/-configuration/jobtemplates/program1.xml b/server/-configuration/obsolate/program1.xml similarity index 100% rename from server/-configuration/jobtemplates/program1.xml rename to server/-configuration/obsolate/program1.xml diff --git a/server/-configuration/jobtemplates/template.xml b/server/-configuration/obsolate/template.xml similarity index 100% rename from server/-configuration/jobtemplates/template.xml rename to server/-configuration/obsolate/template.xml diff --git a/server/-configuration/jobtemplates/teszt.xml b/server/-configuration/obsolate/teszt.xml similarity index 100% rename from server/-configuration/jobtemplates/teszt.xml rename to server/-configuration/obsolate/teszt.xml diff --git a/server/-configuration/jobtemplates/tsmbackup.xml b/server/-configuration/obsolate/tsmbackup.xml similarity index 100% rename from server/-configuration/jobtemplates/tsmbackup.xml rename to server/-configuration/obsolate/tsmbackup.xml diff --git a/server/-configuration/jobtemplates/tsmrestore.xml b/server/-configuration/obsolate/tsmrestore.xml similarity index 100% rename from server/-configuration/jobtemplates/tsmrestore.xml rename to server/-configuration/obsolate/tsmrestore.xml diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/AFakeStep.java b/server/user.jobengine.executors/src/obsolate/AFakeStep.java similarity index 75% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/AFakeStep.java rename to server/user.jobengine.executors/src/obsolate/AFakeStep.java index 717d11ab..71a9256e 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/AFakeStep.java +++ b/server/user.jobengine.executors/src/obsolate/AFakeStep.java @@ -1,6 +1,8 @@ -package user.jobengine.server.steps; +package obsolate; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.JobStep; +import user.jobengine.server.steps.StepEntry; public class AFakeStep extends JobStep { int count = 10; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/DownloadStep.java b/server/user.jobengine.executors/src/obsolate/DownloadStep.java similarity index 92% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/DownloadStep.java rename to server/user.jobengine.executors/src/obsolate/DownloadStep.java index 54fc00fe..f1b3e57e 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/DownloadStep.java +++ b/server/user.jobengine.executors/src/obsolate/DownloadStep.java @@ -1,4 +1,4 @@ -package user.jobengine.server.steps; +package obsolate; import java.util.UUID; @@ -17,6 +17,8 @@ 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.JobStep; +import user.jobengine.server.steps.StepEntry; public class DownloadStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/GetItemSourcesStep.java b/server/user.jobengine.executors/src/obsolate/GetItemSourcesStep.java similarity index 90% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/GetItemSourcesStep.java rename to server/user.jobengine.executors/src/obsolate/GetItemSourcesStep.java index 722099f4..3896c3bc 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/GetItemSourcesStep.java +++ b/server/user.jobengine.executors/src/obsolate/GetItemSourcesStep.java @@ -1,4 +1,4 @@ -package user.jobengine.server.steps; +package obsolate; import java.util.ArrayList; import java.util.List; @@ -9,6 +9,8 @@ import user.jobengine.db.Scene; import user.jobengine.db.SceneContent; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.steps.JobStep; +import user.jobengine.server.steps.StepEntry; public class GetItemSourcesStep extends JobStep { diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportWriteDataToDBStep.java b/server/user.jobengine.executors/src/obsolate/ImportWriteDataToDBStep.java similarity index 82% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/ImportWriteDataToDBStep.java rename to server/user.jobengine.executors/src/obsolate/ImportWriteDataToDBStep.java index 14af8fa9..1647717f 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ImportWriteDataToDBStep.java +++ b/server/user.jobengine.executors/src/obsolate/ImportWriteDataToDBStep.java @@ -1,4 +1,4 @@ -package user.jobengine.server.steps; +package obsolate; import java.util.List; @@ -9,6 +9,8 @@ import user.jobengine.db.Media; import user.jobengine.db.MediaFile; import user.jobengine.db.Store; import user.jobengine.server.IJobEngine; +import user.jobengine.server.steps.JobStep; +import user.jobengine.server.steps.StepEntry; public class ImportWriteDataToDBStep extends JobStep { @@ -28,13 +30,13 @@ public class ImportWriteDataToDBStep extends JobStep { } private void configure(IItemManager manager, Item item, List medias) { - Store store = manager.getStore("Archívum gyorstár"); + Store store = manager.getStore("Arch�vum gyorst�r"); item.setMedias(medias); if (medias != null) { for (Media media : medias) { FileType fileType = manager.getFileType(media.getTitle()); if (fileType == null) - fileType = manager.getFileType("bináris"); + fileType = manager.getFileType("bin�ris"); List files = media.getMediaFiles(); for (MediaFile file: files) { file.setFileType(fileType); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/MediaDBWriterStep.java b/server/user.jobengine.executors/src/obsolate/MediaDBWriterStep.java similarity index 84% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/MediaDBWriterStep.java rename to server/user.jobengine.executors/src/obsolate/MediaDBWriterStep.java index a42ddc8a..619e5908 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/MediaDBWriterStep.java +++ b/server/user.jobengine.executors/src/obsolate/MediaDBWriterStep.java @@ -1,4 +1,4 @@ -package user.jobengine.server.steps; +package obsolate; import java.util.List; @@ -7,6 +7,8 @@ import user.jobengine.db.Media; import user.jobengine.db.MediaFile; import user.jobengine.server.IJobEngine; import user.jobengine.server.JobEngineException; +import user.jobengine.server.steps.JobStep; +import user.jobengine.server.steps.StepEntry; public class MediaDBWriterStep extends JobStep { diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/MediaDownloadStep.java b/server/user.jobengine.executors/src/obsolate/MediaDownloadStep.java similarity index 93% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/MediaDownloadStep.java rename to server/user.jobengine.executors/src/obsolate/MediaDownloadStep.java index 5b4704cb..97fc9c2f 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/MediaDownloadStep.java +++ b/server/user.jobengine.executors/src/obsolate/MediaDownloadStep.java @@ -1,4 +1,4 @@ -package user.jobengine.server.steps; +package obsolate; import java.util.UUID; @@ -18,6 +18,8 @@ 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.JobStep; +import user.jobengine.server.steps.StepEntry; public class MediaDownloadStep extends JobStep { private static final Logger logger = LogManager.getLogger(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/MediaUploadStep.java b/server/user.jobengine.executors/src/obsolate/MediaUploadStep.java similarity index 92% rename from server/user.jobengine.executors/src/user/jobengine/server/steps/MediaUploadStep.java rename to server/user.jobengine.executors/src/obsolate/MediaUploadStep.java index 6bc92ce6..fad502d8 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/MediaUploadStep.java +++ b/server/user.jobengine.executors/src/obsolate/MediaUploadStep.java @@ -1,4 +1,4 @@ -package user.jobengine.server.steps; +package obsolate; import java.util.List; @@ -17,6 +17,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.JobStep; +import user.jobengine.server.steps.StepEntry; public class MediaUploadStep 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 e5220b29..3f4ee2e8 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 @@ -2,6 +2,8 @@ package user.jobengine.server.steps; import java.io.IOException; import java.nio.file.Path; +import java.sql.Timestamp; +import java.util.Date; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -53,8 +55,7 @@ public class TSMBackupStep extends JobStep { String sourceFileName = inputFilePath.toFile().getName(); RemoteFile remoteFile = sourceUri.transferFrom(targetStoreUri, sourceFileName, sourceFileName); - MediaFile mediaFile = manager.createMediaFile(sourceFileName, fileType, targetStore, mediaCubeMedia); - mediaCubeMedia.appendMediaFile(mediaFile); + saveMetadata(mediaCubeMedia, sourceFileName); } catch (Exception e) { logger.catching(e); @@ -65,6 +66,14 @@ public class TSMBackupStep extends JobStep { return null; } + private void saveMetadata(Media mediaCubeMedia, String sourceFileName) { + MediaFile mediaFile = manager.createMediaFile(sourceFileName, fileType, targetStore, mediaCubeMedia); + mediaFile.add(); + mediaCubeMedia.setPersister(manager); + mediaCubeMedia.setArchived(new Timestamp(new Date().getTime())); + mediaCubeMedia.modify(); + } + private void setAndCheck(IJobEngine jobEngine, ArchiveItem archiveItem, Media mediaCubeMedia) throws JobEngineException, IOException { manager = jobEngine.getItemManager(); if (manager == null) -- 2.54.0