ENTAXY-248 release 1.8.1

2022-02-28 15:20:38 +03:00
parent 4d274c4fcc
commit c826adf1db
1958 changed files with 195926 additions and 10280 deletions
--- a/system/core/dispatcher/pom.xml
+++ b/system/core/dispatcher/pom.xml
@ -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>

--- a/system/core/error-handler/pom.xml
+++ b/system/core/error-handler/pom.xml
@ -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>../pom.xml</relativePath>
    </parent>

@ -25,6 +25,10 @@
        <bundle.osgi.import.pkg>
            *
        </bundle.osgi.import.pkg>
+        <!-- bundle.osgi.private.pkg>{local-packages}</bundle.osgi.private.pkg -->
+        	<!--ru.entaxy.esb.system.core.common.error.handler.processor,
+        	ru.entaxy.esb.system.core.common.error.handler.util-->
+        
    </properties>

    <dependencies>
--- a/system/core/events/events-api/pom.xml
+++ b/system/core/events/events-api/pom.xml
@ -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>

--- a/system/core/events/events-common/pom.xml
+++ b/system/core/events/events-common/pom.xml
@ -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>

--- a/system/core/events/events-handler/pom.xml
+++ b/system/core/events/events-handler/pom.xml
@ -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>
--- a/system/core/events/events-handler/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/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"/>
--- a/system/core/events/events-impl/pom.xml
+++ b/system/core/events/events-impl/pom.xml
@ -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>
--- a/system/core/events/events-rest/pom.xml
+++ b/system/core/events/events-rest/pom.xml
@ -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>


--- a/system/core/events/events-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/system/core/events/events-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@ -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>
--- a/system/core/events/pom.xml
+++ b/system/core/events/pom.xml
@ -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>

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

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

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

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

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

--- a/system/core/security/permission-handler/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/system/core/security/permission-handler/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@ -49,10 +49,10 @@
        <route id="test-permission" autoStartup="{{mode.dev}}">
            <from uri="timer:test-permission?period=60&amp;repeatCount=1"/>

-            <to uri="bean-fix:permissionService?method=add(1, 'system', '2', 'system', 'send')"/>
+            <to uri="bean:permissionService?method=add(1, 'system', '2', 'system', 'send')"/>
            <log message="CREATE PERMISSION RECORD ${body}"/>

-            <to uri="bean-fix:permissionService?method=getByAllParameters(1, 'system', '2', 'system', 'send')"/>
+            <to uri="bean:permissionService?method=getByAllParameters(1, 'system', '2', 'system', 'send')"/>
            <log message="${body}"/>
            <choice>
                <when>
@ -65,7 +65,7 @@
            </choice>

            <doTry>
-                <to uri="bean-fix:permissionService?method=getByAllParameters(1, '4321', '4321', '4321', '4321')"/>
+                <to uri="bean:permissionService?method=getByAllParameters(1, '4321', '4321', '4321', '4321')"/>
                <log message="GET NOT EXISTING RECORD: TEST FAILED"/>
                <doCatch>
                    <exception>java.lang.Exception</exception>
@ -73,7 +73,7 @@
                </doCatch>
            </doTry>

-            <to uri="bean-fix:permissionService?method=remove(1, 'system', '2', 'system', 'send')"/>
+            <to uri="bean:permissionService?method=remove(1, 'system', '2', 'system', 'send')"/>

            <log message="DELETE PERMISSION RECORD ${body}"/>
        </route>
--- a/system/core/security/permission-impl/pom.xml
+++ b/system/core/security/permission-impl/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>ru.entaxy.esb.system.core.permission</groupId>
        <artifactId>permission</artifactId>
-        <version>1.8.0</version>
+        <version>1.8.1</version>
        <relativePath>../../security/pom.xml</relativePath>
    </parent>

@ -20,6 +20,10 @@
        <bundle.osgi.export.pkg>
            ru.entaxy.esb.system.core.permission.jpa.entity
        </bundle.osgi.export.pkg>
+        <!-- bundle.osgi.private.pkg>
+            ru.entaxy.esb.system.core.permission.interceptor,
+            ru.entaxy.esb.system.core.permission.jpa.impl
+        </bundle.osgi.private.pkg -->
        <bundle.osgi.import.pkg>
            javax.xml.bind;version="[2,3)",
            javax.xml.bind.annotation;version="[2,3)",
@ -38,7 +42,6 @@
        <dependency>
            <groupId>org.osgi</groupId>
            <artifactId>osgi.core</artifactId>
-            <version>${osgi.version}</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
--- a/system/core/security/permission-impl/src/main/java/ru/entaxy/esb/system/core/permission/jpa/impl/PermissionServiceImpl.java
+++ b/system/core/security/permission-impl/src/main/java/ru/entaxy/esb/system/core/permission/jpa/impl/PermissionServiceImpl.java
@ -106,7 +106,7 @@ public class PermissionServiceImpl implements PermissionService {
                                builder.equal(root.get("objectType"), type)),
                        builder.and(
                                builder.equal(root.get("subjectId"), String.valueOf(id)),
-                                builder.equal(root.get("objectType"), type))));
+                                builder.equal(root.get("subjectType"), type))));

        return s.createQuery(criteriaQuery).getResultList();
    }
--- a/system/core/security/permission-soap/pom.xml
+++ b/system/core/security/permission-soap/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>ru.entaxy.esb.system.core.permission</groupId>
        <artifactId>permission</artifactId>
