From: Vásáry Dániel Date: Thu, 25 Jul 2019 08:26:45 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=cb84d7a86c6555cae54d73c8094cae891640cc19;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31462 --- diff --git a/server/-configuration/maestro.json b/server/-configuration/maestro.json new file mode 100644 index 00000000..464730c2 --- /dev/null +++ b/server/-configuration/maestro.json @@ -0,0 +1,26 @@ +{ + "sourceStoreUri": { + "protocol": "file://", + "rootPath": "c:/temp" + }, + "targets": + [ + { + "name": "name1", + "storeUri": { + "protocol": "file://", + "rootPath": "c:/temp1" + } + }, + { + "name": "name2", + "storeUri": { + "protocol": "file://", + "rootPath": "c:/temp2" + } + } + ] +} + + + diff --git a/server/-configuration/run-mediacube-server.launch b/server/-configuration/run-mediacube-server.launch index c11b2c2b..e77ba96d 100644 --- a/server/-configuration/run-mediacube-server.launch +++ b/server/-configuration/run-mediacube-server.launch @@ -19,7 +19,7 @@ - + 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 c164fd7f..92041c9e 100644 --- a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/Support.java +++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/Support.java @@ -41,6 +41,8 @@ import user.jobengine.server.steps.ItemManagerExtensions; import user.jobengine.server.steps.PlanAirExtensions; import user.jobengine.server.steps.ProjectCleanupMountedLocationStep; import user.jobengine.server.steps.RundownArchive; +import user.tsm.client.TSMBackupFileObject; +import user.tsm.client.TSMClient; public class Support { @@ -223,7 +225,7 @@ public class Support { public void test_ProjectCleanupMountedLocationStep() throws Exception { //TODO ProjectCleanupMountedLocationStep sut = new ProjectCleanupMountedLocationStep(); - sut.execute("c:\\_video\\projects", null, new JobRuntime()); + sut.execute("c://_video//projects", null, new JobRuntime()); } @Test @@ -249,7 +251,7 @@ public class Support { @Test public void test1() throws Exception { - File sourceFile = new File("c:\\thumbnail - generali\\ShellExtractLoadTest.exe"); + File sourceFile = new File("c://thumbnail - generali//ShellExtractLoadTest.exe"); BasicFileAttributes attr = Files.readAttributes(sourceFile.toPath(), BasicFileAttributes.class); Timestamp timestamp = new Timestamp(attr.creationTime().toMillis()); System.out.println(timestamp); @@ -266,4 +268,27 @@ public class Support { System.out.println("itemid=" + i.getId() + " AND mediaid=" + m.getId() + " AND mediafileid=" + mf.getId()); } + + @Test + public void testTSM() throws Exception { + //System.setProperty("PATH", "c:\\_workspace\\USER\\MediaCube\\server\\user.tsm.client\\apilib\\;%PATH%"); + TSMClient client = null; + try { + client = new TSMClient("JOBENGINE"); + client.connect("mediacube", "password"); + + TSMBackupFileObject[] objects = client.queryActiveBackupObjects("/JOBENGINE", File.separator + "JOBENGINE/", + File.separator + "0606_RAZZIA_CLEANFEED_MIX-20180531113140.MXF"); + + if (objects != null) + System.out.println(objects.length); + } catch (Exception e) { + System.out.println(e.getMessage()); + } finally { + if (client != null) + client.disconnect(); + } + + } + } diff --git a/server/user.tsm.client/apilib/TSMAPI-1.2.DLL b/server/user.tsm.client/apilib/TSMAPI-1.2.DLL new file mode 100644 index 00000000..abb52463 Binary files /dev/null and b/server/user.tsm.client/apilib/TSMAPI-1.2.DLL differ diff --git a/server/user.tsm.client/apilib/tsmapi-1.1.dll b/server/user.tsm.client/apilib/tsmapi-1.1.dll new file mode 100644 index 00000000..b92868b4 Binary files /dev/null and b/server/user.tsm.client/apilib/tsmapi-1.1.dll differ diff --git a/server/user.tsm.client/src/user/tsm/client/TSMClient.java b/server/user.tsm.client/src/user/tsm/client/TSMClient.java index 90219ea8..a83c3073 100644 --- a/server/user.tsm.client/src/user/tsm/client/TSMClient.java +++ b/server/user.tsm.client/src/user/tsm/client/TSMClient.java @@ -237,7 +237,7 @@ public class TSMClient { return connected; } - private TSMBackupFileObject[] queryActiveBackupObjects(String fsQuery, String hlQuery, String llQuery) throws TSMException { + public TSMBackupFileObject[] queryActiveBackupObjects(String fsQuery, String hlQuery, String llQuery) throws TSMException { TSMBackupFileObject result[] = null; Vector objects = new Vector(); short rc = 0;