From 43ed443352baa6617c7dc48d7eede63a9466f8f1 Mon Sep 17 00:00:00 2001 From: "vasary.daniel" Date: Wed, 27 Jan 2021 10:08:42 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32124 --- .../debug-mediacube-main-8888.launch | 2 +- .../run-mediacube-server-hirtv.launch | 2 +- .../run-mediacube-server-mv.launch | 2 +- .../run-mediacube-server-test.launch | 30 +++++++ .../run-mediacube-server-user (1).launch | 30 ------- .../run-mediacube-server-user (2).launch | 30 ------- .../run-mediacube-server-user.launch | 4 +- .../run-mediacube-server.launch | 2 +- .../test-debug-mediacube-bkup-9999.launch | 2 +- .../test-debug-mediacube-main-9999.launch | 4 +- ...ine-old.target => jobengine-210127.target} | 87 ++++++------------- server/-dependencies/jobengine.target | 64 ++++++-------- server/-dependencies/pom.xml | 59 +++++++++++-- server/-modules/pom.xml | 5 ++ server/-product/mediacube.product | 4 +- .../mediacube/executors/tests/SmallTests.java | 61 ++++++++++++- .../FILEZILLA_PASARESTORETransferToStep.java | 22 ++++- .../server/steps/ForkUploadStep.java | 12 +++ .../server/steps/PASAPOOLTransferToStep.java | 27 ++++-- ...PeableBeachMissingMaterialCheckerStep.java | 44 ++++++++-- .../server/steps/CreateMissingLowresStep.java | 3 +- .../META-INF/MANIFEST.MF | 6 +- .../META-INF/MANIFEST.MF | 4 +- .../028_alter_storeuri_incrase_username.sql | 31 +++++++ .../src/user/commons/pool/ContextPool.java | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../jobengine/server/JobStepExecutor.java | 6 +- .../osgi/mediacube/MediaCubeService.java | 4 + .../user.mediacube.gui/META-INF/MANIFEST.MF | 2 +- server/user.mediacube.gui/css/searchitems.css | 8 +- .../pages/searchitems/filters.zul | 2 +- .../user/jobengine/zk/model/SearchModel.java | 32 ++++--- .../META-INF/MANIFEST.MF | 2 +- .../user/tsm/client/api/internal/TSMAPI.java | 1 + 34 files changed, 379 insertions(+), 221 deletions(-) create mode 100644 server/-configuration/run-mediacube-server-test.launch delete mode 100644 server/-configuration/run-mediacube-server-user (1).launch delete mode 100644 server/-configuration/run-mediacube-server-user (2).launch rename server/-dependencies/{jobengine-old.target => jobengine-210127.target} (56%) create mode 100644 server/user.jobengine.osgi.db/migrations/scripts/028_alter_storeuri_incrase_username.sql diff --git a/server/-configuration/debug-mediacube-main-8888.launch b/server/-configuration/debug-mediacube-main-8888.launch index e7463db1..e9e30483 100644 --- a/server/-configuration/debug-mediacube-main-8888.launch +++ b/server/-configuration/debug-mediacube-main-8888.launch @@ -7,7 +7,7 @@ - + diff --git a/server/-configuration/run-mediacube-server-hirtv.launch b/server/-configuration/run-mediacube-server-hirtv.launch index 93820b4f..689f6fb2 100644 --- a/server/-configuration/run-mediacube-server-hirtv.launch +++ b/server/-configuration/run-mediacube-server-hirtv.launch @@ -22,7 +22,7 @@ - + diff --git a/server/-configuration/run-mediacube-server-mv.launch b/server/-configuration/run-mediacube-server-mv.launch index dd2d677b..68ece584 100644 --- a/server/-configuration/run-mediacube-server-mv.launch +++ b/server/-configuration/run-mediacube-server-mv.launch @@ -22,7 +22,7 @@ - + diff --git a/server/-configuration/run-mediacube-server-test.launch b/server/-configuration/run-mediacube-server-test.launch new file mode 100644 index 00000000..a17e092c --- /dev/null +++ b/server/-configuration/run-mediacube-server-test.launch @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/server/-configuration/run-mediacube-server-user (1).launch b/server/-configuration/run-mediacube-server-user (1).launch deleted file mode 100644 index eeebbda6..00000000 --- a/server/-configuration/run-mediacube-server-user (1).launch +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/-configuration/run-mediacube-server-user (2).launch b/server/-configuration/run-mediacube-server-user (2).launch deleted file mode 100644 index c249daef..00000000 --- a/server/-configuration/run-mediacube-server-user (2).launch +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/-configuration/run-mediacube-server-user.launch b/server/-configuration/run-mediacube-server-user.launch index b7027372..3f71cb6e 100644 --- a/server/-configuration/run-mediacube-server-user.launch +++ b/server/-configuration/run-mediacube-server-user.launch @@ -19,10 +19,10 @@ - + - + diff --git a/server/-configuration/run-mediacube-server.launch b/server/-configuration/run-mediacube-server.launch index d8603cff..f5ff4bb2 100644 --- a/server/-configuration/run-mediacube-server.launch +++ b/server/-configuration/run-mediacube-server.launch @@ -21,7 +21,7 @@ - + diff --git a/server/-configuration/test-debug-mediacube-bkup-9999.launch b/server/-configuration/test-debug-mediacube-bkup-9999.launch index af15006c..5567d0dd 100644 --- a/server/-configuration/test-debug-mediacube-bkup-9999.launch +++ b/server/-configuration/test-debug-mediacube-bkup-9999.launch @@ -7,7 +7,7 @@ - + diff --git a/server/-configuration/test-debug-mediacube-main-9999.launch b/server/-configuration/test-debug-mediacube-main-9999.launch index f188461c..5162ccb1 100644 --- a/server/-configuration/test-debug-mediacube-main-9999.launch +++ b/server/-configuration/test-debug-mediacube-main-9999.launch @@ -7,10 +7,10 @@ - + - + diff --git a/server/-dependencies/jobengine-old.target b/server/-dependencies/jobengine-210127.target similarity index 56% rename from server/-dependencies/jobengine-old.target rename to server/-dependencies/jobengine-210127.target index 0c77ae3e..36a7032b 100644 --- a/server/-dependencies/jobengine-old.target +++ b/server/-dependencies/jobengine-210127.target @@ -1,97 +1,65 @@ - + - - - - + - - - + - - - - - - - - - + - - + - - - - + + - - - + + + - - - - - - - - - - - - - - - + + + + - - - - - + - @@ -102,13 +70,9 @@ - - - - + - @@ -117,16 +81,19 @@ - - - + - - - - - + + + + + + + + + + win32 diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target index 5b106430..02402b93 100644 --- a/server/-dependencies/jobengine.target +++ b/server/-dependencies/jobengine.target @@ -1,7 +1,6 @@ - + - @@ -16,68 +15,64 @@ - - - - + - + - + - - - - + + + - - - - + + + + + - - + - - + + - - - - - + + + + + - - - + + + - + @@ -86,18 +81,11 @@ - - + - + - - - - - - diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml index 174959de..74e93792 100644 --- a/server/-dependencies/pom.xml +++ b/server/-dependencies/pom.xml @@ -11,10 +11,8 @@ 1.7 UTF-8 UTF-8 - 9.3.9.v20160517 - + 9.3.9.v20160517 + 1.5.9 3.0.11.Final 2.4.5 @@ -121,6 +119,54 @@ default-cli + + org.ow2.asm:asm:5.0.1 + + + org.ow2.asm:asm-tree:5.0.1 + + + junit:junit:4.12 + + + org.hamcrest:hamcrest-core:1.3 + + + org.eclipse.platform:org.eclipse.equinox.console:1.1.200 + + + org.eclipse.platform:org.eclipse.equinox.common:3.8.0 + + + org.eclipse.platform:org.eclipse.equinox.ds:1.4.400 + + + org.eclipse.platform:org.eclipse.equinox.util:1.0.500 + + + org.eclipse.platform:org.eclipse.equinox.cm:1.1.200 + + + org.eclipse.platform:org.eclipse.osgi:3.11.2 + + + org.eclipse.platform:org.eclipse.osgi.util:3.3.100 + + + org.eclipse.jetty:jetty-server:9.3.9.v20160517 + + + org.apache.felix:org.apache.felix.gogo.shell:0.12.0 + + + org.apache.felix:org.apache.felix.gogo.command:0.12.0 + + + org.apache.felix:org.apache.felix.gogo.runtime:0.12.0 + + + commons-io:commons-io:2.2 + org.slf4j:slf4j-api:1.7.2 @@ -148,9 +194,6 @@ org.apache.commons:commons-digester3:3.2 - - commons-logging:commons-logging:1.1.1 - commons-net:commons-net:3.6 @@ -231,7 +274,7 @@ - + org.eclipse.jetty.toolchain:jetty-schemas:3.1 diff --git a/server/-modules/pom.xml b/server/-modules/pom.xml index 1ab6ca44..668b8789 100644 --- a/server/-modules/pom.xml +++ b/server/-modules/pom.xml @@ -39,6 +39,11 @@ p2 + + + + + dependencies p2 diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product index 0f6b8d7a..bcfe6b22 100644 --- a/server/-product/mediacube.product +++ b/server/-product/mediacube.product @@ -107,7 +107,6 @@ - @@ -118,6 +117,7 @@ + @@ -125,7 +125,6 @@ - @@ -166,7 +165,6 @@ - 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 65aad988..f6f0feb4 100644 --- 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 @@ -8,11 +8,13 @@ import java.io.File; import java.io.IOException; import java.lang.reflect.Method; import java.nio.file.DirectoryStream; +import java.nio.file.FileStore; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.sql.Timestamp; import java.text.DecimalFormat; +import java.text.NumberFormat; import java.text.SimpleDateFormat; import java.time.Duration; import java.time.Instant; @@ -35,6 +37,7 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; +import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang.StringUtils; import org.apache.ibatis.jdbc.SQL; @@ -44,8 +47,11 @@ import com.ibm.nosql.json.api.BasicDBList; import com.ibm.nosql.json.api.BasicDBObject; import groovy.lang.GroovyClassLoader; +import user.commons.RemoteFile; +import user.commons.StoreUri; import user.commons.mediatool.Timecode; import user.commons.mediatool.Timecode.Type; +import user.commons.remotestore.RemoteStoreProtocol; import user.jobengine.db.Media; import user.jobengine.server.steps.ArchiveItem; import user.jobengine.server.steps.EscortFiles; @@ -1079,4 +1085,57 @@ public class SmallTests { } } -} + //amc get free space + @Test + public void test99991() throws Exception { + try { + Path tempPath = Paths.get("/opt"); + FileStore store = Files.getFileStore(tempPath.getRoot()); + long usableSpace = store.getUsableSpace(); + float spaceInGigs = usableSpace / (1024f * 1024f * 1024f); + if (spaceInGigs < 100) + System.out.println("LOW DISK SPACE"); + NumberFormat nf = NumberFormat.getNumberInstance(); + System.out.println("Free space on temp " + nf.format(spaceInGigs) + "G"); + } catch (IOException e) { + System.err.println(e.getMessage()); + } + } + + @Test + public void test99992() throws Exception { + System.out.println(Paths.get("/opt/exists").toFile().exists()); + int i = 1; + System.out.println(Paths.get("/opt/exists").toFile().exists()); + } + + @Test + public void test99993() throws Exception { + + StoreUri su = new StoreUri(); + su.setProtocol(RemoteStoreProtocol.FTP); + su.setUri("localhost"); + su.setUserName("dani"); + su.setPassword("dani"); + su.setRootPath("ftp-1/xxx"); + // FtpDirectoryLister lister = (FtpDirectoryLister) su.getLister(); + // FTPClient ftp = lister.connect(); + // System.out.println(ftp.changeWorkingDirectory("ftp-1")); + // System.out.println(ftp.changeWorkingDirectory("xxx")); + + List list = su.getRemoteFiles(); + su.cleanUp(); + for (RemoteFile f : list) + System.out.println(f.getName()); + } + + @Test + public void test99994() throws Exception { + long start = System.currentTimeMillis(); + Thread.sleep(1001); + long diff = (System.currentTimeMillis() - start) / 1000; + long size = 10000; + + System.out.println(FileUtils.byteCountToDisplaySize(size / diff) + "/sec"); + } +} \ No newline at end of file diff --git a/server/user.jobengine.executors/amc/user/jobengine/server/steps/FILEZILLA_PASARESTORETransferToStep.java b/server/user.jobengine.executors/amc/user/jobengine/server/steps/FILEZILLA_PASARESTORETransferToStep.java index d69a6ed4..c3831307 100644 --- a/server/user.jobengine.executors/amc/user/jobengine/server/steps/FILEZILLA_PASARESTORETransferToStep.java +++ b/server/user.jobengine.executors/amc/user/jobengine/server/steps/FILEZILLA_PASARESTORETransferToStep.java @@ -1,11 +1,31 @@ package user.jobengine.server.steps; +import org.apache.commons.io.FileUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import user.commons.RemoteFile; import user.commons.StoreUri; public class FILEZILLA_PASARESTORETransferToStep extends TransferStep { + private static final Logger logger = LogManager.getLogger(); + @Override @StepEntry public Object[] execute(StoreUri sourceStoreUri, String sourceFileName, StoreUri targetStoreUri, String targetFileName) throws Exception { - return super.execute(sourceStoreUri, sourceFileName, targetStoreUri, targetFileName); + long start = System.currentTimeMillis(); + Object[] result = super.execute(sourceStoreUri, sourceFileName, targetStoreUri, targetFileName); + RemoteFile remoteFile = sourceStoreUri.getRemoteFile(targetFileName); + if (remoteFile != null) { + if (remoteFile.getSize() > 0) { + long diff = (System.currentTimeMillis() - start) / 1000; + long bytesSpeed = remoteFile.getSize() / diff; + String speed = FileUtils.byteCountToDisplaySize(bytesSpeed); + logger.info(getMarker(), "{} size is {}, upload speed was {}/sec", targetFileName, FileUtils.byteCountToDisplaySize(remoteFile.getSize()), + speed); + } else + logger.info(getMarker(), "RemoteFile {} size is 0!", targetFileName); + } + return result; } } diff --git a/server/user.jobengine.executors/amc/user/jobengine/server/steps/ForkUploadStep.java b/server/user.jobengine.executors/amc/user/jobengine/server/steps/ForkUploadStep.java index ada5e5b1..e9fc1a7a 100644 --- a/server/user.jobengine.executors/amc/user/jobengine/server/steps/ForkUploadStep.java +++ b/server/user.jobengine.executors/amc/user/jobengine/server/steps/ForkUploadStep.java @@ -2,9 +2,11 @@ package user.jobengine.server.steps; import java.io.IOException; import java.nio.file.DirectoryStream; +import java.nio.file.FileStore; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.text.NumberFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -36,6 +38,16 @@ public class ForkUploadStep extends JobStep { try { StoreUri tempStoreUri = getManager().getStoreUri(tempStoreName, RemoteStoreProtocol.LOCAL); + + try { + Path tempPath = Paths.get(tempStoreUri.toString(true)); + FileStore store = Files.getFileStore(tempPath.getRoot()); + NumberFormat nf = NumberFormat.getNumberInstance(); + logger.info(getMarker(), "Free space on temp {}", nf.format(store.getUsableSpace())); + } catch (IOException e) { + logger.error(getMarker(), e.getMessage()); + } + Path path = Paths.get(tempStoreUri.toString(true), ".STATUS"); List escortFiles = new ArrayList<>(); diff --git a/server/user.jobengine.executors/amc/user/jobengine/server/steps/PASAPOOLTransferToStep.java b/server/user.jobengine.executors/amc/user/jobengine/server/steps/PASAPOOLTransferToStep.java index db31f924..017f58fe 100644 --- a/server/user.jobengine.executors/amc/user/jobengine/server/steps/PASAPOOLTransferToStep.java +++ b/server/user.jobengine.executors/amc/user/jobengine/server/steps/PASAPOOLTransferToStep.java @@ -3,11 +3,13 @@ package user.jobengine.server.steps; import java.nio.file.Path; import java.nio.file.Paths; +import org.apache.commons.io.FileUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; +import user.commons.RemoteFile; import user.commons.StoreUri; import user.commons.mediatool.MediaInfo; @@ -26,7 +28,23 @@ public class PASAPOOLTransferToStep extends TransferStep { this.sourceStoreUri = sourceStoreUri; this.sourceFileName = sourceFileName; logMediaProfile(); - return super.execute(sourceStoreUri, sourceFileName, targetStoreUri, targetFileName); + long start = System.currentTimeMillis(); + Object[] result = super.execute(sourceStoreUri, sourceFileName, targetStoreUri, targetFileName); + RemoteFile remoteFile = sourceStoreUri.getRemoteFile(targetFileName); + if (remoteFile != null) { + long diff = (System.currentTimeMillis() - start) / 1000; + long bytesSpeed = remoteFile.getSize() / diff; + String speed = FileUtils.byteCountToDisplaySize(bytesSpeed); + logger.info(getMarker(), "{} size is {}, upload speed was {}/sec", targetFileName, FileUtils.byteCountToDisplaySize(remoteFile.getSize()), speed); + } + return result; + } + + // HD + // height = 1080 + // >PEABLEBEACH | \\10.170.100.21\media\BeachPool + private boolean isHD(MediaInfo mi) { + return mi.getHeight() == 1080; } // @Override @@ -63,13 +81,6 @@ public class PASAPOOLTransferToStep extends TransferStep { // return result; // } - // HD - // height = 1080 - // >PEABLEBEACH | \\10.170.100.21\media\BeachPool - private boolean isHD(MediaInfo mi) { - return mi.getHeight() == 1080; - } - // SD - HIGH@HIGH / 16:9 // height < 650 // profile=High diff --git a/server/user.jobengine.executors/amc/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.java b/server/user.jobengine.executors/amc/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.java index 56f633a2..74a80b51 100644 --- a/server/user.jobengine.executors/amc/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.java +++ b/server/user.jobengine.executors/amc/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.java @@ -5,19 +5,21 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.LinkedHashSet; import java.util.List; import org.apache.commons.lang.StringUtils; +import org.apache.commons.net.ftp.FTPClient; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import com.ibm.nosql.json.api.BasicDBList; import user.commons.DownloadableMedia; -import user.commons.RemoteFile; import user.commons.StoreUri; +import user.commons.remotestore.FtpDirectoryLister; import user.commons.remotestore.RemoteStoreProtocol; import user.jobengine.db.Media; import user.jobengine.server.steps.PBQuery.MMMedia; @@ -51,7 +53,7 @@ public class PeableBeachMissingMaterialCheckerStep extends JobStep { } String lookupStoreName = String.valueOf(lookup); - StoreUri lookupStoreUri = getManager().getStoreUri(lookupStoreName, RemoteStoreProtocol.LOCAL); + StoreUri lookupStoreUri = getManager().getStoreUri(lookupStoreName, Enum.valueOf(RemoteStoreProtocol.class, targetProtocol)); logger.info(getMarker(), "Checking pool {}", lookupStoreName); List lookupContent = getPoolContent(lookupStoreName, lookupStoreUri); poolContent.addAll(lookupContent); @@ -61,7 +63,7 @@ public class PeableBeachMissingMaterialCheckerStep extends JobStep { } /* if (1 == 1) { - + logger.info(getMarker(), "Kikapcsolva"); return null; } @@ -104,11 +106,18 @@ public class PeableBeachMissingMaterialCheckerStep extends JobStep { private List getPoolContent(String storeName, StoreUri targetStoreUri) throws Exception { List poolContent = new ArrayList<>(); - List remoteFiles = targetStoreUri.getRemoteFiles(); - if (remoteFiles != null) { - for (RemoteFile rf : remoteFiles) { + + FtpDirectoryLister lister = (FtpDirectoryLister) targetStoreUri.getLister(); + FTPClient client = lister.connect(); + logger.info(getMarker(), "Working dir is {}", client.printWorkingDirectory()); + String[] listNames = client.listNames(); + targetStoreUri.cleanUp(); + + if (listNames != null) { + List remoteFileNames = Arrays.asList(listNames); + logger.info(getMarker(), "Remote file list size :{}", remoteFileNames.size()); + for (String name : remoteFileNames) { try { - String name = rf.getName(); if (name.toLowerCase().endsWith(".mxf")) { int pos = name.lastIndexOf("."); if (pos > -1) { @@ -123,6 +132,27 @@ public class PeableBeachMissingMaterialCheckerStep extends JobStep { } } + + // List remoteFiles = targetStoreUri.getRemoteFiles(); + // if (remoteFiles != null) { + // logger.info(getMarker(), "Remote file list size :{}", remoteFiles.size()); + // for (RemoteFile rf : remoteFiles) { + // try { + // String name = rf.getName(); + // if (name.toLowerCase().endsWith(".mxf")) { + // int pos = name.lastIndexOf("."); + // if (pos > -1) { + // name = name.substring(0, pos); + // //logger.info(getMarker(), "Adding {}", name); + // poolContent.add(name); + // } + // } + // } catch (Exception e) { + // logger.error(e.getMessage()); + // } + // + // } + // } logger.info(getMarker(), "Pool {} contains {} items", storeName, poolContent == null ? 0 : poolContent.size()); return poolContent; } diff --git a/server/user.jobengine.executors/mediavivantis/user/jobengine/server/steps/CreateMissingLowresStep.java b/server/user.jobengine.executors/mediavivantis/user/jobengine/server/steps/CreateMissingLowresStep.java index 5a1ddc5f..568b23c1 100644 --- a/server/user.jobengine.executors/mediavivantis/user/jobengine/server/steps/CreateMissingLowresStep.java +++ b/server/user.jobengine.executors/mediavivantis/user/jobengine/server/steps/CreateMissingLowresStep.java @@ -58,7 +58,8 @@ public class CreateMissingLowresStep extends JobStep { private Media getFirstUntranscodedMedia(IItemManager manager, DBCollection collection) { Media[] result = new Media[] { null }; - String query = "SELECT mediaid FROM VW_MISSING_PROXY_IDS WHERE HOUSEID like 'M%' or HOUSEID like 'P%' or HOUSEID like 'R%' ORDER BY modified DESC FETCH FIRST ROW ONLY"; + //String query = "SELECT mediaid FROM VW_MISSING_PROXY_IDS WHERE HOUSEID like 'M%' or HOUSEID like 'P%' or HOUSEID like 'R%' ORDER BY modified DESC FETCH FIRST ROW ONLY"; + String query = "SELECT mediaid FROM VW_MISSING_PROXY_IDS"; manager.executeQuery(query, rs -> { try { long mediaId = rs.getLong(1); diff --git a/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF index fb7783e4..c178cccf 100644 --- a/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF +++ b/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF @@ -11,11 +11,15 @@ Import-Package: com.fasterxml.jackson.annotation;version="2.4.5", com.fasterxml.jackson.jaxrs.json;version="2.4.5", io.humble.video, io.humble.video.awt, + junit.framework, org.apache.logging.log4j;version="2.8.2", org.apache.logging.log4j.message;version="2.8.2", + org.hamcrest, org.jboss.resteasy.client.jaxrs, org.jboss.resteasy.plugins.providers, org.jboss.resteasy.spi, + org.junit, + org.junit.runner, org.osgi.framework;version="1.5.0" DynamicImport-Package: * Bundle-ClassPath: . @@ -47,7 +51,6 @@ Require-Bundle: org.apache.commons.lang;bundle-version="2.4.0", org.apache.commons.digester;bundle-version="3.2.0";visibility:=reexport, jcifs;bundle-version="1.3.17", org.jmock.junit4;bundle-version="2.6.0", - org.junit;bundle-version="4.12.0", org.jmock;bundle-version="2.6.0", org.apache.commons.net;bundle-version="3.6.0", org.apache.commons.beanutils;bundle-version="1.8.3";visibility:=reexport, @@ -57,6 +60,5 @@ Require-Bundle: org.apache.commons.lang;bundle-version="2.4.0", com.microsoft.sqlserver.sqljdbc;bundle-version="6.0.8112", org.apache.httpcomponents.httpclient;bundle-version="4.2.6", org.apache.httpcomponents.httpcore;bundle-version="4.2.5", - org.apache.commons.logging;bundle-version="1.1.1", org.apache.commons.io;bundle-version="2.2.0", com.ibm.db2.jcc;bundle-version="1.4.0" diff --git a/server/user.jobengine.osgi.db/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.db/META-INF/MANIFEST.MF index 03d3ebc7..1cd481b6 100644 --- a/server/user.jobengine.osgi.db/META-INF/MANIFEST.MF +++ b/server/user.jobengine.osgi.db/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Bundle-ClassPath: . Require-Bundle: user.jobengine.osgi.commons;bundle-version="1.0.0", com.ibm.nosql;bundle-version="4.19.26";visibility:=reexport, org.jmock.junit4;bundle-version="2.6.0", - org.junit;bundle-version="4.12.0", org.jmock;bundle-version="2.6.0", com.ibm.db2.jcc;bundle-version="1.4.0" Service-Component: OSGI-INF/component.xml @@ -19,6 +18,9 @@ Import-Package: com.fasterxml.jackson.annotation;version="2.4.5", javax.ws.rs.core, org.apache.commons.io;version="2.2.0", org.apache.logging.log4j;version="2.8.2", + org.hamcrest, + org.junit, + org.junit.runner, sqlj.runtime.ref Export-Package: user.jobengine.db, user.jobengine.search diff --git a/server/user.jobengine.osgi.db/migrations/scripts/028_alter_storeuri_incrase_username.sql b/server/user.jobengine.osgi.db/migrations/scripts/028_alter_storeuri_incrase_username.sql new file mode 100644 index 00000000..5b00ff9e --- /dev/null +++ b/server/user.jobengine.osgi.db/migrations/scripts/028_alter_storeuri_incrase_username.sql @@ -0,0 +1,31 @@ +-- +-- Copyright 2010-2016 the original author or authors. +-- +-- Licensed under the Apache License, Version 2.0 (the "License"); +-- you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + +-- // Alter STOREURI incrase username +-- Migration SQL that makes the change goes here. + +ALTER TABLE STOREURI ALTER COLUMN USERNAME SET DATA TYPE VARCHAR(50) +@ +CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE DB2ADMIN.STOREURI' ) +@ + +-- //@UNDO +-- SQL to undo the change goes here. + +ALTER TABLE STOREURI ALTER COLUMN USERNAME SET DATA TYPE VARCHAR(20) +@ +CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE DB2ADMIN.STOREURI' ) +@ diff --git a/server/user.jobengine.osgi.db/src/user/commons/pool/ContextPool.java b/server/user.jobengine.osgi.db/src/user/commons/pool/ContextPool.java index 10f74cd4..26501d2c 100644 --- a/server/user.jobengine.osgi.db/src/user/commons/pool/ContextPool.java +++ b/server/user.jobengine.osgi.db/src/user/commons/pool/ContextPool.java @@ -56,7 +56,7 @@ public class ContextPool extends ResourcePool { result = !context.getConnection().isClosed(); } catch (SQLException e) { } - logger.info("Context check {}", result); + //logger.info("Context check {}", result); // String sql = "SELECT 1 FROM SYSIBM.SYSDUMMY1"; // Statement stmt = null; // ResultSet rs = null; diff --git a/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF index 01013b4e..0ed9c4d4 100644 --- a/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF +++ b/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF @@ -19,8 +19,11 @@ Import-Package: com.fasterxml.jackson.databind;version="2.4.5", org.apache.logging.log4j.message;version="2.8.2", org.eclipse.core.runtime.adaptor, org.eclipse.osgi.framework.console;version="1.1.0", + org.hamcrest, org.jboss.resteasy.client.jaxrs, org.jboss.resteasy.spi, + org.junit, + org.junit.runner, org.osgi.framework;version="1.5.0", org.osgi.framework.wiring;version="1.2.0", org.osgi.util.tracker;version="1.4.0", @@ -30,7 +33,6 @@ Require-Bundle: user.jobengine.osgi.db;bundle-version="1.0.0", user.jobengine.osgi.commons;bundle-version="1.0.0", user.tsm.client;bundle-version="1.2.0", org.apache.commons.lang;bundle-version="2.4.0";visibility:=reexport, - org.junit;bundle-version="4.12.0", org.jmock;bundle-version="2.6.0", org.jmock.junit4;bundle-version="2.6.0", org.apache.servicemix.bundles.quartz;bundle-version="2.2.2" diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobStepExecutor.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobStepExecutor.java index c9fcbdf9..a6be04f5 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobStepExecutor.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobStepExecutor.java @@ -290,7 +290,7 @@ public class JobStepExecutor implements IJobStepExecutor { private Class parseClassHierarchy(GroovyClassLoader cl, String root, String className) throws IOException { Path path = Paths.get(root, className); - logger.info("Loading class {} from {}", className, path.toString()); + //logger.info("Loading class {} from {}", className, path.toString()); Class result = null; if (!path.toFile().exists()) return result; @@ -302,9 +302,9 @@ public class JobStepExecutor implements IJobStepExecutor { String[] tokens = line.split("extends"); String parent = tokens[tokens.length - 1]; parent = parent.replace("{", "").trim(); - logger.info("Class {} needs parent class {}", className, parent); + //logger.info("Class {} needs parent class {}", className, parent); - parseClassHierarchy(cl, root, parent); + parseClassHierarchy(cl, root, parent + ".java"); break; } } diff --git a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/mediacube/MediaCubeService.java b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/mediacube/MediaCubeService.java index 92c8a3ea..c66357f8 100644 --- a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/mediacube/MediaCubeService.java +++ b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/mediacube/MediaCubeService.java @@ -49,6 +49,10 @@ public class MediaCubeService { public Response check() { Response result = null; try { + BasicDBObject ret = new BasicDBObject(); + ret.put("message", "JobEngine service is alive!"); + result = Response.ok(ret).build(); + result = Response.ok("JobEngine service is alive!").build(); } catch (Exception e) { result = Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build(); diff --git a/server/user.mediacube.gui/META-INF/MANIFEST.MF b/server/user.mediacube.gui/META-INF/MANIFEST.MF index bfbc2b21..7cbef014 100644 --- a/server/user.mediacube.gui/META-INF/MANIFEST.MF +++ b/server/user.mediacube.gui/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ Service-Component: OSGI-INF/componentBinder.xml Require-Bundle: user.jobengine.osgi.db;bundle-version="1.0.0", user.jobengine.osgi.commons;bundle-version="1.0.0", org.apache.commons.lang;bundle-version="2.4.0";visibility:=reexport, - org.junit;bundle-version="4.12.0", user.commons.zk;bundle-version="1.0.0", org.apache.servicemix.bundles.quartz;bundle-version="2.3.0" Export-Package: user.jobengine.gui @@ -19,6 +18,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: javax.servlet;version="3.1.0", javax.servlet.http;version="3.1.0", org.apache.logging.log4j;version="2.8.2", + org.junit, org.slf4j;version="1.7.2", user.jobengine.server, user.jobengine.server.messages, diff --git a/server/user.mediacube.gui/css/searchitems.css b/server/user.mediacube.gui/css/searchitems.css index 784c416c..7f24dd0c 100644 --- a/server/user.mediacube.gui/css/searchitems.css +++ b/server/user.mediacube.gui/css/searchitems.css @@ -190,4 +190,10 @@ div.z-row-content span { .vjs-no-js { width: 100%; height: 100%; -} \ No newline at end of file +} + +.z-notification-content { + width: auto; + min-width: 400px; +} + \ No newline at end of file diff --git a/server/user.mediacube.gui/pages/searchitems/filters.zul b/server/user.mediacube.gui/pages/searchitems/filters.zul index c6a109cb..a4956fe2 100644 --- a/server/user.mediacube.gui/pages/searchitems/filters.zul +++ b/server/user.mediacube.gui/pages/searchitems/filters.zul @@ -61,7 +61,7 @@ - + diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/SearchModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/SearchModel.java index cbf32811..06cbc784 100644 --- a/server/user.mediacube.gui/src/user/jobengine/zk/model/SearchModel.java +++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/SearchModel.java @@ -117,7 +117,8 @@ public class SearchModel extends AsyncBaseModel { Combobox search; @Wire Toolbar tagsToolbar; - + @Wire + Button btnSearch; @Wire Hbox searchFiltersMenu; @Wire @@ -319,9 +320,14 @@ public class SearchModel extends AsyncBaseModel { orderAscending = columnOrder.entrySet().iterator().next().getValue().equals("ascending"); } + if (searchFilters == null || searchFilters.size() == 0) + throw new Exception("Anyag típus kiválasztása kötelező!"); + + List selectedTypeIds = getTypeIDs(searchFilters); + SearchOptions options = SearchOptions.create() .setText(searchValue) - .setTypes(getTypeIDs(searchFilters)) + .setTypes(selectedTypeIds) .setTags(searchTags) .setFrom(searchFrom) .setTo(searchTo) @@ -492,15 +498,13 @@ public class SearchModel extends AsyncBaseModel { private List getSelectedFilters() { List result = null; - if (!allChecked) { - for (String label : typeFilters.keySet()) { - boolean isChecked = typeFilters.get(label).isChecked(); - if (!isChecked) - continue; - if (result == null) - result = new ArrayList<>(); - result.add(label); - } + for (String label : typeFilters.keySet()) { + boolean isChecked = typeFilters.get(label).isChecked(); + if (!isChecked) + continue; + if (result == null) + result = new ArrayList<>(); + result.add(label); } return result; } @@ -535,6 +539,8 @@ public class SearchModel extends AsyncBaseModel { } private List getTypeIDs(List searchFilters) { + if (allChecked) + return null; List result = null; if (searchFilters != null) { for (String typeName : searchFilters) { @@ -551,9 +557,9 @@ public class SearchModel extends AsyncBaseModel { private void handleSearchError(Exception e) { if (e instanceof NullPointerException) - Clients.showNotification("Database query error!", "error", search, "start_center", 3000); + Clients.showNotification("Database query error!", "error", btnSearch, "start_center", 3000); else - Clients.showNotification(e.getMessage(), "error", search, "start_center", 3000); + Clients.showNotification(e.getMessage(), "error", btnSearch, "start_center", 3000); logger.error(e); } diff --git a/server/user.mediacube.metadata/META-INF/MANIFEST.MF b/server/user.mediacube.metadata/META-INF/MANIFEST.MF index 9e6b6ca5..6d81603f 100644 --- a/server/user.mediacube.metadata/META-INF/MANIFEST.MF +++ b/server/user.mediacube.metadata/META-INF/MANIFEST.MF @@ -9,11 +9,11 @@ Export-Package: user.mediacube.metadata, Service-Component: OSGI-INF/component.xml DynamicImport-Package: * Require-Bundle: org.mybatis.mybatis;bundle-version="3.5.2", - org.junit;bundle-version="4.12.0", com.microsoft.sqlserver.sqljdbc, com.ibm.db2.jcc;bundle-version="1.4.0" Bundle-ActivationPolicy: lazy Import-Package: com.ibm.nosql.bson, com.ibm.nosql.json.api, + org.junit, user.mediacube.metadata.interfaces Bundle-ClassPath: . diff --git a/server/user.tsm.client/src/user/tsm/client/api/internal/TSMAPI.java b/server/user.tsm.client/src/user/tsm/client/api/internal/TSMAPI.java index 64c3f792..05829829 100644 --- a/server/user.tsm.client/src/user/tsm/client/api/internal/TSMAPI.java +++ b/server/user.tsm.client/src/user/tsm/client/api/internal/TSMAPI.java @@ -8,6 +8,7 @@ public class TSMAPI { System.loadLibrary("tsmapi-1.1"); isAvailable = true; } catch (UnsatisfiedLinkError e) { + System.err.println("NO TSMAAPI FOUND!!!!!"); } } -- 2.54.0