-        <version>1.8.0</version>
+        <version>1.8.1</version>
    </parent>

    <artifactId>permission-soap</artifactId>
@ -26,7 +26,6 @@
        <dependency>
            <groupId>org.osgi</groupId>
            <artifactId>osgi.core</artifactId>
-            <version>${osgi.version}</version>
            <scope>provided</scope>
        </dependency>

--- a/system/core/security/permission-soap/src/main/resources/OSGI-INF/blueprint/camel-context.xml
+++ b/system/core/security/permission-soap/src/main/resources/OSGI-INF/blueprint/camel-context.xml
@ -77,7 +77,7 @@
            <doTry>
                <to uri="direct:preparePermissionCommon"/>

-                <to uri="bean-fix:permissionService?method=existByAllParameters(${exchangeProperty.objectId}, ${exchangeProperty.objectType},
+                <to uri="bean:permissionService?method=existByAllParameters(${exchangeProperty.objectId}, ${exchangeProperty.objectType},
                 	${exchangeProperty.subjectId}, ${exchangeProperty.subjectType}, ${exchangeProperty.action})"/>

                <log message="\r\nRESPONSE ${body}\r\n" loggingLevel="DEBUG"/>
@ -103,7 +103,7 @@
                <xpath resultType="long">//p:permissionId</xpath>
            </setProperty>

-            <to uri="bean-fix:permissionService?method=get(${exchangeProperty.permissionId})"/>
+            <to uri="bean:permissionService?method=get(${exchangeProperty.permissionId})"/>

            <log message="\r\nGet permission ${body}\r\n" loggingLevel="DEBUG"/>
            <to uri="direct:modelToHeaders"/>
@ -117,7 +117,7 @@
            <from uri="direct:getByAllParams"/>
            <to uri="direct:preparePermissionCommon"/>

-            <to uri="bean-fix:permissionService?method=getByAllParameters(${exchangeProperty.objectId}, ${exchangeProperty.objectType},
+            <to uri="bean:permissionService?method=getByAllParameters(${exchangeProperty.objectId}, ${exchangeProperty.objectType},
                 	${exchangeProperty.subjectId}, ${exchangeProperty.subjectType}, ${exchangeProperty.action})"/>

            <to uri="direct:modelToHeaders"/>
@ -130,7 +130,7 @@
            <from uri="direct:create"/>
            <to uri="direct:preparePermissionCommon"/>

-            <to uri="bean-fix:permissionService?method=add(${exchangeProperty.objectId}, ${exchangeProperty.objectType},
+            <to uri="bean:permissionService?method=add(${exchangeProperty.objectId}, ${exchangeProperty.objectType},
                 	${exchangeProperty.subjectId}, ${exchangeProperty.subjectType}, ${exchangeProperty.action})"/>

            <to uri="direct:modelToHeaders"/>
@ -160,7 +160,7 @@
                <xpath resultType="String">//p:permission/p:action</xpath>
            </setProperty>

-            <to uri="bean-fix:permissionService?method=update(${exchangeProperty.permissionId}, ${exchangeProperty.objectId}, ${exchangeProperty.objectType},
+            <to uri="bean:permissionService?method=update(${exchangeProperty.permissionId}, ${exchangeProperty.objectId}, ${exchangeProperty.objectType},
                 	${exchangeProperty.subjectId}, ${exchangeProperty.subjectType}, ${exchangeProperty.action})"/>

            <to uri="direct:modelToHeaders"/>
@ -173,7 +173,7 @@
            <from uri="direct:delete"/>
            <to uri="direct:preparePermissionCommon"/>

-            <to uri="bean-fix:permissionService?method=remove(${exchangeProperty.objectId}, ${exchangeProperty.objectType},
+            <to uri="bean:permissionService?method=remove(${exchangeProperty.objectId}, ${exchangeProperty.objectType},
             	${exchangeProperty.subjectId}, ${exchangeProperty.subjectType}, ${exchangeProperty.action})"/>

            <setBody>
--- a/system/core/security/permission-soap/src/main/resources/types/permission.ftl
+++ b/system/core/security/permission-soap/src/main/resources/types/permission.ftl
@ -1,22 +1,24 @@
-<#--
- ~~~~~~licensing~~~~~~
- permission-soap
- ==========
- 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~~~~~~
-->
+[#--
+
+    ~~~~~~licensing~~~~~~
+    permission-soap
+    ==========
+    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~~~~~~
+
+--]
 <tns:permission xmlns:tns="http://www.entaxy.ru/permission/">
    <tns:permissionId>${exchange.properties.permissionId}</tns:permissionId>
    <tns:objectId>${exchange.properties.objectId}</tns:objectId>
--- a/system/core/security/pom.xml
+++ b/system/core/security/pom.xml
@ -7,7 +7,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>

--- a/system/core/template/pom.xml
+++ b/system/core/template/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>system-core</artifactId>
        <groupId>ru.entaxy.esb.system.core</groupId>
-        <version>1.8.0</version>
+        <version>1.8.1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@ -37,7 +37,6 @@
        <dependency>
            <groupId>org.osgi</groupId>
            <artifactId>osgi.core</artifactId>
-            <version>${osgi.version}</version>
            <scope>provided</scope>
        </dependency>
        <dependency>