From 3641693dc8a966ecd181b06aa7c0463faf4dded0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Tue, 10 Oct 2017 14:54:16 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30578 --- server/-configuration/scheduledjobs.json | 19 ++- .../jobtemplates/archive-material.xml | 4 +- .../jobtemplates/archive-ondemand.xml | 8 +- .../jobtemplates/delete-materials.xml | 4 +- .../jobtemplates/retrieve-material.xml | 14 ++- .../retrieve-morpheus-missing-materials.xml | 8 +- .../retrieve-ondemand-material.xml | 46 ++++++++ .../retrieve-traffic-missing-materials.xml | 4 +- .../server/steps/ArchiveListBuilderStep.java | 4 +- .../steps/ArchiveMaterialSubmitStep.java | 6 +- .../CheckMORPHEUSMissingMaterialsStep.java | 26 ++--- .../CheckTrafficMissingMaterialsStep.java | 8 +- .../server/steps/DeleteMaterialsStep.java | 10 +- .../jobengine/server/steps/TSMBackupStep.java | 16 +-- .../server/steps/TSMRestoreStep.java | 21 ++-- .../server/steps/TranscodeSELENIOStep.java | 4 +- .../pages/mediaplayer.jsp | 2 +- .../pages/search_items.zul | 48 ++++---- .../jobengine/zk/model/CachedListModel.java | 110 +++++++++--------- 19 files changed, 214 insertions(+), 148 deletions(-) create mode 100644 server/user.jobengine.executors/jobtemplates/retrieve-ondemand-material.xml diff --git a/server/-configuration/scheduledjobs.json b/server/-configuration/scheduledjobs.json index 199f396d..9347880f 100644 --- a/server/-configuration/scheduledjobs.json +++ b/server/-configuration/scheduledjobs.json @@ -6,8 +6,8 @@ "executeimmediate": true, "cronexpression": "0 0 0/1 1/1 * ? *", "parameters": [ - {"name": "inputFolder", "value": "/mnt/ISILON/ARCHIVE", "type": "java.lang.String"}, - {"name": "globalInputFolder", "value": "\\\\10.10.1.100\\BRAAVOS\\ARCHIVE", "type": "java.lang.String"} + {"name": "sourcePath", "value": "/mnt/ISILON/ARCHIVE", "type": "java.lang.String"}, + {"name": "globalSourcePath", "value": "\\\\10.10.1.100\\BRAAVOS\\ARCHIVE", "type": "java.lang.String"} ] }, { @@ -21,7 +21,18 @@ {"name": "userName", "value": "MAM", "type": "java.lang.String"}, {"name": "password", "value": "Echotv.hu", "type": "java.lang.String"}, {"name": "lookupDays", "value": 7, "type": "java.lang.Integer"}, - {"name": "outputPath", "value": "\\\\10.10.1.100\\BRAAVOS\\PLAYOUT", "type": "java.lang.String"} + {"name": "targetPath", "value": "\\\\10.10.1.100\\BRAAVOS\\PLAYOUT", "type": "java.lang.String"} + ] + }, + { + "active": false, + "name" : "MORPHEUS anyagok visszatöltése", + "template": "retrieve-morpheus-missing-materials.xml", + "executeimmediate": true, + "cronexpression": "0 0 0/1 1/1 * ? *", + "parameters": [ + {"name": "sourcePath", "value": "\\\\10.10.1.100\\BRAAVOS\\PLAYOUT\\MORPHEUS", "type": "java.lang.String"}, + {"name": "targetPath", "value": "\\\\10.10.1.100\\BRAAVOS\\PLAYOUT", "type": "java.lang.String"} ] }, { @@ -31,7 +42,7 @@ "executeimmediate": true, "cronexpression": "0 0 0/1 1/1 * ? *", "parameters": [ - {"name": "inputFolder", "value": "\\\\10.10.1.100\\BRAAVOS\\ARCHIVE", "type": "java.lang.String"}, + {"name": "sourcePath", "value": "\\\\10.10.1.100\\BRAAVOS\\ARCHIVE", "type": "java.lang.String"}, {"name": "userName", "value": "mediacube", "type": "java.lang.String"}, {"name": "password", "value": "Broadca5T", "type": "java.lang.String"} ] diff --git a/server/user.jobengine.executors/jobtemplates/archive-material.xml b/server/user.jobengine.executors/jobtemplates/archive-material.xml index 500f3264..bb9fd2bf 100644 --- a/server/user.jobengine.executors/jobtemplates/archive-material.xml +++ b/server/user.jobengine.executors/jobtemplates/archive-material.xml @@ -3,7 +3,7 @@ - + @@ -35,7 +35,7 @@ - + diff --git a/server/user.jobengine.executors/jobtemplates/archive-ondemand.xml b/server/user.jobengine.executors/jobtemplates/archive-ondemand.xml index 956b84c1..9f38a3bb 100644 --- a/server/user.jobengine.executors/jobtemplates/archive-ondemand.xml +++ b/server/user.jobengine.executors/jobtemplates/archive-ondemand.xml @@ -2,8 +2,8 @@ - - + + @@ -13,7 +13,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/server/user.jobengine.executors/jobtemplates/delete-materials.xml b/server/user.jobengine.executors/jobtemplates/delete-materials.xml index 96f53ce3..86f5c8ef 100644 --- a/server/user.jobengine.executors/jobtemplates/delete-materials.xml +++ b/server/user.jobengine.executors/jobtemplates/delete-materials.xml @@ -2,7 +2,7 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/server/user.jobengine.executors/jobtemplates/retrieve-material.xml b/server/user.jobengine.executors/jobtemplates/retrieve-material.xml index cae277b0..6f381175 100644 --- a/server/user.jobengine.executors/jobtemplates/retrieve-material.xml +++ b/server/user.jobengine.executors/jobtemplates/retrieve-material.xml @@ -1,10 +1,11 @@ - - - - + + + + + @@ -13,7 +14,10 @@ - + + + + diff --git a/server/user.jobengine.executors/jobtemplates/retrieve-morpheus-missing-materials.xml b/server/user.jobengine.executors/jobtemplates/retrieve-morpheus-missing-materials.xml index b16ecb8f..0f9c1eb6 100644 --- a/server/user.jobengine.executors/jobtemplates/retrieve-morpheus-missing-materials.xml +++ b/server/user.jobengine.executors/jobtemplates/retrieve-morpheus-missing-materials.xml @@ -2,18 +2,18 @@ - - + + - + - + diff --git a/server/user.jobengine.executors/jobtemplates/retrieve-ondemand-material.xml b/server/user.jobengine.executors/jobtemplates/retrieve-ondemand-material.xml new file mode 100644 index 00000000..b1f806ee --- /dev/null +++ b/server/user.jobengine.executors/jobtemplates/retrieve-ondemand-material.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/user.jobengine.executors/jobtemplates/retrieve-traffic-missing-materials.xml b/server/user.jobengine.executors/jobtemplates/retrieve-traffic-missing-materials.xml index 2e5682b9..c31360cb 100644 --- a/server/user.jobengine.executors/jobtemplates/retrieve-traffic-missing-materials.xml +++ b/server/user.jobengine.executors/jobtemplates/retrieve-traffic-missing-materials.xml @@ -6,7 +6,7 @@ - + @@ -25,7 +25,7 @@ - + diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveListBuilderStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveListBuilderStep.java index 3724cfd3..bbc0b511 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveListBuilderStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveListBuilderStep.java @@ -76,11 +76,11 @@ public class ArchiveListBuilderStep extends JobStep { } @StepEntry - public Object[] execute(String inputFolder, IJobEngine jobEngine, IJobRuntime jobRuntime) { + public Object[] execute(String sourcePath, IJobEngine jobEngine, IJobRuntime jobRuntime) { List archiveList = new ArrayList(); DirectoryStream directoryStream = null; try { - Files.newDirectoryStream(Paths.get(inputFolder)).forEach(p -> processPathItem(p, archiveList)); + Files.newDirectoryStream(Paths.get(sourcePath)).forEach(p -> processPathItem(p, archiveList)); } catch (Exception e) { logger.error("", e); } finally { diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveMaterialSubmitStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveMaterialSubmitStep.java index bea945bf..234332c9 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveMaterialSubmitStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveMaterialSubmitStep.java @@ -16,18 +16,18 @@ import user.jobengine.server.IJobRuntime; */ public class ArchiveMaterialSubmitStep extends JobStep { private static final String ARCHIVE = "Archiválás"; - private static final String GLOBAL_INPUT_FOLDER = "globalInputFolder"; + private static final String GLOBAL_SOURCE_PATH = "globalSourcePath"; private static final Logger logger = LogManager.getLogger(); private static final String JOBTEMPLATE = "archive-material.xml"; private static final String ARCHIVE_ITEM = "archiveItem"; @StepEntry - public Object[] execute(String globalInputFolder, ArrayList archiveList, IJobEngine jobEngine, IJobRuntime jobRuntime) { + public Object[] execute(String globalSourcePath, ArrayList archiveList, IJobEngine jobEngine, IJobRuntime jobRuntime) { try { for (ArchiveItem archiveItem : archiveList) { try { IJobRuntime submit = jobEngine.submit(JOBTEMPLATE, ARCHIVE, - ListUtils.asMap(ARCHIVE_ITEM, archiveItem, GLOBAL_INPUT_FOLDER, globalInputFolder)); + ListUtils.asMap(ARCHIVE_ITEM, archiveItem, GLOBAL_SOURCE_PATH, globalSourcePath)); } catch (Exception e) { if (archiveItem != null) archiveItem.removeCatchedFile(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckMORPHEUSMissingMaterialsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckMORPHEUSMissingMaterialsStep.java index 9bb0b89e..d166e18a 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckMORPHEUSMissingMaterialsStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckMORPHEUSMissingMaterialsStep.java @@ -29,16 +29,16 @@ public class CheckMORPHEUSMissingMaterialsStep extends JobStep { private static final String MEDIA_CUBE_MEDIA = "mediaCubeMedia"; private static final String JOBTEMPLATE = "retrieve-material.xml"; private static final String CSV_EXT = ".csv"; - private String outputPath; + private String targetPath; private MediaFileDAO dao; private IJobEngine jobEngine; @StepEntry - public Object[] execute(String inputPath, String outputPath, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception { - setAndCheck(inputPath, outputPath, jobEngine); + public Object[] execute(String sourcePath, String targetPath, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception { + setAndCheck(sourcePath, targetPath, jobEngine); DirectoryStream directoryStream = null; try { - Files.newDirectoryStream(Paths.get(inputPath)).forEach(p -> processPathItem(p)); + Files.newDirectoryStream(Paths.get(sourcePath)).forEach(p -> processPathItem(p)); } catch (Exception e) { logger.error("", e); } finally { @@ -64,7 +64,7 @@ public class CheckMORPHEUSMissingMaterialsStep extends JobStep { return; } - jobEngine.submit(JOBTEMPLATE, RETRIEVE_MATERIAL, ListUtils.asMap(MEDIA_CUBE_MEDIA, medias.get(0), OUTPUT_PATH, outputPath)); + jobEngine.submit(JOBTEMPLATE, RETRIEVE_MATERIAL, ListUtils.asMap(MEDIA_CUBE_MEDIA, medias.get(0), OUTPUT_PATH, targetPath)); } private void processMissingMaterialCSV(Path csvFilePath) throws Exception { @@ -111,7 +111,7 @@ public class CheckMORPHEUSMissingMaterialsStep extends JobStep { logger.error(getMarker(), "A {} MORPHEUS állomány nem törölhető.", csvFile.getName()); } - private void setAndCheck(String inputPath, String outputPath, IJobEngine jobEngine) { + private void setAndCheck(String sourcePath, String targetPath, IJobEngine jobEngine) { if (jobEngine == null) { logger.error(getMarker(), "Az folyamatkezelő réteg nem elérhető."); throw new NullPointerException("Internal error, missing JobEngine reference."); @@ -126,15 +126,15 @@ public class CheckMORPHEUSMissingMaterialsStep extends JobStep { logger.error(getMarker(), "Az adatbáziskezelő réteg MediaFile kezelöje nem elérhető."); throw new NullPointerException("Internal error, missing MediaFile DAO reference."); } - if (inputPath == null) { - logger.error(getMarker(), "A folyamat 'inputPath' bemeneti paramétere üres."); - throw new NullPointerException("System is not configured properly, 'inputPath' input parameter missing."); + if (sourcePath == null) { + logger.error(getMarker(), "A folyamat 'sourcePath' bemeneti paramétere üres."); + throw new NullPointerException("System is not configured properly, 'sourcePath' input parameter missing."); } - if (outputPath == null) { - logger.error(getMarker(), "A folyamat 'outputPath' bemeneti paramétere üres."); - throw new NullPointerException("System is not configured properly, 'outputPath' input parameter missing."); + if (targetPath == null) { + logger.error(getMarker(), "A folyamat 'targetPath' bemeneti paramétere üres."); + throw new NullPointerException("System is not configured properly, 'targetPath' input parameter missing."); } - this.outputPath = outputPath; + this.targetPath = targetPath; } } diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckTrafficMissingMaterialsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckTrafficMissingMaterialsStep.java index a5b9dc1b..d54e055e 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckTrafficMissingMaterialsStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CheckTrafficMissingMaterialsStep.java @@ -27,7 +27,7 @@ public class CheckTRAFFICMissingMaterialsStep extends JobStep { private static final String JOBTEMPLATE = "retrieve-material.xml"; @StepEntry - public Object[] execute(String dbUrl, String userName, String password, int lookupDays, String outputPath, IJobEngine jobEngine, IJobRuntime jobRuntime) + public Object[] execute(String dbUrl, String userName, String password, int lookupDays, String targetPath, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception { try (Connection con = getConnection(dbUrl, userName, password); PreparedStatement stmt = con.prepareStatement(SQL)) { @@ -39,7 +39,7 @@ public class CheckTRAFFICMissingMaterialsStep extends JobStep { continue; try { - processTrafficId(trafficId, outputPath, jobEngine); + processTrafficId(trafficId, targetPath, jobEngine); } catch (Exception e) { logger.error(getMarker(), "Hiba lépett fel az {} anyag visszatöltéskor. A rendszer hibaüzenete: {}", trafficId, e.getMessage()); } @@ -66,7 +66,7 @@ public class CheckTRAFFICMissingMaterialsStep extends JobStep { return result; } - private void processTrafficId(String trafficId, String outputPath, IJobEngine jobEngine) throws Exception { + private void processTrafficId(String trafficId, String targetPath, IJobEngine jobEngine) throws Exception { IItemManager manager = jobEngine.getItemManager(); MediaFileDAO dao = (MediaFileDAO) manager.getBaseDAO(MediaFile.class); List medias = dao.getByHouseId(trafficId); @@ -81,7 +81,7 @@ public class CheckTRAFFICMissingMaterialsStep extends JobStep { } String title = "Traffic adásanyag visszatöltés: " + trafficId; - jobEngine.submit(JOBTEMPLATE, title, ListUtils.asMap(MEDIA_CUBE_MEDIA, medias.get(0), OUTPUT_PATH, outputPath)); + jobEngine.submit(JOBTEMPLATE, title, ListUtils.asMap(MEDIA_CUBE_MEDIA, medias.get(0), OUTPUT_PATH, targetPath)); } } diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/DeleteMaterialsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/DeleteMaterialsStep.java index 759173f5..9c15de32 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/DeleteMaterialsStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/DeleteMaterialsStep.java @@ -24,13 +24,13 @@ public class DeleteMaterialsStep extends JobStep { private StoreUri sourceUri; @StepEntry - public Object[] execute(String inputFolder, String userName, String password, IJobEngine jobEngine, IJobRuntime jobRuntime) { - if (StringUtils.isBlank(inputFolder)) { - logger.error(getMarker(), "A folyamat 'inputFolder' bemeneti paramétere üres."); - throw new NullPointerException("System is not configured properly, 'inputFolder' input parameter missing."); + public Object[] execute(String sourceFolder, String userName, String password, IJobEngine jobEngine, IJobRuntime jobRuntime) { + if (StringUtils.isBlank(sourceFolder)) { + logger.error(getMarker(), "A folyamat 'sourceFolder' bemeneti paramétere üres."); + throw new NullPointerException("System is not configured properly, 'sourceFolder' input parameter missing."); } IItemManager manager = jobEngine.getItemManager(); - sourceUri = manager.createStoreUri(RemoteStoreProtocol.SMB, inputFolder); + sourceUri = manager.createStoreUri(RemoteStoreProtocol.SMB, sourceFolder); sourceUri.setUserName(userName); sourceUri.setPassword(password); try { 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 0525d7b4..b3fb5dbd 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 @@ -27,7 +27,7 @@ import user.jobengine.server.JobEngineException; public class TSMBackupStep extends JobStep { private static final Logger logger = LogManager.getLogger(); private IItemManager manager; - private Path inputMediaFile; + private Path sourceMediaFile; private Store tsmStore; private StoreUri targetUri; private FileType fileType; @@ -37,7 +37,7 @@ public class TSMBackupStep extends JobStep { try { setAndCheck(archiveItem, mediaCubeMedia, jobEngine); - StoreUri sourceUri = manager.createStoreUri(RemoteStoreProtocol.LOCAL, inputMediaFile.getParent().toString()); + StoreUri sourceUri = manager.createStoreUri(RemoteStoreProtocol.LOCAL, sourceMediaFile.getParent().toString()); final IJobRuntime runtime = jobRuntime; sourceUri.addProgressListener(new IProgressEventListener() { @@ -52,7 +52,7 @@ public class TSMBackupStep extends JobStep { evt.setCancel(!canContinue()); } }); - String sourceFileName = inputMediaFile.toFile().getName(); + String sourceFileName = sourceMediaFile.toFile().getName(); RemoteFile remoteFile = sourceUri.transferFrom(targetUri, sourceFileName, sourceFileName); String name = getHouseId(archiveItem); @@ -102,14 +102,14 @@ public class TSMBackupStep extends JobStep { logger.error(getMarker(), "A folyamat 'archiveItem' bemeneti paramétere üres."); throw new NullPointerException("System is not configured properly, missing 'archiveItem' input parameter."); } - inputMediaFile = archiveItem.getMediaFile(); - if (inputMediaFile == null) { + sourceMediaFile = archiveItem.getMediaFile(); + if (sourceMediaFile == null) { logger.error(getMarker(), "A folyamat 'archiveItem' bemeneti paraméter 'mediaFile' értéke üres."); throw new NullPointerException("System is not configured properly, missing 'mediaFile' value in 'archiveItem' input parameter."); } - if (!inputMediaFile.toFile().exists()) { - logger.error(getMarker(), "Az {} állomány nem létezik vagy nem érhető el.", inputMediaFile.toFile().getName()); - throw new IOException(String.format("Input file {} not exists or unreachable.", inputMediaFile.toFile().getName())); + if (!sourceMediaFile.toFile().exists()) { + logger.error(getMarker(), "Az {} állomány nem létezik vagy nem érhető el.", sourceMediaFile.toFile().getName()); + throw new IOException(String.format("Input file {} not exists or unreachable.", sourceMediaFile.toFile().getName())); } tsmStore = manager.getSystemStore(false); if (tsmStore == null) { 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 0db98376..60774550 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,8 +28,8 @@ public class TSMRestoreStep extends JobStep { private String sourceFileName; @StepEntry - public Object[] execute(Media mediaCubeMedia, String outputPath, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception { - setAndCheck(mediaCubeMedia, outputPath, jobEngine); + public Object[] execute(Media mediaCubeMedia, String targetPath, String targetNamePattern, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception { + setAndCheck(mediaCubeMedia, targetPath, targetNamePattern, jobEngine); try { //TODO check file existance? final IJobRuntime runtime = jobRuntime; @@ -45,7 +45,8 @@ public class TSMRestoreStep extends JobStep { evt.setCancel(!canContinue()); } }); - RemoteFile result = sourceUri.transferFrom(targetUri, sourceFileName, sourceFileName); + String targetFileName = String.format(targetNamePattern, sourceFileName); + RemoteFile result = sourceUri.transferFrom(targetUri, sourceFileName, targetFileName); } catch (Exception e) { logger.error(getMarker(), "A {} állomány visszatöltése sikertelen. A rendszer hibaüzenete: {}", sourceFileName, e.getMessage()); logger.catching(e); @@ -66,7 +67,7 @@ public class TSMRestoreStep extends JobStep { return null; } - private void setAndCheck(Media mediaCubeMedia, String outputPath, IJobEngine jobEngine) { + private void setAndCheck(Media mediaCubeMedia, String targetPath, String targetNamePattern, IJobEngine jobEngine) { if (jobEngine == null) { logger.error(getMarker(), "Az folyamatkezelő réteg nem elérhető."); throw new NullPointerException("Internal error, missing JobEngine reference."); @@ -80,9 +81,13 @@ public class TSMRestoreStep extends JobStep { logger.error(getMarker(), "A folyamat 'mediaCubeMedia' bemeneti paramétere üres."); throw new NullPointerException("System is not configured properly, 'mediaCubeMedia' input parameter missing."); } - if (StringUtils.isBlank(outputPath)) { - logger.error(getMarker(), "A folyamat 'inputFolder' bemeneti paramétere üres."); - throw new NullPointerException("System is not configured properly, 'inputFolder' input parameter missing."); + if (StringUtils.isBlank(targetPath)) { + logger.error(getMarker(), "A folyamat 'targetPath' bemeneti paramétere üres."); + throw new NullPointerException("System is not configured properly, 'targetPath' input parameter missing."); + } + if (StringUtils.isBlank(targetNamePattern)) { + logger.error(getMarker(), "A folyamat 'targetNamePattern' bemeneti paramétere üres."); + throw new NullPointerException("System is not configured properly, 'targetNamePattern' input parameter missing."); } Store tsmStore = manager.getSystemStore(false); if (tsmStore == null) { @@ -94,7 +99,7 @@ public class TSMRestoreStep extends JobStep { logger.error(getMarker(), "A TSM rendszer beállítás paraméterei nem elérhetőek."); throw new NullPointerException("System is not configured properly, missing TSM StoreUri."); } - targetUri = manager.createStoreUri(RemoteStoreProtocol.LOCAL, outputPath); + targetUri = manager.createStoreUri(RemoteStoreProtocol.LOCAL, targetPath); sourceFileName = getSourceFileName(mediaCubeMedia, tsmStore); if (sourceFileName == null) { logger.error(getMarker(), "Adatbázis bejegyzés hiba, a visszatöltendő fájl neve nem található."); 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 6b9ff175..67461133 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 @@ -67,7 +67,7 @@ public class TranscodeSELENIOStep extends JobStep { } } - private TranscodeRequest buildTranscodeRequest(String projectFilePath, String sourceFilePath, String outputPath) throws java.lang.Exception { + private TranscodeRequest buildTranscodeRequest(String projectFilePath, String sourceFilePath, String targetPath) throws java.lang.Exception { Clip clip = new Clip(); MediaFile mediaFile = new MediaFile(); mediaFile.setFile(sourceFilePath); @@ -94,7 +94,7 @@ public class TranscodeSELENIOStep extends JobStep { TranscodeDestination transcodeDestination = new TranscodeDestination(); //transcodeDestination.setOutputWriteDirectory(outputPath); - transcodeDestination.setOutputPostMoveDirectory(outputPath); + transcodeDestination.setOutputPostMoveDirectory(targetPath); transcodeRequest.setTranscodeDestination(transcodeDestination); return transcodeRequest; } diff --git a/server/user.jobengine.osgi.server/pages/mediaplayer.jsp b/server/user.jobengine.osgi.server/pages/mediaplayer.jsp index f11681f8..f7cbeee3 100644 --- a/server/user.jobengine.osgi.server/pages/mediaplayer.jsp +++ b/server/user.jobengine.osgi.server/pages/mediaplayer.jsp @@ -31,7 +31,7 @@ <%if(!"".equals(mediaURL) && !mediaURL.endsWith("empty.zul")){%> -