From: vasary.daniel Date: Fri, 4 Mar 2022 15:50:35 +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=6ad4f2790a377c77318f0b7cf3441c9acc2c33e1;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33017 --- diff --git a/server/-configuration/run-mediacube-server-hirtv (1).launch b/server/-configuration/run-mediacube-server-hirtv (1).launch deleted file mode 100644 index 5d433363..00000000 --- a/server/-configuration/run-mediacube-server-hirtv (1).launch +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/-configuration/run-mediacube-server-hirtv.launch b/server/-configuration/run-mediacube-server-hirtv.launch index 2716732a..3c9d8e68 100644 --- a/server/-configuration/run-mediacube-server-hirtv.launch +++ b/server/-configuration/run-mediacube-server-hirtv.launch @@ -61,9 +61,6 @@ - - - @@ -102,8 +99,8 @@ - + diff --git a/server/-configuration/run-mediacube-server-local.launch b/server/-configuration/run-mediacube-server-local.launch index 1cb817b1..a479b5dd 100644 --- a/server/-configuration/run-mediacube-server-local.launch +++ b/server/-configuration/run-mediacube-server-local.launch @@ -1,6 +1,4 @@ - - @@ -74,8 +72,6 @@ - - @@ -110,10 +106,12 @@ + + - + diff --git a/server/-configuration/run-mediacube-server-mv.launch b/server/-configuration/run-mediacube-server-mv.launch index a4790c96..8efb4093 100644 --- a/server/-configuration/run-mediacube-server-mv.launch +++ b/server/-configuration/run-mediacube-server-mv.launch @@ -1,5 +1,4 @@ - @@ -73,9 +72,6 @@ - - - @@ -114,8 +110,8 @@ - + diff --git a/server/-configuration/run-mediacube-server-omar.launch b/server/-configuration/run-mediacube-server-omar.launch index f659508c..4ebacff2 100644 --- a/server/-configuration/run-mediacube-server-omar.launch +++ b/server/-configuration/run-mediacube-server-omar.launch @@ -72,9 +72,6 @@ - - - @@ -113,9 +110,8 @@ - - + diff --git a/server/-configuration/run-mediacube-server-test.launch b/server/-configuration/run-mediacube-server-test.launch deleted file mode 100644 index f930cb2e..00000000 --- a/server/-configuration/run-mediacube-server-test.launch +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/-configuration/run-mediacube-server-user.launch b/server/-configuration/run-mediacube-server-user.launch deleted file mode 100644 index c28bb92c..00000000 --- a/server/-configuration/run-mediacube-server-user.launch +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product index d61a7e99..14d38d58 100644 --- a/server/-product/mediacube.product +++ b/server/-product/mediacube.product @@ -70,7 +70,6 @@ - @@ -103,8 +102,8 @@ - + diff --git a/server/-product/production/LOCAL/jobs/steps/ArchiveRecursive.java b/server/-product/production/LOCAL/jobs/steps/ArchiveRecursive.java index 2ba1b39e..3f01f32b 100644 --- a/server/-product/production/LOCAL/jobs/steps/ArchiveRecursive.java +++ b/server/-product/production/LOCAL/jobs/steps/ArchiveRecursive.java @@ -26,7 +26,7 @@ import com.ibm.nosql.json.api.BasicDBObject; import user.commons.JobStatus; import user.commons.ListUtils; -import user.commons.MediaCubeMarker; +import user.commons.log4j2.marker.MediaCubeMarker; import user.commons.mediatool.MediaInfo; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; diff --git a/server/-product/production/LOCAL/jobs/steps/BatchRetrieveForkStep.java b/server/-product/production/LOCAL/jobs/steps/BatchRetrieveForkStep.java index 15cf36c1..4f6b130b 100644 --- a/server/-product/production/LOCAL/jobs/steps/BatchRetrieveForkStep.java +++ b/server/-product/production/LOCAL/jobs/steps/BatchRetrieveForkStep.java @@ -6,8 +6,8 @@ import java.util.Map; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import user.commons.MediaCubeFinishMarker; -import user.commons.MediaCubeMarker; +import user.commons.log4j2.marker.MediaCubeFinishMarker; +import user.commons.log4j2.marker.MediaCubeMarker; import user.jobengine.db.ArchivedMedia; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; diff --git a/server/-product/production/LOCAL/jobs/steps/CreateMissingLowresStep.java b/server/-product/production/LOCAL/jobs/steps/CreateMissingLowresStep.java index b549e59e..72b4cfb1 100644 --- a/server/-product/production/LOCAL/jobs/steps/CreateMissingLowresStep.java +++ b/server/-product/production/LOCAL/jobs/steps/CreateMissingLowresStep.java @@ -9,7 +9,7 @@ import com.ibm.nosql.json.api.BasicDBObject; import com.ibm.nosql.json.api.DB; import com.ibm.nosql.json.api.DBCollection; -import user.commons.MediaCubeUndoMarker; +import user.commons.log4j2.marker.MediaCubeUndoMarker; import user.commons.nosql.NoSQLUtils; import user.jobengine.db.IItemManager; import user.jobengine.db.Media; diff --git a/server/-product/production/LOCAL/jobs/steps/HSMMigrateStep.java b/server/-product/production/LOCAL/jobs/steps/HSMMigrateStep.java index 6b85f1d7..895b1411 100644 --- a/server/-product/production/LOCAL/jobs/steps/HSMMigrateStep.java +++ b/server/-product/production/LOCAL/jobs/steps/HSMMigrateStep.java @@ -29,7 +29,7 @@ import com.ibm.nosql.json.api.DBCollection; import com.ibm.nosql.json.api.QueryBuilder; import user.commons.IEntityBase; -import user.commons.MediaCubeMarker; +import user.commons.log4j2.marker.MediaCubeMarker; import user.commons.nosql.NoSQLUtils; import user.jobengine.db.IItemManager; import user.jobengine.db.MediaFile; diff --git a/server/-product/production/LOCAL/jobs/steps/QueryMissingProxyMediaStep.java b/server/-product/production/LOCAL/jobs/steps/QueryMissingProxyMediaStep.java index a91f9e97..7df2bed0 100644 --- a/server/-product/production/LOCAL/jobs/steps/QueryMissingProxyMediaStep.java +++ b/server/-product/production/LOCAL/jobs/steps/QueryMissingProxyMediaStep.java @@ -7,7 +7,7 @@ import com.ibm.nosql.json.api.BasicDBObject; import com.ibm.nosql.json.api.DB; import com.ibm.nosql.json.api.DBCollection; -import user.commons.MediaCubeUndoMarker; +import user.commons.log4j2.marker.MediaCubeUndoMarker; import user.commons.nosql.NoSQLUtils; import user.jobengine.db.IItemManager; import user.jobengine.db.Media; diff --git a/server/-product/production/LOCAL/jobs/steps/shared/EscortFiles.java b/server/-product/production/LOCAL/jobs/steps/shared/EscortFiles.java index d872f6b9..406d90f1 100644 --- a/server/-product/production/LOCAL/jobs/steps/shared/EscortFiles.java +++ b/server/-product/production/LOCAL/jobs/steps/shared/EscortFiles.java @@ -43,7 +43,7 @@ import com.ibm.nosql.json.api.BasicDBObject; import com.ibm.nosql.json.util.JSON; import user.commons.CalendarUtils; -import user.commons.MediaCubeMarker; +import user.commons.log4j2.marker.MediaCubeMarker; import user.commons.StoreUri; import user.commons.remotestore.FtpDirectoryLister; diff --git a/server/user.jobengine.executors/META-INF/MANIFEST.MF b/server/user.jobengine.executors/META-INF/MANIFEST.MF index 7dd0961f..f5af6b8c 100644 --- a/server/user.jobengine.executors/META-INF/MANIFEST.MF +++ b/server/user.jobengine.executors/META-INF/MANIFEST.MF @@ -48,5 +48,6 @@ Import-Package: groovy.lang;version="3.0.3", org.joda.time;version="2.2.0", org.joda.time.base;version="2.2.0", sqlj.runtime.ref, + user.commons.log4j2.marker, user.mediacube.metadata, user.mediacube.metadata.hsm diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java index 6b8f6c53..1f320e48 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveRecursive.java @@ -23,7 +23,7 @@ import com.ibm.nosql.json.api.BasicDBObject; import user.commons.JobStatus; import user.commons.ListUtils; -import user.commons.MediaCubeMarker; +import user.commons.log4j2.marker.MediaCubeMarker; import user.commons.mediatool.MediaInfo; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; @@ -145,8 +145,8 @@ public class ArchiveRecursive extends JobStep implements FileVisitor { Files.walkFileTree(Paths.get(sourcePath), this); } } catch (Exception e) { - logger.error(getSessionMarker(), "A(z) '{}' mappa elérése sikertelen. A rendszer hibaüzenete: {}", sourcePath, - e.getMessage()); + logger.error(getSessionMarker(), "A(z) '{}' mappa elérése sikertelen. A rendszer hibaüzenete: {}", + sourcePath, e.getMessage()); } finally { if (submitted > 0) getJobRuntime().forkWaitComplete(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/BatchRetrieveForkStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/BatchRetrieveForkStep.java index d56bb950..a531a2ea 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/BatchRetrieveForkStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/BatchRetrieveForkStep.java @@ -6,8 +6,8 @@ import java.util.Map; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import user.commons.MediaCubeFinishMarker; -import user.commons.MediaCubeMarker; +import user.commons.log4j2.marker.MediaCubeFinishMarker; +import user.commons.log4j2.marker.MediaCubeMarker; import user.jobengine.db.ArchivedMedia; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; @@ -65,7 +65,8 @@ public class BatchRetrieveForkStep extends JobStep { parameters.put(HOUSEID, houseId); parameters.put(RECIPIENT, recipient); parameters.put(TARGET_PATH_TYPE, targetPathType); - IJobRuntime child = jobEngine.submit(jobRuntime, null, CHILD_TEMPLATE, String.format("Visszatöltés %s részére", recipient), parameters); + IJobRuntime child = jobEngine.submit(jobRuntime, null, CHILD_TEMPLATE, + String.format("Visszatöltés %s részére", recipient), parameters); ((MediaCubeMarker) child.getSessionMarker()).setTo(recipient); } catch (Exception e) { logger.catching(e); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CreateMissingLowresStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CreateMissingLowresStep.java index fa315174..519b28a7 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CreateMissingLowresStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CreateMissingLowresStep.java @@ -9,7 +9,7 @@ import com.ibm.nosql.json.api.BasicDBObject; import com.ibm.nosql.json.api.DB; import com.ibm.nosql.json.api.DBCollection; -import user.commons.MediaCubeUndoMarker; +import user.commons.log4j2.marker.MediaCubeUndoMarker; import user.commons.nosql.NoSQLUtils; import user.jobengine.db.IItemManager; import user.jobengine.db.Media; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/HSMMigrateStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/HSMMigrateStep.java index 39106b39..fa8d65fb 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/HSMMigrateStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/HSMMigrateStep.java @@ -29,7 +29,7 @@ import com.ibm.nosql.json.api.DBCollection; import com.ibm.nosql.json.api.QueryBuilder; import user.commons.IEntityBase; -import user.commons.MediaCubeMarker; +import user.commons.log4j2.marker.MediaCubeMarker; import user.commons.nosql.NoSQLUtils; import user.jobengine.db.IItemManager; import user.jobengine.db.MediaFile; @@ -77,8 +77,8 @@ public class HSMMigrateStep extends JobStep { } catch (Exception e) { logger.error("PlanAir metadata error", e); - //nem latja a drivert pl. - //throw e; + // nem latja a drivert pl. + // throw e; } if (result == null) { @@ -99,8 +99,8 @@ public class HSMMigrateStep extends JobStep { @StepEntry public Object[] execute(String sourceLocation, String targetLocation) throws Exception { marker = getJobRuntime().getSessionMarker(); - //remove from prod - //cleanupHistory(); + // remove from prod + // cleanupHistory(); hsmProvider = getMetadataProvider(MetadataProviderType.HSM); if (hsmProvider == null) throw new NullPointerException("No HSM metadata provider available"); @@ -146,7 +146,7 @@ public class HSMMigrateStep extends JobStep { if (getJobRuntime().isWaitingCancel()) { logger.info("Job canceled by user"); - //ne mentsuk a szalagot meg + // ne mentsuk a szalagot meg return null; } @@ -162,7 +162,7 @@ public class HSMMigrateStep extends JobStep { }, subject); } - //ha mar sikerult valamit archivalni kilepunk + // ha mar sikerult valamit archivalni kilepunk if (oneSuccess) break; } @@ -210,7 +210,7 @@ public class HSMMigrateStep extends JobStep { return null; } - //true if need copy + // true if need copy public boolean prepareCopy(String hsmFileName, Path source, Path target) throws IOException { boolean result = true; BasicDBObject excludeResult = queryExclude(hsmFileName); @@ -227,13 +227,14 @@ public class HSMMigrateStep extends JobStep { return false; } - // BasicDBObject historyResult = queryFileHistory(contentFileName); - // if (historyResult != null) - // return false; + // BasicDBObject historyResult = queryFileHistory(contentFileName); + // if (historyResult != null) + // return false; - // if (!mediaFile.getName().toLowerCase().endsWith(MOVEXT.toLowerCase()) && !mediaFile.getName().toLowerCase().endsWith(MXFEXT.toLowerCase())) - // return; - // logger.info("Start copy from {} to {}", sourceFilePath, targetFilePath); + // if (!mediaFile.getName().toLowerCase().endsWith(MOVEXT.toLowerCase()) && + // !mediaFile.getName().toLowerCase().endsWith(MXFEXT.toLowerCase())) + // return; + // logger.info("Start copy from {} to {}", sourceFilePath, targetFilePath); boolean targetExists = targetFile.exists(); @@ -253,14 +254,16 @@ public class HSMMigrateStep extends JobStep { } if (targetExists) { - logger.warn(marker, "A fájl már létezik, a másolás folytatódik: {}, {} -> {}", target, sourceLength, targetLength); + logger.warn(marker, "A fájl már létezik, a másolás folytatódik: {}, {} -> {}", target, sourceLength, + targetLength); } else logger.warn(marker, "Migrálás: {}, {} -> {}", source, sourceLength, targetLength); return result; } - private boolean processHSMFile(String volumeName, String hsmFileName, Path sourceFilePath, Path targetFilePath) throws Exception { + private boolean processHSMFile(String volumeName, String hsmFileName, Path sourceFilePath, Path targetFilePath) + throws Exception { int repeat = 4; boolean successCopy = false; @@ -281,21 +284,24 @@ public class HSMMigrateStep extends JobStep { } catch (Exception e) { if (Files.exists(targetFilePath) && targetFilePath.toFile().length() == 0) Files.delete(targetFilePath); - //logger.warn(marker, "Hiba a másolás során: {} ({})", sourceFilePath, e.getMessage()); + // logger.warn(marker, "Hiba a másolás során: {} ({})", sourceFilePath, + // e.getMessage()); repeat--; } } } String metadataFileName = sourceFilePath.getFileName() + EscortFiles.DOT_JSON; - Path metadataPath = Paths.get(targetFilePath.getParent().toString(), EscortFiles.STATUSFOLDER, metadataFileName); + Path metadataPath = Paths.get(targetFilePath.getParent().toString(), EscortFiles.STATUSFOLDER, + metadataFileName); boolean createMetadata = Files.exists(targetFilePath) && !Files.exists(metadataPath); if (successCopy || createMetadata) { String metadata = null; try { metadata = createMetadata(volumeName, hsmFileName).toPrettyString(""); - EscortFiles.createMetadata(targetFilePath.getParent().toString(), targetFilePath.getFileName().toString(), metadata); - //saveFileHistory(contentFileName); + EscortFiles.createMetadata(targetFilePath.getParent().toString(), + targetFilePath.getFileName().toString(), metadata); + // saveFileHistory(contentFileName); } catch (Exception e) { logger.error(marker, "Metadata error", e); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/QueryMissingProxyMediaStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/QueryMissingProxyMediaStep.java index 56262737..94baec76 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/QueryMissingProxyMediaStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/QueryMissingProxyMediaStep.java @@ -7,7 +7,7 @@ import com.ibm.nosql.json.api.BasicDBObject; import com.ibm.nosql.json.api.DB; import com.ibm.nosql.json.api.DBCollection; -import user.commons.MediaCubeUndoMarker; +import user.commons.log4j2.marker.MediaCubeUndoMarker; import user.commons.nosql.NoSQLUtils; import user.jobengine.db.IItemManager; import user.jobengine.db.Media; @@ -36,17 +36,18 @@ public class QueryMissingProxyMediaStep extends JobStep { private Media getFirstUntranscodedMedia(DBCollection collection) { Media[] result = new Media[] { null }; - //MV + // MV 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"; - //HTV - //String query = "SELECT mediaid FROM VW_MISSING_PROXY_IDS"; + // HTV + // String query = "SELECT mediaid FROM VW_MISSING_PROXY_IDS"; IItemManager manager = getManager(); manager.executeQuery(query, rs -> { try { long mediaId = rs.getLong(1); Media media = manager.getMedia(mediaId); - //a nevgeneralas miatt az eredeti MediaFilesName nem jo, a pontos nev kell nekunk + // a nevgeneralas miatt az eredeti MediaFilesName nem jo, a pontos nev kell + // nekunk String name = media.getMediaFileRealName(); logger.info(getSessionMarker(), "Checking {}", name); long existing = collection.find(new BasicDBObject("name", name)).count(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ReportServerStatusStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ReportServerStatusStep.java index 3c0026b4..98798808 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ReportServerStatusStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ReportServerStatusStep.java @@ -12,7 +12,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import user.commons.JobStatus; -import user.commons.MediaCubeMarker; +import user.commons.log4j2.marker.MediaCubeMarker; import user.commons.strings.FileSizeUtils; import user.jobengine.server.IJobRuntime; @@ -33,18 +33,22 @@ public class ReportServerStatusStep extends JobStep { for (Long key : keys) { IJobRuntime runtime = jobs.get(key); if (JobStatus.SUSPENDED.equals(runtime.getStatus())) - sb.append(String.format("Felfüggesztve: %s %s %s %s %s
", df.format(runtime.getSubmitted()), df.format(runtime.getFinished()), - runtime.getStatus(), runtime.getRelated(), runtime.getDescription())); + sb.append(String.format("Felfüggesztve: %s %s %s %s %s
", df.format(runtime.getSubmitted()), + df.format(runtime.getFinished()), runtime.getStatus(), runtime.getRelated(), + runtime.getDescription())); } // sb.append("
"); - // float cpuTime = getCPUTime(); - // sb.append(String.format("Processzor használat: %.2f %%
", cpuTime == 0 ? cpuTime : cpuTime * 100 / 1000000000d)); + // float cpuTime = getCPUTime(); + // sb.append(String.format("Processzor használat: %.2f %%
", cpuTime == 0 ? + // cpuTime : cpuTime * 100 / 1000000000d)); sb.append("
"); - sb.append(String.format("Szabad JVM memória: %s
", FileSizeUtils.sizeAsString(Runtime.getRuntime().freeMemory()))); + sb.append(String.format("Szabad JVM memória: %s
", + FileSizeUtils.sizeAsString(Runtime.getRuntime().freeMemory()))); sb.append(String.format("Használt JVM memória: %s
", FileSizeUtils.sizeAsString(Runtime.getRuntime().maxMemory() - Runtime.getRuntime().freeMemory()))); - sb.append(String.format("Maximum JVM memória: %s
", FileSizeUtils.sizeAsString(Runtime.getRuntime().maxMemory()))); + sb.append(String.format("Maximum JVM memória: %s
", + FileSizeUtils.sizeAsString(Runtime.getRuntime().maxMemory()))); logger.info(marker, sb.toString()); return null; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ServerStatusReportStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ServerStatusReportStep.java index 787a07e8..5e582bdb 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ServerStatusReportStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ServerStatusReportStep.java @@ -8,7 +8,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import user.commons.JobStatus; -import user.commons.MediaCubeMarker; +import user.commons.log4j2.marker.MediaCubeMarker; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMSystemRestoreStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMSystemRestoreStep.java index fa8ab3fe..a3a90be3 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMSystemRestoreStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMSystemRestoreStep.java @@ -10,9 +10,9 @@ import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.message.Message; import user.commons.LogUtils; -import user.commons.MediaCubeMarker; import user.commons.RemoteFile; import user.commons.StoreUri; +import user.commons.log4j2.marker.MediaCubeMarker; import user.commons.remotestore.IProgressEventListener; import user.commons.remotestore.IStatusEventListener; import user.commons.remotestore.ProgressEvent; @@ -34,7 +34,8 @@ public class TSMSystemRestoreStep extends JobStep { private String sourceFileName; private Marker marker; - protected void afterRestore(StoreUri targetUri, String targetPath, int killDateDays, String targetFileName) throws IOException, Exception { + protected void afterRestore(StoreUri targetUri, String targetPath, int killDateDays, String targetFileName) + throws IOException, Exception { if (killDateDays > 0) EscortFiles.createUNCKillDate(targetPath, targetFileName, killDateDays, marker); } @@ -54,8 +55,8 @@ public class TSMSystemRestoreStep extends JobStep { } @StepEntry - public Object[] execute(Media mediaCubeMedia, String targetPath, String targetNamePattern, String successRecipient, int killDateDays, IJobEngine jobEngine, - IJobRuntime jobRuntime) throws Exception { + public Object[] execute(Media mediaCubeMedia, String targetPath, String targetNamePattern, String successRecipient, + int killDateDays, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception { marker = jobRuntime.getSessionMarker(); setAndCheck(mediaCubeMedia, targetPath, targetNamePattern, jobEngine); String targetFileName = String.format(targetNamePattern, sourceFileName); @@ -76,14 +77,16 @@ public class TSMSystemRestoreStep extends JobStep { }); RemoteFile result = sourceUri.transferFrom(targetUri, sourceFileName, targetFileName); - Message msg = LogUtils.format("Az '{}' állomány visszatöltése sikeres volt '{}' néven. ", sourceFileName, targetFileName); + Message msg = LogUtils.format("Az '{}' állomány visszatöltése sikeres volt '{}' néven. ", sourceFileName, + targetFileName); if (StringUtils.isNotBlank(successRecipient)) logger.info(new MediaCubeMarker(successRecipient), msg); logger.info(marker, msg); afterRestore(targetUri, targetPath, killDateDays, targetFileName); } catch (Exception e) { - Message msg = LogUtils.format("Az '{}' állomány visszatöltése sikertelen. A rendszer hibaüzenete: {}", sourceFileName, e.getMessage()); + Message msg = LogUtils.format("Az '{}' állomány visszatöltése sikertelen. A rendszer hibaüzenete: {}", + sourceFileName, e.getMessage()); logger.error(marker, msg); // logger.error(jobRuntime.marker, msg); logger.catching(e); @@ -116,12 +119,14 @@ public class TSMSystemRestoreStep extends JobStep { } if (mediaCubeMedia == null) { logger.error(marker, "A folyamat 'mediaCubeMedia' bemeneti paramétere üres."); - throw new NullPointerException("System is not configured properly, 'mediaCubeMedia' input parameter missing."); + throw new NullPointerException( + "System is not configured properly, 'mediaCubeMedia' input parameter missing."); } checkTargetPath(targetPath); if (StringUtils.isBlank(targetNamePattern)) { logger.error(marker, "A folyamat 'targetNamePattern' bemeneti paramétere üres."); - throw new NullPointerException("System is not configured properly, 'targetNamePattern' input parameter missing."); + throw new NullPointerException( + "System is not configured properly, 'targetNamePattern' input parameter missing."); } Store tsmStore = manager.getSystemStore(false); if (tsmStore == null) { diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/EscortFiles.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/EscortFiles.java index 2657f768..beb8ed03 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/EscortFiles.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/EscortFiles.java @@ -43,8 +43,8 @@ import com.ibm.nosql.json.api.BasicDBObject; import com.ibm.nosql.json.util.JSON; import user.commons.CalendarUtils; -import user.commons.MediaCubeMarker; import user.commons.StoreUri; +import user.commons.log4j2.marker.MediaCubeMarker; import user.commons.remotestore.FtpDirectoryLister; public class EscortFiles { diff --git a/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF index d70a3524..7f2eb3dc 100644 --- a/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF +++ b/server/user.jobengine.osgi.commons/META-INF/MANIFEST.MF @@ -15,8 +15,8 @@ Import-Package: com.fasterxml.jackson.annotation;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.apache.logging.log4j, + org.apache.logging.log4j.message, org.jboss.resteasy.client.jaxrs, org.jboss.resteasy.plugins.providers, org.jboss.resteasy.spi, diff --git a/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeFinishMarker.java b/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeFinishMarker.java deleted file mode 100644 index d1c35c4a..00000000 --- a/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeFinishMarker.java +++ /dev/null @@ -1,20 +0,0 @@ -package user.commons; - -@SuppressWarnings("serial") -public class MediaCubeFinishMarker extends MediaCubeMarker { - - public MediaCubeFinishMarker(MediaCubeMarker parent) { - setSessionID(parent.getSessionID()); - setSessionName(parent.getSessionName()); - setTo(parent.getTo()); - setUseSessionLog(parent.isUseSessionLog()); - setParents(parent); - } - - public MediaCubeFinishMarker(MediaCubeMarker parent, String to) { - super(to); - setSessionID(parent.getSessionID()); - setSessionName(parent.getSessionName()); - setParents(parent); - } -} diff --git a/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeMarker.java b/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeMarker.java deleted file mode 100644 index 0a1d0e3f..00000000 --- a/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeMarker.java +++ /dev/null @@ -1,78 +0,0 @@ -package user.commons; - -import org.apache.logging.log4j.MarkerManager.Log4jMarker; - -@SuppressWarnings("serial") -public class MediaCubeMarker extends Log4jMarker { - private static final String MEDIACUBE = "MEDIACUBE"; - private String to; - private String subject; - private String sessionID; - private String sessionName; - private boolean useSessionLog; - - public MediaCubeMarker() { - super(MEDIACUBE); - } - - public MediaCubeMarker(String to) { - super(MEDIACUBE); - this.to = to; - } - - public MediaCubeMarker(String to, String subject) { - super(MEDIACUBE); - this.to = to; - this.subject = subject; - } - - public String getSessionID() { - return sessionID; - } - - public String getSessionName() { - return sessionName; - } - - public String getSubject() { - return subject; - } - - public String getTo() { - return to; - } - - public boolean isUseSessionLog() { - return useSessionLog; - } - - public void setSessionID(String sessionID) { - this.sessionID = sessionID; - } - - public void setSessionName(String sessionName) { - this.sessionName = sessionName; - } - - public void setSubject(String subject) { - this.subject = subject; - } - - public void setTo(String to) { - this.to = to; - } - - public void setUseSessionLog(boolean useSessionLog) { - this.useSessionLog = useSessionLog; - } - - // @Override - // public boolean equals(Object o) { - // if (o == null || !o.getClass().equals(MediaCubeMarker.class)) - // return false; - // - // - // return true; - // } - -} diff --git a/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeUndoMarker.java b/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeUndoMarker.java deleted file mode 100644 index 1668503b..00000000 --- a/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeUndoMarker.java +++ /dev/null @@ -1,8 +0,0 @@ -package user.commons; - -@SuppressWarnings("serial") -public class MediaCubeUndoMarker extends MediaCubeMarker { - public MediaCubeUndoMarker(String sessionID) { - setSessionID(sessionID); - } -} diff --git a/server/user.jobengine.osgi.commons/src/user/commons/nexio/NexioDispatcher.java b/server/user.jobengine.osgi.commons/src/user/commons/nexio/NexioDispatcher.java index fa3871d3..c5a06f51 100644 --- a/server/user.jobengine.osgi.commons/src/user/commons/nexio/NexioDispatcher.java +++ b/server/user.jobengine.osgi.commons/src/user/commons/nexio/NexioDispatcher.java @@ -4,12 +4,12 @@ import java.util.Iterator; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.MarkerManager; import com.ibm.nosql.json.api.BasicDBObject; import com.ibm.nosql.json.api.DB; import com.ibm.nosql.json.api.DBCollection; -import user.commons.MediaCubeMarker; import user.commons.configuration.SystemConfiguration; import user.commons.nexio.api.Clip; import user.commons.nexio.api.ClipEvent; @@ -23,9 +23,11 @@ import user.commons.nexio.server.protocol.GetExtendedFieldCommand; import user.commons.nosql.NoSQLUtils; /** - * NexioWSServlet hozza letre. Indulaskor betolti a teljes nexio clip listat mongodb-be. Beregisztralja magat ClipEventListener-nek. Az erkezo esemenyekkel - * updateli a mongo adatbazist (es a memoriat is) Az erkezo esemenyekrol eldonti, hogy add, update, vagy delete esemeny volt e Az uj, atalakitott esemenyt - * tovabbkuldi a feliratkozoknak (NexioWSServlet) + * NexioWSServlet hozza letre. Indulaskor betolti a teljes nexio clip listat + * mongodb-be. Beregisztralja magat ClipEventListener-nek. Az erkezo + * esemenyekkel updateli a mongo adatbazist (es a memoriat is) Az erkezo + * esemenyekrol eldonti, hogy add, update, vagy delete esemeny volt e Az uj, + * atalakitott esemenyt tovabbkuldi a feliratkozoknak (NexioWSServlet) * * @author robi */ @@ -105,17 +107,17 @@ public class NexioDispatcher implements ClipEventListener { this.db = NoSQLUtils.getNoSQLDB(); - // Runtime.getRuntime().addShutdownHook(new Thread() { - // @Override - // public void run() { - // logger.info("SHUTDOWN!!!!!"); - // } - // }); + // Runtime.getRuntime().addShutdownHook(new Thread() { + // @Override + // public void run() { + // logger.info("SHUTDOWN!!!!!"); + // } + // }); } @Override public void clipEventPerformed(ClipEvent evt) { - //logger.info("ClipEvent {} {}", evt.getEventType(), evt.getClip()); + // logger.info("ClipEvent {} {}", evt.getEventType(), evt.getClip()); if (disabled) return; try { @@ -134,8 +136,9 @@ public class NexioDispatcher implements ClipEventListener { jsClip.put(ID, evt.getClip().getId().get()); removeDeleted(jsClip); } else if (evt.getEventType() == ClipEventType.LISTENER_RESTART_NEEDED) { - logger.info(new MediaCubeMarker(), "In progress {}", isRestartInProgress()); - logger.info(new MediaCubeMarker(), "A kommunikácó a NEXIO eszközzel megszakadt. A szinkronizáció újraindítása szükséges."); + logger.info(MarkerManager.getMarker("MEDIACUBE"), "In progress {}", isRestartInProgress()); + logger.info(MarkerManager.getMarker("MEDIACUBE"), + "A kommunikácó a NEXIO eszközzel megszakadt. A szinkronizáció újraindítása szükséges."); } } catch (Exception e) { logger.catching(e); @@ -146,54 +149,56 @@ public class NexioDispatcher implements ClipEventListener { BasicDBObject jsClip = new BasicDBObject(); try { String xid = clip.getId().get(); - jsClip.put(ID, xid); //Unique internal ID + jsClip.put(ID, xid); // Unique internal ID } catch (Exception e) { - // System.out.println(e); + // System.out.println(e); } try { String xid = clip.getXid().get(); - jsClip.put(LONGNAMEID, xid); //Extended ID (Filename) + jsClip.put(LONGNAMEID, xid); // Extended ID (Filename) } catch (Exception e) { - // System.out.println(e); + // System.out.println(e); } try { jsClip.put(DURATION, clip.getDuration()); } catch (Exception e) { - // System.out.println(e); + // System.out.println(e); } try { jsClip.put(MODIFIEDTIMESTAMP, clip.getModifiedTimestamp().getTime()); } catch (Exception e) { - // System.out.println(e); + // System.out.println(e); } try { jsClip.put(RECORDDATE, clip.getRecordDateTimestamp().getTime()); } catch (Exception e) { - // System.out.println(e); + // System.out.println(e); } try { jsClip.put(KILLDATE, clip.getKillDate().getTime()); } catch (Exception e) { - // System.out.println(e); + // System.out.println(e); } try { jsClip.put(VIDEO_FORMAT, clip.getVideoFormat()); } catch (Exception e) { - // System.out.println(e); + // System.out.println(e); } try { jsClip.put(VIDEO_BITRATE, clip.getVideoBitrate()); } catch (Exception e) { - // System.out.println(e); + // System.out.println(e); } try { String agency = new String(clip.getExtendedField(GetExtendedFieldCommand.FN_AGENCY), INexioAPI.ENCODING); jsClip.put(EXTAGENCY, agency); } catch (Exception e) { - // System.out.println(e); + // System.out.println(e); } - //System.out.println(String.format("ID = '%s'\tXID = '%s'\tDuration = '%s'\tModified = '%s'\tVideoFormat = '%s'\tVideoBitrate = '%s'", id, xid, duration, modifiedTimestamp.getTime(), videoFormat, videoBitrate)); + // System.out.println(String.format("ID = '%s'\tXID = '%s'\tDuration = + // '%s'\tModified = '%s'\tVideoFormat = '%s'\tVideoBitrate = '%s'", id, xid, + // duration, modifiedTimestamp.getTime(), videoFormat, videoBitrate)); return jsClip; } @@ -204,7 +209,7 @@ public class NexioDispatcher implements ClipEventListener { */ private void copyClipsIntoMongo() throws Exception { logger.info("Starting initial NEXIO metadata import."); - // Map emptyMap = new HashMap(); + // Map emptyMap = new HashMap(); Iterator clips = controller.getMediabase().getClips(); while (clips.hasNext()) { Clip clip = null; @@ -222,7 +227,7 @@ public class NexioDispatcher implements ClipEventListener { } } catch (Exception e) { logger.error(e.getMessage()); - //logger.catching(e); + // logger.catching(e); } } logger.info("NEXIO metadata import completed."); @@ -232,7 +237,7 @@ public class NexioDispatcher implements ClipEventListener { db.getCollection(CLIP_COLLECTION_NAME).drop(); } - //create mongo index on longnameid + // create mongo index on longnameid private void ensureIndexes() { DBCollection collection = db.getCollection(CLIP_COLLECTION_NAME); if (collection.count() == 0) @@ -262,7 +267,7 @@ public class NexioDispatcher implements ClipEventListener { mediaListener.startListener(); setRestartInProgress(false); - logger.info(new MediaCubeMarker(), "Thread progress {}", isRestartInProgress()); + logger.info(MarkerManager.getMarker("MEDIACUBE"), "Thread progress {}", isRestartInProgress()); } catch (Exception e) { logger.catching(e); @@ -278,15 +283,16 @@ public class NexioDispatcher implements ClipEventListener { } /* - Nem foglalkozunk a clippel ha: - C8 84 Get Special ID Attributes - REQ: C8 84 + 8-byte(ID), - RESP: D284 MASK(2 byte, unsigned int, MSB first) vagy D0 84 if no matching ID handle is found - 0x0200 Not Ready to Play Indicates the first audio buffer of the media has not yet been written to disk. A controller should wait to load and play any clips with this attribute set. - 0x0400 Not Ready to Transfer Indicates the ID is currently in record or being written to disk - 0x0800 Not Ready to Archive Indicates the ID is currently in record or being written to disk - 0x1000 Transfer in Progress Indicates the ID is currently being transferred or imported into the system - */ + * Nem foglalkozunk a clippel ha: C8 84 Get Special ID Attributes REQ: C8 84 + + * 8-byte(ID), RESP: D284 MASK(2 byte, unsigned int, MSB first) vagy D0 84 if no + * matching ID handle is found 0x0200 Not Ready to Play Indicates the first + * audio buffer of the media has not yet been written to disk. A controller + * should wait to load and play any clips with this attribute set. 0x0400 Not + * Ready to Transfer Indicates the ID is currently in record or being written to + * disk 0x0800 Not Ready to Archive Indicates the ID is currently in record or + * being written to disk 0x1000 Transfer in Progress Indicates the ID is + * currently being transferred or imported into the system + */ private boolean isValidClip(Clip clip) throws Exception { boolean ret = false; try { @@ -300,7 +306,7 @@ public class NexioDispatcher implements ClipEventListener { int c = connection.read(buffer, 0, 2); if (c == 2) { int mask = ((buffer[0] << 8) & 0xFF00) | (buffer[1] & 0x00FF); - if ((mask & 0x1E00) == 0) { //0x0200 + 0x0400 + 0x0800 + 0x1000 + if ((mask & 0x1E00) == 0) { // 0x0200 + 0x0400 + 0x0800 + 0x1000 ret = true; } @@ -311,20 +317,17 @@ public class NexioDispatcher implements ClipEventListener { } /* - - int c = connection.read(buffer, 0, 2); - //2 bytes hosszan az idokozben hozzaadott id-k szamossaga - if (c < 2) { - throw new ProtocolException("c, 2, 2"); - } - //MSB, LSB - - return nofIds; - */ + * + * int c = connection.read(buffer, 0, 2); //2 bytes hosszan az idokozben + * hozzaadott id-k szamossaga if (c < 2) { throw new + * ProtocolException("c, 2, 2"); } //MSB, LSB + * + * return nofIds; + */ return ret; } - //dispatch events to NexioWSServlet + // dispatch events to NexioWSServlet public void onCreate(BasicDBObject data) { logger.debug("onCreate clip: " + data); if (nexioChangeListener != null) @@ -373,7 +376,7 @@ public class NexioDispatcher implements ClipEventListener { BasicDBObject clipForName = (BasicDBObject) collection.findOne(new BasicDBObject(LONGNAMEID, xid)); BasicDBObject clipForID = (BasicDBObject) collection.findOne(new BasicDBObject(ID, id)); - //rename-nel a clipForName null lesz de a clipForID nem ezert nem kell create + // rename-nel a clipForName null lesz de a clipForID nem ezert nem kell create if (clipForName == null && clipForID == null) { collection.save(clip); if (!isRestartInProgress()) diff --git a/server/user.jobengine.osgi.commons/test/user/commons/TestMediaCubeMarker.java b/server/user.jobengine.osgi.commons/test/user/commons/TestMediaCubeMarker.java deleted file mode 100644 index f8b863d5..00000000 --- a/server/user.jobengine.osgi.commons/test/user/commons/TestMediaCubeMarker.java +++ /dev/null @@ -1,13 +0,0 @@ -package user.commons; - -import org.apache.logging.log4j.Marker; -import org.junit.Test; - -public class TestMediaCubeMarker { - @Test - public void test() throws Exception { - MediaCubeMarker sut = new MediaCubeMarker("valami"); - Marker[] parents = sut.getParents(); - } - -} diff --git a/server/user.jobengine.osgi.db/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.db/META-INF/MANIFEST.MF index df46620f..74b2c8a0 100644 --- a/server/user.jobengine.osgi.db/META-INF/MANIFEST.MF +++ b/server/user.jobengine.osgi.db/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Import-Package: com.fasterxml.jackson.annotation;version="2.4.5", javax.ws.rs.client, javax.ws.rs.core, org.apache.commons.io;version="2.2.0", - org.apache.logging.log4j;version="2.8.2", + org.apache.logging.log4j, sqlj.runtime.ref Export-Package: user.jobengine.db, user.jobengine.search diff --git a/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF index 60485d47..911fcd09 100644 --- a/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF +++ b/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF @@ -15,8 +15,8 @@ Import-Package: com.fasterxml.jackson.databind;version="2.4.5", javax.ws.rs.core, org.apache.commons.io;version="2.2.0", org.apache.commons.io.output;version="2.2.0", - org.apache.logging.log4j;version="2.8.2", - org.apache.logging.log4j.message;version="2.8.2", + org.apache.logging.log4j, + org.apache.logging.log4j.message, org.codehaus.groovy.ast;version="3.0.3", org.codehaus.groovy.classgen;version="3.0.3", org.codehaus.groovy.control;version="3.0.3", @@ -30,8 +30,8 @@ Import-Package: com.fasterxml.jackson.databind;version="2.4.5", org.osgi.framework;version="1.5.0", org.osgi.framework.wiring;version="1.2.0", org.osgi.util.tracker;version="1.4.0", - org.slf4j;version="1.6.3", - sqlj.runtime.ref + sqlj.runtime.ref, + user.commons.log4j2.marker 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", diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java index 9296a950..f4c2e263 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java @@ -30,9 +30,9 @@ import user.commons.IEntityPersister; import user.commons.IJob; import user.commons.Job; import user.commons.JobStatus; -import user.commons.MediaCubeFinishMarker; -import user.commons.MediaCubeMarker; import user.commons.cluster.ClusteredJob; +import user.commons.log4j2.marker.MediaCubeFinishMarker; +import user.commons.log4j2.marker.MediaCubeMarker; import user.jobengine.db.ItemManager; import user.jobengine.db.ItemManagerData.SignalType; import user.jobengine.db.JobParameters; diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/JobStep.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/JobStep.java index fa9cfebe..6969d991 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/JobStep.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/JobStep.java @@ -20,7 +20,7 @@ import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; import user.commons.IEntityPersister; -import user.commons.MediaCubeMarker; +import user.commons.log4j2.marker.MediaCubeMarker; import user.jobengine.db.IItemManager; import user.jobengine.server.IJobEngine; import user.jobengine.server.IJobRuntime; diff --git a/server/user.jobengine.osgi.services/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.services/META-INF/MANIFEST.MF index 6da52cf8..9e513b25 100644 --- a/server/user.jobengine.osgi.services/META-INF/MANIFEST.MF +++ b/server/user.jobengine.osgi.services/META-INF/MANIFEST.MF @@ -26,7 +26,7 @@ Import-Package: com.fasterxml.jackson.annotation;version="2.4.5", javax.ws.rs.core;version="2.0.1", javax.ws.rs.ext;version="2.0.1", org.apache.ibatis.jdbc;version="3.5.2", - org.apache.logging.log4j;version="2.8.2", + org.apache.logging.log4j, org.eclipse.core.runtime.adaptor, org.eclipse.jetty.util;version="9.3.9", org.eclipse.jetty.websocket.api;version="9.3.9", @@ -38,6 +38,7 @@ Import-Package: com.fasterxml.jackson.annotation;version="2.4.5", user.commons, user.commons.cluster, user.commons.configuration, + user.commons.log4j2.marker, user.commons.nexio, user.commons.octopus, user.commons.rest, 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 c81e7a6f..c2040d8f 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 @@ -22,7 +22,7 @@ import com.ibm.nosql.json.api.BasicDBObject; import com.ibm.nosql.json.util.JSON; import user.commons.Job; -import user.commons.MediaCubeMarker; +import user.commons.log4j2.marker.MediaCubeMarker; import user.jobengine.db.IItemManager; import user.jobengine.db.IResultSetConsumer; import user.jobengine.db.IStatementDecorator; diff --git a/server/user.mediacube.gui/META-INF/MANIFEST.MF b/server/user.mediacube.gui/META-INF/MANIFEST.MF index 737fd8cd..13717227 100644 --- a/server/user.mediacube.gui/META-INF/MANIFEST.MF +++ b/server/user.mediacube.gui/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Web-ContextPath: / 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.apache.logging.log4j, org.junit, org.osgi.framework;version="1.8.0", org.osgi.util.tracker;version="1.5.1", diff --git a/server/user.mediacube.metadata/META-INF/MANIFEST.MF b/server/user.mediacube.metadata/META-INF/MANIFEST.MF index 7528b42c..e8f4966f 100644 --- a/server/user.mediacube.metadata/META-INF/MANIFEST.MF +++ b/server/user.mediacube.metadata/META-INF/MANIFEST.MF @@ -18,8 +18,8 @@ Require-Bundle: org.mybatis.mybatis;bundle-version="3.5.2", Bundle-ActivationPolicy: lazy Import-Package: com.ibm.nosql.bson, com.ibm.nosql.json.api, - org.apache.logging.log4j;version="2.8.2", - org.apache.logging.log4j.core;version="2.8.2", + org.apache.logging.log4j, + org.apache.logging.log4j.core, org.hamcrest, org.junit, user.mediacube.metadata.interfaces