Replace JMS by Task Scheduler dcm4che#3211

alforo · Jun 16, 2021 · 6250770 · 6250770
1 parent 91b314c
commit 6250770
Show file tree

Hide file tree

Showing 214 changed files with 1,640 additions and 2,600 deletions.
diff --git a/dcm4chee-arc-assembly/pom.xml b/dcm4chee-arc-assembly/pom.xml
@@ -45,7 +45,7 @@
   <parent>
     <artifactId>dcm4chee-arc-parent</artifactId>
     <groupId>org.dcm4che.dcm4chee-arc</groupId>
-    <version>5.23.3</version>
+    <version>5.24.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/dcm4chee-arc-assembly/src/main/resources/cli/add-jms-queues.cli b/dcm4chee-arc-assembly/src/main/resources/cli/add-jms-queues.cli
diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/apacheds/dcm4chee-archive.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/apacheds/dcm4chee-archive.ldif
@@ -1,4 +1,4 @@
-# Generated by Apache Directory Studio on May 26, 2021, 2:09:46 PM
+# Generated by Apache Directory Studio on June 16, 2021, 1:21:51 PM
 
 # SCHEMA "DCM4CHEE-ARCHIVE"
 dn: cn=dcm4chee-archive, ou=schema
@@ -335,7 +335,7 @@ objectclass: metaTop
 objectclass: top
 m-oid: 1.2.40.0.13.1.15.110.3.26
 m-name: dcmQueueName
-m-description: JMS Queue Name
+m-description: Task Queue Name
 m-equality: caseExactIA5Match
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.26
 m-singleValue: TRUE
@@ -347,7 +347,7 @@ objectclass: metaTop
 objectclass: top
 m-oid: 1.2.40.0.13.1.15.110.3.27
 m-name: dcmJndiName
-m-description: JNDI Name
+m-description: NO LONGER USED - MAY BE DECLARED OBSOLETE IN FUTURE VERSION
 m-equality: caseExactIA5Match
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.26
 m-singleValue: TRUE
@@ -2524,9 +2524,7 @@ objectclass: metaTop
 objectclass: top
 m-oid: 1.2.40.0.13.1.15.110.3.190
 m-name: dcmMaxQueueSize
-m-description: Maximal number of scheduled tasks in the queue. If the number of 
- scheduled tasks reaches the limit, an attempt to schedule another tasks will fa
- il. 0 = no limitation.
+m-description: NO LONGER USED - MAY BE DECLARED OBSOLETE IN FUTURE VERSION
 m-equality: integerMatch
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
 m-singleValue: TRUE
@@ -2549,8 +2547,7 @@ objectclass: metaTop
 objectclass: top
 m-oid: 1.2.40.0.13.1.15.110.3.192
 m-name: dcmExportPriority
-m-description: JMS Priority Level for processing the Export Task from 0 (lowest)
-  to 9 (highest). 4 if absent.
+m-description: NO LONGER USED - MAY BE DECLARED OBSOLETE IN FUTURE VERSION
 m-equality: integerMatch
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
 m-singleValue: TRUE
@@ -5272,8 +5269,7 @@ objectclass: metaTop
 objectclass: top
 m-oid: 1.2.40.0.13.1.15.110.3.398
 m-name: dcmPrefetchPriority
-m-description: JMS Priority Level of scheduled retrieve tasks from 0 (lowest) to
-  9 (highest). 4 if absent.
+m-description: NO LONGER USED - MAY BE DECLARED OBSOLETE IN FUTURE VERSION
 m-equality: integerMatch
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
 m-singleValue: TRUE
@@ -5505,6 +5501,58 @@ m-equality: booleanMatch
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
 m-singleValue: TRUE
 
