git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorvasary.daniel <TFS\vasary.daniel>
Tue, 20 Apr 2021 14:22:59 +0000 (14:22 +0000)
committervasary.daniel <TFS\vasary.daniel>
Tue, 20 Apr 2021 14:22:59 +0000 (14:22 +0000)
187 files changed:
server/-product/production/AMC/configuration/config.ini
server/-product/production/AMC/jobs/steps/FileSearchFilterOptions.java [new file with mode: 0644]
server/-product/production/AMC/jobs/steps/PathItemsCollectorStep.java [new file with mode: 0644]
server/-product/production/AMC/jobs/steps/RundownFilesCollectorStep.java [new file with mode: 0644]
server/-product/production/AMC/jobs/templates/sync-subtitles.xml [new file with mode: 0644]
server/-product/production/HIRTV/configuration/config.ini
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ArchiveListBuilderStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ArchiveListBuilderStep2.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ArchiveMaterialSubmitStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ArchiveRecursive.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/AttachLowresStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/BatchRetrieveForkStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CancelableStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CheckLOWRESIntegrity.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CheckMORPHEUSMissingMaterialsStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CheckTRAFFICMissingMaterialsStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CleanupMountedLocationStep$1.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CleanupMountedLocationStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/Cmd$IResponseCallback.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/Cmd.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CreateArchiveItemStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CreateMissingLowresStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DeleteFileStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DeleteNEXIOMaterialsStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DetectMissingLengthStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DirMXFValidatorStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DownloadRecordingFromNexioStep$1.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DownloadRecordingFromNexioStep$2.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DownloadRecordingFromNexioStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DuplicateRemoverStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/EscortFiles.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FFMpeg$IProgressChanged.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FFMpeg.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FILEZILLA_AVIDTransferToStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FILEZILLA_PASARESTORETransferToStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FakeSpawnStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FakeStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FileCleanupStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FileCopyStep$1.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FileCopyStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FileValidatorStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ForkDownloadStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ForkUploadStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/GenerateMorpheusMetadataStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/GenericArchiveCheckerStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/HLSProxyStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/HSMMigrateStep$1.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/HSMMigrateStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/HarrisMissingMaterialCheckerStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ImportMORPHEUSMissingMaterialsStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ImportStatisticsStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ItemManagerExtensions.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MVCancelableStep$1.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MVCancelableStep$2.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MVCancelableStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MXFCutterStep$1.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MXFCutterStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MediaToolStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MergeStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MetadataPersisterStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MetadataTransformStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MetadataType.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MetadataTypeDetector.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIO1TransferFromStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIO1TransferToStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIO2TransferFromStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIO2TransferToStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIOArchiveCheckerStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIOMetadataPersisterStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/OctopusDataMiner.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/OctopusDataMinerStable.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/OutputPathAndNameSelectorStep$1.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/OutputPathAndNameSelectorStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PASAPOOLTransferToStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PBQuery$MMMedia.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PBQuery.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PlanAirExtensions.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ProjectCleanupMountedLocationStep$1.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ProjectCleanupMountedLocationStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/RecordingsArchiveItemBuilderStep$1.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/RecordingsArchiveItemBuilderStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/RegisterUserRestoreStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/RegisterVODRestoreStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SubmitChildStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SubmitDownloadStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SyncOCTOPUSDataStep$1.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SyncOCTOPUSDataStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SyncSubtitlesStep$1.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SyncSubtitlesStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMBackupStep$1.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMBackupStep$2.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMBackupStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMExtendedRetrieveStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMRestoreStep$1.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMRestoreStep$2.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMRestoreStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMRetrieveMissingMaterialStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSimpleRestoreStep$1.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSimpleRestoreStep$2.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSimpleRestoreStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSystemRestoreStep$1.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSystemRestoreStep$2.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSystemRestoreStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMTransferFromStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMTransferToStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMWriterStep$1.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMWriterStep$2.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMWriterStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TestForkCancelableStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TranscodeFFAStranStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TranscodeSELENIOStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TranscodeStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TransferFromFTPStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TransferFromTSMStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TransferStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TransferToFTPStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/UpdateGhostMediaDataStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/UploadRecordingToNexioStep$1.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/UploadRecordingToNexioStep$2.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/UploadRecordingToNexioStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/VODTransferToStep.class [new file with mode: 0644]
server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/WorkerKeepAliveStep.class [new file with mode: 0644]
server/-product/production/HIRTV/settings/jetty/jetty-http.xml [new file with mode: 0644]
server/-product/production/HIRTV/settings/jetty/jetty-https.xml [new file with mode: 0644]
server/-product/production/HIRTV/settings/jetty/jetty-ssl-context.xml [new file with mode: 0644]
server/-product/production/HIRTV/settings/jetty/jetty-ssl.xml [new file with mode: 0644]
server/-product/production/HIRTV/settings/jetty/jetty.xml [new file with mode: 0644]
server/-product/production/HIRTV/settings/jetty/mediacube.jks [new file with mode: 0644]
server/-product/production/LOCAL/settings/application.yaml
server/-product/production/MEDIAVIVANTIS/configuration/config.ini
server/user.jobengine.executors/amc/user/jobengine/server/steps/PathItemsCollectorStep.java
server/user.jobengine.executors/amc/user/jobengine/server/steps/RundownFilesCollectorStep.java [new file with mode: 0644]
server/user.jobengine.executors/src/user/jobengine/server/steps/OctopusDataMiner.java
server/user.jobengine.osgi.db/build-remote-sqlj.bat
server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO.java [deleted file]
server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/FileTypeDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO.java [deleted file]
server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemIter.java [deleted file]
server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemTypeDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO.java [deleted file]
server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO.java
server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO.java [deleted file]
server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataTypeDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/SearchDefinitionDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO.java [deleted file]
server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO.java [deleted file]
server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser
server/user.jobengine.osgi.db/migrations/scripts/031_add_creation_date_media.sql [new file with mode: 0644]
server/user.jobengine.osgi.db/migrations/scripts/032_add_creation_date_trigger.sql [new file with mode: 0644]
server/user.jobengine.osgi.db/migrations/scripts/033_init_creation_date.sql [new file with mode: 0644]
server/user.jobengine.osgi.db/src/user/jobengine/db/Media.java
server/user.jobengine.osgi.db/src/user/jobengine/db/MediaDAO.sqlj
server/user.jobengine.osgi.db/src/user/jobengine/search/MediaFinder.java
server/user.jobengine.osgi.services/WEB-INF/web.xml
server/user.mediacube.gui/WEB-INF/web.xml
server/user.mediacube.gui/pages/menu.zul
server/user.mediacube.gui/pages/metadatadetails.zul
server/user.mediacube.gui/pages/searchitems/details.zul
server/user.mediacube.gui/pages/searchitems/results.zul
server/user.mediacube.gui/resources/i3-label_hu.properties
server/user.mediacube.gui/src/user/jobengine/zk/model/MenuModel.java
server/user.mediacube.gui/src/user/jobengine/zk/model/SearchModel.java

index 265bf754a360cae19b62a363c9e32b5ec0a32010..702342e6cd59f34fe1fa01adde553dc64164165e 100644 (file)
@@ -1,5 +1,5 @@
 #This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser\r
-#Thu Mar 11 15:00:06 CET 2021\r
+#Sun Apr 18 21:25:34 CEST 2021\r
 osgi.bundles=reference\:file\:cglib_2.2.2.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-annotations_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-core_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-databind_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.dataformat.jackson-dataformat-yaml_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.datatype.jackson-datatype-joda_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-base_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.module.jackson-module-jaxb-annotations_2.4.5.jar@4,reference\:file\:com.ibm.db2.jcc_1.4.0.jar@4,reference\:file\:com.ibm.nosql_4.19.26.jar@4,reference\:file\:com.microsoft.sqlserver.sqljdbc_6.0.8112.100.jar@4,reference\:file\:com.sun.jna_4.2.0.jar@4,reference\:file\:groovy_3.0.3.jar@4,reference\:file\:io.humble.video-arch-x86_64-pc-linux-gnu6_0.2.1.jar@4,reference\:file\:io.humble.video-arch-x86_64-w64-mingw32_0.2.1.jar@4,reference\:file\:io.humble.video-noarch_0.2.1.jar@4,reference\:file\:javax.annotation-api_1.2.0.jar@4,reference\:file\:javax.mail_1.5.0.b01.jar@4,reference\:file\:javax.servlet-api_3.1.0.jar@4,reference\:file\:javax.ws.rs-api_2.0.1.jar@4,reference\:file\:jcifs_1.3.17.jar@4,reference\:file\:joda-time_2.2.0.jar@4,reference\:file\:junit_4.12.0.jar@4,reference\:file\:org.apache.aries.spifly.dynamic.bundle_1.0.8.jar@4,reference\:file\:org.apache.aries.util_1.0.0.jar@4,reference\:file\:org.apache.commons.beanutils_1.8.3.jar@4,reference\:file\:org.apache.commons.collections_3.2.2.jar@4,reference\:file\:org.apache.commons.digester_3.2.0.jar@4,reference\:file\:org.apache.commons.io_2.6.0.jar@4,reference\:file\:org.apache.commons.lang_2.6.0.jar@4,reference\:file\:org.apache.commons.net_3.6.0.jar@4,reference\:file\:org.apache.felix.gogo.command_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.runtime_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.shell_0.12.0.jar@4,reference\:file\:org.apache.httpcomponents.httpclient_4.2.6.jar@4,reference\:file\:org.apache.httpcomponents.httpcore_4.2.5.jar@4,reference\:file\:org.apache.logging.log4j.api_2.8.2.jar@1\:start,reference\:file\:org.apache.logging.log4j.core_2.8.2.jar@4,reference\:file\:org.apache.logging.log4j.slf4j-impl_2.8.2.jar@4,reference\:file\:org.apache.servicemix.bundles.quartz_2.3.0.2.jar@4,reference\:file\:org.eclipse.equinox.common_3.8.0.v20160509-1230.jar@2\:start,reference\:file\:org.eclipse.equinox.console_1.1.200.v20150929-1405.jar@4,reference\:file\:org.eclipse.equinox.ds_1.4.400.v20160226-2036.jar@1\:start,reference\:file\:org.eclipse.equinox.launcher_1.3.201.v20161025-1711.jar@4,reference\:file\:org.eclipse.equinox.util_1.0.500.v20130404-1337.jar@4,reference\:file\:org.eclipse.jetty.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.deploy_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.http_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.io_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.osgi.boot_9.3.9.v20160517.jar@4\:start,reference\:file\:org.eclipse.jetty.schemas_3.1.0.jar@4,reference\:file\:org.eclipse.jetty.security_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.util_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.webapp_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.api_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.common_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.xml_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.osgi.services_3.2.100.v20100503.jar@4,reference\:file\:org.hamcrest.core_1.3.0.jar@4,reference\:file\:org.jboss.resteasy.client_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxb-provider_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs-api_3.0.11.Final.jar@4,reference\:file\:org.jmock_2.6.0.jar@4,reference\:file\:org.jmock.junit4_2.6.0.jar@4,reference\:file\:org.mybatis.mybatis_3.5.2.jar@4,reference\:file\:org.objectweb.asm_5.0.1.jar@4,reference\:file\:org.objectweb.asm.commons_5.0.1.jar@4,reference\:file\:org.objectweb.asm.tree_5.0.1.jar@4,reference\:file\:org.omnifaces_3.4.1.jar@4,reference\:file\:slf4j.api_1.7.24.jar@4,reference\:file\:slf4j.simple_1.7.2.jar@4,reference\:file\:user.commons.log4j2_1.0.0.jar@4,reference\:file\:user.commons.zk_8.0.3.jar@4,reference\:file\:user.jobengine.osgi.commons_1.0.0.jar@4\:start,reference\:file\:user.jobengine.osgi.db_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.server_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.services_1.0.0.jar@4,reference\:file\:user.mediacube.gui_1.0.0.jar@4,reference\:file\:user.mediacube.metadata_1.0.0.jar@4,reference\:file\:user.tsm.client_1.2.0.jar@4\r
 equinox.use.ds=true\r
 osgi.bundles.defaultStartLevel=4\r
diff --git a/server/-product/production/AMC/jobs/steps/FileSearchFilterOptions.java b/server/-product/production/AMC/jobs/steps/FileSearchFilterOptions.java
new file mode 100644 (file)
index 0000000..436c3be
--- /dev/null
@@ -0,0 +1,41 @@
+package user.jobengine.server.steps;\r
+\r
+import java.nio.file.Path;\r
+import java.util.regex.Matcher;\r
+import java.util.regex.Pattern;\r
+\r
+import com.ibm.nosql.json.api.BasicDBObject;\r
+\r
+public class FileSearchFilterOptions {\r
+\r
+       private BasicDBObject filter;\r
+\r
+       public FileSearchFilterOptions(BasicDBObject filter) {\r
+               this.filter = filter;\r
+       }\r
+\r
+       public boolean acceptFile(Path file) {\r
+               if (filter == null)\r
+                       return true;\r
+\r
+               if (filter.containsKey("fileName")) {\r
+                       //.*\.(sh|ini|conf|vhost|xml|php)$\r
+                       String fileNamePattern = filter.getString("fileName");\r
+                       if (fileNamePattern == null || fileNamePattern.trim().length() == 0)\r
+                               return true;\r
+\r
+                       Pattern pattern = Pattern.compile(fileNamePattern, Pattern.CASE_INSENSITIVE);\r
+\r
+                       Matcher matcher = pattern.matcher(file.getFileName().toString());\r
+                       if (matcher.find())\r
+                               return true;\r
+\r
+               }\r
+\r
+               return false;\r
+       }\r
+\r
+       public boolean preAcceptDirectory(Path file) {\r
+               return true;\r
+       }\r
+}\r
diff --git a/server/-product/production/AMC/jobs/steps/PathItemsCollectorStep.java b/server/-product/production/AMC/jobs/steps/PathItemsCollectorStep.java
new file mode 100644 (file)
index 0000000..725bca4
--- /dev/null
@@ -0,0 +1,73 @@
+package user.jobengine.server.steps;\r
+\r
+import java.io.IOException;\r
+import java.nio.file.FileVisitResult;\r
+import java.nio.file.FileVisitor;\r
+import java.nio.file.Files;\r
+import java.nio.file.Path;\r
+import java.nio.file.Paths;\r
+import java.nio.file.SimpleFileVisitor;\r
+import java.nio.file.attribute.BasicFileAttributes;\r
+import java.util.ArrayList;\r
+import java.util.List;\r
+\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
+\r
+import com.ibm.nosql.json.api.BasicDBObject;\r
+\r
+/* DO NOT REMOVE!\r
+import user.jobengine.server.steps.FileSearchFilterOptions;\r
+*/\r
+public class PathItemsCollectorStep extends JobStep {\r
+       private static final Logger logger = LogManager.getLogger();\r
+\r
+       protected FileSearchFilterOptions createFileFilter(BasicDBObject filter) {\r
+               return new FileSearchFilterOptions(filter);\r
+       }\r
+\r
+       @StepEntry\r
+       public Object[] execute(String sourceFolder, BasicDBObject filter) throws Exception {\r
+               Path sourcePath = Paths.get(sourceFolder);\r
+\r
+               List<String> files = new ArrayList<>();\r
+\r
+               //teljes rekurzivitas szuressel\r
+               FileSearchFilterOptions filterOptions = createFileFilter(filter);\r
+               FileVisitor<Path> visitor = new SimpleFileVisitor<Path>() {\r
+                       @Override\r
+                       public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {\r
+                               if (!filterOptions.preAcceptDirectory(dir))\r
+                                       return FileVisitResult.SKIP_SUBTREE;\r
+                               return FileVisitResult.CONTINUE;\r
+                       }\r
+\r
+                       @Override\r
+                       public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {\r
+                               if (filterOptions.acceptFile(file))\r
+                                       files.add(file.toString());\r
+                               logger.info(file);\r
+                               return FileVisitResult.CONTINUE;\r
+                       }\r
+\r
+                       @Override\r
+                       public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {\r
+                               return FileVisitResult.CONTINUE;\r
+                       }\r
+\r
+               };\r
+\r
+               try {\r
+                       Files.walkFileTree(sourcePath, visitor);\r
+               } catch (Exception e) {\r
+                       logger.error(getSessionMarker(), "Hiba a '{}' mappa feldolgozásában. A rendszer hibaüzenete: {}", sourcePath, e.getMessage());\r
+                       logger.catching(e);\r
+                       throw e;\r
+               } finally {\r
+               }\r
+\r
+               logger.info("Found {} files", files.size());\r
+\r
+               return new Object[] { files };\r
+       }\r
+}\r
diff --git a/server/-product/production/AMC/jobs/steps/RundownFilesCollectorStep.java b/server/-product/production/AMC/jobs/steps/RundownFilesCollectorStep.java
new file mode 100644 (file)
index 0000000..8b104d9
--- /dev/null
@@ -0,0 +1,42 @@
+package user.jobengine.server.steps;\r
+\r
+import java.nio.file.Path;\r
+import java.text.SimpleDateFormat;\r
+import java.util.Calendar;\r
+\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
+\r
+import com.ibm.nosql.json.api.BasicDBObject;\r
+\r
+/* DO NOT REMOVE!\r
+import user.jobengine.server.steps.FileSearchFilterOptions;\r
+*/\r
+public class RundownFilesCollectorStep extends PathItemsCollectorStep {\r
+       private static final Logger logger = LogManager.getLogger();\r
+\r
+       @Override\r
+       protected FileSearchFilterOptions createFileFilter(BasicDBObject filter) {\r
+               SimpleDateFormat df = new SimpleDateFormat("yyyy/MM");\r
+               Calendar thisMonthCal = Calendar.getInstance();\r
+               Calendar nextMonthCal = Calendar.getInstance();\r
+               nextMonthCal.add(Calendar.MONTH, 1);\r
+\r
+               FileSearchFilterOptions result = new FileSearchFilterOptions(filter) {\r
+                       @Override\r
+                       public boolean acceptFile(Path file) {\r
+                               if (file.toString().contains(df.format(thisMonthCal.getTime())) || file.toString().contains(df.format(nextMonthCal.getTime())))\r
+                                       return super.acceptFile(file);\r
+\r
+                               return false;\r
+                       }\r
+               };\r
+               return result;\r
+       }\r
+\r
+       @Override\r
+       @StepEntry\r
+       public Object[] execute(String sourceFolder, BasicDBObject filter) throws Exception {\r
+               return super.execute(sourceFolder, filter);\r
+       }\r
+}\r
diff --git a/server/-product/production/AMC/jobs/templates/sync-subtitles.xml b/server/-product/production/AMC/jobs/templates/sync-subtitles.xml
new file mode 100644 (file)
index 0000000..49c35cb
--- /dev/null
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<jobtemplate>\r
+       <declarations>\r
+               <parameters>\r
+                       <parameter name="sourceFolder" type="java.lang.String" />\r
+                       <parameter name="filter" type="com.ibm.nosql.json.api.BasicDBObject" />\r
+               </parameters>\r
+       </declarations>\r
+       <commands>\r
+               <calljobstep remote="true" type="RundownFilesCollectorStep.java" weight="1" >\r
+                       <inputs>\r
+                               <input>\r
+                                       <parameter name="sourceFolder" />\r
+                               </input>\r
+                               <input>\r
+                                       <parameter name="filter" />\r
+                               </input>\r
+                       </inputs>\r
+               </calljobstep>\r
+       </commands>\r
+</jobtemplate>
\ No newline at end of file
index 265bf754a360cae19b62a363c9e32b5ec0a32010..702342e6cd59f34fe1fa01adde553dc64164165e 100644 (file)
@@ -1,5 +1,5 @@
 #This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser\r
