From bb19c61253835c56e60e2a3888fd126a73d634ab Mon Sep 17 00:00:00 2001
From: CezarLeahu <35226487+CezarLeahu@users.noreply.github.com>
Date: Fri, 19 Feb 2021 14:52:28 +0200
Subject: [PATCH] ACS-1253 Enable Camel JMX management (#295)

- enable Camel JMX management
- disable JMS connection idle timeout
- update ActiveMQ broker URLs to use NIO
---
 .../tests/environment/docker-compose-minimal+transforms.yml  | 2 +-
 packaging/tests/environment/docker-compose-minimal.yml       | 2 +-
 pom.xml                                                      | 5 +++++
 repository/pom.xml                                           | 4 ++++
 .../subsystems/Messaging/default/messaging-context.xml       | 3 ++-
 .../subsystems/Messaging/default/messaging.properties        | 4 ++--
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/packaging/tests/environment/docker-compose-minimal+transforms.yml b/packaging/tests/environment/docker-compose-minimal+transforms.yml
index 17281c9512..676e1e6c9e 100644
--- a/packaging/tests/environment/docker-compose-minimal+transforms.yml
+++ b/packaging/tests/environment/docker-compose-minimal+transforms.yml
@@ -38,7 +38,7 @@ services:
         -Dftp.dataPortTo=30099
         -Dshare.host=localhost
         -Daos.baseUrlOverwrite=http://localhost:8082/alfresco/aos
-        -Dmessaging.broker.url=\"failover:(tcp://activemq:61616)?timeout=3000&jms.useCompression=true\"
+        -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
         -DlocalTransform.core-aio.url=http://transform-core-aio:8090/
         -Dimap.server.port=1143
         -Dftp.port=1221
diff --git a/packaging/tests/environment/docker-compose-minimal.yml b/packaging/tests/environment/docker-compose-minimal.yml
index b6d91f1cae..dd0649c65c 100644
--- a/packaging/tests/environment/docker-compose-minimal.yml
+++ b/packaging/tests/environment/docker-compose-minimal.yml
@@ -38,7 +38,7 @@ services:
         -Dftp.dataPortTo=30099
         -Dshare.host=localhost
         -Daos.baseUrlOverwrite=http://localhost:8082/alfresco/aos
-        -Dmessaging.broker.url=\"failover:(tcp://activemq:61616)?timeout=3000&jms.useCompression=true\"
+        -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
         -Dlocal.transform.service.enabled=false
         -Dlegacy.transform.service.enabled=false
         -Dimap.server.port=1143
diff --git a/pom.xml b/pom.xml
index c94ffb0b91..93d6677df4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -777,6 +777,11 @@
                 <artifactId>camel-direct</artifactId>
                 <version>${dependency.camel.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.camel</groupId>
+                <artifactId>camel-management</artifactId>
+                <version>${dependency.camel.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-mock</artifactId>
diff --git a/repository/pom.xml b/repository/pom.xml
index 047ca6de20..dda259011b 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -687,6 +687,10 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-direct</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-management</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-mock</artifactId>
diff --git a/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml b/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
index 3c06c00252..adfa56d7db 100644
--- a/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
+++ b/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging-context.xml
@@ -22,6 +22,7 @@
     <bean id="pooledConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory"
         init-method="start" destroy-method="stop">
         <property name="maxConnections" value="${messaging.broker.connections.max}" />
+        <property name="createConnectionOnStartup" value="false"/>
         <property name="connectionFactory" ref="activeMqConnectionFactory" />
     </bean>
     
@@ -85,7 +86,7 @@
 
     <camelContext id="alfrescoCamelContext" xmlns="http://camel.apache.org/schema/spring" useBreadcrumb="true">
         <contextScan/>
-        <camel:jmxAgent id="agent" mbeanObjectDomainName="Alfresco.Camel" />
+        <jmxAgent id="agent" mbeanObjectDomainName="Alfresco.Camel" />
         <template id="camelProducerTemplate" defaultEndpoint="direct:alfresco.default" />
     </camelContext>
 
diff --git a/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging.properties b/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging.properties
index 48fb9ef838..bf6433d601 100644
--- a/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging.properties
+++ b/repository/src/main/resources/alfresco/subsystems/Messaging/default/messaging.properties
@@ -1,5 +1,5 @@
-# External failover broker at tcp://localhost
-messaging.broker.url=failover:(tcp://localhost:61616)?timeout=3000&jms.useCompression=true
+# External failover broker at nio://localhost ("nio" = "tcp" through the java.nio API)
+messaging.broker.url=failover:(nio://localhost:61616)?timeout=3000&jms.useCompression=true
 messaging.broker.ssl=false
 messaging.broker.username=
 messaging.broker.password=