ENTAXY-248 release 1.8.1

This commit is contained in:
2022-02-28 15:20:38 +03:00
parent 4d274c4fcc
commit c826adf1db
1958 changed files with 195926 additions and 10280 deletions

View File

@ -5,7 +5,7 @@
<parent>
<groupId>ru.entaxy.esb.platform.runtime.modules</groupId>
<artifactId>uniform-service</artifactId>
<version>1.8.0</version>
<version>1.8.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -64,7 +64,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
<version>${osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>

View File

@ -107,6 +107,10 @@
<property name="addresses" value="$ignite{ignite.addresses}"/>
</bean>
<bean id="aggregateProcessor" class="ru.entaxy.esb.system.common.aggregation.hazelcast.DisconnectedMembershipListener">
<property name="hazelcastInstance" ref="hazelcastInstance"/>
</bean>
<reference id="hazelcastInstance" interface="com.hazelcast.core.HazelcastInstance" timeout="30000"/>
<bean id="timeoutAwareAggregationStrategy"
@ -114,18 +118,6 @@
<argument index="0" value="NTX_Acknowledge"/>
</bean>
<bean id="aggregationProcessor" class="ru.entaxy.esb.system.common.aggregation.AggregationProcessorBean"
init-method="init" destroy-method="doStop" activation="eager">
<property name="camelContext" ref="soap-connector-context"/>
<property name="aggregationRepositoryRef" value="${acknowledge.aggregation.repository}"/>
<property name="aggregationStrategyRef" value="timeoutAwareAggregationStrategy"/>
<property name="completionTimeout" value="${acknowledge.completion.timeout}"/>
<property name="aggregateExpression" value="${headers.X-SystemUuid}:${headers.ENTAXY_AcknowledgeMsgID}"/>
<property name="toDefinition" value="direct-vm:uniform-service-common-revert-no-acknowledge-messages?block=true&amp;timeout=60000"/>
<property name="hazelcastInstance" ref="hazelcastInstance"/>
</bean>
<reference id="entaxy-broker" interface="org.apache.camel.Component"
filter="(connection.name=entaxy-broker)"/>
@ -158,7 +150,18 @@
<route id="aggregation">
<from uri="entaxy-broker:queue:entaxy.uniform.service.exchange.aggregate?concurrentConsumers=50&amp;asyncConsumer=true&amp;acknowledgementModeName=CLIENT_ACKNOWLEDGE"/>
<to uri="bean:aggregationProcessor"/>
<aggregate id="aggregateProcessor" strategyRef="timeoutAwareAggregationStrategy"
aggregationRepositoryRef="{{acknowledge.aggregation.repository}}"
discardOnCompletionTimeout="false" completionSize="2">
<correlationExpression>
<simple>${headers.X-SystemUuid}:${headers.ENTAXY_AcknowledgeMsgID}</simple>
</correlationExpression>
<completionTimeoutExpression>
<simple>{{acknowledge.completion.timeout}}</simple>
</completionTimeoutExpression>
<to uri="direct-vm:uniform-service-common-revert-no-acknowledge-messages?block=true&amp;timeout=60000"/>
</aggregate>
</route>
<route id="revert-no-acknowledge-messages">