-#Thu Mar 11 15:00:06 CET 2021\r
+#Sun Apr 18 21:25:34 CEST 2021\r
 osgi.bundles=reference\:file\:cglib_2.2.2.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-annotations_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-core_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-databind_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.dataformat.jackson-dataformat-yaml_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.datatype.jackson-datatype-joda_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-base_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.module.jackson-module-jaxb-annotations_2.4.5.jar@4,reference\:file\:com.ibm.db2.jcc_1.4.0.jar@4,reference\:file\:com.ibm.nosql_4.19.26.jar@4,reference\:file\:com.microsoft.sqlserver.sqljdbc_6.0.8112.100.jar@4,reference\:file\:com.sun.jna_4.2.0.jar@4,reference\:file\:groovy_3.0.3.jar@4,reference\:file\:io.humble.video-arch-x86_64-pc-linux-gnu6_0.2.1.jar@4,reference\:file\:io.humble.video-arch-x86_64-w64-mingw32_0.2.1.jar@4,reference\:file\:io.humble.video-noarch_0.2.1.jar@4,reference\:file\:javax.annotation-api_1.2.0.jar@4,reference\:file\:javax.mail_1.5.0.b01.jar@4,reference\:file\:javax.servlet-api_3.1.0.jar@4,reference\:file\:javax.ws.rs-api_2.0.1.jar@4,reference\:file\:jcifs_1.3.17.jar@4,reference\:file\:joda-time_2.2.0.jar@4,reference\:file\:junit_4.12.0.jar@4,reference\:file\:org.apache.aries.spifly.dynamic.bundle_1.0.8.jar@4,reference\:file\:org.apache.aries.util_1.0.0.jar@4,reference\:file\:org.apache.commons.beanutils_1.8.3.jar@4,reference\:file\:org.apache.commons.collections_3.2.2.jar@4,reference\:file\:org.apache.commons.digester_3.2.0.jar@4,reference\:file\:org.apache.commons.io_2.6.0.jar@4,reference\:file\:org.apache.commons.lang_2.6.0.jar@4,reference\:file\:org.apache.commons.net_3.6.0.jar@4,reference\:file\:org.apache.felix.gogo.command_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.runtime_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.shell_0.12.0.jar@4,reference\:file\:org.apache.httpcomponents.httpclient_4.2.6.jar@4,reference\:file\:org.apache.httpcomponents.httpcore_4.2.5.jar@4,reference\:file\:org.apache.logging.log4j.api_2.8.2.jar@1\:start,reference\:file\:org.apache.logging.log4j.core_2.8.2.jar@4,reference\:file\:org.apache.logging.log4j.slf4j-impl_2.8.2.jar@4,reference\:file\:org.apache.servicemix.bundles.quartz_2.3.0.2.jar@4,reference\:file\:org.eclipse.equinox.common_3.8.0.v20160509-1230.jar@2\:start,reference\:file\:org.eclipse.equinox.console_1.1.200.v20150929-1405.jar@4,reference\:file\:org.eclipse.equinox.ds_1.4.400.v20160226-2036.jar@1\:start,reference\:file\:org.eclipse.equinox.launcher_1.3.201.v20161025-1711.jar@4,reference\:file\:org.eclipse.equinox.util_1.0.500.v20130404-1337.jar@4,reference\:file\:org.eclipse.jetty.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.deploy_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.http_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.io_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.osgi.boot_9.3.9.v20160517.jar@4\:start,reference\:file\:org.eclipse.jetty.schemas_3.1.0.jar@4,reference\:file\:org.eclipse.jetty.security_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.util_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.webapp_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.api_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.common_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.xml_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.osgi.services_3.2.100.v20100503.jar@4,reference\:file\:org.hamcrest.core_1.3.0.jar@4,reference\:file\:org.jboss.resteasy.client_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxb-provider_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs-api_3.0.11.Final.jar@4,reference\:file\:org.jmock_2.6.0.jar@4,reference\:file\:org.jmock.junit4_2.6.0.jar@4,reference\:file\:org.mybatis.mybatis_3.5.2.jar@4,reference\:file\:org.objectweb.asm_5.0.1.jar@4,reference\:file\:org.objectweb.asm.commons_5.0.1.jar@4,reference\:file\:org.objectweb.asm.tree_5.0.1.jar@4,reference\:file\:org.omnifaces_3.4.1.jar@4,reference\:file\:slf4j.api_1.7.24.jar@4,reference\:file\:slf4j.simple_1.7.2.jar@4,reference\:file\:user.commons.log4j2_1.0.0.jar@4,reference\:file\:user.commons.zk_8.0.3.jar@4,reference\:file\:user.jobengine.osgi.commons_1.0.0.jar@4\:start,reference\:file\:user.jobengine.osgi.db_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.server_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.services_1.0.0.jar@4,reference\:file\:user.mediacube.gui_1.0.0.jar@4,reference\:file\:user.mediacube.metadata_1.0.0.jar@4,reference\:file\:user.tsm.client_1.2.0.jar@4\r
 equinox.use.ds=true\r
 osgi.bundles.defaultStartLevel=4\r
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ArchiveListBuilderStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ArchiveListBuilderStep.class
new file mode 100644 (file)
index 0000000..05b95f1
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ArchiveListBuilderStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ArchiveListBuilderStep2.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ArchiveListBuilderStep2.class
new file mode 100644 (file)
index 0000000..b34dbd0
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ArchiveListBuilderStep2.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ArchiveMaterialSubmitStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ArchiveMaterialSubmitStep.class
new file mode 100644 (file)
index 0000000..0f9078b
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ArchiveMaterialSubmitStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ArchiveRecursive.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ArchiveRecursive.class
new file mode 100644 (file)
index 0000000..c02bb53
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ArchiveRecursive.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/AttachLowresStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/AttachLowresStep.class
new file mode 100644 (file)
index 0000000..fd423b8
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/AttachLowresStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/BatchRetrieveForkStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/BatchRetrieveForkStep.class
new file mode 100644 (file)
index 0000000..357fa1d
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/BatchRetrieveForkStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CancelableStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CancelableStep.class
new file mode 100644 (file)
index 0000000..90d6339
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CancelableStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CheckLOWRESIntegrity.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CheckLOWRESIntegrity.class
new file mode 100644 (file)
index 0000000..a657652
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CheckLOWRESIntegrity.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CheckMORPHEUSMissingMaterialsStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CheckMORPHEUSMissingMaterialsStep.class
new file mode 100644 (file)
index 0000000..be17a96
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CheckMORPHEUSMissingMaterialsStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CheckTRAFFICMissingMaterialsStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CheckTRAFFICMissingMaterialsStep.class
new file mode 100644 (file)
index 0000000..d438d1d
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CheckTRAFFICMissingMaterialsStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CleanupMountedLocationStep$1.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CleanupMountedLocationStep$1.class
new file mode 100644 (file)
index 0000000..1d1e69d
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CleanupMountedLocationStep$1.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CleanupMountedLocationStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CleanupMountedLocationStep.class
new file mode 100644 (file)
index 0000000..fe8f40f
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CleanupMountedLocationStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/Cmd$IResponseCallback.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/Cmd$IResponseCallback.class
new file mode 100644 (file)
index 0000000..d6c7f28
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/Cmd$IResponseCallback.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/Cmd.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/Cmd.class
new file mode 100644 (file)
index 0000000..4880b7d
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/Cmd.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.class
new file mode 100644 (file)
index 0000000..3396c88
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CopyForArchiveNEXIOMaterialsStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.class
new file mode 100644 (file)
index 0000000..61da4ec
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CopyForArchiveNEXIORecordingsStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CreateArchiveItemStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CreateArchiveItemStep.class
new file mode 100644 (file)
index 0000000..54de7ff
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CreateArchiveItemStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CreateMissingLowresStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CreateMissingLowresStep.class
new file mode 100644 (file)
index 0000000..34132c3
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/CreateMissingLowresStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DeleteFileStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DeleteFileStep.class
new file mode 100644 (file)
index 0000000..06b9d43
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DeleteFileStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DeleteNEXIOMaterialsStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DeleteNEXIOMaterialsStep.class
new file mode 100644 (file)
index 0000000..fd1a485
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DeleteNEXIOMaterialsStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DetectMissingLengthStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DetectMissingLengthStep.class
new file mode 100644 (file)
index 0000000..aead1a6
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DetectMissingLengthStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DirMXFValidatorStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DirMXFValidatorStep.class
new file mode 100644 (file)
index 0000000..625fa0f
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DirMXFValidatorStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DownloadRecordingFromNexioStep$1.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DownloadRecordingFromNexioStep$1.class
new file mode 100644 (file)
index 0000000..66b3929
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DownloadRecordingFromNexioStep$1.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DownloadRecordingFromNexioStep$2.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DownloadRecordingFromNexioStep$2.class
new file mode 100644 (file)
index 0000000..cb195e9
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DownloadRecordingFromNexioStep$2.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DownloadRecordingFromNexioStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DownloadRecordingFromNexioStep.class
new file mode 100644 (file)
index 0000000..f7985e7
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DownloadRecordingFromNexioStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DuplicateRemoverStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DuplicateRemoverStep.class
new file mode 100644 (file)
index 0000000..a01b757
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/DuplicateRemoverStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/EscortFiles.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/EscortFiles.class
new file mode 100644 (file)
index 0000000..181784c
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/EscortFiles.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FFMpeg$IProgressChanged.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FFMpeg$IProgressChanged.class
new file mode 100644 (file)
index 0000000..fd39f9b
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FFMpeg$IProgressChanged.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FFMpeg.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FFMpeg.class
new file mode 100644 (file)
index 0000000..d472219
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FFMpeg.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FILEZILLA_AVIDTransferToStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FILEZILLA_AVIDTransferToStep.class
new file mode 100644 (file)
index 0000000..4671e24
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FILEZILLA_AVIDTransferToStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FILEZILLA_PASARESTORETransferToStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FILEZILLA_PASARESTORETransferToStep.class
new file mode 100644 (file)
index 0000000..23cf93f
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FILEZILLA_PASARESTORETransferToStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FakeSpawnStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FakeSpawnStep.class
new file mode 100644 (file)
index 0000000..c9f262e
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FakeSpawnStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FakeStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FakeStep.class
new file mode 100644 (file)
index 0000000..b2bb2d9
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FakeStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FileCleanupStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FileCleanupStep.class
new file mode 100644 (file)
index 0000000..7900919
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FileCleanupStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FileCopyStep$1.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FileCopyStep$1.class
new file mode 100644 (file)
index 0000000..95108c2
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FileCopyStep$1.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FileCopyStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FileCopyStep.class
new file mode 100644 (file)
index 0000000..4e958dc
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FileCopyStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FileValidatorStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FileValidatorStep.class
new file mode 100644 (file)
index 0000000..8bc10b6
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/FileValidatorStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ForkDownloadStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ForkDownloadStep.class
new file mode 100644 (file)
index 0000000..607d7a6
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ForkDownloadStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ForkUploadStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ForkUploadStep.class
new file mode 100644 (file)
index 0000000..0ff19c4
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ForkUploadStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/GenerateMorpheusMetadataStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/GenerateMorpheusMetadataStep.class
new file mode 100644 (file)
index 0000000..cc67ae7
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/GenerateMorpheusMetadataStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/GenericArchiveCheckerStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/GenericArchiveCheckerStep.class
new file mode 100644 (file)
index 0000000..710ad19
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/GenericArchiveCheckerStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/HLSProxyStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/HLSProxyStep.class
new file mode 100644 (file)
index 0000000..35644ba
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/HLSProxyStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/HSMMigrateStep$1.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/HSMMigrateStep$1.class
new file mode 100644 (file)
index 0000000..7cde1b7
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/HSMMigrateStep$1.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/HSMMigrateStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/HSMMigrateStep.class
new file mode 100644 (file)
index 0000000..ccab870
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/HSMMigrateStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/HarrisMissingMaterialCheckerStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/HarrisMissingMaterialCheckerStep.class
new file mode 100644 (file)
index 0000000..1b32087
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/HarrisMissingMaterialCheckerStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ImportMORPHEUSMissingMaterialsStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ImportMORPHEUSMissingMaterialsStep.class
new file mode 100644 (file)
index 0000000..09b45d8
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ImportMORPHEUSMissingMaterialsStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ImportStatisticsStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ImportStatisticsStep.class
new file mode 100644 (file)
index 0000000..1594474
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ImportStatisticsStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ItemManagerExtensions.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ItemManagerExtensions.class
new file mode 100644 (file)
index 0000000..ebfd080
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ItemManagerExtensions.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MVCancelableStep$1.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MVCancelableStep$1.class
new file mode 100644 (file)
index 0000000..a2659d1
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MVCancelableStep$1.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MVCancelableStep$2.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MVCancelableStep$2.class
new file mode 100644 (file)
index 0000000..2477f6e
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MVCancelableStep$2.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MVCancelableStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MVCancelableStep.class
new file mode 100644 (file)
index 0000000..0d9d9af
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MVCancelableStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MXFCutterStep$1.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MXFCutterStep$1.class
new file mode 100644 (file)
index 0000000..8e7c112
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MXFCutterStep$1.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MXFCutterStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MXFCutterStep.class
new file mode 100644 (file)
index 0000000..4aab7e5
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MXFCutterStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MediaToolStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MediaToolStep.class
new file mode 100644 (file)
index 0000000..0e59bad
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MediaToolStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MergeStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MergeStep.class
new file mode 100644 (file)
index 0000000..f86e9ff
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MergeStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MetadataPersisterStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MetadataPersisterStep.class
new file mode 100644 (file)
index 0000000..c98b706
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MetadataPersisterStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MetadataTransformStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MetadataTransformStep.class
new file mode 100644 (file)
index 0000000..0669fba
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MetadataTransformStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MetadataType.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MetadataType.class
new file mode 100644 (file)
index 0000000..ae205ad
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MetadataType.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MetadataTypeDetector.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MetadataTypeDetector.class
new file mode 100644 (file)
index 0000000..affbeb6
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/MetadataTypeDetector.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIO1TransferFromStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIO1TransferFromStep.class
new file mode 100644 (file)
index 0000000..f675d48
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIO1TransferFromStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIO1TransferToStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIO1TransferToStep.class
new file mode 100644 (file)
index 0000000..ea98512
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIO1TransferToStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIO2TransferFromStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIO2TransferFromStep.class
new file mode 100644 (file)
index 0000000..50d7157
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIO2TransferFromStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIO2TransferToStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIO2TransferToStep.class
new file mode 100644 (file)
index 0000000..74c2751
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIO2TransferToStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIOArchiveCheckerStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIOArchiveCheckerStep.class
new file mode 100644 (file)
index 0000000..5ca56df
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIOArchiveCheckerStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIOMetadataPersisterStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIOMetadataPersisterStep.class
new file mode 100644 (file)
index 0000000..1408b6d
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/NEXIOMetadataPersisterStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/OctopusDataMiner.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/OctopusDataMiner.class
new file mode 100644 (file)
index 0000000..53bffb1
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/OctopusDataMiner.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/OctopusDataMinerStable.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/OctopusDataMinerStable.class
new file mode 100644 (file)
index 0000000..3c7df19
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/OctopusDataMinerStable.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/OutputPathAndNameSelectorStep$1.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/OutputPathAndNameSelectorStep$1.class
new file mode 100644 (file)
index 0000000..a3fb35d
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/OutputPathAndNameSelectorStep$1.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/OutputPathAndNameSelectorStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/OutputPathAndNameSelectorStep.class
new file mode 100644 (file)
index 0000000..9b48167
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/OutputPathAndNameSelectorStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PASAPOOLTransferToStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PASAPOOLTransferToStep.class
new file mode 100644 (file)
index 0000000..59f03dc
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PASAPOOLTransferToStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PBQuery$MMMedia.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PBQuery$MMMedia.class
new file mode 100644 (file)
index 0000000..2ff535c
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PBQuery$MMMedia.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PBQuery.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PBQuery.class
new file mode 100644 (file)
index 0000000..be1b662
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PBQuery.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.class
new file mode 100644 (file)
index 0000000..61ce860
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PlanAirExtensions.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PlanAirExtensions.class
new file mode 100644 (file)
index 0000000..14c758d
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/PlanAirExtensions.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ProjectCleanupMountedLocationStep$1.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ProjectCleanupMountedLocationStep$1.class
new file mode 100644 (file)
index 0000000..b5e7b7d
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ProjectCleanupMountedLocationStep$1.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ProjectCleanupMountedLocationStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ProjectCleanupMountedLocationStep.class
new file mode 100644 (file)
index 0000000..0b8f201
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/ProjectCleanupMountedLocationStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/RecordingsArchiveItemBuilderStep$1.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/RecordingsArchiveItemBuilderStep$1.class
new file mode 100644 (file)
index 0000000..c47c1b1
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/RecordingsArchiveItemBuilderStep$1.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/RecordingsArchiveItemBuilderStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/RecordingsArchiveItemBuilderStep.class
new file mode 100644 (file)
index 0000000..e5153d3
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/RecordingsArchiveItemBuilderStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/RegisterUserRestoreStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/RegisterUserRestoreStep.class
new file mode 100644 (file)
index 0000000..5d1fd6e
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/RegisterUserRestoreStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/RegisterVODRestoreStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/RegisterVODRestoreStep.class
new file mode 100644 (file)
index 0000000..6126346
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/RegisterVODRestoreStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SubmitChildStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SubmitChildStep.class
new file mode 100644 (file)
index 0000000..3a5d29e
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SubmitChildStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SubmitDownloadStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SubmitDownloadStep.class
new file mode 100644 (file)
index 0000000..33a61c3
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SubmitDownloadStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SyncOCTOPUSDataStep$1.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SyncOCTOPUSDataStep$1.class
new file mode 100644 (file)
index 0000000..eaf15e0
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SyncOCTOPUSDataStep$1.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SyncOCTOPUSDataStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SyncOCTOPUSDataStep.class
new file mode 100644 (file)
index 0000000..ac9fbc4
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SyncOCTOPUSDataStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SyncSubtitlesStep$1.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SyncSubtitlesStep$1.class
new file mode 100644 (file)
index 0000000..42b74db
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SyncSubtitlesStep$1.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SyncSubtitlesStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SyncSubtitlesStep.class
new file mode 100644 (file)
index 0000000..09486b2
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/SyncSubtitlesStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMBackupStep$1.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMBackupStep$1.class
new file mode 100644 (file)
index 0000000..909eb4d
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMBackupStep$1.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMBackupStep$2.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMBackupStep$2.class
new file mode 100644 (file)
index 0000000..24d0046
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMBackupStep$2.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMBackupStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMBackupStep.class
new file mode 100644 (file)
index 0000000..0e4de20
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMBackupStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMExtendedRetrieveStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMExtendedRetrieveStep.class
new file mode 100644 (file)
index 0000000..b7d0cb5
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMExtendedRetrieveStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMRestoreStep$1.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMRestoreStep$1.class
new file mode 100644 (file)
index 0000000..ee3c4df
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMRestoreStep$1.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMRestoreStep$2.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMRestoreStep$2.class
new file mode 100644 (file)
index 0000000..f4a241c
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMRestoreStep$2.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMRestoreStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMRestoreStep.class
new file mode 100644 (file)
index 0000000..3918167
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMRestoreStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMRetrieveMissingMaterialStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMRetrieveMissingMaterialStep.class
new file mode 100644 (file)
index 0000000..6e36708
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMRetrieveMissingMaterialStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSimpleRestoreStep$1.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSimpleRestoreStep$1.class
new file mode 100644 (file)
index 0000000..eff6af1
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSimpleRestoreStep$1.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSimpleRestoreStep$2.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSimpleRestoreStep$2.class
new file mode 100644 (file)
index 0000000..81ee41c
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSimpleRestoreStep$2.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSimpleRestoreStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSimpleRestoreStep.class
new file mode 100644 (file)
index 0000000..a8dfdf4
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSimpleRestoreStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSystemRestoreStep$1.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSystemRestoreStep$1.class
new file mode 100644 (file)
index 0000000..b0a4926
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSystemRestoreStep$1.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSystemRestoreStep$2.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSystemRestoreStep$2.class
new file mode 100644 (file)
index 0000000..db83e3c
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSystemRestoreStep$2.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSystemRestoreStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSystemRestoreStep.class
new file mode 100644 (file)
index 0000000..ff76fd3
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMSystemRestoreStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMTransferFromStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMTransferFromStep.class
new file mode 100644 (file)
index 0000000..c571739
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMTransferFromStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMTransferToStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMTransferToStep.class
new file mode 100644 (file)
index 0000000..6c2c9a6
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMTransferToStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMWriterStep$1.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMWriterStep$1.class
new file mode 100644 (file)
index 0000000..122f255
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMWriterStep$1.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMWriterStep$2.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMWriterStep$2.class
new file mode 100644 (file)
index 0000000..8fb3188
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMWriterStep$2.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMWriterStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMWriterStep.class
new file mode 100644 (file)
index 0000000..d6a288a
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TSMWriterStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TestForkCancelableStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TestForkCancelableStep.class
new file mode 100644 (file)
index 0000000..23bbe99
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TestForkCancelableStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TranscodeFFAStranStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TranscodeFFAStranStep.class
new file mode 100644 (file)
index 0000000..e10bed4
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TranscodeFFAStranStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TranscodeSELENIOStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TranscodeSELENIOStep.class
new file mode 100644 (file)
index 0000000..3cb014b
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TranscodeSELENIOStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TranscodeStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TranscodeStep.class
new file mode 100644 (file)
index 0000000..d5fef16
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TranscodeStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TransferFromFTPStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TransferFromFTPStep.class
new file mode 100644 (file)
index 0000000..ae18b92
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TransferFromFTPStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TransferFromTSMStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TransferFromTSMStep.class
new file mode 100644 (file)
index 0000000..fb9bf99
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TransferFromTSMStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TransferStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TransferStep.class
new file mode 100644 (file)
index 0000000..a137523
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TransferStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TransferToFTPStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TransferToFTPStep.class
new file mode 100644 (file)
index 0000000..db5c97f
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/TransferToFTPStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/UpdateGhostMediaDataStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/UpdateGhostMediaDataStep.class
new file mode 100644 (file)
index 0000000..92fbb78
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/UpdateGhostMediaDataStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/UploadRecordingToNexioStep$1.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/UploadRecordingToNexioStep$1.class
new file mode 100644 (file)
index 0000000..2977669
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/UploadRecordingToNexioStep$1.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/UploadRecordingToNexioStep$2.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/UploadRecordingToNexioStep$2.class
new file mode 100644 (file)
index 0000000..4e1d33a
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/UploadRecordingToNexioStep$2.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/UploadRecordingToNexioStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/UploadRecordingToNexioStep.class
new file mode 100644 (file)
index 0000000..befef51
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/UploadRecordingToNexioStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/VODTransferToStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/VODTransferToStep.class
new file mode 100644 (file)
index 0000000..5cae813
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/VODTransferToStep.class differ
diff --git a/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/WorkerKeepAliveStep.class b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/WorkerKeepAliveStep.class
new file mode 100644 (file)
index 0000000..ab82182
Binary files /dev/null and b/server/-product/production/HIRTV/jobs/classes/user/jobengine/server/steps/WorkerKeepAliveStep.class differ
diff --git a/server/-product/production/HIRTV/settings/jetty/jetty-http.xml b/server/-product/production/HIRTV/settings/jetty/jetty-http.xml
new file mode 100644 (file)
index 0000000..e81c1be
--- /dev/null
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<!-- ============================================================= -->
+<!-- Configure the Jetty Server instance with an ID "Server"       -->
+<!-- by adding a HTTP connector.                                   -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- ============================================================= -->
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+  <!-- =========================================================== -->
+  <!-- Add a HTTP Connector.                                       -->
+  <!-- Configure an o.e.j.server.ServerConnector with a single     -->
+  <!-- HttpConnectionFactory instance using the common httpConfig  -->
+  <!-- instance defined in jetty.xml                               -->
+  <!--                                                             -->
+  <!-- Consult the javadoc of o.e.j.server.ServerConnector and     -->
+  <!-- o.e.j.server.HttpConnectionFactory for all configuration    -->
+  <!-- that may be set here.                                       -->
+  <!-- =========================================================== 
+  <Call name="addConnector">
+    <Arg>
+      <New class="org.eclipse.jetty.server.ServerConnector">
+        <Arg name="server"><Ref refid="Server" /></Arg>
+        <Arg name="factories">
+          <Array type="org.eclipse.jetty.server.ConnectionFactory">
+            <Item>
+              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+                <Arg name="config"><Ref refid="httpConfig" /></Arg>
+              </New>
+            </Item>
+          </Array>
+        </Arg>
+        <Set name="host"><Property name="jetty.http.host" /></Set>
+        <Set name="port"><Property name="jetty.http.port" default="88" /></Set>
+        <Set name="idleTimeout"><Property name="jetty.http.idleTimeout" default="30000"/></Set>
+      </New>
+    </Arg>
+  </Call>
+-->
+  <Call name="addConnector">
+    <Arg>
+      <New id="httpConnector" class="org.eclipse.jetty.server.ServerConnector">
+        <Arg name="server"><Ref refid="Server" /></Arg>
+        <Arg name="acceptors" type="int"><Property name="jetty.http.acceptors" deprecated="http.acceptors" default="-1"/></Arg>
+        <Arg name="selectors" type="int"><Property name="jetty.http.selectors" deprecated="http.selectors" default="-1"/></Arg>
+        <Arg name="factories">
+          <Array type="org.eclipse.jetty.server.ConnectionFactory">
+            <Item>
+              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+               <Arg name="config">
+                  <New id="tlsHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
+                                          <Arg>
+                                             <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
+                                                <!-- This says... Redirect to https://host:8443 if server returns "NOT SECURE" error -->
+                                                <Set name="secureScheme">https</Set>
+                                                <Set name="securePort">89</Set>
+                                             </New>
+                                          </Arg>
+                                          <Call name="addCustomizer">
+                                             <Arg>
+                                                <New class="org.eclipse.jetty.server.SecureRequestCustomizer" />
+                                             </Arg>
+                                          </Call>
+                                       </New>
+                </Arg>
+              </New>
+            </Item>
+          </Array>
+        </Arg>
+        <Set name="host"><Property name="jetty.http.host" deprecated="jetty.host" /></Set>
+        <Set name="port"><Property name="jetty.http.port" deprecated="jetty.port" default="88" /></Set>
+        <Set name="idleTimeout"><Property name="jetty.http.idleTimeout" deprecated="http.timeout" default="30000"/></Set>
+        <Set name="soLingerTime"><Property name="jetty.http.soLingerTime" deprecated="http.soLingerTime" default="-1"/></Set>
+        <Set name="acceptorPriorityDelta"><Property name="jetty.http.acceptorPriorityDelta" deprecated="http.acceptorPriorityDelta" default="0"/></Set>
+        <Set name="acceptQueueSize"><Property name="jetty.http.acceptQueueSize" deprecated="http.acceptQueueSize" default="0"/></Set>
+      </New>
+    </Arg>
+  </Call>
+  
+</Configure>
diff --git a/server/-product/production/HIRTV/settings/jetty/jetty-https.xml b/server/-product/production/HIRTV/settings/jetty/jetty-https.xml
new file mode 100644 (file)
index 0000000..71a0837
--- /dev/null
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<!-- ============================================================= -->
+<!-- Configure a HTTPS connector.                                  -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- and jetty-ssl.xml.                                            -->
+<!-- ============================================================= -->
+<Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
+
+  <Call name="addIfAbsentConnectionFactory">
+    <Arg>
+      <New class="org.eclipse.jetty.server.SslConnectionFactory">
+        <Arg name="next">http/1.1</Arg>
+        <Arg name="sslContextFactory"><Ref refid="sslContextFactory"/></Arg>
+      </New>
+    </Arg>
+  </Call>
+
+  <Call name="addConnectionFactory">
+    <Arg>
+      <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+        <Arg name="config"><Ref refid="sslHttpConfig" /></Arg>
+        <Arg name="compliance"><Call class="org.eclipse.jetty.http.HttpCompliance" name="valueOf"><Arg><Property name="jetty.http.compliance" default="RFC7230"/></Arg></Call></Arg>
+      </New>
+    </Arg>
+  </Call>
+  
+</Configure>
diff --git a/server/-product/production/HIRTV/settings/jetty/jetty-ssl-context.xml b/server/-product/production/HIRTV/settings/jetty/jetty-ssl-context.xml
new file mode 100644 (file)
index 0000000..2808f50
--- /dev/null
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<!-- ============================================================= -->
+<!-- SSL ContextFactory configuration                              -->
+<!-- ============================================================= -->
+
+<!-- 
+  To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at 
+     https://www.eclipse.org/jetty/documentation/current/configuring-ssl.html#configuring-sslcontextfactory-cipherSuites
+-->
+
+<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
+  <Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.keyStorePath" deprecated="jetty.keystore" default="mediacube.jks"/></Set>
+  <Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" deprecated="jetty.keystore.password" default="password"/></Set>
+  <Set name="KeyStoreType"><Property name="jetty.sslContext.keyStoreType" default="JKS"/></Set>
+  <Set name="KeyStoreProvider"><Property name="jetty.sslContext.keyStoreProvider"/></Set>
+  <Set name="KeyManagerPassword"><Property name="jetty.sslContext.keyManagerPassword" deprecated="jetty.keymanager.password" default="aA123456"/></Set>
+  <Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslContext.trustStorePath" deprecated="jetty.truststore" default="mediacube.jks"/></Set>
+  <Set name="TrustStorePassword"><Property name="jetty.sslContext.trustStorePassword" deprecated="jetty.truststore.password" default="password"/></Set>
+  <Set name="TrustStoreType"><Property name="jetty.sslContext.trustStoreType"/></Set>
+  <Set name="TrustStoreProvider"><Property name="jetty.sslContext.trustStoreProvider"/></Set>
+  <Set name="EndpointIdentificationAlgorithm"></Set>
+  <Set name="NeedClientAuth"><Property name="jetty.sslContext.needClientAuth" deprecated="jetty.ssl.needClientAuth" default="false"/></Set>
+  <Set name="WantClientAuth"><Property name="jetty.sslContext.wantClientAuth" deprecated="jetty.ssl.wantClientAuth" default="false"/></Set>
+  <Set name="useCipherSuitesOrder"><Property name="jetty.sslContext.useCipherSuitesOrder" default="true"/></Set>
+  <Set name="sslSessionCacheSize"><Property name="jetty.sslContext.sslSessionCacheSize" default="-1"/></Set>
+  <Set name="sslSessionTimeout"><Property name="jetty.sslContext.sslSessionTimeout" default="-1"/></Set>
+</Configure>
diff --git a/server/-product/production/HIRTV/settings/jetty/jetty-ssl.xml b/server/-product/production/HIRTV/settings/jetty/jetty-ssl.xml
new file mode 100644 (file)
index 0000000..0da193e
--- /dev/null
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<!-- ============================================================= -->
+<!-- Base SSL configuration                                        -->
+<!-- This configuration needs to be used together with 1 or more   -->
+<!-- of jetty-https.xml or jetty-http2.xml                         -->
+<!-- ============================================================= -->
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+  <!-- =========================================================== -->
+  <!-- Add a SSL Connector with no protocol factories              -->
+  <!-- =========================================================== -->
+  <Call  name="addConnector">
+    <Arg>
+      <New id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
+        <Arg name="server"><Ref refid="Server" /></Arg>
+        <Arg name="acceptors" type="int"><Property name="jetty.ssl.acceptors" deprecated="ssl.acceptors" default="-1"/></Arg>
+        <Arg name="selectors" type="int"><Property name="jetty.ssl.selectors" deprecated="ssl.selectors" default="-1"/></Arg>
+        <Arg name="factories">
+          <Array type="org.eclipse.jetty.server.ConnectionFactory">
+            <!-- uncomment to support proxy protocol
+            <Item>
+              <New class="org.eclipse.jetty.server.ProxyConnectionFactory"/>
+            </Item>-->
+          </Array>
+        </Arg>
+
+        <Set name="host"><Property name="jetty.ssl.host" deprecated="jetty.host" /></Set>
+        <Set name="port"><Property name="jetty.ssl.port" deprecated="ssl.port" default="89" /></Set>
+        <Set name="idleTimeout"><Property name="jetty.ssl.idleTimeout" deprecated="ssl.timeout" default="30000"/></Set>
+        <Set name="soLingerTime"><Property name="jetty.ssl.soLingerTime" deprecated="ssl.soLingerTime" default="-1"/></Set>
+        <Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta" deprecated="ssl.acceptorPriorityDelta" default="0"/></Set>
+        <Set name="acceptQueueSize"><Property name="jetty.ssl.acceptQueueSize" deprecated="ssl.acceptQueueSize" default="0"/></Set>
+      </New>
+    </Arg>
+  </Call>
+
+  <!-- =========================================================== -->
+  <!-- Create a TLS specific HttpConfiguration based on the        -->
+  <!-- common HttpConfiguration defined in jetty.xml               -->
+  <!-- Add a SecureRequestCustomizer to extract certificate and    -->
+  <!-- session information                                         -->
+  <!-- =========================================================== -->
+  <New id="sslHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
+    <Arg><Ref refid="httpConfig"/></Arg>
+    <Call name="addCustomizer">
+      <Arg>
+        <New class="org.eclipse.jetty.server.SecureRequestCustomizer">
+          <Arg name="sniHostCheck" type="boolean"><Property name="jetty.ssl.sniHostCheck" default="true"/></Arg>
+          <Arg name="stsMaxAgeSeconds" type="int"><Property name="jetty.ssl.stsMaxAgeSeconds" default="-1"/></Arg>
+          <Arg name="stsIncludeSubdomains" type="boolean"><Property name="jetty.ssl.stsIncludeSubdomains" default="false"/></Arg>
+        </New>
+      </Arg>
+    </Call>
+  </New>
+
+</Configure>
diff --git a/server/-product/production/HIRTV/settings/jetty/jetty.xml b/server/-product/production/HIRTV/settings/jetty/jetty.xml
new file mode 100644 (file)
index 0000000..0ba3838
--- /dev/null
@@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<!-- =============================================================== -->
+<!-- Documentation of this file format can be found at:              -->
+<!-- http://wiki.eclipse.org/Jetty/Reference/jetty.xml_syntax        -->
+<!--                                                                 -->
+<!-- Additional configuration files are available in $JETTY_HOME/etc -->
+<!-- and can be mixed in. See start.ini file for the default         -->
+<!-- configuration files.                                            -->
+<!--                                                                 -->
+<!-- For a description of the configuration mechanism, see the       -->
+<!-- output of:                                                      -->
+<!--   java -jar start.jar -?                                        -->
+<!-- =============================================================== -->
+
+<!-- =============================================================== -->
+<!-- Configure a Jetty Server instance with an ID "Server"           -->
+<!-- Other configuration files may also configure the "Server"       -->
+<!-- ID, in which case they are adding configuration to the same     -->
+<!-- instance.  If other configuration have a different ID, they     -->
+<!-- will create and configure another instance of Jetty.            -->
+<!-- Consult the javadoc of o.e.j.server.Server for all              -->
+<!-- configuration that may be set here.                             -->
+<!-- =============================================================== -->
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+    <!-- =========================================================== -->
+    <!-- Configure the Server Thread Pool.                           -->
+    <!-- The server holds a common thread pool which is used by      -->
+    <!-- default as the executor used by all connectors and servlet  -->
+    <!-- dispatches.                                                 -->
+    <!--                                                             -->
+    <!-- Configuring a fixed thread pool is vital to controlling the -->
+    <!-- maximal memory footprint of the server and is a key tuning  -->
+    <!-- parameter for tuning.  In an application that rarely blocks -->
+    <!-- then maximal threads may be close to the number of 5*CPUs.  -->
+    <!-- In an application that frequently blocks, then maximal      -->
+    <!-- threads should be set as high as possible given the memory  -->
+    <!-- available.                                                  -->
+    <!--                                                             -->
+    <!-- Consult the javadoc of o.e.j.util.thread.QueuedThreadPool   -->
+    <!-- for all configuration that may be set here.                 -->
+    <!-- =========================================================== -->
+    <!-- uncomment to change type of threadpool
+    <Arg name="threadpool"><New id="threadpool" class="org.eclipse.jetty.util.thread.QueuedThreadPool"/></Arg>
+    -->
+    <Get name="ThreadPool">
+      <Set name="minThreads" type="int"><Property name="jetty.threadPool.minThreads" deprecated="threads.min" default="10"/></Set>
+      <Set name="maxThreads" type="int"><Property name="jetty.threadPool.maxThreads" deprecated="threads.max" default="200"/></Set>
+      <Set name="idleTimeout" type="int"><Property name="jetty.threadPool.idleTimeout" deprecated="threads.timeout" default="60000"/></Set>
+      <Set name="detailedDump">false</Set>
+    </Get>
+
+    <!-- =========================================================== -->
+    <!-- Add shared Scheduler instance                               -->
+    <!-- =========================================================== -->
+    <Call name="addBean">
+      <Arg>
+        <New class="org.eclipse.jetty.util.thread.ScheduledExecutorScheduler"/>
+      </Arg>
+    </Call>
+
+    <!-- =========================================================== -->
+    <!-- Http Configuration.                                         -->
+    <!-- This is a common configuration instance used by all         -->
+    <!-- connectors that can carry HTTP semantics (HTTP, HTTPS, etc.)-->
+    <!-- It configures the non wire protocol aspects of the HTTP     -->
+    <!-- semantic.                                                   -->
+    <!--                                                             -->
+    <!-- This configuration is only defined here and is used by      -->
+    <!-- reference from other XML files such as jetty-http.xml,      -->
+    <!-- jetty-https.xml and other configuration files which         -->
+    <!-- instantiate the connectors.                                 -->
+    <!--                                                             -->
+    <!-- Consult the javadoc of o.e.j.server.HttpConfiguration       -->
+    <!-- for all configuration that may be set here.                 -->
+    <!-- =========================================================== -->
+    <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
+      <Set name="secureScheme"><Property name="jetty.httpConfig.secureScheme" default="https" /></Set>
+      <Set name="securePort"><Property name="jetty.httpConfig.securePort" deprecated="jetty.secure.port" default="8443" /></Set>
+      <Set name="outputBufferSize"><Property name="jetty.httpConfig.outputBufferSize" deprecated="jetty.output.buffer.size" default="32768" /></Set>
+      <Set name="outputAggregationSize"><Property name="jetty.httpConfig.outputAggregationSize" deprecated="jetty.output.aggregation.size" default="8192" /></Set>
+      <Set name="requestHeaderSize"><Property name="jetty.httpConfig.requestHeaderSize" deprecated="jetty.request.header.size" default="8192" /></Set>
+      <Set name="responseHeaderSize"><Property name="jetty.httpConfig.responseHeaderSize" deprecated="jetty.response.header.size" default="8192" /></Set>
+      <Set name="sendServerVersion"><Property name="jetty.httpConfig.sendServerVersion" deprecated="jetty.send.server.version" default="true" /></Set>
+      <Set name="sendDateHeader"><Property name="jetty.httpConfig.sendDateHeader" deprecated="jetty.send.date.header" default="false" /></Set>
+      <Set name="headerCacheSize"><Property name="jetty.httpConfig.headerCacheSize" default="512" /></Set>
+      <Set name="delayDispatchUntilContent"><Property name="jetty.httpConfig.delayDispatchUntilContent" deprecated="jetty.delayDispatchUntilContent" default="true"/></Set>
+      <Set name="maxErrorDispatches"><Property name="jetty.httpConfig.maxErrorDispatches" default="10"/></Set>
+      <Set name="blockingTimeout"><Property name="jetty.httpConfig.blockingTimeout" default="-1"/></Set>
+      <Set name="persistentConnectionsEnabled"><Property name="jetty.httpConfig.persistentConnectionsEnabled" default="true"/></Set>
+    </New>
+
+    <!-- =========================================================== -->
+    <!-- Set the default handler structure for the Server            -->
+    <!-- A handler collection is used to pass received requests to   -->
+    <!-- both the ContextHandlerCollection, which selects the next   -->
+    <!-- handler by context path and virtual host, and the           -->
+    <!-- DefaultHandler, which handles any requests not handled by   -->
+    <!-- the context handlers.                                       -->
+    <!-- Other handlers may be added to the "Handlers" collection,   -->
+    <!-- for example the jetty-requestlog.xml file adds the          -->
+    <!-- RequestLogHandler after the default handler                 -->
+    <!-- =========================================================== -->
+    <Set name="handler">
+      <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
+        <Set name="handlers">
+         <Array type="org.eclipse.jetty.server.Handler">
+           <Item>
+             <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
+           </Item>
+           <Item>
+             <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
+           </Item>
+         </Array>
+        </Set>
+      </New>
+    </Set>
+
+    <!-- =========================================================== -->
+    <!-- extra server options                                        -->
+    <!-- =========================================================== -->
+    <Set name="stopAtShutdown"><Property name="jetty.server.stopAtShutdown" default="true"/></Set>
+    <Set name="stopTimeout">5000</Set>
+    <Set name="dumpAfterStart"><Property name="jetty.server.dumpAfterStart" deprecated="jetty.dump.start" default="false"/></Set>
+    <Set name="dumpBeforeStop"><Property name="jetty.server.dumpBeforeStop" deprecated="jetty.dump.stop" default="false"/></Set>
+
+</Configure>
diff --git a/server/-product/production/HIRTV/settings/jetty/mediacube.jks b/server/-product/production/HIRTV/settings/jetty/mediacube.jks
new file mode 100644 (file)
index 0000000..51cdbd1
Binary files /dev/null and b/server/-product/production/HIRTV/settings/jetty/mediacube.jks differ
index d7c9e8ed33b77d92369ccbcbac84013c1ee9a7f5..d2573c76f7637215cab3c7fafd048cc60284e25b 100644 (file)
@@ -1,22 +1,22 @@
 datasource:\r
   mediacube:\r
