entaxy/entaxy-public
14
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ENTAXY-248 release 1.8.1

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/runtime/modules/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>ru.entaxy.esb.platform</groupId>
<artifactId>runtime</artifactId>
<version>1.8.0</version>
<version>1.8.1</version>
</parent>
<groupId>ru.entaxy.esb.platform.runtime</groupId>
<artifactId>modules</artifactId>

1
platform/runtime/modules/src/main/features/features.xml
View File

@ -37,3 +37,4 @@
</feature>
</features>

3
platform/runtime/modules/uniform-service/connector/pom.xml
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>
@ -65,7 +65,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
<version>${osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>

55
platform/runtime/modules/uniform-service/connector/src/main/resources/template/uniform-service-in-connector.ftl
View File

@ -1,22 +1,25 @@
<#--
~~~~~~licensing~~~~~~
connector
==========
Copyright (C) 2020 - 2021 EmDev LLC
==========
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
~~~~~~/licensing~~~~~~
-->
[#ftl attributes={"generated.type":"blueprint"}]
[#--
~~~~~~licensing~~~~~~
connector
==========
Copyright (C) 2020 - 2021 EmDev LLC
==========
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
~~~~~~/licensing~~~~~~
--]
<?xml version="1.0" encoding="UTF-8"?>
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@ -42,7 +45,7 @@
<reference id="entaxy-broker" interface="org.apache.camel.Component"
filter="(connection.name=entaxy-broker)"/>
<bean id="inConnector" class="ru.entaxy.esb.system.profile.commons.connectors.in.QueueInConnectorImpl">
<bean id="inConnector" class="ru.entaxy.esb.system.profile.commons.connectors.in.DirectVMInConnectorImpl">
<property name="endpointName" value="uniform-service"/>
<property name="systemName" value="[=systemName]"/>
<property name="params">
@ -85,7 +88,7 @@
type="DeadLetterChannel" deadLetterUri="direct-vm:commonErrorEndpoint"/>
<redeliveryPolicyProfile id="noRedelivery" disableRedelivery="true"/>
<#if isActive == "true">
[#if isActive == "true"]
<route id="uniform-service-active-in-connector">
<from uri="timer://get-package?synchronous=true&amp;period=[=period]"/>
<setHeader name="ENTAXY_SystemId">
@ -247,7 +250,7 @@
<to uri="direct-vm:profile-[=systemName]-exit-dispatcher?block=false"/>
</route>
<#else>
[#else]
<route id="uniform-service-in-connector">
<from uri="direct-vm:uniform-service-in-connector-[=systemName]"/>
<log message="Start uniform exchange connector ${headers.operationName}" loggingLevel="DEBUG"/>
@ -276,7 +279,7 @@
</otherwise>
</choice>
</route>
</#if>
[/#if]
<route id="send-packets">
<from uri="direct:send-packets"/>
@ -299,7 +302,7 @@
<choice>
<when>
<simple>${headers.ENTAXY_MessageUUID} == "00000000-0000-0000-0000-000000000000"</simple>
<#-- health check -->
[#-- health check --]
<removeHeaders pattern="ENTAXY_.+|NTX_.+|X-.+"/>
<setBody>
<simple><![CDATA[<test/>]]></simple>
@ -520,10 +523,6 @@
<log message="Get Message ${body}" loggingLevel="DEBUG"/>
<bean ref="headersConverter" method="json2xml"/>
<setHeader name="NTX_OutQueue">
<simple>${headers.JMSDestination.name}</simple>
</setHeader>
<setHeader name="ENTAXY_AcknowledgeMsgID">
<simple>${bean:uuidGenerator.toString}</simple>
</setHeader>

49
platform/runtime/modules/uniform-service/connector/src/main/resources/template/uniform-service-out-connector.ftl
View File

@ -1,22 +1,25 @@
<#--
~~~~~~licensing~~~~~~
connector
==========
Copyright (C) 2020 - 2021 EmDev LLC
==========
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
~~~~~~/licensing~~~~~~
-->
[#ftl attributes={"generated.type":"blueprint"}]
[#--
~~~~~~licensing~~~~~~
connector
==========
Copyright (C) 2020 - 2021 EmDev LLC
==========
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
~~~~~~/licensing~~~~~~
--]
<?xml version="1.0" encoding="UTF-8"?>
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@ -42,7 +45,7 @@
<reference id="entaxy-broker" interface="org.apache.camel.Component"
filter="(connection.name=entaxy-broker)"/>
<bean id="soapOutConnector" class="ru.entaxy.esb.system.profile.commons.connectors.out.QueueOutConnectorImpl">
<bean id="soapOutConnector" class="ru.entaxy.esb.system.profile.commons.connectors.out.DirectVMOutConnectorImpl">
<property name="endpointName" value="uniform-service"/>
<property name="systemName" value="[=systemName]"/>
<property name="params">
@ -80,7 +83,7 @@
type="DeadLetterChannel" deadLetterUri="direct-vm:commonErrorEndpoint"/>
<redeliveryPolicyProfile id="noRedelivery" disableRedelivery="true"/>
<#if isActive == "true">
[#if isActive == "true"]
<route id="soap-out-active-connector" streamCache="true">
<from uri="entaxy-broker:queue:entaxy.uniform.service.exchange.[=systemName]?exchangePattern=InOnly"/>
<log message="Message ${headers} send to system" loggingLevel="TRACE"/>
@ -102,7 +105,7 @@
<bean ref="headersConverter" method="xml2Json"/>
<setHeader name="NTX_OutQueue">
<simple>${headers.JMSDestination.name}</simple>
<simple>entaxy.uniform.service.exchange.[=systemName]</simple>
</setHeader>
<setHeader name="ENTAXY_AcknowledgeMsgID">
<simple>${bean:uuidGenerator.toString}</simple>
@ -141,7 +144,7 @@
</otherwise>
</choice>
</route>
</#if>
[/#if]
<route id="uniform-service-out-connector">
<from uri="direct-vm:uniform-service-out-connector-[=systemName]"/>

54
platform/runtime/modules/uniform-service/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>ru.entaxy.esb.platform.runtime</groupId>
<artifactId>modules</artifactId>
<version>1.8.0</version>
<version>1.8.1</version>
</parent>
<groupId>ru.entaxy.esb.platform.runtime.modules</groupId>
<artifactId>uniform-service</artifactId>
@ -18,6 +18,56 @@
<profiles>
<profile>
<id>attach-configs</id>
<build>
<resources>
<resource>
<directory>cfg</directory>
<targetPath>${project.build.directory}/cfg</targetPath>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>attach-configs</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>target/cfg/uniform.service.ignite.cfg</file>
<type>cfg</type>
<classifier>uniform.service.ignite</classifier>
</artifact>
<artifact>
<file>target/cfg/uniform.exchange.passive.cfg</file>
<type>cfg</type>
<classifier>uniform.exchange.passive</classifier>
</artifact>
<artifact>
<file>target/cfg/uniform.service.support.cfg</file>
<type>cfg</type>
<classifier>uniform.service.support</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<activation>
<file>
<exists>cfg</exists>
</file>
</activation>
</profile>
<profile>
<id>features</id>
<build>
@ -78,7 +128,7 @@
</build>
<activation>
<file>
<exists>feature/features.xml</exists>
<exists>feature1/features.xml</exists>
</file>
</activation>
</profile>

57
platform/runtime/modules/uniform-service/src/main/features/features.xml Normal file
View File

@ -0,0 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~~~~~~licensing~~~~~~
uniform-service
==========
Copyright (C) 2020 - 2022 EmDev LLC
==========
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
~~~~~~/licensing~~~~~~
-->
<!-- feature:repo-add mvn:ru.entaxy.esb.platform.runtime.modules/uniform-service/$ESB_ENTAXY_VERSION/xml/features -->
<features name="ru.entaxy.esb.platform.runtime.modules-${project.version}"
xmlns="http://karaf.apache.org/xmlns/features/v1.3.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
<!-- repository>mvn:ru.entaxy.esb/karaf-features/${project.version}/xml/features</repository -->
<feature name="common-soap" version="${project.version}">
<configfile finalname="${karaf.etc}/uniform.service.support.cfg" override="false">
mvn:ru.entaxy.esb.platform.runtime.modules/uniform-service/${project.version}/cfg/uniform.service.support
</configfile>
<configfile finalname="${karaf.etc}/uniform.service.ignite.cfg" override="false">
mvn:ru.entaxy.esb.platform.runtime.modules/uniform-service/${project.version}/cfg/uniform.service.ignite
</configfile>
<bundle>mvn:ru.entaxy.esb.platform.runtime.modules.uniform.service/support/${project.version}</bundle>
<bundle>mvn:ru.entaxy.esb.platform.runtime.modules.uniform.service/connector/${project.version}</bundle>
<capability>
osgi.service;effective:=active;objectClass=org.apache.camel.Component;connection.name=entaxy-broker
</capability>
</feature>
<feature name="entaxy-uniform-service" version="${project.version}">
<feature version="${project.version}">common-soap</feature>
<configfile finalname="${karaf.etc}/uniform.exchange.passive.cfg" override="false">
mvn:ru.entaxy.esb.platform.runtime.modules/uniform-service/${project.version}/cfg/uniform.exchange.passive
</configfile>
<configfile finalname="${karaf.etc}/org.apache.felix.hc.generalchecks.HttpRequestsCheck-uniform_service.cfg" override="true">
mvn:ru.entaxy.esb.platform.runtime.modules/uniform-service/${project.version}/cfg/org.apache.felix.hc.generalchecks.HttpRequestsCheck-uniform_service
</configfile>
<bundle>mvn:ru.entaxy.esb.platform.runtime.modules.uniform.service/uniform-service-endpoint/${project.version}</bundle>
</feature>
</features>

5
platform/runtime/modules/uniform-service/src/main/healthcheck/generated/fragments.xml Normal file
View File

@ -0,0 +1,5 @@
<!-- -->
<configfile finalname="${karaf.etc}/org.apache.felix.hc.generalchecks.HttpRequestsCheck-uniform_service.cfg" override="true">
mvn:ru.entaxy.esb.platform.runtime.modules/uniform-service/1.8.1/cfg/org.apache.felix.hc.generalchecks.HttpRequestsCheck-uniform_service
</configfile>
<!-- -->

24
platform/runtime/modules/uniform-service/src/main/healthcheck/org.apache.felix.hc.generalchecks.HttpRequestsCheck-uniform_service.cfg Normal file
View File

@ -0,0 +1,24 @@
###
# ~~~~~~licensing~~~~~~
# uniform-service
# ==========
# Copyright (C) 2020 - 2022 EmDev LLC
# ==========
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# ~~~~~~/licensing~~~~~~
###
requests = [ \
"http://localhost:8181/cxf/uniform-exchange => 200", \
]
hc.name="Entaxy Uniform Service"
hc.mbean.name="Entaxy.Uniform.Service"

3
platform/runtime/modules/uniform-service/support/pom.xml
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>

29
platform/runtime/modules/uniform-service/support/src/main/resources/OSGI-INF/blueprint/camel-context.xml
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">

2
platform/runtime/modules/uniform-service/uniform-service-endpoint/pom.xml
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>