ENTAXY-248 release 1.8.1

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

@@ -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"/>