-#    url: jdbc:db2://192.168.100.2:50000/mc\r
-#    user: db2inst1\r
-#    password: password\r
-    url: jdbc:db2://10.10.1.27:50000/mc\r
-    user: db2admin\r
+    url: jdbc:db2://192.168.100.2:50000/mc\r
+    user: db2inst1\r
     password: password\r
+#    url: jdbc:db2://10.10.1.27:50000/mc\r
+#    user: db2admin\r
+#    password: password\r
     external-indexer: false\r
     simple-search: true\r
     login-timeout: 3\r
     pool-size: 10\r
   mediacube-nosql:\r
-#    url: jdbc:db2://192.168.100.2:50000/mc\r
-#    user: db2inst1\r
-#    password: password\r
-    url: jdbc:db2://10.10.1.27:50000/mc\r
-    user: db2admin\r
+    url: jdbc:db2://192.168.100.2:50000/mc\r
+    user: db2inst1\r
     password: password\r
+#    url: jdbc:db2://10.10.1.27:50000/mc\r
+#    user: db2admin\r
+#    password: password\r
     schema: test\r
     login-timeout: 3\r
   hsm: \r
index 265bf754a360cae19b62a363c9e32b5ec0a32010..702342e6cd59f34fe1fa01adde553dc64164165e 100644 (file)
@@ -1,5 +1,5 @@
 #This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser\r
-#Thu Mar 11 15:00:06 CET 2021\r
+#Sun Apr 18 21:25:34 CEST 2021\r
 osgi.bundles=reference\:file\:cglib_2.2.2.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-annotations_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-core_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.core.jackson-databind_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.dataformat.jackson-dataformat-yaml_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.datatype.jackson-datatype-joda_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-base_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider_2.4.5.jar@4,reference\:file\:com.fasterxml.jackson.module.jackson-module-jaxb-annotations_2.4.5.jar@4,reference\:file\:com.ibm.db2.jcc_1.4.0.jar@4,reference\:file\:com.ibm.nosql_4.19.26.jar@4,reference\:file\:com.microsoft.sqlserver.sqljdbc_6.0.8112.100.jar@4,reference\:file\:com.sun.jna_4.2.0.jar@4,reference\:file\:groovy_3.0.3.jar@4,reference\:file\:io.humble.video-arch-x86_64-pc-linux-gnu6_0.2.1.jar@4,reference\:file\:io.humble.video-arch-x86_64-w64-mingw32_0.2.1.jar@4,reference\:file\:io.humble.video-noarch_0.2.1.jar@4,reference\:file\:javax.annotation-api_1.2.0.jar@4,reference\:file\:javax.mail_1.5.0.b01.jar@4,reference\:file\:javax.servlet-api_3.1.0.jar@4,reference\:file\:javax.ws.rs-api_2.0.1.jar@4,reference\:file\:jcifs_1.3.17.jar@4,reference\:file\:joda-time_2.2.0.jar@4,reference\:file\:junit_4.12.0.jar@4,reference\:file\:org.apache.aries.spifly.dynamic.bundle_1.0.8.jar@4,reference\:file\:org.apache.aries.util_1.0.0.jar@4,reference\:file\:org.apache.commons.beanutils_1.8.3.jar@4,reference\:file\:org.apache.commons.collections_3.2.2.jar@4,reference\:file\:org.apache.commons.digester_3.2.0.jar@4,reference\:file\:org.apache.commons.io_2.6.0.jar@4,reference\:file\:org.apache.commons.lang_2.6.0.jar@4,reference\:file\:org.apache.commons.net_3.6.0.jar@4,reference\:file\:org.apache.felix.gogo.command_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.runtime_0.12.0.jar@4,reference\:file\:org.apache.felix.gogo.shell_0.12.0.jar@4,reference\:file\:org.apache.httpcomponents.httpclient_4.2.6.jar@4,reference\:file\:org.apache.httpcomponents.httpcore_4.2.5.jar@4,reference\:file\:org.apache.logging.log4j.api_2.8.2.jar@1\:start,reference\:file\:org.apache.logging.log4j.core_2.8.2.jar@4,reference\:file\:org.apache.logging.log4j.slf4j-impl_2.8.2.jar@4,reference\:file\:org.apache.servicemix.bundles.quartz_2.3.0.2.jar@4,reference\:file\:org.eclipse.equinox.common_3.8.0.v20160509-1230.jar@2\:start,reference\:file\:org.eclipse.equinox.console_1.1.200.v20150929-1405.jar@4,reference\:file\:org.eclipse.equinox.ds_1.4.400.v20160226-2036.jar@1\:start,reference\:file\:org.eclipse.equinox.launcher_1.3.201.v20161025-1711.jar@4,reference\:file\:org.eclipse.equinox.util_1.0.500.v20130404-1337.jar@4,reference\:file\:org.eclipse.jetty.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.deploy_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.http_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.io_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.osgi.boot_9.3.9.v20160517.jar@4\:start,reference\:file\:org.eclipse.jetty.schemas_3.1.0.jar@4,reference\:file\:org.eclipse.jetty.security_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.util_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.webapp_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.api_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.client_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.common_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.server_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.websocket.servlet_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.jetty.xml_9.3.9.v20160517.jar@4,reference\:file\:org.eclipse.osgi.services_3.2.100.v20100503.jar@4,reference\:file\:org.hamcrest.core_1.3.0.jar@4,reference\:file\:org.jboss.resteasy.client_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxb-provider_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs_3.0.11.Final.jar@4,reference\:file\:org.jboss.resteasy.jaxrs-api_3.0.11.Final.jar@4,reference\:file\:org.jmock_2.6.0.jar@4,reference\:file\:org.jmock.junit4_2.6.0.jar@4,reference\:file\:org.mybatis.mybatis_3.5.2.jar@4,reference\:file\:org.objectweb.asm_5.0.1.jar@4,reference\:file\:org.objectweb.asm.commons_5.0.1.jar@4,reference\:file\:org.objectweb.asm.tree_5.0.1.jar@4,reference\:file\:org.omnifaces_3.4.1.jar@4,reference\:file\:slf4j.api_1.7.24.jar@4,reference\:file\:slf4j.simple_1.7.2.jar@4,reference\:file\:user.commons.log4j2_1.0.0.jar@4,reference\:file\:user.commons.zk_8.0.3.jar@4,reference\:file\:user.jobengine.osgi.commons_1.0.0.jar@4\:start,reference\:file\:user.jobengine.osgi.db_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.server_1.0.0.jar@4,reference\:file\:user.jobengine.osgi.services_1.0.0.jar@4,reference\:file\:user.mediacube.gui_1.0.0.jar@4,reference\:file\:user.mediacube.metadata_1.0.0.jar@4,reference\:file\:user.tsm.client_1.2.0.jar@4\r
 equinox.use.ds=true\r
 osgi.bundles.defaultStartLevel=4\r
