ACS-1253 Enable Camel JMX management (#295)

- enable Camel JMX management
- disable JMS connection idle timeout
- update ActiveMQ broker URLs to use NIO
This commit is contained in:
CezarLeahu
2021-02-19 14:52:28 +02:00
committed by GitHub
parent 6f17779e71
commit bb19c61253
6 changed files with 15 additions and 5 deletions

View File

@@ -38,7 +38,7 @@ services:
-Dftp.dataPortTo=30099 -Dftp.dataPortTo=30099
-Dshare.host=localhost -Dshare.host=localhost
-Daos.baseUrlOverwrite=http://localhost:8082/alfresco/aos -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/ -DlocalTransform.core-aio.url=http://transform-core-aio:8090/
-Dimap.server.port=1143 -Dimap.server.port=1143
-Dftp.port=1221 -Dftp.port=1221

View File

@@ -38,7 +38,7 @@ services:
-Dftp.dataPortTo=30099 -Dftp.dataPortTo=30099
-Dshare.host=localhost -Dshare.host=localhost
-Daos.baseUrlOverwrite=http://localhost:8082/alfresco/aos -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 -Dlocal.transform.service.enabled=false
-Dlegacy.transform.service.enabled=false -Dlegacy.transform.service.enabled=false
-Dimap.server.port=1143 -Dimap.server.port=1143

View File

@@ -777,6 +777,11 @@
<artifactId>camel-direct</artifactId> <artifactId>camel-direct</artifactId>
<version>${dependency.camel.version}</version> <version>${dependency.camel.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-management</artifactId>
<version>${dependency.camel.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.camel</groupId> <groupId>org.apache.camel</groupId>
<artifactId>camel-mock</artifactId> <artifactId>camel-mock</artifactId>

View File

@@ -687,6 +687,10 @@
<groupId>org.apache.camel</groupId> <groupId>org.apache.camel</groupId>
<artifactId>camel-direct</artifactId> <artifactId>camel-direct</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-management</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.camel</groupId> <groupId>org.apache.camel</groupId>
<artifactId>camel-mock</artifactId> <artifactId>camel-mock</artifactId>

View File

@@ -22,6 +22,7 @@
<bean id="pooledConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory" <bean id="pooledConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory"
init-method="start" destroy-method="stop"> init-method="start" destroy-method="stop">
<property name="maxConnections" value="${messaging.broker.connections.max}" /> <property name="maxConnections" value="${messaging.broker.connections.max}" />
<property name="createConnectionOnStartup" value="false"/>
<property name="connectionFactory" ref="activeMqConnectionFactory" /> <property name="connectionFactory" ref="activeMqConnectionFactory" />
</bean> </bean>
@@ -85,7 +86,7 @@
<camelContext id="alfrescoCamelContext" xmlns="http://camel.apache.org/schema/spring" useBreadcrumb="true"> <camelContext id="alfrescoCamelContext" xmlns="http://camel.apache.org/schema/spring" useBreadcrumb="true">
<contextScan/> <contextScan/>
<camel:jmxAgent id="agent" mbeanObjectDomainName="Alfresco.Camel" /> <jmxAgent id="agent" mbeanObjectDomainName="Alfresco.Camel" />
<template id="camelProducerTemplate" defaultEndpoint="direct:alfresco.default" /> <template id="camelProducerTemplate" defaultEndpoint="direct:alfresco.default" />
</camelContext> </camelContext>

View File

@@ -1,5 +1,5 @@
# External failover broker at tcp://localhost # External failover broker at nio://localhost ("nio" = "tcp" through the java.nio API)
messaging.broker.url=failover:(tcp://localhost:61616)?timeout=3000&jms.useCompression=true messaging.broker.url=failover:(nio://localhost:61616)?timeout=3000&jms.useCompression=true
messaging.broker.ssl=false messaging.broker.ssl=false
messaging.broker.username= messaging.broker.username=
messaging.broker.password= messaging.broker.password=