+dn: m-oid=1.2.40.0.13.1.15.110.3.415, ou=attributetypes, cn=dcm4chee-archive, ou
+ =schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.2.40.0.13.1.15.110.3.415
+m-name: dcmTaskProcessingPollingInterval
+m-description: Polling Interval for scheduled Tasks ready for processing in ISO-
+ 8601 duration format PnDTnHnMnS. If absent, Tasks will not get processed.
+m-equality: caseExactIA5Match
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.26
+m-singleValue: TRUE
+
+dn: m-oid=1.2.40.0.13.1.15.110.3.416, ou=attributetypes, cn=dcm4chee-archive, ou
+ =schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.2.40.0.13.1.15.110.3.416
+m-name: dcmTaskProcessingFetchSize
+m-description: Limit result set of DB query for scheduled Tasks ready for proces
+ sing; 100 if absent
+m-equality: integerMatch
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
+m-singleValue: TRUE
+
+dn: m-oid=1.2.40.0.13.1.15.110.3.417, ou=attributetypes, cn=dcm4chee-archive, ou
+ =schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.2.40.0.13.1.15.110.3.417
+m-name: dcmTaskProcessorName
+m-description: Name of Task Processor associated with the Queue. Enumerated valu
+ es: EXPORTER, MOVE_SCU, MPPS_SCU, IAN_SCU, STGCMT_SCP, STGCMT_SCU, STG_VERIFIER
+ , HL7_SENDER, REST_CLIENT, REJECT_SCU, DIFF_SCU.
+m-equality: caseExactIA5Match
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.26
+m-singleValue: TRUE
+
+dn: m-oid=1.2.40.0.13.1.15.110.3.418, ou=attributetypes, cn=dcm4chee-archive, ou
+ =schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.2.40.0.13.1.15.110.3.418
+m-name: dcmMaxTasksParallel
+m-description: Maximal number of tasks processed in parallel; 1 if absent.
+m-equality: integerMatch
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
+m-singleValue: TRUE
+
 dn: ou=comparators, cn=dcm4chee-archive, ou=schema
 objectclass: organizationalUnit
 objectclass: top
@@ -5648,11 +5696,12 @@ objectclass: metaTop
 objectclass: top
 m-oid: 1.2.40.0.13.1.15.110.4.14
 m-name: dcmQueue
-m-description: Managed JMS Queue
+m-description: Task Queue
 m-supObjectClass: top
 m-must: dcmQueueName
-m-must: dcmJndiName
 m-may: dicomDescription
+m-may: dcmTaskProcessorName
+m-may: dcmMaxTasksParallel
 m-may: dcmMaxRetries
 m-may: dcmRetryDelay
 m-may: dcmMaxRetryDelay
@@ -5664,6 +5713,8 @@ m-may: dcmPurgeQueueMessageFailedDelay
 m-may: dcmPurgeQueueMessageWarningDelay
 m-may: dcmPurgeQueueMessageCanceledDelay
 m-may: dcmSchedule
+m-may: dicomInstalled
+m-may: dcmJndiName
 m-may: dcmMaxQueueSize
 
 dn: m-oid=1.2.40.0.13.1.15.110.4.15, ou=objectclasses, cn=dcm4chee-archive, ou=s
@@ -6255,6 +6306,8 @@ m-may: dcmCStoreSCUOfCMoveSCP
 m-may: dcmDiffStudiesIncludefieldAll
 m-may: dcmUPSProcessingPollingInterval
 m-may: dcmUPSProcessingFetchSize
+m-may: dcmTaskProcessingPollingInterval
+m-may: dcmTaskProcessingFetchSize
 m-may: dcmExportTaskPollingInterval
 m-may: dcmExportTaskFetchSize
 m-may: dcmRetrieveTaskPollingInterval