index 6955a8a9b71601772f37ff2cb22188cc1aca32a7..725bca4f4098a1dbe77be55f71eb9ce9a29d6f9a 100644 (file)
@@ -22,6 +22,10 @@ import user.jobengine.server.steps.FileSearchFilterOptions;
 public class PathItemsCollectorStep extends JobStep {\r
        private static final Logger logger = LogManager.getLogger();\r
 \r
+       protected FileSearchFilterOptions createFileFilter(BasicDBObject filter) {\r
+               return new FileSearchFilterOptions(filter);\r
+       }\r
+\r
        @StepEntry\r
        public Object[] execute(String sourceFolder, BasicDBObject filter) throws Exception {\r
                Path sourcePath = Paths.get(sourceFolder);\r
@@ -29,7 +33,7 @@ public class PathItemsCollectorStep extends JobStep {
                List<String> files = new ArrayList<>();\r
 \r
                //teljes rekurzivitas szuressel\r
-               FileSearchFilterOptions filterOptions = new FileSearchFilterOptions(filter);\r
+               FileSearchFilterOptions filterOptions = createFileFilter(filter);\r
                FileVisitor<Path> visitor = new SimpleFileVisitor<Path>() {\r
                        @Override\r
                        public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {\r
@@ -61,6 +65,9 @@ public class PathItemsCollectorStep extends JobStep {
                        throw e;\r
                } finally {\r
                }\r
+\r
+               logger.info("Found {} files", files.size());\r
+\r
                return new Object[] { files };\r
        }\r
 }\r
diff --git a/server/user.jobengine.executors/amc/user/jobengine/server/steps/RundownFilesCollectorStep.java b/server/user.jobengine.executors/amc/user/jobengine/server/steps/RundownFilesCollectorStep.java
new file mode 100644 (file)
index 0000000..8b104d9
--- /dev/null
@@ -0,0 +1,42 @@
+package user.jobengine.server.steps;\r
+\r
+import java.nio.file.Path;\r
+import java.text.SimpleDateFormat;\r
+import java.util.Calendar;\r
+\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
+\r
+import com.ibm.nosql.json.api.BasicDBObject;\r
+\r
+/* DO NOT REMOVE!\r
+import user.jobengine.server.steps.FileSearchFilterOptions;\r
+*/\r
+public class RundownFilesCollectorStep extends PathItemsCollectorStep {\r
+       private static final Logger logger = LogManager.getLogger();\r
+\r
+       @Override\r
+       protected FileSearchFilterOptions createFileFilter(BasicDBObject filter) {\r
+               SimpleDateFormat df = new SimpleDateFormat("yyyy/MM");\r
+               Calendar thisMonthCal = Calendar.getInstance();\r
+               Calendar nextMonthCal = Calendar.getInstance();\r
+               nextMonthCal.add(Calendar.MONTH, 1);\r
+\r
+               FileSearchFilterOptions result = new FileSearchFilterOptions(filter) {\r
+                       @Override\r
+                       public boolean acceptFile(Path file) {\r
+                               if (file.toString().contains(df.format(thisMonthCal.getTime())) || file.toString().contains(df.format(nextMonthCal.getTime())))\r
+                                       return super.acceptFile(file);\r
+\r
+                               return false;\r
+                       }\r
+               };\r
+               return result;\r
+       }\r
+\r
+       @Override\r
+       @StepEntry\r
+       public Object[] execute(String sourceFolder, BasicDBObject filter) throws Exception {\r
+               return super.execute(sourceFolder, filter);\r
+       }\r
+}\r
index a35cb7da1f6e083fa26d28e4e2cf25c7e066e9d2..56e40e5910b5bb159ee7fc5e98453732d1b12543 100644 (file)
@@ -422,6 +422,22 @@ public class OctopusDataMiner {
                return result;\r
        }\r
 \r
+       BasicDBObject getDbObject(String json) {\r
+               BasicDBObject result = (BasicDBObject) JSONUtil.jsonToDbObject(json);\r
+\r
+               if (result == null)\r
+                       throw new NullPointerException("API Result is null!");\r
+\r
+               if (result.containsKey("exception")) {\r
+                       BasicDBObject e = (BasicDBObject) result.get("exception");\r
+                       throw new RuntimeException(e.getString("message"));\r
+\r
+               }\r
+               //{"exception":{"message":"Invalid credentials.","publicName":"AuthenticationFailedException"}}\r
+\r
+               return result;\r
+       }\r
+\r
        private Builder query(String path, String fields) {\r
                ResteasyWebTarget target = webTarget.path(path).queryParam(FIELDS, fields);\r
                Builder result = target.request().header(OCTOPUS_DEVICE_ID, OCTOPUS_API_USER).header(OCTOPUS_DEVICE_NAME, OCTOPUS_API_PASSWORD);\r
@@ -458,7 +474,7 @@ public class OctopusDataMiner {
                long id = NoSQLUtils.asLong(rundown, IOctopusAPI.ID);\r
                Response response = query(String.format("%s/%d", RUNDOWN, id), fields).get();\r
                String json = response.readEntity(String.class);\r
-               BasicDBObject resultObject = (BasicDBObject) JSONUtil.jsonToDbObject(json);\r
+               BasicDBObject resultObject = getDbObject(json);\r
                if (resultObject == null)\r
                        logger.error("Rundown {} {} is not available", id, rundown.getString(IOctopusAPI.NAME));\r
                else\r
@@ -478,7 +494,7 @@ public class OctopusDataMiner {
                        response = query.get();\r
 \r
                String json = response.readEntity(String.class);\r
-               BasicDBObject resultObject = (BasicDBObject) JSONUtil.jsonToDbObject(json);\r
+               BasicDBObject resultObject = getDbObject(json);\r
                if (resultObject != null)\r
                        result = NoSQLUtils.asDBList(resultObject, RESULT);\r
                logger.trace(EXIT);\r
@@ -490,7 +506,7 @@ public class OctopusDataMiner {
                BasicDBObject result = null;\r
                Response response = query(String.format("%s/%d", STORY, storyID), FIELDS_STORIES).get();\r
                String json = response.readEntity(String.class);\r
-               BasicDBObject resultObject = (BasicDBObject) JSONUtil.jsonToDbObject(json);\r
+               BasicDBObject resultObject = getDbObject(json);\r
                if (resultObject == null)\r
                        logger.error("Story {} is not available", storyID);\r
                else\r
@@ -505,7 +521,7 @@ public class OctopusDataMiner {
                long id = NoSQLUtils.asLong(storyFolder, IOctopusAPI.ID);\r
                Response response = query(String.format("%s/%d", STORY_FOLDER, id), fields).get();\r
                String json = response.readEntity(String.class);\r
-               BasicDBObject resultObject = (BasicDBObject) JSONUtil.jsonToDbObject(json);\r
+               BasicDBObject resultObject = getDbObject(json);\r
                if (resultObject == null)\r
                        logger.error("StoryFolder {} {} is not available", id, storyFolder.getString(IOctopusAPI.NAME));\r
                else\r
@@ -519,7 +535,7 @@ public class OctopusDataMiner {
                BasicDBList result = null;\r
                Response response = query(STORY_FOLDER, FIELDS_STORYFOLDER).get();\r
                String json = response.readEntity(String.class);\r
-               BasicDBObject resultObject = (BasicDBObject) JSONUtil.jsonToDbObject(json);\r
+               BasicDBObject resultObject = getDbObject(json);\r
                if (resultObject != null)\r
                        result = NoSQLUtils.asDBList(resultObject, RESULT);\r
 \r
index 43ab407b0b1b0147947af2cc78c9cb5025585760..4a6e619627a0f385829451d00e064eb59ebcd2f1 100644 (file)
@@ -1,3 +1,5 @@
+::A generalas elott checkout : user.jobengine.osgi.db/generated/user.jobengine.db\r
+\r
 @ECHO OFF\r
        ECHO *** Begin SQL compile ***\r
 \r
diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO.java b/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO.java
deleted file mode 100644 (file)
index 570f909..0000000
+++ /dev/null
@@ -1,390 +0,0 @@
-/*@lineinfo:filename=BreakDAO*//*@lineinfo:user-code*//*@lineinfo:1^1*/package user.jobengine.db;
-
-import user.commons.IEntityBase;
-import sqlj.runtime.ref.*;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.util.List;
-import java.util.ArrayList;
-
-/*@lineinfo:generated-code*//*@lineinfo:10^2*/
-
-//  ************************************************************
-//  SQLJ iterator declaration:
-//  ************************************************************
-
-class BreakIter 
-extends sqlj.runtime.ref.ResultSetIterImpl
-implements sqlj.runtime.NamedIterator
-{
-  private int thumbnailNdx;
-  private int createdNdx;
-  private int mediaIdNdx;
-  private int inPointNdx;
-  private int breakTypeNdx;
-  private int idNdx;
-  public BreakIter(sqlj.runtime.profile.RTResultSet resultSet) 
-    throws java.sql.SQLException 
-  {
-    super(resultSet);
-    idNdx = findColumn("id");
-    breakTypeNdx = findColumn("breakType");
-    inPointNdx = findColumn("inPoint");
-    mediaIdNdx = findColumn("mediaId");
-    createdNdx = findColumn("created");
-    thumbnailNdx = findColumn("thumbnail");
-  }
-  public BreakIter(sqlj.runtime.profile.RTResultSet resultSet, int fetchSize, int maxRows) 
-    throws java.sql.SQLException 
-  {
-    super(resultSet, fetchSize, maxRows);
-    idNdx = findColumn("id");
-    breakTypeNdx = findColumn("breakType");
-    inPointNdx = findColumn("inPoint");
-    mediaIdNdx = findColumn("mediaId");
-    createdNdx = findColumn("created");
-    thumbnailNdx = findColumn("thumbnail");
-  }
-  public long id() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getLongNoNull(idNdx);
-  }
-  public String breakType() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(breakTypeNdx);
-  }
-  public long inPoint() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getLongNoNull(inPointNdx);
-  }
-  public long mediaId() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getLongNoNull(mediaIdNdx);
-  }
-  public Timestamp created() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getTimestamp(createdNdx);
-  }
-  public byte[] thumbnail() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getBytes(thumbnailNdx);
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:10^114*/
-
-@SuppressWarnings("unused")
-class BreakDAO extends EntityBaseDAO {
-       
-       public BreakDAO(ItemManager manager) {
-               super(manager);
-       }
-       
-       @Override
-       protected List<IEntityBase> entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) throws SQLException {
-               List<IEntityBase> result = null;
-               BreakIter iterator = (BreakIter) iter;
-               while (iterator.next()) {
-                       Break entity = new Break();
-                       entity.setId(iterator.id());
-                       entity.setBreakType(ItemManagerData.toBreakType(iterator.breakType()));
-                       entity.setInPoint(iterator.inPoint());
-                       entity.setMediaId(iterator.mediaId());
-                       entity.setCreated(iterator.created());
-                       entity.setThumbnail(iterator.thumbnail());
-                       
-                       if (result == null)
-                               result = new ArrayList<IEntityBase>();                          
-                       result.add(entity);
-               }       
-               iterator.close();
-               return result;
-       }
-       
-       @Override
-       protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{
-               BreakIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:43^2*/
-
-//  ************************************************************
-//  #sql [context] iter = { SELECT ID, BREAKTYPE, INPOINT, MEDIAID, CREATED, THUMBNAIL FROM BREAK WHERE ID = :id  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, BreakDAO_SJProfileKeys.getKey(0), 0);
-    try 
-    {
-      __sJT_stmt.setLong(1, id);
-      iter = new BreakIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:43^111*/
-               return iter;
-       }
-
-       @Override
-       protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException{
-               BreakIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:50^2*/
-
-//  ************************************************************
-//  #sql [context] iter = { SELECT ID, BREAKTYPE, INPOINT, MEDIAID, CREATED, THUMBNAIL FROM BREAK WHERE MEDIAID = :id  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, BreakDAO_SJProfileKeys.getKey(0), 1);
-    try 
-    {
-      __sJT_stmt.setLong(1, id);
-      iter = new BreakIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:50^116*/
-               return iter;
-       }
-       
-       @Override
-       protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{
-               BreakIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:57^2*/
-
-//  ************************************************************
-//  #sql [context] iter = { SELECT ID, BREAKTYPE, INPOINT, MEDIAID, CREATED, THUMBNAIL FROM BREAK  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, BreakDAO_SJProfileKeys.getKey(0), 2);
-    try 
-    {
-      iter = new BreakIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:57^96*/
-               return iter;
-       }
-       
-       @Override
-       protected void delete(DefaultContext context, long id) throws SQLException{
-               /*@lineinfo:generated-code*//*@lineinfo:63^2*/
-
-//  ************************************************************
-//  #sql [context] { DELETE FROM BREAK WHERE ID = :id  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, BreakDAO_SJProfileKeys.getKey(0), 3);
-    try 
-    {
-      __sJT_stmt.setLong(1, id);
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:63^52*/
-       }
-       
-       @Override
-       protected void truncateTable(DefaultContext context) throws SQLException{
-               /*@lineinfo:generated-code*//*@lineinfo:68^2*/
-
-//  ************************************************************
-//  #sql [context] { TRUNCATE TABLE BREAK DROP STORAGE IGNORE DELETE TRIGGERS IMMEDIATE  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, BreakDAO_SJProfileKeys.getKey(0), 4);
-    try 
-    {
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:68^86*/
-       }
-       
-       @Override
-       protected void update(DefaultContext context, IEntityBase entity) throws SQLException{
-               Break obj = (Break) entity;
-               long id = obj.getId();
-               String breakType = obj.getBreakType().toString();
-               long inPoint = obj.getInPoint();
-               long mediaId = obj.getMediaId();
-               byte[] thumbnail = obj.getThumbnail();
-               
-               /*@lineinfo:generated-code*//*@lineinfo:80^2*/
-
-//  ************************************************************
-//  #sql [context] { UPDATE BREAK SET BREAKTYPE = :breakType, INPOINT = :inPoint, MEDIAID = :mediaId, THUMBNAIL = :thumbnail WHERE ID = :id  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, BreakDAO_SJProfileKeys.getKey(0), 5);
-    try 
-    {
-      __sJT_stmt.setString(1, breakType);
-      __sJT_stmt.setLong(2, inPoint);
-      __sJT_stmt.setLong(3, mediaId);
-      __sJT_stmt.setBytes(4, thumbnail);
-      __sJT_stmt.setLong(5, id);
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:80^138*/
-       }
-       
-       @Override
-       protected void insert(DefaultContext context, IEntityBase entity) throws SQLException{
-               Break obj = (Break) entity;
-               String breakType = obj.getBreakType().toString();
-               long inPoint = obj.getInPoint();
-               long mediaId = obj.getMediaId();
-               byte[] thumbnail = obj.getThumbnail();
-
-               /*@lineinfo:generated-code*//*@lineinfo:91^2*/
-
-//  ************************************************************
-//  #sql [context] { INSERT INTO BREAK (BREAKTYPE, INPOINT, MEDIAID, THUMBNAIL) VALUES (:breakType, :inPoint, :mediaId, :thumbnail)  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, BreakDAO_SJProfileKeys.getKey(0), 6);
-    try 
-    {
-      __sJT_stmt.setString(1, breakType);
-      __sJT_stmt.setLong(2, inPoint);
-      __sJT_stmt.setLong(3, mediaId);
-      __sJT_stmt.setBytes(4, thumbnail);
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:91^130*/
-       }
-
-}/*@lineinfo:generated-code*/class BreakDAO_SJProfileKeys 
-{
-  private java.lang.Object[] keys;
-  private final sqlj.runtime.profile.Loader loader = sqlj.runtime.RuntimeContext.getRuntime().getLoaderForClass(getClass());
-  private static BreakDAO_SJProfileKeys inst = null;
-  public static java.lang.Object getKey(int keyNum) 
-    throws java.sql.SQLException 
-  {
-    synchronized(user.jobengine.db.BreakDAO_SJProfileKeys.class) {
-      if (inst == null)
-      {
-        inst = new BreakDAO_SJProfileKeys();
-      }
-    }
-    return inst.keys[keyNum];
-  }
-  private BreakDAO_SJProfileKeys() 
-    throws java.sql.SQLException 
-  {
-    keys = new java.lang.Object[1];
-    keys[0] = DefaultContext.getProfileKey(loader, "user.jobengine.db.BreakDAO_SJProfile0");
-  }
-}
index 4b35461a0e4c30b67b6639dfd53512bfbd57c549..1b8cd5efbc88b640aff35edfcbdbc3bf312a0690 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser differ
index b01c0b4557d87c3e9a0f34899cf784697fce31d0..21e71cc4a7b5c9596417e348f1500946549a1482 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser differ
index f03cf916cc4e1b1b9841bcc629e2f2b473edff14..f9206ac0d9a2163ade966fec12c41567632b12aa 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser differ
index fb72d90a4e85876f0016511654a6c7ab3748edb3..de9d7df20bfd3a48a3f8712f5a6e6d6ba0116376 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser differ
index 33f05e2206d1e2522ef260453e281dafe6af0995..dad2100aab91f898d0904bee61062fb9a4814e6d 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser differ
index eaa80a0bf61f8a4d7ba7ab21b88b2f95d7792e07..18b6577ace652ac2f0a0b5ef4b66bc6b98b3af5a 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/FileTypeDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/FileTypeDAO_SJProfile0.ser differ
diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO.java b/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO.java
deleted file mode 100644 (file)
index 7398406..0000000
+++ /dev/null
@@ -1,312 +0,0 @@
-/*@lineinfo:filename=FolderDAO*//*@lineinfo:user-code*//*@lineinfo:1^1*/package user.jobengine.db;
-
-import user.commons.IEntityBase;
-import sqlj.runtime.ref.*;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-/*@lineinfo:generated-code*//*@lineinfo:9^2*/
-
-//  ************************************************************
-//  SQLJ iterator declaration:
-//  ************************************************************
-
-class FolderIter 
-extends sqlj.runtime.ref.ResultSetIterImpl
-implements sqlj.runtime.NamedIterator
-{
-  private int childIdNdx;
-  private int parentIdNdx;
-  private int idNdx;
-  public FolderIter(sqlj.runtime.profile.RTResultSet resultSet) 
-    throws java.sql.SQLException 
-  {
-    super(resultSet);
-    idNdx = findColumn("id");
-    parentIdNdx = findColumn("parentId");
-    childIdNdx = findColumn("childId");
-  }
-  public FolderIter(sqlj.runtime.profile.RTResultSet resultSet, int fetchSize, int maxRows) 
-    throws java.sql.SQLException 
-  {
-    super(resultSet, fetchSize, maxRows);
-    idNdx = findColumn("id");
-    parentIdNdx = findColumn("parentId");
-    childIdNdx = findColumn("childId");
-  }
-  public long id() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getLongNoNull(idNdx);
-  }
-  public long parentId() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getLongNoNull(parentIdNdx);
-  }
-  public long childId() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getLongNoNull(childIdNdx);
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:9^61*/
-
-@SuppressWarnings("unused")
-public class FolderDAO extends EntityBaseDAO {
-       
-       public FolderDAO(ItemManager manager) {
-               super(manager);
-       }
-       
-       @Override
-       protected List<IEntityBase> entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) throws SQLException {
-               List<IEntityBase> result = null;
-               FolderIter iterator = (FolderIter) iter;
-               while (iterator.next()) {
-                       Folder entity = new Folder();
-                       entity.setId(iterator.id());
-                       entity.setParentId(iterator.parentId());
-                       entity.setChildId(iterator.childId());
-                       if (result == null)
-                               result = new ArrayList<IEntityBase>();                          
-                       result.add(entity);
-               }       
-               iterator.close();
-               return result;
-       }
-       
-       @Override
-       protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{
-               FolderIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:38^2*/
-
-//  ************************************************************
-//  #sql [context] iter = { SELECT ID, PARENTID, CHILDID FROM FOLDER WHERE ID = :id  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, FolderDAO_SJProfileKeys.getKey(0), 0);
-    try 
-    {
-      __sJT_stmt.setLong(1, id);
-      iter = new FolderIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:38^82*/
-               return iter;
-       }
-
-       protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException{
-               FolderIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:44^2*/
-
-//  ************************************************************
-//  #sql [context] iter = { SELECT ID, PARENTID, CHILDID FROM FOLDER WHERE CHILDID = :id  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, FolderDAO_SJProfileKeys.getKey(0), 1);
-    try 
-    {
-      __sJT_stmt.setLong(1, id);
-      iter = new FolderIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:44^87*/
-               return iter;
-       }
-
-       @Override
-       protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{
-               FolderIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:51^2*/
-
-//  ************************************************************
-//  #sql [context] iter = { SELECT ID, PARENTID, CHILDID FROM FOLDER  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, FolderDAO_SJProfileKeys.getKey(0), 2);
-    try 
-    {
-      iter = new FolderIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:51^67*/
-               return iter;
-       }
-       
-       @Override
-       protected void delete(DefaultContext context, long id) throws SQLException{
-               /*@lineinfo:generated-code*//*@lineinfo:57^2*/
-
-//  ************************************************************
-//  #sql [context] { DELETE FROM FOLDER WHERE ID = :id  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, FolderDAO_SJProfileKeys.getKey(0), 3);
-    try 
-    {
-      __sJT_stmt.setLong(1, id);
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:57^53*/
-       }
-       
-       @Override
-       protected void truncateTable(DefaultContext context) throws SQLException{
-               /*@lineinfo:generated-code*//*@lineinfo:62^2*/
-
-//  ************************************************************
-//  #sql [context] { TRUNCATE TABLE FOLDER DROP STORAGE IGNORE DELETE TRIGGERS IMMEDIATE  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, FolderDAO_SJProfileKeys.getKey(0), 4);
-    try 
-    {
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:62^87*/
-       }
-       
-       @Override
-       protected void insert(DefaultContext context, IEntityBase entity) throws SQLException{
-               Folder obj = (Folder) entity;
-               long parentId = obj.getParentId();
-               long childId = obj.getChildId();
-
-               /*@lineinfo:generated-code*//*@lineinfo:71^2*/
-
-//  ************************************************************
-//  #sql [context] { INSERT INTO FOLDER (PARENTID, CHILDID) VALUES (:parentId, :childId)  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, FolderDAO_SJProfileKeys.getKey(0), 5);
-    try 
-    {
-      __sJT_stmt.setLong(1, parentId);
-      __sJT_stmt.setLong(2, childId);
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:71^87*/
-       }
-       
-}/*@lineinfo:generated-code*/class FolderDAO_SJProfileKeys 
-{
-  private java.lang.Object[] keys;
-  private final sqlj.runtime.profile.Loader loader = sqlj.runtime.RuntimeContext.getRuntime().getLoaderForClass(getClass());
-  private static FolderDAO_SJProfileKeys inst = null;
-  public static java.lang.Object getKey(int keyNum) 
-    throws java.sql.SQLException 
-  {
-    synchronized(user.jobengine.db.FolderDAO_SJProfileKeys.class) {
-      if (inst == null)
-      {
-        inst = new FolderDAO_SJProfileKeys();
-      }
-    }
-    return inst.keys[keyNum];
-  }
-  private FolderDAO_SJProfileKeys() 
-    throws java.sql.SQLException 
-  {
-    keys = new java.lang.Object[1];
-    keys[0] = DefaultContext.getProfileKey(loader, "user.jobengine.db.FolderDAO_SJProfile0");
-  }
-}
index 8fe928380e34aab11b88bdf39c1fcf20f02f5ed4..5f3d51e7bf5f72da78960ac8376e729bc287456e 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser differ
index d596bd3064acb7278fa1368901d18c4238d87cc6..ab0eeacec76644a754e00b6080574dedffa2c01b 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser differ
index 795d052161ead94ceb64bc82f5cb30b379ab1c62..6925b826962255ae93391f1e3d613fe6e5036c14 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemDAO_SJProfile0.ser differ
diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemIter.java b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemIter.java
deleted file mode 100644 (file)
index 5eb8196..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-/*@lineinfo:filename=ItemIter*//*@lineinfo:user-code*//*@lineinfo:1^1*/package user.jobengine.db;
-
-import java.sql.Timestamp;
-
-/*@lineinfo:generated-code*//*@lineinfo:5^2*/
-
-//  ************************************************************
-//  SQLJ iterator declaration:
-//  ************************************************************
-
-public class ItemIter 
-extends sqlj.runtime.ref.ResultSetIterImpl
-implements sqlj.runtime.NamedIterator
-{
-  private int isFolderNdx;
-  private int createdNdx;
-  private int houseIdNdx;
-  private int itemTypeIdNdx;
-  private int descriptionNdx;
-  private int titleNdx;
-  private int idNdx;
-  public ItemIter(sqlj.runtime.profile.RTResultSet resultSet) 
-    throws java.sql.SQLException 
-  {
-    super(resultSet);
-    idNdx = findColumn("id");
-    titleNdx = findColumn("title");
-    descriptionNdx = findColumn("description");
-    itemTypeIdNdx = findColumn("itemTypeId");
-    houseIdNdx = findColumn("houseId");
-    createdNdx = findColumn("created");
-    isFolderNdx = findColumn("isFolder");
-  }
-  public ItemIter(sqlj.runtime.profile.RTResultSet resultSet, int fetchSize, int maxRows) 
-    throws java.sql.SQLException 
-  {
-    super(resultSet, fetchSize, maxRows);
-    idNdx = findColumn("id");
-    titleNdx = findColumn("title");
-    descriptionNdx = findColumn("description");
-    itemTypeIdNdx = findColumn("itemTypeId");
-    houseIdNdx = findColumn("houseId");
-    createdNdx = findColumn("created");
-    isFolderNdx = findColumn("isFolder");
-  }
-  public long id() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getLongNoNull(idNdx);
-  }
-  public String title() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(titleNdx);
-  }
-  public String description() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(descriptionNdx);
-  }
-  public long itemTypeId() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getLongNoNull(itemTypeIdNdx);
-  }
-  public String houseId() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(houseIdNdx);
-  }
-  public Timestamp created() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getTimestamp(createdNdx);
-  }
-  public String isFolder() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(isFolderNdx);
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:5^140*//*@lineinfo:generated-code*/
\ No newline at end of file
index 2f196a5e0fdd170a27e1b333d82cdf13d84cb3cc..cb87d0df746d678f24002e3b2bbea0f029ad21cf 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemTypeDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemTypeDAO_SJProfile0.ser differ
index f91175e9e9826fe0917914c8ad03ebe8a1bff731..1d85834351e252548daaf9926e23df014422bb3a 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser differ
index 0838889f251a7356c7f8a4ee1197292ef8d36751..4402c87929f91bed9cf5427c58e76c334a08544a 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser differ
diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO.java b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO.java
deleted file mode 100644 (file)
index ba6c52a..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
-/*@lineinfo:filename=MasterIdDAO*//*@lineinfo:user-code*//*@lineinfo:1^1*/package user.jobengine.db;
-
-import user.commons.IEntityBase;
-import sqlj.runtime.ref.*;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.List;
-import java.util.ArrayList;
-
-/*@lineinfo:generated-code*//*@lineinfo:11^2*/
-
-//  ************************************************************
-//  SQLJ iterator declaration:
-//  ************************************************************
-
-class MasterIdIter 
-extends sqlj.runtime.ref.ResultSetIterImpl
-implements sqlj.runtime.NamedIterator
-{
-  private int createdNdx;
-  private int idNdx;
-  public MasterIdIter(sqlj.runtime.profile.RTResultSet resultSet) 
-    throws java.sql.SQLException 
-  {
-    super(resultSet);
-    idNdx = findColumn("id");
-    createdNdx = findColumn("created");
-  }
-  public MasterIdIter(sqlj.runtime.profile.RTResultSet resultSet, int fetchSize, int maxRows) 
-    throws java.sql.SQLException 
-  {
-    super(resultSet, fetchSize, maxRows);
-    idNdx = findColumn("id");
-    createdNdx = findColumn("created");
-  }
-  public long id() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getLongNoNull(idNdx);
-  }
-  public Timestamp created() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getTimestamp(createdNdx);
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:11^53*/
-
-@SuppressWarnings("unused")
-class MasterIdDAO extends EntityBaseDAO {
-
-       public MasterIdDAO(ItemManager manager) {
-               super(manager);
-       }
-       
-       @Override
-       protected List<IEntityBase> entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) throws SQLException {
-               List<IEntityBase> result = null;
-               ShotIter iterator = (ShotIter) iter;
-               while (iterator.next()) {
-                       MasterId entity = new MasterId();
-                       entity.setId(iterator.id());
-                       entity.setCreated(iterator.created());
-                       
-                       if (result == null)
-                               result = new ArrayList<IEntityBase>();                          
-                       result.add(entity);
-               }       
-               iterator.close();
-               return result;
-       }
-
-       
-       @Override
-       protected void insert(DefaultContext context, IEntityBase entity) throws SQLException{
-               MasterId obj = (MasterId) entity;
-               obj.setCreated(new Timestamp(new Date().getTime()));
-               Timestamp created = obj.getCreated();
-
-               /*@lineinfo:generated-code*//*@lineinfo:44^2*/
-
-//  ************************************************************
-//  #sql [context] { INSERT INTO MASTERID (CREATED) VALUES (:created)  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, MasterIdDAO_SJProfileKeys.getKey(0), 0);
-    try 
-    {
-      __sJT_stmt.setTimestamp(1, created);
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:44^68*/
-       }
-       
-       @Override
-       protected void truncateTable(DefaultContext context) throws SQLException{
-               /*@lineinfo:generated-code*//*@lineinfo:49^2*/
-
-//  ************************************************************
-//  #sql [context] { TRUNCATE TABLE MASTERID DROP STORAGE IGNORE DELETE TRIGGERS IMMEDIATE  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, MasterIdDAO_SJProfileKeys.getKey(0), 1);
-    try 
-    {
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:49^89*/
-       }
-}/*@lineinfo:generated-code*/class MasterIdDAO_SJProfileKeys 
-{
-  private java.lang.Object[] keys;
-  private final sqlj.runtime.profile.Loader loader = sqlj.runtime.RuntimeContext.getRuntime().getLoaderForClass(getClass());
-  private static MasterIdDAO_SJProfileKeys inst = null;
-  public static java.lang.Object getKey(int keyNum) 
-    throws java.sql.SQLException 
-  {
-    synchronized(user.jobengine.db.MasterIdDAO_SJProfileKeys.class) {
-      if (inst == null)
-      {
-        inst = new MasterIdDAO_SJProfileKeys();
-      }
-    }
-    return inst.keys[keyNum];
-  }
-  private MasterIdDAO_SJProfileKeys() 
-    throws java.sql.SQLException 
-  {
-    keys = new java.lang.Object[1];
-    keys[0] = DefaultContext.getProfileKey(loader, "user.jobengine.db.MasterIdDAO_SJProfile0");
-  }
-}
index 7573db067cce181df0c95dd3c4e9f254e48d0fda..dd8c65ed9cf866aa691c06a6923c5cc315b15ded 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO_SJProfile0.ser differ
index 5a539709e30ac739be6831eedfa8fce5bad1bee3..3d424a0893621005c52ff2ff36d96889f512eb3d 100644 (file)
@@ -18,6 +18,7 @@ extends sqlj.runtime.ref.ResultSetIterImpl
 implements sqlj.runtime.NamedIterator
 {
   private int posterNdx;
+  private int creationNdx;
   private int modifiedNdx;
   private int archivedNdx;
   private int createdNdx;
@@ -42,6 +43,7 @@ implements sqlj.runtime.NamedIterator
     createdNdx = findColumn("created");
     archivedNdx = findColumn("archived");
     modifiedNdx = findColumn("modified");
+    creationNdx = findColumn("creation");
     posterNdx = findColumn("poster");
   }
   public MediaIter(sqlj.runtime.profile.RTResultSet resultSet, int fetchSize, int maxRows) 
@@ -58,6 +60,7 @@ implements sqlj.runtime.NamedIterator
     createdNdx = findColumn("created");
     archivedNdx = findColumn("archived");
     modifiedNdx = findColumn("modified");
+    creationNdx = findColumn("creation");
     posterNdx = findColumn("poster");
   }
   public long id() 
@@ -110,6 +113,11 @@ implements sqlj.runtime.NamedIterator
   {
     return resultSet.getTimestamp(modifiedNdx);
   }
+  public Timestamp creation() 
+    throws java.sql.SQLException 
+  {
+    return resultSet.getTimestamp(creationNdx);
+  }
   public byte[] poster() 
     throws java.sql.SQLException 
   {
@@ -120,7 +128,7 @@ implements sqlj.runtime.NamedIterator
 
 //  ************************************************************
 
-/*@lineinfo:user-code*//*@lineinfo:10^198*/
+/*@lineinfo:user-code*//*@lineinfo:10^218*/
 
 @SuppressWarnings("unused")
 class MediaDAO extends EntityBaseDAO {
@@ -176,6 +184,7 @@ class MediaDAO extends EntityBaseDAO {
                        entity.setCreated(iterator.created());
                        entity.setArchived(iterator.archived());
                        entity.setModified(iterator.modified());
+                       entity.setCreation(iterator.creation());
                        entity.setPoster(iterator.poster());
 
                        if (result == null)
@@ -189,7 +198,7 @@ class MediaDAO extends EntityBaseDAO {
        @Override
        protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{
                MediaIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:79^2*/
+               /*@lineinfo:generated-code*//*@lineinfo:80^2*/
 
 //  ************************************************************
 //  #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER FROM MEDIA WHERE ID = :id  };
@@ -217,14 +226,14 @@ class MediaDAO extends EntityBaseDAO {
 
 //  ************************************************************
 
-/*@lineinfo:user-code*//*@lineinfo:79^156*/
+/*@lineinfo:user-code*//*@lineinfo:80^156*/
                return iter;
        }
 
        @Override
        protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException{
                MediaIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:86^2*/
+               /*@lineinfo:generated-code*//*@lineinfo:87^2*/
 
 //  ************************************************************
 //  #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER FROM MEDIA WHERE ITEMID = :id  };
@@ -252,13 +261,13 @@ class MediaDAO extends EntityBaseDAO {
 
 //  ************************************************************
 
-/*@lineinfo:user-code*//*@lineinfo:86^160*/
+/*@lineinfo:user-code*//*@lineinfo:87^160*/
                return iter;
        }
        
        public ResultSetIterImpl selectByTitle(DefaultContext context, String title) throws SQLException{
                MediaIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:92^2*/
+               /*@lineinfo:generated-code*//*@lineinfo:93^2*/
 
 //  ************************************************************
 //  #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER FROM MEDIA WHERE TITLE = :title  };
@@ -286,14 +295,14 @@ class MediaDAO extends EntityBaseDAO {
 
 //  ************************************************************
 
-/*@lineinfo:user-code*//*@lineinfo:92^162*/
+/*@lineinfo:user-code*//*@lineinfo:93^162*/
                return iter;
        }
        
        @Override
        protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{
                MediaIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:99^2*/
+               /*@lineinfo:generated-code*//*@lineinfo:100^2*/
 
 //  ************************************************************
 //  #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER FROM MEDIA  };
@@ -320,13 +329,13 @@ class MediaDAO extends EntityBaseDAO {
 
 //  ************************************************************
 
-/*@lineinfo:user-code*//*@lineinfo:99^141*/
+/*@lineinfo:user-code*//*@lineinfo:100^141*/
                return iter;
        }
        
        @Override
        protected void delete(DefaultContext context, long id) throws SQLException{
-               /*@lineinfo:generated-code*//*@lineinfo:105^2*/
+               /*@lineinfo:generated-code*//*@lineinfo:106^2*/
 
 //  ************************************************************
 //  #sql [context] { DELETE FROM MEDIA WHERE ID = :id  };
@@ -354,12 +363,12 @@ class MediaDAO extends EntityBaseDAO {
 
 //  ************************************************************
 
-/*@lineinfo:user-code*//*@lineinfo:105^52*/
+/*@lineinfo:user-code*//*@lineinfo:106^52*/
        }
        
        @Override
        protected void truncateTable(DefaultContext context) throws SQLException{
-               /*@lineinfo:generated-code*//*@lineinfo:110^2*/
+               /*@lineinfo:generated-code*//*@lineinfo:111^2*/
 
 //  ************************************************************
 //  #sql [context] { TRUNCATE TABLE MEDIA DROP STORAGE IGNORE DELETE TRIGGERS IMMEDIATE  };
@@ -386,7 +395,7 @@ class MediaDAO extends EntityBaseDAO {
 
 //  ************************************************************
 
-/*@lineinfo:user-code*//*@lineinfo:110^86*/
+/*@lineinfo:user-code*//*@lineinfo:111^86*/
        }
        
        @Override
@@ -402,11 +411,12 @@ class MediaDAO extends EntityBaseDAO {
                byte[] poster = obj.getPoster();
                Timestamp archived = obj.getArchived();
                Timestamp modified = obj.getModified();
+               Timestamp creation = obj.getCreation();
 
-               /*@lineinfo:generated-code*//*@lineinfo:127^2*/
+               /*@lineinfo:generated-code*//*@lineinfo:129^2*/
 
 //  ************************************************************
-//  #sql [context] { UPDATE MEDIA SET TITLE = :title, DESCRIPTION = :description, ITEMID = :itemId, ITEMTYPEID = :itemTypeId, HOUSEID = :houseId, LENGTH = :length, POSTER = :poster, ARCHIVED = :archived, MODIFIED = :modified WHERE ID = :id  };
+//  #sql [context] { UPDATE MEDIA SET TITLE = :title, DESCRIPTION = :description, ITEMID = :itemId, ITEMTYPEID = :itemTypeId, HOUSEID = :houseId, LENGTH = :length, POSTER = :poster, ARCHIVED = :archived, MODIFIED = :modified, CREATION = :creation WHERE ID = :id  };
 //  ************************************************************
 
 {
@@ -427,7 +437,8 @@ class MediaDAO extends EntityBaseDAO {
       __sJT_stmt.setBytes(7, poster);
       __sJT_stmt.setTimestamp(8, archived);
       __sJT_stmt.setTimestamp(9, modified);
-      __sJT_stmt.setLong(10, id);
+      __sJT_stmt.setTimestamp(10, creation);
+      __sJT_stmt.setLong(11, id);
       __sJT_execCtx.executeUpdate();
     }
     finally 
@@ -440,7 +451,7 @@ class MediaDAO extends EntityBaseDAO {
 
 //  ************************************************************
 
-/*@lineinfo:user-code*//*@lineinfo:127^238*/
+/*@lineinfo:user-code*//*@lineinfo:129^260*/
        }
        
        @Override
@@ -456,11 +467,12 @@ class MediaDAO extends EntityBaseDAO {
                byte[] poster = obj.getPoster();
                Timestamp archived = obj.getArchived();
                Timestamp modified = obj.getModified();
+               Timestamp creation = obj.getCreation();
                
-               /*@lineinfo:generated-code*//*@lineinfo:144^2*/
+               /*@lineinfo:generated-code*//*@lineinfo:147^2*/
 
 //  ************************************************************
-//  #sql [context] { INSERT INTO MEDIA (ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, POSTER, ARCHIVED, MODIFIED) VALUES (:id, :title, :description, :itemId, :itemTypeId, :houseId, :length, :poster, :archived, :modified)  };
+//  #sql [context] { INSERT INTO MEDIA (ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, POSTER, ARCHIVED, MODIFIED, CREATION) VALUES (:id, :title, :description, :itemId, :itemTypeId, :houseId, :length, :poster, :archived, :modified, :creation)  };
 //  ************************************************************
 
 {
@@ -482,6 +494,7 @@ class MediaDAO extends EntityBaseDAO {
       __sJT_stmt.setBytes(8, poster);
       __sJT_stmt.setTimestamp(9, archived);
       __sJT_stmt.setTimestamp(10, modified);
+      __sJT_stmt.setTimestamp(11, creation);
       __sJT_execCtx.executeUpdate();
     }
     finally 
@@ -494,7 +507,7 @@ class MediaDAO extends EntityBaseDAO {
 
 //  ************************************************************
 
-/*@lineinfo:user-code*//*@lineinfo:144^234*/
+/*@lineinfo:user-code*//*@lineinfo:147^255*/
        }
        
        /**
index b48972027f9532e82b594c47d7d45cbc09fc7e32..af7204410c7542ba314eac99864fe3c6fd629f1c 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser differ
index 4ca9e8bf1d94964dcb54d94c1c8c36d4df47116b..174d5be5f9472bf42449c42008ca402286d64ae0 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO_SJProfile0.ser differ
diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO.java b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO.java
deleted file mode 100644 (file)
index 3dc91a0..0000000
+++ /dev/null
@@ -1,906 +0,0 @@
-/*@lineinfo:filename=MetadataDAO*//*@lineinfo:user-code*//*@lineinfo:1^1*/package user.jobengine.db;
-
-import user.commons.IEntityBase;
-import sqlj.runtime.ref.*;
-import user.jobengine.db.ItemManagerData.SignalType;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.List;
-import java.util.ArrayList;
-
-/*@lineinfo:generated-code*//*@lineinfo:12^2*/
-
-//  ************************************************************
-//  SQLJ iterator declaration:
-//  ************************************************************
-
-class MetadataIter 
-extends sqlj.runtime.ref.ResultSetIterImpl
-implements sqlj.runtime.NamedIterator
-{
-  private int metadataElementIdNdx;
-  private int itemTypeIdNdx;
-  private int parameterNdx;
-  private int staticTableNdx;
-  private int sqlFieldNdx;
-  private int pojoFieldNdx;
-  private int listTypeNdx;
-  private int guiTypeNdx;
-  private int isSearchableNdx;
-  private int isGeneratedNdx;
-  private int isListableNdx;
-  private int isEditableNdx;
-  private int isDbNullableNdx;
-  private int isDbUniqueNdx;
-  private int isDbIndexNdx;
-  private int idNdx;
-  public MetadataIter(sqlj.runtime.profile.RTResultSet resultSet) 
-    throws java.sql.SQLException 
-  {
-    super(resultSet);
-    idNdx = findColumn("id");
-    isDbIndexNdx = findColumn("isDbIndex");
-    isDbUniqueNdx = findColumn("isDbUnique");
-    isDbNullableNdx = findColumn("isDbNullable");
-    isEditableNdx = findColumn("isEditable");
-    isListableNdx = findColumn("isListable");
-    isGeneratedNdx = findColumn("isGenerated");
-    isSearchableNdx = findColumn("isSearchable");
-    guiTypeNdx = findColumn("guiType");
-    listTypeNdx = findColumn("listType");
-    pojoFieldNdx = findColumn("pojoField");
-    sqlFieldNdx = findColumn("sqlField");
-    staticTableNdx = findColumn("staticTable");
-    parameterNdx = findColumn("parameter");
-    itemTypeIdNdx = findColumn("itemTypeId");
-    metadataElementIdNdx = findColumn("metadataElementId");
-  }
-  public MetadataIter(sqlj.runtime.profile.RTResultSet resultSet, int fetchSize, int maxRows) 
-    throws java.sql.SQLException 
-  {
-    super(resultSet, fetchSize, maxRows);
-    idNdx = findColumn("id");
-    isDbIndexNdx = findColumn("isDbIndex");
-    isDbUniqueNdx = findColumn("isDbUnique");
-    isDbNullableNdx = findColumn("isDbNullable");
-    isEditableNdx = findColumn("isEditable");
-    isListableNdx = findColumn("isListable");
-    isGeneratedNdx = findColumn("isGenerated");
-    isSearchableNdx = findColumn("isSearchable");
-    guiTypeNdx = findColumn("guiType");
-    listTypeNdx = findColumn("listType");
-    pojoFieldNdx = findColumn("pojoField");
-    sqlFieldNdx = findColumn("sqlField");
-    staticTableNdx = findColumn("staticTable");
-    parameterNdx = findColumn("parameter");
-    itemTypeIdNdx = findColumn("itemTypeId");
-    metadataElementIdNdx = findColumn("metadataElementId");
-  }
-  public long id() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getLongNoNull(idNdx);
-  }
-  public String isDbIndex() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(isDbIndexNdx);
-  }
-  public String isDbUnique() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(isDbUniqueNdx);
-  }
-  public String isDbNullable() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(isDbNullableNdx);
-  }
-  public String isEditable() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(isEditableNdx);
-  }
-  public String isListable() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(isListableNdx);
-  }
-  public String isGenerated() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(isGeneratedNdx);
-  }
-  public String isSearchable() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(isSearchableNdx);
-  }
-  public String guiType() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(guiTypeNdx);
-  }
-  public String listType() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(listTypeNdx);
-  }
-  public String pojoField() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(pojoFieldNdx);
-  }
-  public String sqlField() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(sqlFieldNdx);
-  }
-  public String staticTable() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(staticTableNdx);
-  }
-  public String parameter() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(parameterNdx);
-  }
-  public long itemTypeId() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getLongNoNull(itemTypeIdNdx);
-  }
-  public long metadataElementId() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getLongNoNull(metadataElementIdNdx);
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:12^318*/
-
-@SuppressWarnings("unused")
-class MetadataDAO extends EntityBaseDAO {
-               
-       public MetadataDAO(ItemManager manager) {
-               super(manager);
-       }
-
-       @Override
-       protected void afterAdd(DefaultContext context, IEntityBase entity) throws SQLException { 
-               Metadata metadata = (Metadata) entity;
-               if (metadata.requireDataTable())
-                       createTable(context.getConnection(), entity);
-               manager.notifyItemTypeChange(entity, SignalType.CREATE);
-       }
-
-       @Override
-       protected void afterModify(DefaultContext context, IEntityBase entity) throws SQLException { 
-               Metadata metadata = (Metadata) entity;
-               if (metadata.requireDataTable()) {
-                       dropTable(context.getConnection(), entity);
-                       createTable(context.getConnection(), entity);
-               }
-               manager.notifyItemTypeChange(entity, SignalType.UPDATE);
-       }
-
-       @Override
-       protected void afterDelete(DefaultContext context, IEntityBase entity) throws SQLException { 
-               Metadata metadata = (Metadata) entity;
-               if (metadata.requireDataTable())
-                       dropTable(context.getConnection(), entity);
-               manager.notifyItemTypeChange(entity, SignalType.DELETE);
-       }
-       
-       @Override
-       protected List<IEntityBase> entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) throws SQLException {
-               List<IEntityBase> result = null;
-               MetadataIter iterator = (MetadataIter) iter;
-               while (iterator.next()) {
-                       Metadata entity = new Metadata();
-                       entity.setId(iterator.id());
-                       entity.setIsDbIndex(iterator.isDbIndex().equals("Y") ? true : false);
-                       entity.setIsDbUnique(iterator.isDbUnique().equals("Y") ? true : false);
-                       entity.setIsDbNullable(iterator.isDbNullable().equals("Y") ? true : false);
-                       entity.setIsEditable(iterator.isEditable().equals("Y") ? true : false);
-                       entity.setIsListable(iterator.isListable().equals("Y") ? true : false);
-                       entity.setIsGenerated(iterator.isGenerated().equals("Y") ? true : false);
-                       entity.setIsSearchable(iterator.isSearchable().equals("Y") ? true : false);
-                       entity.setGuiType(ItemManagerData.toGuiType(iterator.guiType()));
-                       entity.setListType(ItemManagerData.toListType(iterator.listType()));
-                       entity.setPojoField(iterator.pojoField());
-                       entity.setSqlField(iterator.sqlField());
-                       entity.setStaticTable(ItemManagerData.toStaticTable(iterator.staticTable()));
-                       entity.setParameter(iterator.parameter());
-                       entity.setItemTypeId(iterator.itemTypeId());
-                       entity.setMetadataElementId(iterator.metadataElementId());
-
-                       if (result == null)
-                               result = new ArrayList<IEntityBase>();                          
-                       result.add(entity);
-               }       
-               iterator.close();
-               return result;
-       }
-       
-       @Override
-       protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{
-               MetadataIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:81^2*/
-
-//  ************************************************************
-//  #sql [context] iter = { SELECT ID, ISDBINDEX, ISDBUNIQUE, ISDBNULLABLE, ISEDITABLE, ISLISTABLE, ISGENERATED, ISSEARCHABLE, GUITYPE, LISTTYPE, POJOFIELD, SQLFIELD, STATICTABLE, PARAMETER, ITEMTYPEID, METADATAELEMENTID FROM METADATA WHERE ID = :id  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, MetadataDAO_SJProfileKeys.getKey(0), 0);
-    try 
-    {
-      __sJT_stmt.setLong(1, id);
-      iter = new MetadataIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:81^248*/
-               return iter;
-       }
-
-       @Override
-       protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException{
-               MetadataIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:88^2*/
-
-//  ************************************************************
-//  #sql [context] iter = { SELECT ID, ISDBINDEX, ISDBUNIQUE, ISDBNULLABLE, ISEDITABLE, ISLISTABLE, ISGENERATED, ISSEARCHABLE,GUITYPE, LISTTYPE, POJOFIELD, SQLFIELD, STATICTABLE, PARAMETER, ITEMTYPEID, METADATAELEMENTID FROM METADATA WHERE ITEMTYPEID = :id  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, MetadataDAO_SJProfileKeys.getKey(0), 1);
-    try 
-    {
-      __sJT_stmt.setLong(1, id);
-      iter = new MetadataIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:88^255*/
-               return iter;
-       }
-       
-       @Override
-       protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{
-               MetadataIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:95^2*/
-
-//  ************************************************************
-//  #sql [context] iter = { SELECT ID, ISDBINDEX, ISDBUNIQUE, ISDBNULLABLE, ISEDITABLE, ISLISTABLE, ISGENERATED, ISSEARCHABLE, GUITYPE, LISTTYPE, POJOFIELD, SQLFIELD, STATICTABLE, PARAMETER, ITEMTYPEID, METADATAELEMENTID FROM METADATA  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, MetadataDAO_SJProfileKeys.getKey(0), 2);
-    try 
-    {
-      iter = new MetadataIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:95^233*/
-               return iter;
-       }
-       
-       @Override
-       protected void delete(DefaultContext context, long id) throws SQLException{
-               /*@lineinfo:generated-code*//*@lineinfo:101^2*/
-
-//  ************************************************************
-//  #sql [context] { DELETE FROM METADATA WHERE ID = :id  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, MetadataDAO_SJProfileKeys.getKey(0), 3);
-    try 
-    {
-      __sJT_stmt.setLong(1, id);
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:101^55*/
-       }
-       
-       @Override
-       protected void truncateTable(DefaultContext context) throws SQLException{
-               /*@lineinfo:generated-code*//*@lineinfo:106^2*/
-
-//  ************************************************************
-//  #sql [context] { TRUNCATE TABLE METADATA DROP STORAGE IGNORE DELETE TRIGGERS IMMEDIATE  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, MetadataDAO_SJProfileKeys.getKey(0), 4);
-    try 
-    {
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:106^89*/
-       }
-       
-       @Override
-       protected void update(DefaultContext context, IEntityBase entity) throws SQLException{
-               Metadata obj = (Metadata) entity;
-               long id = obj.getId();
-               String isDbIndex = obj.getIsDbIndex() == true ? "Y" : "N";
-               String isDbUnique = obj.getIsDbUnique() == true ? "Y" : "N";
-               String isDbNullable = obj.getIsDbNullable() == true ? "Y" : "N";
-               String isEditable = obj.getIsEditable() == true ? "Y" : "N";
-               String isListable = obj.getIsListable() == true ? "Y" : "N";
-               String isGenerated = obj.getIsGenerated() == true ? "Y" : "N";
-               String isSearchable = obj.getIsSearchable() == true ? "Y" : "N";
-               String guiType = obj.getGuiType().toString();
-               String listType = obj.getListType().toString();
-               String pojoField = obj.getPojoField();
-               String sqlField = obj.getSqlField();
-               String staticTable = obj.getStaticTable() == null ? null : obj.getStaticTable().toString();
-               String parameter = obj.getParameter();
-               long itemTypeId = obj.getItemTypeId();
-               long metadataElementId = obj.getMetadataElementId();
-               
-               /*@lineinfo:generated-code*//*@lineinfo:129^2*/
-
-//  ************************************************************
-//  #sql [context] { UPDATE METADATA SET ISDBINDEX = :isDbIndex, ISDBUNIQUE = :isDbUnique, ISDBNULLABLE = :isDbNullable, ISEDITABLE = :isEditable, ISLISTABLE = :isListable, ISGENERATED = :isGenerated, ISSEARCHABLE = :isSearchable, GUITYPE = :guiType, LISTTYPE = :listType, POJOFIELD = :pojoField, SQLFIELD = :sqlField, STATICTABLE = :staticTable, PARAMETER = :parameter, ITEMTYPEID = :itemTypeId, METADATAELEMENTID = :metadataElementId WHERE ID = :id  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, MetadataDAO_SJProfileKeys.getKey(0), 5);
-    try 
-    {
-      __sJT_stmt.setString(1, isDbIndex);
-      __sJT_stmt.setString(2, isDbUnique);
-      __sJT_stmt.setString(3, isDbNullable);
-      __sJT_stmt.setString(4, isEditable);
-      __sJT_stmt.setString(5, isListable);
-      __sJT_stmt.setString(6, isGenerated);
-      __sJT_stmt.setString(7, isSearchable);
-      __sJT_stmt.setString(8, guiType);
-      __sJT_stmt.setString(9, listType);
-      __sJT_stmt.setString(10, pojoField);
-      __sJT_stmt.setString(11, sqlField);
-      __sJT_stmt.setString(12, staticTable);
-      __sJT_stmt.setString(13, parameter);
-      __sJT_stmt.setLong(14, itemTypeId);
-      __sJT_stmt.setLong(15, metadataElementId);
-      __sJT_stmt.setLong(16, id);
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:129^449*/
-       }
-       
-       @Override
-       protected void insert(DefaultContext context, IEntityBase entity) throws SQLException{
-               Metadata obj = (Metadata) entity;
-               String isDbIndex = obj.getIsDbIndex() == true ? "Y" : "N";
-               String isDbUnique = obj.getIsDbUnique() == true ? "Y" : "N";
-               String isDbNullable = obj.getIsDbNullable() == true ? "Y" : "N";
-               String isEditable = obj.getIsEditable() == true ? "Y" : "N";
-               String isListable = obj.getIsListable() == true ? "Y" : "N";
-               String isGenerated = obj.getIsGenerated() == true ? "Y" : "N";
-               String isSearchable = obj.getIsSearchable() == true ? "Y" : "N";
-               String guiType = obj.getGuiType().toString();
-               String listType = obj.getListType().toString();
-               String pojoField = obj.getPojoField();
-               String sqlField = obj.getSqlField();
-               String staticTable = obj.getStaticTable() == null ? null : obj.getStaticTable().toString();
-               String parameter = obj.getParameter();
-               long itemTypeId = obj.getItemTypeId();
-               long metadataElementId = obj.getMetadataElementId();
-
-               /*@lineinfo:generated-code*//*@lineinfo:151^2*/
-
-//  ************************************************************
-//  #sql [context] { INSERT INTO METADATA (ISDBINDEX, ISDBUNIQUE, ISDBNULLABLE, ISEDITABLE, ISLISTABLE, ISGENERATED, ISSEARCHABLE, GUITYPE, LISTTYPE, POJOFIELD, SQLFIELD, STATICTABLE, PARAMETER, ITEMTYPEID, METADATAELEMENTID) 
-//             VALUES (:isDbIndex, :isDbUnique, :isDbNullable, :isEditable, :isListable, :isGenerated, :isSearchable, :guiType, :listType, :pojoField, :sqlField, :staticTable, :parameter, :itemTypeId, :metadataElementId)  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, MetadataDAO_SJProfileKeys.getKey(0), 6);
-    try 
-    {
-      __sJT_stmt.setString(1, isDbIndex);
-      __sJT_stmt.setString(2, isDbUnique);
-      __sJT_stmt.setString(3, isDbNullable);
-      __sJT_stmt.setString(4, isEditable);
-      __sJT_stmt.setString(5, isListable);
-      __sJT_stmt.setString(6, isGenerated);
-      __sJT_stmt.setString(7, isSearchable);
-      __sJT_stmt.setString(8, guiType);
-      __sJT_stmt.setString(9, listType);
-      __sJT_stmt.setString(10, pojoField);
-      __sJT_stmt.setString(11, sqlField);
-      __sJT_stmt.setString(12, staticTable);
-      __sJT_stmt.setString(13, parameter);
-      __sJT_stmt.setLong(14, itemTypeId);
-      __sJT_stmt.setLong(15, metadataElementId);
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:152^208*/
-       }
-       
-       public IEntityBase get(String name) {
-               manager.traceIn();
-               DefaultContext context = manager.getDbContext();
-               IEntityBase entity = null;
-               try {
-                       MetadataIter iter = null;
-                       /*@lineinfo:generated-code*//*@lineinfo:161^3*/
-
-//  ************************************************************
-//  #sql [context] iter = { SELECT ID, ISDBINDEX, ISDBUNIQUE, ISDBNULLABLE, ISEDITABLE, ISLISTABLE, ISGENERATED, ISSEARCHABLE, GUITYPE, LISTTYPE, POJOFIELD, SQLFIELD, STATICTABLE, PARAMETER, ITEMTYPEID, METADATAELEMENTID FROM METADATA WHERE NAME = :name  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, MetadataDAO_SJProfileKeys.getKey(0), 7);
-    try 
-    {
-      __sJT_stmt.setString(1, name);
-      iter = new MetadataIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:161^253*/
-                       List<IEntityBase> result = entities(context, iter, false);
-                       if (result != null && result.size() == 1)
-                               entity = result.get(0); 
-                       /*@lineinfo:generated-code*//*@lineinfo:165^3*/
-
-//  ************************************************************
-//  #sql [context] { COMMIT  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, MetadataDAO_SJProfileKeys.getKey(0), 8);
-    try 
-    {
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:165^27*/
-               } catch (Exception e) {
-                       logger.error(e.getMessage());
-                       try {
-                               /*@lineinfo:generated-code*//*@lineinfo:169^4*/
-
-//  ************************************************************
-//  #sql [context] { ROLLBACK  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, MetadataDAO_SJProfileKeys.getKey(0), 9);
-    try 
-    {
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:169^30*/
-                       } catch(Exception e1) {
-                       }
-               } finally {
-                       manager.putDbContext(context);
-               }
-               manager.traceOut();
-               return entity;
-       }
-       
-       /**
-        * Besz\ufffdrja az ItemType objektumhoz kapcsol\ufffdd\ufffd Metadata adatokat. 
-        */
-       void addAll(DefaultContext context, ItemType itemType) throws SQLException {
-               List<Metadata> metadatas = itemType.getMetadatas();
-               if (metadatas != null) {
-                       for (Metadata metadata: metadatas) {
-                               metadata.setItemTypeId(itemType.getId());
-                               add(context, metadata);
-                       }
-               }
-       }
-
-       /**
-        * T\ufffdrli a param\ufffdterk\ufffdnt kapott ItemType azonos\ufffdt\ufffdhoz tartoz\ufffd Metadata bejegyz\ufffdseket. 
-        */
-       void removeAll(DefaultContext context, long filterId) throws SQLException {
-               manager.traceIn();
-               /*@lineinfo:generated-code*//*@lineinfo:197^2*/
-
-//  ************************************************************
-//  #sql [context] { DELETE FROM METADATA WHERE ITEMTYPEID = :filterId  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, MetadataDAO_SJProfileKeys.getKey(0), 10);
-    try 
-    {
-      __sJT_stmt.setLong(1, filterId);
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:197^69*/
-               manager.traceOut();
-       }
-
-//     void addColumn(Connection connection, Metadata metadata) throws SQLException {
-//             Statement st = null;
-//             try {
-//                     ItemType itemType = ItemManager.getInstance().getItemType(metadata.getItemTypeId());
-//                     String tableName = itemType.getTableName();
-//                     String create = metadata.getCreateSQL();
-//                     List<String> commands = new ArrayList<String>();
-//                     if (create != null) {
-//                             commands.add("ALTER TABLE " + tableName + " ADD COLUMN " + create);
-//                             String index = metadata.getIndexSQL();
-//                             if (index != null)
-//                                     commands.add(index);
-//                             commands.add("call SYSPROC.ADMIN_CMD ('REORG TABLE " + tableName + "')");
-//                     }
-//                     st = connection.createStatement();
-//                     for (String sql: commands)
-//                             st.execute(sql);
-//             }
-//             catch (SQLException e) {
-//                     throw new SQLException(e);
-//             } finally {
-//                     try{
-//                             if (st != null) 
-//                                     st.close();
-//                     } catch (Exception e1) { }
-//             }
-//     }
-//
-//     void modifyColumn(Connection connection, Metadata metadata) throws SQLException {
-//             Statement st = null;
-//             try {
-//                     ItemType itemType = ItemManager.getInstance().getItemType(metadata.getItemTypeId());
-//                     String tableName = itemType.getTableName();
-//                     String columnName = metadata.getColumnName();
-//                     List<String> commands = new ArrayList<String>();
-//                     commands.add("ALTER TABLE " + tableName + " DROP COLUMN " + columnName);
-//                     String create = metadata.getCreateSQL();
-//                     if (create != null) {
-//                             commands.add("ALTER TABLE " + tableName + " ADD COLUMN " + create);
-//                             String index = metadata.getIndexSQL();
-//                             if (index != null) {
-//                                     commands.add("call SYSPROC.ADMIN_CMD ('REORG TABLE " + tableName + "')");
-//                                     commands.add(index);
-//                             }
-//                             commands.add("call SYSPROC.ADMIN_CMD ('REORG TABLE " + tableName + "')");
-//                     }
-//                     st = connection.createStatement();
-//                     for (String sql: commands) {
-//                             System.out.println(sql);
-//                             st.execute(sql);
-//                     }
-//             }
-//             catch (SQLException e) {
-//                     throw new SQLException(e);
-//             } finally {
-//                     try{
-//                             if (st != null) 
-//                                     st.close();
-//                     } catch (Exception e1) { }
-//             }
-//     }
-//
-//     void removeColumn(Connection connection, Metadata metadata) throws SQLException {
-//             Statement st = null;
-//             try {
-//                     ItemType itemType = ItemManager.getInstance().getItemType(metadata.getItemTypeId());
-//                     String tableName = itemType.getTableName();
-//                     String columnName = metadata.getColumnName();
-//                     List<String> commands = new ArrayList<String>();
-//                     commands.add("ALTER TABLE " + tableName + " DROP COLUMN " + columnName);
-//                     commands.add("call SYSPROC.ADMIN_CMD ('REORG TABLE " + tableName + "')");
-//                     st = connection.createStatement();
-//                     for (String sql: commands)
-//                             st.execute(sql);
-//             }
-//             catch (SQLException e) {
-//                     throw new SQLException(e);
-//             } finally {
-//                     try{
-//                             if (st != null) 
-//                                     st.close();
-//                     } catch (Exception e1) { }
-//             }
-//     }
-       
-//     void dropMetadataTable(Connection connection, ItemType itemType) throws SQLException {
-//             manager.traceIn();
-//             String tableName = itemType.getTableName().toString();
-//             Statement st = null;
-//             try {
-//                     st = connection.createStatement();
-//                     st.execute("DROP TABLE " + tableName);
-//             }
-//             catch (SQLException e) {
-//                     throw new SQLException(e);
-//             } finally {
-//                     try{
-//                             if (st != null) 
-//                                     st.close();
-//                     } catch (Exception e1) { }
-//             }
-//             manager.traceOut();
-//     }       
-//     
-//     void createMetadataTable(Connection connection, ItemType itemType) throws SQLException {
-//             manager.traceIn();
-//             List<String> commands = new ArrayList<String>();
-//             List<String> indexes = new ArrayList<String>();
-//             String tableName = itemType.getTableName().toString();
-//             StringBuilder sb = new StringBuilder();
-//             sb.append("CREATE TABLE " + tableName + "(");
-//             sb.append("ID BIGINT NOT NULL PRIMARY KEY,");
-//             sb.append("CONSTRAINT FK_" + tableName + "_ID FOREIGN KEY (ID) REFERENCES MASTERID (ID)");
-//             
-//             List<Metadata> metadatas = itemType.getMetadatas();
-//             if (metadatas != null) {
-//                     for (Metadata md : metadatas) {
-//                             String create = md.getCreateSQL();
-//                             if (create != null) {
-//                                     sb.append(", ");
-//                                     sb.append(create);
-//                             }
-//                             String index = md.getIndexSQL();
-//                             if (index != null)
-//                                     indexes.add(index);
-//                     }
-//             }
-//             sb.append(")");
-//             commands.add(sb.toString());
-//             commands.addAll(indexes);
-//             
-//             Statement st = null;
-//             try {
-//                     st = connection.createStatement();
-//                     for (String sql: commands)
-//                             st.execute(sql);
-//             }
-//             catch (SQLException e) {
-//                     throw new SQLException(e);
-//             } finally {
-//                     try{
-//                             if (st != null) 
-//                                     st.close();
-//                     } catch (Exception e1) { }
-//             }
-//             manager.traceOut();
-//     }
-       
-       void createTable(Connection connection, IEntityBase entity) throws SQLException {
-               manager.traceIn();
-               Statement st = null;
-               Metadata metadata = (Metadata) entity;
-               try {
-                       String tableName = metadata.getTableName();
-                       String columnSql = metadata.getCreateSQL();
-                       String sql = String.format("CREATE TABLE %1$s (ID BIGINT NOT NULL PRIMARY KEY, %2$s, CONSTRAINT FK_%1$s_ID FOREIGN KEY (ID) REFERENCES MASTERID (ID))", tableName, columnSql);
-                       st = connection.createStatement();
-                       logger.debug(sql);
-                       st.execute(sql);
-                       String index = metadata.getIndexSQL();
-                       if (index != null) {
-                               logger.debug(index);
-                               st.execute(index);
-                       }
-               }
-               catch (SQLException e) {
-                       throw new SQLException(e);
-               } finally {
-                       try{
-                               if (st != null) 
-                                       st.close();
-                       } catch (Exception e1) { }
-               }
-               manager.traceOut();
-       }
-
-       void dropTable(Connection connection, IEntityBase entity) throws SQLException {
-               manager.traceIn();
-               Metadata metadata = (Metadata) entity;
-               String tableName = metadata.getTableName();
-               Statement st = null;
-               try {
-                       st = connection.createStatement();
-                       String sql = "DROP TABLE " + tableName;
-                       logger.debug(sql);
-                       st.execute(sql);
-               }
-               catch (SQLException e) {
-                       throw new SQLException(e);
-               } finally {
-                       try{
-                               if (st != null) 
-                                       st.close();
-                       } catch (Exception e1) { }
-               }
-               manager.traceOut();
-       }       
-}/*@lineinfo:generated-code*/class MetadataDAO_SJProfileKeys 
-{
-  private java.lang.Object[] keys;
-  private final sqlj.runtime.profile.Loader loader = sqlj.runtime.RuntimeContext.getRuntime().getLoaderForClass(getClass());
-  private static MetadataDAO_SJProfileKeys inst = null;
-  public static java.lang.Object getKey(int keyNum) 
-    throws java.sql.SQLException 
-  {
-    synchronized(user.jobengine.db.MetadataDAO_SJProfileKeys.class) {
-      if (inst == null)
-      {
-        inst = new MetadataDAO_SJProfileKeys();
-      }
-    }
-    return inst.keys[keyNum];
-  }
-  private MetadataDAO_SJProfileKeys() 
-    throws java.sql.SQLException 
-  {
-    keys = new java.lang.Object[1];
-    keys[0] = DefaultContext.getProfileKey(loader, "user.jobengine.db.MetadataDAO_SJProfile0");
-  }
-}
index 47884950fafec7538a29bdb7e139afc0b9432e4b..1f4279941120f51285b0881aaeb4784c8e2fe51b 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser differ
index 5e1b326bbf4eac86f25a3f5757ef461408f8fb0f..08fdd9d6269a217e7f65ac74af1a29997d1fc366 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser differ
index bf2e4e7745d2e0a941fd0278a70cd5a335b8ced4..f46ecd846ce66031bbba3cdb195cceed9a3e38ea 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataTypeDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataTypeDAO_SJProfile0.ser differ
index a5f260c55efcc81e7e3f3f779073c9150ad9e667..aca192d35a0078e202d7149ac67b6a3c865d4264 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser differ
index 2b00f2546ddb283698210846637d49a7ab753cd3..bcdbafc304416ca95274adba16827c96ed730585 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser differ
index 9b1fda83ad8fcdccbe477b0db7a0f951770e3cdf..4fe84ae7ae851ef8746c5dac5fb1048b0dfb3255 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser differ
index 2010cc8bd02f26347f83a6317acf732c0998977d..c05e6563d1a9e9b83fb24afccd48bab8f2c847cd 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SearchDefinitionDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SearchDefinitionDAO_SJProfile0.ser differ
index 53fad35915284b96861b490b1be503951f51cf7c..e01b8e100f539fea464d30402cd639f38736084c 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser differ
diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO.java b/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO.java
deleted file mode 100644 (file)
index d5e8ffb..0000000
+++ /dev/null
@@ -1,448 +0,0 @@
-/*@lineinfo:filename=StoreDAO*//*@lineinfo:user-code*//*@lineinfo:1^1*/package user.jobengine.db;
-
-import user.commons.IEntityBase;
-import sqlj.runtime.ref.*;
-import user.commons.StoreUri;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-/*@lineinfo:generated-code*//*@lineinfo:10^2*/
-
-//  ************************************************************
-//  SQLJ iterator declaration:
-//  ************************************************************
-
-class StoreIter 
-extends sqlj.runtime.ref.ResultSetIterImpl
-implements sqlj.runtime.NamedIterator
-{
-  private int isLowresNdx;
-  private int isSystemNdx;
-  private int nameNdx;
-  private int idNdx;
-  public StoreIter(sqlj.runtime.profile.RTResultSet resultSet) 
-    throws java.sql.SQLException 
-  {
-    super(resultSet);
-    idNdx = findColumn("id");
-    nameNdx = findColumn("name");
-    isSystemNdx = findColumn("isSystem");
-    isLowresNdx = findColumn("isLowres");
-  }
-  public StoreIter(sqlj.runtime.profile.RTResultSet resultSet, int fetchSize, int maxRows) 
-    throws java.sql.SQLException 
-  {
-    super(resultSet, fetchSize, maxRows);
-    idNdx = findColumn("id");
-    nameNdx = findColumn("name");
-    isSystemNdx = findColumn("isSystem");
-    isLowresNdx = findColumn("isLowres");
-  }
-  public long id() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getLongNoNull(idNdx);
-  }
-  public String name() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(nameNdx);
-  }
-  public String isSystem() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(isSystemNdx);
-  }
-  public String isLowres() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(isLowresNdx);
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:10^78*/
-
-@SuppressWarnings("unused")
-class StoreDAO extends EntityBaseDAO {
-       
-       public StoreDAO(ItemManager manager) {
-               super(manager);
-       }
-
-       @Override
-       protected void afterAdd(DefaultContext context, IEntityBase entity) throws SQLException { 
-               StoreUriDAO dao = (StoreUriDAO) manager.getBaseDAO(StoreUri.class);
-               dao.addAll(context, entity);
-       }
-
-       @Override
-       protected void beforeDelete(DefaultContext context, IEntityBase entity) throws SQLException { 
-               StoreUriDAO dao = (StoreUriDAO) manager.getBaseDAO(StoreUri.class);
-               dao.removeAll(context, entity.getId());
-       }
-       
-       @Override
-       protected List<IEntityBase> entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) throws SQLException {
-               List<IEntityBase> result = null;
-               StoreIter iterator = (StoreIter) iter;
-               while (iterator.next()) {
-                       Store entity = new Store();
-                       entity.setId(iterator.id());
-                       entity.setName(iterator.name());
-                       entity.setSystem(iterator.isSystem().equals("Y") ? true : false);
-                       entity.setLowres(iterator.isLowres().equals("Y") ? true : false);
-                       
-                       if (result == null)
-                               result = new ArrayList<IEntityBase>();                          
-                       result.add(entity);
-               }       
-               iterator.close();
-               return result;
-       }
-       
-       @Override
-       protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{
-               StoreIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:53^2*/
-
-//  ************************************************************
-//  #sql [context] iter = { SELECT ID, NAME, ISSYSTEM, ISLOWRES FROM STORE WHERE ID = :id  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, StoreDAO_SJProfileKeys.getKey(0), 0);
-    try 
-    {
-      __sJT_stmt.setLong(1, id);
-      iter = new StoreIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:53^88*/
-               return iter;
-       }
-
-       @Override
-       protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{
-               StoreIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:60^2*/
-
-//  ************************************************************
-//  #sql [context] iter = { SELECT ID, NAME, ISSYSTEM, ISLOWRES FROM STORE  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, StoreDAO_SJProfileKeys.getKey(0), 1);
-    try 
-    {
-      iter = new StoreIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:60^73*/
-               return iter;
-       }
-       
-       protected ResultSetIterImpl selectByName(DefaultContext context, String name) throws SQLException{
-               StoreIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:66^2*/
-
-//  ************************************************************
-//  #sql [context] iter = { SELECT ID, NAME, ISSYSTEM, ISLOWRES FROM STORE WHERE NAME = :name  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, StoreDAO_SJProfileKeys.getKey(0), 2);
-    try 
-    {
-      __sJT_stmt.setString(1, name);
-      iter = new StoreIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:66^92*/
-               return iter;
-       }
-
-       protected ResultSetIterImpl selectBySystem(DefaultContext context, String lowres) throws SQLException{
-               StoreIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:72^2*/
-
-//  ************************************************************
-//  #sql [context] iter = { SELECT ID, NAME, ISSYSTEM, ISLOWRES FROM STORE WHERE ISSYSTEM = 'Y' AND ISLOWRES = :lowres  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, StoreDAO_SJProfileKeys.getKey(0), 3);
-    try 
-    {
-      __sJT_stmt.setString(1, lowres);
-      iter = new StoreIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:72^117*/
-               return iter;
-       }
-       
-       @Override
-       protected void delete(DefaultContext context, long id) throws SQLException{
-               /*@lineinfo:generated-code*//*@lineinfo:78^2*/
-
-//  ************************************************************
-//  #sql [context] { DELETE FROM STORE WHERE ID = :id  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, StoreDAO_SJProfileKeys.getKey(0), 4);
-    try 
-    {
-      __sJT_stmt.setLong(1, id);
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:78^52*/
-       }
-       
-       @Override
-       protected void truncateTable(DefaultContext context) throws SQLException{
-               /*@lineinfo:generated-code*//*@lineinfo:83^2*/
-
-//  ************************************************************
-//  #sql [context] { TRUNCATE TABLE STORE DROP STORAGE IGNORE DELETE TRIGGERS IMMEDIATE  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, StoreDAO_SJProfileKeys.getKey(0), 5);
-    try 
-    {
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:83^86*/
-       }
-       
-       @Override
-       protected void update(DefaultContext context, IEntityBase entity) throws SQLException{
-               Store obj = (Store) entity;
-               long id = obj.getId();
-               String name = obj.getName();
-               String isSystem = obj.isSystem() == true ? "Y" : "N";
-               String isLowres = obj.isLowres() == true ? "Y" : "N";
-               
-               /*@lineinfo:generated-code*//*@lineinfo:94^2*/
-
-//  ************************************************************
-//  #sql [context] { UPDATE STORE SET NAME = :name, ISSYSTEM = :isSystem, ISLOWRES = :isLowres WHERE ID = :id  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, StoreDAO_SJProfileKeys.getKey(0), 6);
-    try 
-    {
-      __sJT_stmt.setString(1, name);
-      __sJT_stmt.setString(2, isSystem);
-      __sJT_stmt.setString(3, isLowres);
-      __sJT_stmt.setLong(4, id);
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:94^108*/
-       }
-       
-       @Override
-       protected void insert(DefaultContext context, IEntityBase entity) throws SQLException{
-               Store obj = (Store) entity;
-               String name = obj.getName();
-               String isSystem = obj.isSystem() == true ? "Y" : "N";
-               String isLowres = obj.isLowres() == true ? "Y" : "N";
-
-               /*@lineinfo:generated-code*//*@lineinfo:104^2*/
-
-//  ************************************************************
-//  #sql [context] { INSERT INTO STORE (NAME, ISSYSTEM, ISLOWRES) VALUES (:name, :isSystem, :isLowres)  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, StoreDAO_SJProfileKeys.getKey(0), 7);
-    try 
-    {
-      __sJT_stmt.setString(1, name);
-      __sJT_stmt.setString(2, isSystem);
-      __sJT_stmt.setString(3, isLowres);
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:104^101*/
-       }
-
-       public IEntityBase getByName(String name) {
-               manager.traceIn();
-               IEntityBase entity = null;
-               DefaultContext context = manager.getDbContext();
-               try {
-                       ResultSetIterImpl iter = selectByName(context, name);
-                       checkNull(iter, ResultSetIterImpl.class);
-                       entity = getEntity(context, iter);
-               } catch (Exception e) {
-                       throw new ItemManagerException(e);
-               } finally {
-                       manager.putDbContext(context);
-               }
-               manager.traceOut();
-               return entity;
-       }
-
-       
-       public IEntityBase getSystemStore(boolean lowres) {
-               manager.traceIn();
-               IEntityBase entity = null;
-               DefaultContext context = manager.getDbContext();
-               try {
-                       ResultSetIterImpl iter = selectBySystem(context, lowres ? "Y" : "N");
-                       checkNull(iter, ResultSetIterImpl.class);
-                       entity = getEntity(context, iter);
-               } catch (Exception e) {
-                       throw new ItemManagerException(e);
-               } finally {
-                       manager.putDbContext(context);
-               }
-               manager.traceOut();
-               return entity;
-       }
-       
-}/*@lineinfo:generated-code*/class StoreDAO_SJProfileKeys 
-{
-  private java.lang.Object[] keys;
-  private final sqlj.runtime.profile.Loader loader = sqlj.runtime.RuntimeContext.getRuntime().getLoaderForClass(getClass());
-  private static StoreDAO_SJProfileKeys inst = null;
-  public static java.lang.Object getKey(int keyNum) 
-    throws java.sql.SQLException 
-  {
-    synchronized(user.jobengine.db.StoreDAO_SJProfileKeys.class) {
-      if (inst == null)
-      {
-        inst = new StoreDAO_SJProfileKeys();
-      }
-    }
-    return inst.keys[keyNum];
-  }
-  private StoreDAO_SJProfileKeys() 
-    throws java.sql.SQLException 
-  {
-    keys = new java.lang.Object[1];
-    keys[0] = DefaultContext.getProfileKey(loader, "user.jobengine.db.StoreDAO_SJProfile0");
-  }
-}
index 41d5e701b730ccbde02617bbe5a1ff1acf9dcc5e..f193184c37ea6514daecf1dc3f75b132b326558b 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO_SJProfile0.ser differ
diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO.java b/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO.java
deleted file mode 100644 (file)
index ecd56f0..0000000
+++ /dev/null
@@ -1,524 +0,0 @@
-/*@lineinfo:filename=StoreUriDAO*//*@lineinfo:user-code*//*@lineinfo:1^1*/package user.jobengine.db;
-
-import user.commons.IEntityBase;
-import sqlj.runtime.ref.*;
-import user.commons.StoreUri;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.ArrayList;
-import user.commons.remotestore.RemoteStoreProtocol;
-import user.commons.remotestore.DeliveryMethod;
-
-/*@lineinfo:generated-code*//*@lineinfo:12^2*/
-
-//  ************************************************************
-//  SQLJ iterator declaration:
-//  ************************************************************
-
-class StoreUriIter 
-extends sqlj.runtime.ref.ResultSetIterImpl
-implements sqlj.runtime.NamedIterator
-{
-  private int protocolNdx;
-  private int deliveryNdx;
-  private int portNumberNdx;
-  private int rootPathNdx;
-  private int passwordNdx;
-  private int userNameNdx;
-  private int isTargetNdx;
-  private int isSourceNdx;
-  private int isStreamNdx;
-  private int uriNdx;
-  private int storeIdNdx;
-  private int idNdx;
-  public StoreUriIter(sqlj.runtime.profile.RTResultSet resultSet) 
-    throws java.sql.SQLException 
-  {
-    super(resultSet);
-    idNdx = findColumn("id");
-    storeIdNdx = findColumn("storeId");
-    uriNdx = findColumn("uri");
-    isStreamNdx = findColumn("isStream");
-    isSourceNdx = findColumn("isSource");
-    isTargetNdx = findColumn("isTarget");
-    userNameNdx = findColumn("userName");
-    passwordNdx = findColumn("password");
-    rootPathNdx = findColumn("rootPath");
-    portNumberNdx = findColumn("portNumber");
-    deliveryNdx = findColumn("delivery");
-    protocolNdx = findColumn("protocol");
-  }
-  public StoreUriIter(sqlj.runtime.profile.RTResultSet resultSet, int fetchSize, int maxRows) 
-    throws java.sql.SQLException 
-  {
-    super(resultSet, fetchSize, maxRows);
-    idNdx = findColumn("id");
-    storeIdNdx = findColumn("storeId");
-    uriNdx = findColumn("uri");
-    isStreamNdx = findColumn("isStream");
-    isSourceNdx = findColumn("isSource");
-    isTargetNdx = findColumn("isTarget");
-    userNameNdx = findColumn("userName");
-    passwordNdx = findColumn("password");
-    rootPathNdx = findColumn("rootPath");
-    portNumberNdx = findColumn("portNumber");
-    deliveryNdx = findColumn("delivery");
-    protocolNdx = findColumn("protocol");
-  }
-  public long id() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getLongNoNull(idNdx);
-  }
-  public long storeId() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getLongNoNull(storeIdNdx);
-  }
-  public String uri() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(uriNdx);
-  }
-  public String isStream() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(isStreamNdx);
-  }
-  public String isSource() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(isSourceNdx);
-  }
-  public String isTarget() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(isTargetNdx);
-  }
-  public String userName() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(userNameNdx);
-  }
-  public String password() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(passwordNdx);
-  }
-  public String rootPath() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(rootPathNdx);
-  }
-  public Integer portNumber() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getIntWrapper(portNumberNdx);
-  }
-  public String delivery() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(deliveryNdx);
-  }
-  public String protocol() 
-    throws java.sql.SQLException 
-  {
-    return resultSet.getString(protocolNdx);
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:12^216*/
-
-@SuppressWarnings("unused")
-
-class StoreUriDAO extends EntityBaseDAO {
-       
-       public StoreUriDAO(ItemManager manager) {
-               super(manager);
-       }
-       
-       @Override
-       protected List<IEntityBase> entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) throws SQLException {
-               List<IEntityBase> result = null;
-               StoreUriIter iterator = (StoreUriIter) iter;
-               while (iterator.next()) {
-                       StoreUri entity = new StoreUri();
-                       entity.setId(iterator.id());
-                       entity.setStoreId(iterator.storeId());
-                       entity.setUri(iterator.uri());
-                       entity.setStream(iterator.isStream().equals("Y") ? true : false);
-                       entity.setSource(iterator.isSource().equals("Y") ? true : false);
-                       entity.setTarget(iterator.isTarget().equals("Y") ? true : false);
-                       entity.setUserName(iterator.userName());
-                       entity.setPassword(iterator.password());
-                       entity.setRootPath(iterator.rootPath());
-                       entity.setPortNumber(iterator.portNumber());
-                       entity.setDelivery(ItemManagerData.toDeliveryMethod(iterator.delivery()));
-                       entity.setProtocol(ItemManagerData.toRemoteStoreProtocol(iterator.protocol()));
-                       
-                       if (result == null)
-                               result = new ArrayList<IEntityBase>();                          
-                       result.add(entity);
-               }       
-               iterator.close();
-               return result;
-       }
-       
-       @Override
-       protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{
-               StoreUriIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:52^2*/
-
-//  ************************************************************
-//  #sql [context] iter = { SELECT ID, STOREID, URI, ISSTREAM, ISSOURCE, ISTARGET, USERNAME, PASSWORD, ROOTPATH, PORTNUMBER, DELIVERY, PROTOCOL FROM STOREURI WHERE ID = :id  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, StoreUriDAO_SJProfileKeys.getKey(0), 0);
-    try 
-    {
-      __sJT_stmt.setLong(1, id);
-      iter = new StoreUriIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:52^171*/
-               return iter;
-       }
-
-       @Override
-       protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException{
-               StoreUriIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:59^2*/
-
-//  ************************************************************
-//  #sql [context] iter = { SELECT ID, STOREID, URI, ISSTREAM, ISSOURCE, ISTARGET, USERNAME, PASSWORD, ROOTPATH, PORTNUMBER, DELIVERY, PROTOCOL FROM STOREURI WHERE STOREID = :id  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, StoreUriDAO_SJProfileKeys.getKey(0), 1);
-    try 
-    {
-      __sJT_stmt.setLong(1, id);
-      iter = new StoreUriIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:59^176*/
-               return iter;
-       }
-
-       @Override
-       protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{
-               StoreUriIter iter = null;
-               /*@lineinfo:generated-code*//*@lineinfo:66^2*/
-
-//  ************************************************************
-//  #sql [context] iter = { SELECT ID, STOREID, URI, ISSTREAM, ISSOURCE, ISTARGET, USERNAME, PASSWORD, ROOTPATH, PORTNUMBER, DELIVERY, PROTOCOL FROM STOREURI  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, StoreUriDAO_SJProfileKeys.getKey(0), 2);
-    try 
-    {
-      iter = new StoreUriIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows());
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:66^156*/
-               return iter;
-       }
-       
-       @Override
-       protected void delete(DefaultContext context, long id) throws SQLException{
-               /*@lineinfo:generated-code*//*@lineinfo:72^2*/
-
-//  ************************************************************
-//  #sql [context] { DELETE FROM STOREURI WHERE ID = :id  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, StoreUriDAO_SJProfileKeys.getKey(0), 3);
-    try 
-    {
-      __sJT_stmt.setLong(1, id);
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:72^55*/
-       }
-       
-       @Override
-       protected void truncateTable(DefaultContext context) throws SQLException{
-               /*@lineinfo:generated-code*//*@lineinfo:77^2*/
-
-//  ************************************************************
-//  #sql [context] { TRUNCATE TABLE STOREURI DROP STORAGE IGNORE DELETE TRIGGERS IMMEDIATE  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, StoreUriDAO_SJProfileKeys.getKey(0), 4);
-    try 
-    {
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:77^89*/
-       }
-       
-       @Override
-       protected void update(DefaultContext context, IEntityBase entity) throws SQLException{
-               StoreUri obj = (StoreUri) entity;
-               long id = obj.getId();
-               long storeId = obj.getStoreId();
-               String uri = obj.getUri();
-               String isStream = obj.isStream() == true ? "Y" : "N";
-               String isSource = obj.isSource() == true ? "Y" : "N";
-               String isTarget = obj.isTarget() == true ? "Y" : "N";
-               String userName = obj.getUserName();
-               String password = obj.getPassword();
-               String rootPath = obj.getRootPath();
-               Integer portNumber = obj.getPortNumber();
-               String delivery = obj.getDelivery() == null ? null : obj.getDelivery().toString();
-               String protocol = obj.getProtocol() == null ? null : obj.getProtocol().toString();
-               
-               /*@lineinfo:generated-code*//*@lineinfo:96^2*/
-
-//  ************************************************************
-//  #sql [context] { UPDATE STOREURI SET STOREID = :storeId, URI = :uri, ISSTREAM = :isStream, ISSOURCE = :isSource, ISTARGET = :isTarget, USERNAME = :userName, PASSWORD = :password, ROOTPATH = :rootPath, PORTNUMBER = :portNumber, DELIVERY = :delivery, PROTOCOL = :protocol WHERE ID = :id  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, StoreUriDAO_SJProfileKeys.getKey(0), 5);
-    try 
-    {
-      __sJT_stmt.setLong(1, storeId);
-      __sJT_stmt.setString(2, uri);
-      __sJT_stmt.setString(3, isStream);
-      __sJT_stmt.setString(4, isSource);
-      __sJT_stmt.setString(5, isTarget);
-      __sJT_stmt.setString(6, userName);
-      __sJT_stmt.setString(7, password);
-      __sJT_stmt.setString(8, rootPath);
-      __sJT_stmt.setIntWrapper(9, portNumber);
-      __sJT_stmt.setString(10, delivery);
-      __sJT_stmt.setString(11, protocol);
-      __sJT_stmt.setLong(12, id);
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:96^287*/
-       }
-       
-       @Override
-       protected void insert(DefaultContext context, IEntityBase entity) throws SQLException{
-               StoreUri obj = (StoreUri) entity;
-               long storeId = obj.getStoreId();
-               String uri = obj.getUri();
-               String isStream = obj.isStream() == true ? "Y" : "N";
-               String isSource = obj.isSource() == true ? "Y" : "N";
-               String isTarget = obj.isTarget() == true ? "Y" : "N";
-               String userName = obj.getUserName();
-               String password = obj.getPassword();
-               String rootPath = obj.getRootPath();
-               Integer portNumber = obj.getPortNumber();
-               String delivery = obj.getDelivery() == null ? null : obj.getDelivery().toString();
-               String protocol = obj.getProtocol() == null ? null : obj.getProtocol().toString();
-
-               /*@lineinfo:generated-code*//*@lineinfo:114^2*/
-
-//  ************************************************************
-//  #sql [context] { INSERT INTO STOREURI (STOREID, URI, ISSTREAM, ISSOURCE, ISTARGET, USERNAME, PASSWORD, ROOTPATH, PORTNUMBER, DELIVERY, PROTOCOL) VALUES (:storeId, :uri, :isStream, :isSource, :isTarget, :userName, :password, :rootPath, :portNumber, :delivery, :protocol)  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, StoreUriDAO_SJProfileKeys.getKey(0), 6);
-    try 
-    {
-      __sJT_stmt.setLong(1, storeId);
-      __sJT_stmt.setString(2, uri);
-      __sJT_stmt.setString(3, isStream);
-      __sJT_stmt.setString(4, isSource);
-      __sJT_stmt.setString(5, isTarget);
-      __sJT_stmt.setString(6, userName);
-      __sJT_stmt.setString(7, password);
-      __sJT_stmt.setString(8, rootPath);
-      __sJT_stmt.setIntWrapper(9, portNumber);
-      __sJT_stmt.setString(10, delivery);
-      __sJT_stmt.setString(11, protocol);
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:114^272*/
-       }
-       
-       void addAll(DefaultContext context, IEntityBase entity) throws SQLException {
-               manager.traceIn();
-               Store store = (Store) entity; 
-               if (store != null && store.getStoreUris() != null) {
-                       for (StoreUri su: store.getStoreUris()) {
-                               su.setStoreId(store.getId());
-                               add(context, su);
-                       }
-               }
-               manager.traceOut();
-       }
-
-       /**
-        * T\ufffdrli a param\ufffdterk\ufffdnt kapott Store azonos\ufffdt\ufffdhoz tartoz\ufffd StoreUri bejegyz\ufffdseket. 
-        */
-       void removeAll(DefaultContext context, long filterId) throws SQLException {
-               manager.traceIn();
-               /*@lineinfo:generated-code*//*@lineinfo:134^2*/
-
-//  ************************************************************
-//  #sql [context] { DELETE FROM STOREURI WHERE STOREID = :filterId  };
-//  ************************************************************
-
-{
-  sqlj.runtime.ConnectionContext __sJT_connCtx = context;
-  if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();
-  sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();
-  if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();
-  synchronized (__sJT_execCtx) {
-    sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, StoreUriDAO_SJProfileKeys.getKey(0), 7);
-    try 
-    {
-      __sJT_stmt.setLong(1, filterId);
-      __sJT_execCtx.executeUpdate();
-    }
-    finally 
-    {
-      __sJT_execCtx.releaseStatement();
-    }
-  }
-}
-
-
-//  ************************************************************
-
-/*@lineinfo:user-code*//*@lineinfo:134^66*/
-               manager.traceOut();
-       }
-
-}/*@lineinfo:generated-code*/class StoreUriDAO_SJProfileKeys 
-{
-  private java.lang.Object[] keys;
-  private final sqlj.runtime.profile.Loader loader = sqlj.runtime.RuntimeContext.getRuntime().getLoaderForClass(getClass());
-  private static StoreUriDAO_SJProfileKeys inst = null;
-  public static java.lang.Object getKey(int keyNum) 
-    throws java.sql.SQLException 
-  {
-    synchronized(user.jobengine.db.StoreUriDAO_SJProfileKeys.class) {
-      if (inst == null)
-      {
-        inst = new StoreUriDAO_SJProfileKeys();
-      }
-    }
-    return inst.keys[keyNum];
-  }
-  private StoreUriDAO_SJProfileKeys() 
-    throws java.sql.SQLException 
-  {
-    keys = new java.lang.Object[1];
-    keys[0] = DefaultContext.getProfileKey(loader, "user.jobengine.db.StoreUriDAO_SJProfile0");
-  }
-}
index d2f9600743e6505f7d74c464815852b3bd99b5a2..7dca9ba07cbd60294721ecaa3259fd324eb58cdc 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser differ
index 7b7301e694d08b19cdb337092b53ede02c77fdb5..801f8b9e14f637e84a78da5dd139b9a5734f038d 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser differ
index 7dbdd906664b2d5ba9a231c87dc13ac969bd329c..d67abdc56ade501ae1d6e4651b2e13c6ba78e7eb 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser differ
diff --git a/server/user.jobengine.osgi.db/migrations/scripts/031_add_creation_date_media.sql b/server/user.jobengine.osgi.db/migrations/scripts/031_add_creation_date_media.sql
new file mode 100644 (file)
index 0000000..83f13d4
--- /dev/null
@@ -0,0 +1,22 @@
+-- // Add creation column to media
+-- Migration SQL that makes the change goes here.
+CALL SYSPROC.ADMIN_CMD ( 'RUNSTATS ON TABLE MEDIA AND INDEXES ALL' )
+@
+ALTER TABLE MEDIA ADD COLUMN CREATION TIMESTAMP
+@
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE MEDIA' )
+@
+CALL SYSPROC.ADMIN_CMD ( 'RUNSTATS ON TABLE MEDIA AND INDEXES ALL' )
+@
+
+-- //@UNDO
+-- SQL to undo the change goes here.
+CALL SYSPROC.ADMIN_CMD ( 'RUNSTATS ON TABLE MEDIA AND INDEXES ALL' )
+@
+ALTER TABLE MEDIA DROP COLUMN CREATION
+@
+
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE MEDIA' )
+@
+CALL SYSPROC.ADMIN_CMD ( 'RUNSTATS ON TABLE MEDIA AND INDEXES ALL' )
+@
diff --git a/server/user.jobengine.osgi.db/migrations/scripts/032_add_creation_date_trigger.sql b/server/user.jobengine.osgi.db/migrations/scripts/032_add_creation_date_trigger.sql
new file mode 100644 (file)
index 0000000..6ebee18
--- /dev/null
@@ -0,0 +1,30 @@
+-- // Add creation trigger to media
+-- Migration SQL that makes the change goes here.
+
+CREATE OR REPLACE TRIGGER TRG_MEDIA_BEFORE_UPDATE_ARCHIVED 
+BEFORE UPDATE OF archived ON media
+REFERENCING NEW AS n
+FOR EACH ROW
+WHEN (n.ARCHIVED IS NOT NULL AND n.CREATION IS NULL)
+BEGIN ATOMIC
+       SET n.CREATION = n.ARCHIVED;
+END
+@
+
+CREATE OR REPLACE TRIGGER TRG_MEDIA_BEFORE_INSERT 
+BEFORE INSERT ON media
+REFERENCING NEW AS n
+FOR EACH ROW
+WHEN (n.ARCHIVED IS NOT NULL AND n.CREATION IS NULL)
+BEGIN ATOMIC
+       SET n.CREATION = n.ARCHIVED;
+END
+@
+
+-- //@UNDO
+-- SQL to undo the change goes here.
+DROP TRIGGER TRG_MEDIA_BEFORE_UPDATE_ARCHIVED
+@
+
+DROP TRIGGER TRG_MEDIA_BEFORE_INSERT
+@
diff --git a/server/user.jobengine.osgi.db/migrations/scripts/033_init_creation_date.sql b/server/user.jobengine.osgi.db/migrations/scripts/033_init_creation_date.sql
new file mode 100644 (file)
index 0000000..8e01e5d
--- /dev/null
@@ -0,0 +1,15 @@
+-- // Init creation
+-- Migration SQL that makes the change goes here.
+
+-- A futtatashoz --force kapcsolo kell !!!
+
+UPDATE MEDIA SET CREATION=ARCHIVED
+@
+
+CREATE INDEX IDX_MEDIA_CREATION ON MEDIA ("CREATION")
+@
+
+-- //@UNDO
+-- SQL to undo the change goes here.
+DROP INDEX IDX_MEDIA_CREATION
+@
index c638f7068881eaeada35cd520663d557b3c5aa47..24a825ba3a1d7a7cc68d4170aca41adb3de317fe 100644 (file)
@@ -20,6 +20,7 @@ public class Media extends DynamicAttributes {
        private static final long serialVersionUID = 1L;
        private Timestamp archived = null;
        private Timestamp created = null;
+       private Timestamp creation = null;
        private Timestamp modified = null;
        private String description = null;
        private String houseId = null;
@@ -184,4 +185,12 @@ public class Media extends DynamicAttributes {
                this.title = title;
        }
 
+       public Timestamp getCreation() {
+               return creation;
+       }
+
+       public void setCreation(Timestamp creation) {
+               this.creation = creation;
+       }
+
 }
\ No newline at end of file
index fbcd0cce3acb7868ae214d596b31737d0160fab9..d50d6478c6ea70ddbb28697aba7c94352eaa41f6 100644 (file)
@@ -7,7 +7,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
-#sql iterator MediaIter(long id, String title, String description, long itemId, long itemTypeId, String houseId, long length, Timestamp created, Timestamp archived, Timestamp modified, byte[] poster);\r
+#sql iterator MediaIter(long id, String title, String description, long itemId, long itemTypeId, String houseId, long length, Timestamp created, Timestamp archived, Timestamp modified, Timestamp creation, byte[] poster);\r
 \r
 @SuppressWarnings("unused")\r
 class MediaDAO extends EntityBaseDAO {\r
@@ -63,6 +63,7 @@ class MediaDAO extends EntityBaseDAO {
                        entity.setCreated(iterator.created());\r
                        entity.setArchived(iterator.archived());\r
                        entity.setModified(iterator.modified());\r
+                       entity.setCreation(iterator.creation());\r
                        entity.setPoster(iterator.poster());\r
 \r
                        if (result == null)\r
@@ -123,8 +124,9 @@ class MediaDAO extends EntityBaseDAO {
                byte[] poster = obj.getPoster();\r
                Timestamp archived = obj.getArchived();\r
                Timestamp modified = obj.getModified();\r
+               Timestamp creation = obj.getCreation();\r
 \r
-               #sql [context] { UPDATE MEDIA SET TITLE = :title, DESCRIPTION = :description, ITEMID = :itemId, ITEMTYPEID = :itemTypeId, HOUSEID = :houseId, LENGTH = :length, POSTER = :poster, ARCHIVED = :archived, MODIFIED = :modified WHERE ID = :id };\r
+               #sql [context] { UPDATE MEDIA SET TITLE = :title, DESCRIPTION = :description, ITEMID = :itemId, ITEMTYPEID = :itemTypeId, HOUSEID = :houseId, LENGTH = :length, POSTER = :poster, ARCHIVED = :archived, MODIFIED = :modified, CREATION = :creation WHERE ID = :id };\r
        }\r
        \r
        @Override\r
@@ -140,8 +142,9 @@ class MediaDAO extends EntityBaseDAO {
                byte[] poster = obj.getPoster();\r
                Timestamp archived = obj.getArchived();\r
                Timestamp modified = obj.getModified();\r
+               Timestamp creation = obj.getCreation();\r
                \r
-               #sql [context] { INSERT INTO MEDIA (ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, POSTER, ARCHIVED, MODIFIED) VALUES (:id, :title, :description, :itemId, :itemTypeId, :houseId, :length, :poster, :archived, :modified) };\r
+               #sql [context] { INSERT INTO MEDIA (ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, POSTER, ARCHIVED, MODIFIED, CREATION) VALUES (:id, :title, :description, :itemId, :itemTypeId, :houseId, :length, :poster, :archived, :modified, :creation) };\r
        }\r
        \r
        /**\r
index 83cd331e3e6a0c490969a13a1f8aca452568fd17..026fc1ba612d722928929ecf2d64e5794505d989 100644 (file)
@@ -36,7 +36,7 @@ public class MediaFinder implements IMediaFinder {
                sql.append("i.title itemtitle,");\r
                sql.append("m.id mediaid,");\r
                sql.append("m.title mediatitle,");\r
-               sql.append("m.archived,");\r
+               sql.append("m.creation,");\r
                sql.append("m.length,");\r
                sql.append("m.itemtypeid mediaitemtypeid,");\r
                sql.append(String.format("HIGHLIGHT(md.description, '<span class=''rhl''>', '</span>', '%s') description,", criteriasPattern));\r
@@ -79,10 +79,10 @@ public class MediaFinder implements IMediaFinder {
                }\r
 \r
                if (options.getFrom() != null)\r
-                       sql.append(String.format(" AND m.archived > '%s'", df.format(options.getFrom())));\r
+                       sql.append(String.format(" AND m.creation > '%s'", df.format(options.getFrom())));\r
 \r
                if (options.getTo() != null)\r
-                       sql.append(String.format(" AND m.archived < '%s'", df.format(options.getTo())));\r
+                       sql.append(String.format(" AND m.creation < '%s'", df.format(options.getTo())));\r
 \r
                if (options.isMissingProxy())\r
                        sql.append(" AND vw_mf.mediafilecount=1");\r
@@ -186,7 +186,7 @@ public class MediaFinder implements IMediaFinder {
                                media.setId(rs.getLong("mediaid"));\r
                                media.setTitle(rs.getString("mediatitle"));\r
                                media.setHouseId(rs.getString("mediahouseid"));\r
-                               media.setArchived(rs.getTimestamp("archived"));\r
+                               media.setCreation(rs.getTimestamp("creation"));\r
                                media.setLength(rs.getLong("length"));\r
                                media.setMediaFilesCount(rs.getInt("mediafilecount"));\r
                                media.setMediaFilesName(rs.getString("mediafilehouseid"));\r
index 7739c9da359bf1b3742f66904782873bfac5c68c..19cc57b2561569e6e691799683ea9e8ffa46b55f 100644 (file)
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>\r
-<web-app version="2.4" \r
-       xmlns="http://java.sun.com/xml/ns/j2ee" \r
-       xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" \r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">\r
-\r
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!DOCTYPE xml>\r
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\r
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\r
+         http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"\r
+         version="3.1">\r
        <!--    REST SERVICES -->\r
        <!--    http://docs.jboss.org/resteasy/docs/1.0.0.GA/userguide/html/Installation_Configuration.html -->\r
        <servlet>\r
index 1ad9b7aaab63c533a34e081bf0a475d32645a475..7d84e06c9e0b1aa1a5d32726c0b8a389c78b73cc 100644 (file)
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<!-- <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> -->\r
-<!-- <web-app id="WebApp"> -->\r
-<web-app version="2.5" \r
-       xmlns="http://java.sun.com/xml/ns/j2ee" \r
-       xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" \r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd">\r
+<!DOCTYPE xml>\r
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\r
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\r
+         http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"\r
+         version="3.1">\r
        \r
        <display-name>Media Archivum</display-name>\r
 \r
        <servlet>\r
                <servlet-name>zkLoader</servlet-name>\r
-               <description>ZK loader for ZUML pages</description>\r
                <servlet-class>org.zkoss.zk.ui.http.DHtmlLayoutServlet</servlet-class>\r
                <init-param>\r
                        <param-name>update-uri</param-name>\r
 \r
        <servlet>\r
                <servlet-name>auEngine</servlet-name>\r
-               <description>The asynchronous update engine for ZK</description>\r
                <servlet-class>org.zkoss.zk.au.http.DHtmlUpdateServlet</servlet-class>\r
        </servlet>\r
 \r
        <servlet>\r
                <servlet-name>action-route</servlet-name>\r
-               <description>Map action path to query string</description>\r
                <servlet-class>user.jobengine.servlet.ActionRouteServlet</servlet-class>\r
                <load-on-startup>2</load-on-startup>\r
        </servlet>\r
index d7319ed18df94692fcb741d6bdaaec3f0201252f..5c04f6fa7aac41ecbf32b5a5104241abfb74b19a 100644 (file)
@@ -73,7 +73,7 @@
                                        <menuitem sclass="rozsda" label="${labels.menu_version}" href="/resource/help.html" target="_blank" />\r
                                </menupopup>\r
                        </menu>\r
-                       <menuitem sclass="whitemenu" label="Mini monitor" onClick="@global-command('createFloatingJobMonitor')" />\r
+                       <menuitem sclass="whitemenu" label="Mini monitor" onClick="@command('createFloatingJobMonitor')" />\r
 \r
                        <menuitem id="basketIMenuItem" image="/img/ic_shopping_cart_black_24dp.png" sclass="whitemenu" style="float: right" label="@load(lm.basketMenuLabel)" onClick="@command('showBasket')" disabled="false" />\r
                        <menuitem sclass="whitemenu" style="float: right" label="Kilépés" onClick="@command('doLogout')" disabled="false" />\r
index ae3f01293d15427fdd9dd071a2198a09ef3f25a7..31986426dae17ad3add727283805f0fdd805fd75 100644 (file)
                                                                <textbox hflex="true" value="@load(vm.archivedMedia.media.houseId) @save(vm.archivedMedia.media.houseId,before='save')"></textbox>\r
                                                        </listcell>\r
                                                </listitem>\r
+                                               <listitem id="media_creation">\r
+                                                       <listcell label="Média dátuma" />\r
+                                                       <listcell>\r
+                                                               <datebox hflex="true" value="@load(vm.archivedMedia.media.creation) @save(vm.archivedMedia.media.creation,before='save')" />\r
+                                                       </listcell>\r
+                                               </listitem>\r
                                                <listitem id="media_title">\r
                                                        <listcell label="Média címe" />\r
                                                        <listcell>\r
index 1740b1fef10b1c7e64362fafda0f88944e5fd21a..b77e7f8dc1e41018d966d3dae99add9110d0b113 100644 (file)
                                disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" label="Szerkesztés" />\r
                </toolbar>\r
 \r
-               <div id="mediaDetails" width="100%" vflex="true" style="padding: 4px; overflow:auto; background-color: white">\r
-                       <div>\r
-                               <label style="font-size:8pt; color: gray" value="Gyűjtő azonosító" />\r
-                               <div style="margin: 4px">\r
+               <vlayout id="mediaDetails" width="100%" vflex="true" style="padding: 4px; overflow:auto; background-color: white">\r
+                       <hlayout style="border-bottom: 1px solid lightgray">\r
+                               <vlayout style="width: 120px; border-right: 1px solid lightgray; padding-right: 10px">\r
+                                       <label style="font-size:8pt; color: gray" value="Gyűjtő azonosító" />\r
                                        <label value="@load(vm.selectedObject.item.houseId)" />\r
-                               </div>\r
-                               <space bar="false" />\r
-                       </div>\r
-                       <div>\r
-                               <label style="font-size:8pt; color: gray" value="Gyűjtő címe" />\r
-                               <div style="margin: 4px">\r
+                               </vlayout>\r
+                               <vlayout>\r
+                                       <label style="font-size:8pt; color: gray" value="Gyűjtő címe" />\r
                                        <label value="@load(vm.selectedObject.item.title)" />\r
-                               </div>\r
-                               <space bar="false" />\r
-                       </div>\r
-                       <div>\r
+                               </vlayout>\r
+                       </hlayout>\r
+                       <vlayout>\r
                                <label style="font-size:8pt; color: gray" value="Gyűjtő leírása" />\r
-                               <div style="margin: 4px">\r
-                                       <label value="@load(vm.selectedObject.item.description)" />\r
-                               </div>\r
-                               <space bar="false" />\r
-                       </div>\r
-                       <div>\r
-                               <label style="font-size:8pt; color: gray" value="Média azonosító" />\r
-                               <div style="margin: 4px">\r
+                               <label value="@load(vm.selectedObject.item.description)" />\r
+                       </vlayout>\r
+                       <hlayout style="border-bottom: 1px solid lightgray">\r
+                               <vlayout style="width: 120px; border-right: 1px solid lightgray; padding-right: 10px">\r
+                                       <label style="font-size:8pt; color: gray" value="Média azonosító" />\r
                                        <label value="@load(vm.selectedObject.media.houseId)" />\r
-                               </div>\r
-                               <space bar="false" />\r
-                       </div>\r
-                       <div>\r
-                               <label style="font-size:8pt; color: gray" value="Média címe" />\r
-                               <div style="margin: 4px">\r
+                               </vlayout>\r
+                               <vlayout>\r
+                                       <label style="font-size:8pt; color: gray" value="Média címe" />\r
                                        <label value="@load(vm.selectedObject.media.title)" />\r
-                               </div>\r
-                               <space bar="false" />\r
-                       </div>\r
-                       <div>\r
+                               </vlayout>\r
+                       </hlayout>\r
+                       <vlayout>\r
+                               <label style="font-size:8pt; color: gray" value="Dátum" />\r
+                               <label value="@load(vm.selectedObject.media.creation)" />\r
+                       </vlayout>\r
+                       <vlayout>\r
                                <label style="font-size:8pt; color: gray" value="Média leírása" />\r
-                               <div style="margin: 4px">\r
-                                       <label multiline="true" value="@load(vm.selectedObject.media.description)" />\r
-                               </div>\r
-                       </div>\r
-                       \r
-                       <div>\r
+                               <label multiline="true" value="@load(vm.selectedObject.media.description)" />\r
+                       </vlayout>\r
+                       <vlayout>\r
                                <h:textarea name='mediaTags' placeholder='Címkék'></h:textarea>\r
-                       </div>\r
-               </div>\r
+                       </vlayout>\r
+               </vlayout>\r
+\r
        </div>\r
 </zk>
\ No newline at end of file
index 48146dea20c5555fdfd9705b0a134c9fd8f06a53..ea00300c78d708cad67a05acc1dd67acff9f7dc0 100644 (file)
@@ -44,7 +44,7 @@
                                        <label value="@load(each.media.houseId)" />\r
                                        <label value="@load(each.media.title)" />\r
                                        <label value="@load(each.media.mediaFileRealName)" />\r
-                                       <label style="font-size: 10px;" value="@load(each.media.archived) @converter('user.jobengine.zk.model.ShortDateConverter')" />\r
+                                       <label style="font-size: 10px;" value="@load(each.media.creation) @converter('user.jobengine.zk.model.ShortDateConverter')" />\r
                                        <cell>\r
                                                <vlayout>\r
                                                        <hlayout>\r
index 620f224a2fa50247d97031fe93782ecebf1f822b..85263bb4f92f875ec4f814b0530608ca71b50704 100644 (file)
@@ -1,5 +1,5 @@
-version=2.7.2\r
-footer=2016-2020 © Copyright User Rendszerház Kft.\r
+version=2.7.3\r
+footer=2016-2021 © Copyright User Rendszerház Kft.\r
 \r
 login_info=Információ\r
 login_dialogtitle=Bejelentkezés\r
index 56ed589adda645314ecae02814ae894bad9a163e..3d6d9ad0c9dfa2d96903d1c21eb8b6e0256b9fe6 100644 (file)
@@ -30,6 +30,8 @@ public class MenuModel extends BaseModel {
        private static final String PAGES_ALTERNATE_RETRIEVEBATCHSELECTOR_ZUL = "/pages/alternate_retrievebatchselector.zul";\r
        private String basketMenuLabel = "(0)";\r
        private List<ArchivedMedia> basketItems = new ArrayList<>();\r
+       private Window floatingMonitorWindow;\r
+\r
        @Wire\r
        Menuitem basketIMenuItem;\r
 \r
@@ -49,6 +51,18 @@ public class MenuModel extends BaseModel {
                BindUtils.postNotifyChange(null, null, this, "basketMenuLabel");\r
        }\r
 \r
+       @Command\r
+       public void createFloatingJobMonitor() {\r
+               if (floatingMonitorWindow != null)\r
+                       return;\r
+               floatingMonitorWindow = (Window) Executions.createComponents("/pages/joblistwnd.zul", null, null);\r
+               floatingMonitorWindow.doOverlapped();\r
+               floatingMonitorWindow.addEventListener("onClose", e -> {\r
+                       logger.info("Floating monitor closed");\r
+                       floatingMonitorWindow = null;\r
+               });\r
+       }\r
+\r
        @Command\r
        public void doLogout() {\r
                SessionUtil.logout();\r
@@ -113,4 +127,5 @@ public class MenuModel extends BaseModel {
                basketMenuLabel = String.format("(%d)", basketItems.size());\r
                BindUtils.postNotifyChange(null, null, this, "basketMenuLabel");\r
        }\r
+\r
 }
\ No newline at end of file
index 853b4761ec67024eda9ded19894f8e6f8a634c15..8f3879819f765542354df55e0ca1aa7644d3c630 100644 (file)
@@ -28,7 +28,6 @@ import org.zkoss.bind.annotation.BindingParam;
 import org.zkoss.bind.annotation.Command;\r
 import org.zkoss.bind.annotation.ContextParam;\r
 import org.zkoss.bind.annotation.ContextType;\r
-import org.zkoss.bind.annotation.GlobalCommand;\r
 import org.zkoss.bind.annotation.NotifyChange;\r
 import org.zkoss.json.JSONObject;\r
 import org.zkoss.zk.ui.Component;\r
@@ -46,7 +45,6 @@ import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Column;\r
 import org.zkoss.zul.Combobox;\r
 import org.zkoss.zul.Detail;\r
-import org.zkoss.zul.Div;\r
 import org.zkoss.zul.Grid;\r
 import org.zkoss.zul.Hbox;\r
 import org.zkoss.zul.Hlayout;\r
@@ -60,6 +58,7 @@ import org.zkoss.zul.Row;
 import org.zkoss.zul.Timer;\r
 import org.zkoss.zul.Toolbar;\r
 import org.zkoss.zul.Toolbarbutton;\r
+import org.zkoss.zul.Vlayout;\r
 import org.zkoss.zul.West;\r
 import org.zkoss.zul.Window;\r
 \r
@@ -132,7 +131,7 @@ public class SearchModel extends AsyncBaseModel {
        @Wire\r
        Menupopup searchSettings;\r
        @Wire\r
-       Div mediaDetails;\r
+       Vlayout mediaDetails;\r
        @Wire\r
        West searchWest;\r
 \r
@@ -149,6 +148,7 @@ public class SearchModel extends AsyncBaseModel {
        private Date searchTo;\r
        private boolean missingProxy;\r
        private int selectedDateOption;\r
+       private Window metaWindow;\r
 \r
        public SearchModel() {\r
                this.itemManager = ItemManager.getInstance();\r
@@ -285,11 +285,11 @@ public class SearchModel extends AsyncBaseModel {
                Executions.getCurrent().sendRedirect(email);\r
        }\r
 \r
-       @GlobalCommand\r
-       public void createFloatingJobMonitor() {\r
-               Window window = (Window) Executions.createComponents("/pages/joblistwnd.zul", null, null);\r
-               window.doOverlapped();\r
-       }\r
+       //      @GlobalCommand\r
+       //      public void createFloatingJobMonitor() {\r
+       //              Window window = (Window) Executions.createComponents("/pages/joblistwnd.zul", null, null);\r
+       //              window.doOverlapped();\r
+       //      }\r
 \r
        @Command\r
        public void createLowres() {\r
@@ -723,10 +723,15 @@ public class SearchModel extends AsyncBaseModel {
 \r
        @Command\r
        public void openMetaDataDialog() {\r
+               if (metaWindow != null)\r
+                       return;\r
                String template = "/pages/metadatadetails.zul";\r
-               Window window = (Window) Executions.createComponents(template, null, ListUtils.asMap("selectedObject", selectedObject));\r
-               window.doOverlapped();\r
-\r
+               metaWindow = (Window) Executions.createComponents(template, null, ListUtils.asMap("selectedObject", selectedObject));\r
+               metaWindow.doOverlapped();\r
+               metaWindow.addEventListener("onClose", e -> {\r
+                       logger.info("Meta window closed");\r
+                       metaWindow = null;\r
+               });\r
        }\r
 \r
        private void processFilterTagChanged(JSONObject jsObject) {\r