Make number of JMS Consumers configurable by System Properties dcm4ch…

…e/dcm4chee-arc-light#1356

Dockerfile

@@ -41,8 +41,7 @@ ENV LDAP_HOST=ldap \
     TRUSTSTORE_PASSWORD=secret \
     WILDFLY_EXECUTER_MAX_THREADS=100 \
     WILDFLY_PACSDS_MAX_POOL_SIZE=50 \
-    WILDFLY_MDB_STRICT_MAX_POOL_DERIVE_SIZE=from-cpu-count \
-    WILDFLY_MDB_STRICT_MAX_POOL_SIZE=20 \
+    WILDFLY_MDB_STRICT_MAX_POOL_SIZE=32 \
     WILDFLY_JMS_QUEUE_STGCMTSCP_CONSUMER_COUNT=1 \
     WILDFLY_JMS_QUEUE_STGCMTSCU_CONSUMER_COUNT=1 \
     WILDFLY_JMS_QUEUE_MPPSSCU_CONSUMER_COUNT=1 \

README.md

@@ -171,18 +171,10 @@ Default value is `100`.
 This environment variable sets the maximum pool size allowed for the PacsDS datasource in the Wildfly configuration.
 Default value is `50`.
 
-#### `WILDFLY_MDB_STRICT_MAX_POOL_DERIVE_SIZE`
-
-Specifies if and what the max pool size for message driven beans should be derived from. A value of `none` indicates
-that the explicit value of max-pool-size should be used. A value of `from-worker-pools` indicates that the max pool
-size should be derived from the size of the total threads for all  worker pools configured on the system.
-A value of `from-cpu-count` indicates that the max pool size should be derived from the total number of processors
-available on the system. Default value is `from-cpu-count`.
-
 #### `WILDFLY_MDB_STRICT_MAX_POOL_SIZE`
 
-Configured maximum number of message driven bean instances that the pool can hold at a given point in time. Only
-effective if `WILDFLY_MDB_STRICT_MAX_POOL_DERIVE_SIZE=none`. Default value is `20`.
+Configured maximum number of message driven bean instances that the pool can hold at a given point in time.
+Default value is `32`.
 
 #### `WILDFLY_JMS_QUEUE_STGCMTSCP_CONSUMER_COUNT`
 

configuration/dcm4chee-arc.xml

@@ -275,7 +275,7 @@
             <pools>
                 <bean-instance-pools>
                     <strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
-                    <strict-max-pool name="mdb-strict-max-pool" derive-size="${env.WILDFLY_MDB_STRICT_MAX_POOL_DERIVE_SIZE}" max-pool-size="${env.WILDFLY_MDB_STRICT_MAX_POOL_SIZE}" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                    <strict-max-pool name="mdb-strict-max-pool" max-pool-size="${env.WILDFLY_MDB_STRICT_MAX_POOL_SIZE}" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
                 </bean-instance-pools>
             </pools>
             <caches>
@@ -535,6 +535,8 @@
                 <jms-queue name="Export1" entries="java:/jms/queue/Export1"/>
                 <jms-queue name="Export2" entries="java:/jms/queue/Export2"/>
                 <jms-queue name="Export3" entries="java:/jms/queue/Export3"/>
+                <jms-queue name="Export4" entries="java:/jms/queue/Export4"/>
+                <jms-queue name="Export5" entries="java:/jms/queue/Export5"/>
                 <jms-queue name="HL7Send" entries="java:/jms/queue/HL7Send"/>
                 <jms-queue name="RSClient" entries="java:/jms/queue/RSClient"/>
                 <jms-queue name="CMoveSCU" entries="java:/jms/queue/CMoveSCU"/>