ENTAXY-248 release 1.8.1
This commit is contained in:
@ -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>
|
||||
|
||||
@ -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&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>
|
||||
|
||||
@ -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]"/>
|
||||
|
||||
Reference in New Issue
Block a user