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
system/core/events/events-api/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core.events</groupId>
<artifactId>events</artifactId>
<version>1.8.0</version>
<version>1.8.1</version>
<relativePath>../../events/pom.xml</relativePath>
</parent>

2
system/core/events/events-common/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core.events</groupId>
<artifactId>events</artifactId>
<version>1.8.0</version>
<version>1.8.1</version>
<relativePath>../../events/pom.xml</relativePath>
</parent>

8
system/core/events/events-handler/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core.events</groupId>
<artifactId>events</artifactId>
<version>1.8.0</version>
<version>1.8.1</version>
<relativePath>../../events/pom.xml</relativePath>
</parent>
@ -25,6 +25,10 @@
com.google.gson.reflect,
*
</bundle.osgi.import.pkg>
<!-- bundle.osgi.private.pkg>
ru.entaxy.esb.system.core.events.handler,
ru.entaxy.esb.system.core.events.handler.util
</bundle.osgi.private.pkg -->
<camel-eventadmin.version>3.1.0</camel-eventadmin.version>
<org.osgi.service.event.version>1.4.0</org.osgi.service.event.version>
</properties>
@ -73,13 +77,11 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-gson</artifactId>
<version>${camel.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
</dependency>
<dependency>

13
system/core/events/events-handler/src/main/resources/OSGI-INF/blueprint/blueprint.xml
View File

@ -34,7 +34,7 @@
<cm:property-placeholder
persistent-id="ru.entaxy.esb.system.event.handler" update-strategy="reload">
<cm:default-properties>
<cm:property name="quirtz.job.clean.cron" value="0+0/1+*+*+*+?+*"/><!-- cron - Every minite -->
<cm:property name="quirtz.job.clean.cron" value="0+0/1+*+*+*+?+*"/><!-- cron - Every minute -->
<cm:property name="mode.dev" value="false"/>
</cm:default-properties>
</cm:property-placeholder>
@ -79,6 +79,11 @@
<property name="schedulerFactory" ref="factory"/>
</bean>
<!-- NOTE: Don't delete! -->
<!-- It needs for quartz because dataSource doesn't has time to registry in jndi-->
<reference id="cache" interface="javax.sql.DataSource" filter="(osgi.jndi.service.name=entaxy.esb.cache)"
availability="mandatory"/>
<bean id="factory" class="org.quartz.impl.StdSchedulerFactory">
<argument>
<props>
@ -105,7 +110,7 @@
<route id="handlerInit" autoStartup="true">
<from uri="timer:handlerInit?repeatCount=1"/>
<to uri="bean-fix:systemSubscriptionService?method=listByDeleted(false)"/>
<to uri="bean:systemSubscriptionService?method=listByDeleted(false)"/>
<bean ref="subscriptionProcessingGenerator" method="construct(${exchange})"/>
</route>
@ -247,11 +252,11 @@
<route id="cleanProcess">
<from uri="direct-vm:cleanProcess"/>
<to uri="bean-fix:systemSubscriptionService?method=listByDeleted(true)"/>
<to uri="bean:systemSubscriptionService?method=listByDeleted(true)"/>
<to uri="direct-vm:deleteSubscriberConsumers"/>
<to uri="bean-fix:eventTopicService?method=clean"/>
<to uri="bean:eventTopicService?method=clean"/>
<log message="CleanProcess: Deleted ${body} topics" loggingLevel="TRACE"/>

6
system/core/events/events-impl/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core.events</groupId>
<artifactId>events</artifactId>
<version>1.8.0</version>
<version>1.8.1</version>
<relativePath>../../events/pom.xml</relativePath>
</parent>
@ -33,13 +33,15 @@
javassist.util.proxy,
*
</bundle.osgi.import.pkg>
<!-- bundle.osgi.private.pkg>
ru.entaxy.esb.system.core.events.jpa.impl
</bundle.osgi.private.pkg -->
</properties>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
<version>${osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>

8
system/core/events/events-rest/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core.events</groupId>
<artifactId>events</artifactId>
<version>1.8.0</version>
<version>1.8.1</version>
<relativePath>../../events/pom.xml</relativePath>
</parent>
@ -24,6 +24,12 @@
ru.entaxy.esb.system.core.permission.handler,
*
</bundle.osgi.import.pkg>
<!-- bundle.osgi.private.pkg>
ru.entaxy.esb.system.core.events.rest,
ru.entaxy.esb.system.core.events.rest.aggregation,
ru.entaxy.esb.system.core.events.rest.exception,
ru.entaxy.esb.system.core.events.rest.response
</bundle.osgi.private.pkg-->
</properties>

2
system/core/events/events-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml
View File

@ -516,7 +516,7 @@
<log message="X-ForwardedUserId ${headers.X-ForwardedUserId}" loggingLevel="DEBUG"/>
<setProperty name="permissionCheck">
<simple>bean-fix:permissionChecker?method=check(${headers.X-ForwardedUserId}, 'account',
<simple>bean:permissionChecker?method=check(${headers.X-ForwardedUserId}, 'account',
${exchangeProperty.serviceName}, 'service', 'manage')
</simple>
</setProperty>

2
system/core/events/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core</groupId>
<artifactId>system-core</artifactId>
<version>1.8.0</version>
<version>1.8.1</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>