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

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 717d11abe0e45b8f428fbca1143b58502a473703..71a9256ec11a4d258af5e1344065ee350f5916ed 100644 (file)
--- 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;\r
+package obsolate;\r
 \r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.JobStep;\r
+import user.jobengine.server.steps.StepEntry;\r
 \r
 public class AFakeStep extends JobStep {\r
        int count = 10;\r

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 54fc00fe2c34eb025b61d0aa969d8a93f4463743..f1b3e57e525a51fc1f4c6ac6c1dd9afd116fb284 100644 (file)
--- 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;\r
+package obsolate;\r
 \r
 import java.util.UUID;\r
 \r
@@ -17,6 +17,8 @@ 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.JobStep;\r
+import user.jobengine.server.steps.StepEntry;\r
 \r
 public class DownloadStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 722099f4ddec193627eb9cb22791762471dd4f88..3896c3bc22147c3395f8beb2ca8df2814a1fccab 100644 (file)
--- 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;\r
+package obsolate;\r
 \r
 import java.util.ArrayList;\r
 import java.util.List;\r
@@ -9,6 +9,8 @@ import user.jobengine.db.Scene;
 import user.jobengine.db.SceneContent;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.steps.JobStep;\r
+import user.jobengine.server.steps.StepEntry;\r
 \r
 public class GetItemSourcesStep extends JobStep {\r
 \r

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 14af8fa94e6113d3ad30c9f0779d7f0677f13494..1647717f1ed8cec6c91468abb7eb3832bebd256a 100644 (file)
--- 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;\r
+package obsolate;\r
 \r
 import java.util.List;\r
 \r
@@ -9,6 +9,8 @@ import user.jobengine.db.Media;
 import user.jobengine.db.MediaFile;\r
 import user.jobengine.db.Store;\r
 import user.jobengine.server.IJobEngine;\r
+import user.jobengine.server.steps.JobStep;\r
+import user.jobengine.server.steps.StepEntry;\r
 \r
 public class ImportWriteDataToDBStep extends JobStep {\r
        \r
@@ -28,13 +30,13 @@ public class ImportWriteDataToDBStep extends JobStep {
        }\r
        \r
        private void configure(IItemManager manager, Item item, List<Media> medias) {\r
-               Store store = manager.getStore("Archívum gyorstár");\r
+               Store store = manager.getStore("Arch�vum gyorst�r");\r
                item.setMedias(medias);\r
                if (medias != null) {\r
                        for (Media media : medias) {\r
                                FileType fileType = manager.getFileType(media.getTitle());\r
                                if (fileType == null)\r
-                                       fileType = manager.getFileType("bináris");\r
+                                       fileType = manager.getFileType("bin�ris");\r
                                List<MediaFile> files = media.getMediaFiles();\r
                                for (MediaFile file: files) {\r
                                        file.setFileType(fileType);\r

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 a42ddc8a33f95a1edb27b2af5b21323fd254a2ea..619e5908f806b6acb7c7edc6487a7b3f2a6c9853 100644 (file)
--- 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;\r
+package obsolate;\r
 \r
 import java.util.List;\r
 \r
@@ -7,6 +7,8 @@ import user.jobengine.db.Media;
 import user.jobengine.db.MediaFile;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.JobEngineException;\r
+import user.jobengine.server.steps.JobStep;\r
+import user.jobengine.server.steps.StepEntry;\r
 \r
 public class MediaDBWriterStep extends JobStep {\r
        \r

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 5b4704cb431c933497da1bbad0ef049daf2f3a46..97fc9c2fdb1442e66bc1e08d64cee2b34d6ada81 100644 (file)
--- 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;\r
+package obsolate;\r
 \r
 import java.util.UUID;\r
 \r
@@ -18,6 +18,8 @@ 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.JobStep;\r
+import user.jobengine.server.steps.StepEntry;\r
 \r
 public class MediaDownloadStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r

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 6bc92ce65320c91c87de1993d47950931416bdfa..fad502d82bcb9c556430ed0f42833f8b95df4002 100644 (file)
--- 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;\r
+package obsolate;\r
 \r
 import java.util.List;\r
 \r
@@ -17,6 +17,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.JobStep;\r
+import user.jobengine.server.steps.StepEntry;\r
 \r
 public class MediaUploadStep 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 e5220b29085b4e19b1c38b346ea282438bbb8652..3f4ee2e8ba41ab80c4947fa0339dfc86458dca0d 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
@@ -2,6 +2,8 @@ package user.jobengine.server.steps;
 \r
 import java.io.IOException;\r
 import java.nio.file.Path;\r
+import java.sql.Timestamp;\r
+import java.util.Date;\r
 \r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
@@ -53,8 +55,7 @@ public class TSMBackupStep extends JobStep {
                        String sourceFileName = inputFilePath.toFile().getName();\r
                        RemoteFile remoteFile = sourceUri.transferFrom(targetStoreUri, sourceFileName, sourceFileName);\r
 \r
-                       MediaFile mediaFile = manager.createMediaFile(sourceFileName, fileType, targetStore, mediaCubeMedia);\r
-                       mediaCubeMedia.appendMediaFile(mediaFile);\r
+                       saveMetadata(mediaCubeMedia, sourceFileName);\r
 \r
                } catch (Exception e) {\r
                        logger.catching(e);\r
@@ -65,6 +66,14 @@ public class TSMBackupStep extends JobStep {
                return null;\r
        }\r
 \r
+       private void saveMetadata(Media mediaCubeMedia, String sourceFileName) {\r
+               MediaFile mediaFile = manager.createMediaFile(sourceFileName, fileType, targetStore, mediaCubeMedia);\r
+               mediaFile.add();\r
+               mediaCubeMedia.setPersister(manager);\r
+               mediaCubeMedia.setArchived(new Timestamp(new Date().getTime()));\r
+               mediaCubeMedia.modify();\r
+       }\r
+\r
        private void setAndCheck(IJobEngine jobEngine, ArchiveItem archiveItem, Media mediaCubeMedia) throws JobEngineException, IOException {\r
                manager = jobEngine.getItemManager();\r
                if (manager == null)\r