diff --git a/dcm4chee-arc-assembly/src/main/resources/ldap/opendj/12-dcm4chee-archive.ldif b/dcm4chee-arc-assembly/src/main/resources/ldap/opendj/12-dcm4chee-archive.ldif
@@ -129,12 +129,12 @@ attributeTypes: ( 1.2.40.0.13.1.15.110.3.25 NAME 'dcmFwdMppsDestination'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 attributeTypes: ( 1.2.40.0.13.1.15.110.3.26 NAME 'dcmQueueName'
-  DESC 'JMS Queue Name'
+  DESC 'Task Queue Name'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   SINGLE-VALUE )
 attributeTypes: ( 1.2.40.0.13.1.15.110.3.27 NAME 'dcmJndiName'
-  DESC 'JNDI Name'
+  DESC 'NO LONGER USED - MAY BE DECLARED OBSOLETE IN FUTURE VERSION'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   SINGLE-VALUE )
@@ -942,7 +942,7 @@ attributeTypes: ( 1.2.40.0.13.1.15.110.3.189 NAME 'hl7UseNullValue'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE )
 attributeTypes: ( 1.2.40.0.13.1.15.110.3.190 NAME 'dcmMaxQueueSize'
-  DESC 'Maximal number of scheduled tasks in the queue. If the number of scheduled tasks reaches the limit, an attempt to schedule another tasks will fail. 0 = no limitation.'
+  DESC 'NO LONGER USED - MAY BE DECLARED OBSOLETE IN FUTURE VERSION'
   EQUALITY integerMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE )
@@ -951,7 +951,7 @@ attributeTypes: ( 1.2.40.0.13.1.15.110.3.191 NAME 'dcmNullifyTag'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 attributeTypes: ( 1.2.40.0.13.1.15.110.3.192 NAME 'dcmExportPriority'
-  DESC 'JMS Priority Level for processing the Export Task from 0 (lowest) to 9 (highest). 4 if absent.'
+  DESC 'NO LONGER USED - MAY BE DECLARED OBSOLETE IN FUTURE VERSION'
   EQUALITY integerMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE )
@@ -1938,7 +1938,7 @@ attributeTypes: ( 1.2.40.0.13.1.15.110.3.397 NAME 'hl7ImportReportMissingStudyIU
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   SINGLE-VALUE )
 attributeTypes: ( 1.2.40.0.13.1.15.110.3.398 NAME 'dcmPrefetchPriority'
-  DESC 'JMS Priority Level of scheduled retrieve tasks from 0 (lowest) to 9 (highest). 4 if absent.'
+  DESC 'NO LONGER USED - MAY BE DECLARED OBSOLETE IN FUTURE VERSION'
   EQUALITY integerMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE )
@@ -2021,6 +2021,26 @@ attributeTypes: ( 1.2.40.0.13.1.15.110.3.414 NAME 'dcmQidoETag'
   EQUALITY booleanMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE )
+attributeTypes: ( 1.2.40.0.13.1.15.110.3.415 NAME 'dcmTaskProcessingPollingInterval'
+  DESC 'Polling Interval for scheduled Tasks ready for processing in ISO-8601 duration format PnDTnHnMnS. If absent, Tasks will not get processed.'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE )
+attributeTypes: ( 1.2.40.0.13.1.15.110.3.416 NAME 'dcmTaskProcessingFetchSize'
+  DESC 'Limit result set of DB query for scheduled Tasks ready for processing; 100 if absent'
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+  SINGLE-VALUE )
+attributeTypes: ( 1.2.40.0.13.1.15.110.3.417 NAME 'dcmTaskProcessorName'
+  DESC 'Name of Task Processor associated with the Queue. Enumerated values: EXPORTER, MOVE_SCU, MPPS_SCU, IAN_SCU, STGCMT_SCP, STGCMT_SCU, STG_VERIFIER, HL7_SENDER, REST_CLIENT, REJECT_SCU, DIFF_SCU.'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE )
+attributeTypes: ( 1.2.40.0.13.1.15.110.3.418 NAME 'dcmMaxTasksParallel'
+  DESC 'Maximal number of tasks processed in parallel; 1 if absent.'
+  EQUALITY integerMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+  SINGLE-VALUE )
 objectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
   DESC 'DICOM Archive Device related information'
   SUP top AUXILIARY
@@ -2120,6 +2140,8 @@ objectClasses: ( 1.2.40.0.13.1.15.110.4.4 NAME 'dcmArchiveDevice'
     dcmDiffStudiesIncludefieldAll $
     dcmUPSProcessingPollingInterval $
     dcmUPSProcessingFetchSize $
+    dcmTaskProcessingPollingInterval $
+    dcmTaskProcessingFetchSize $
     dcmExportTaskPollingInterval $
     dcmExportTaskFetchSize $
     dcmRetrieveTaskPollingInterval $
@@ -2464,13 +2486,14 @@ objectClasses: ( 1.2.40.0.13.1.15.110.4.13 NAME 'dcmQueryRetrieveView'
     dcmHideRejectionNoteWithCode $
     dcmHideNotRejectedInstances ) )
 objectClasses: ( 1.2.40.0.13.1.15.110.4.14 NAME 'dcmQueue'
-  DESC 'Managed JMS Queue'
+  DESC 'Task Queue'
   SUP top STRUCTURAL
   MUST (
-    dcmQueueName $
-    dcmJndiName)
+    dcmQueueName )
   MAY (
     dicomDescription $
+    dcmTaskProcessorName $
+    dcmMaxTasksParallel $
     dcmMaxRetries $
     dcmRetryDelay $
     dcmMaxRetryDelay $
@@ -2482,6 +2505,8 @@ objectClasses: ( 1.2.40.0.13.1.15.110.4.14 NAME 'dcmQueue'
     dcmPurgeQueueMessageWarningDelay $
     dcmPurgeQueueMessageCanceledDelay $
     dcmSchedule $
+    dicomInstalled $
+    dcmJndiName $
     dcmMaxQueueSize ) )
 objectClasses: ( 1.2.40.0.13.1.15.110.4.15 NAME 'dcmExporter'
   DESC 'Exporter Descriptor'