Prepare for 2.2.17 release

wso2 · Dec 1, 2023 · 802c7bb · 802c7bb
1 parent b556fb5
commit 802c7bb
Show file tree

Hide file tree

Showing 81 changed files with 197 additions and 11,438 deletions.
diff --git a/components/event-flow/org.wso2.carbon.event.flow.ui/pom.xml b/components/event-flow/org.wso2.carbon.event.flow.ui/pom.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8" standalone="no"?><!--
   ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,13 +12,12 @@
   ~ 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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.carbon.event-processing</groupId>
         <artifactId>event-flow</artifactId>
-        <version>2.2.14</version>
+        <version>2.2.17-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -74,4 +72,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/components/event-flow/org.wso2.carbon.event.flow/pom.xml b/components/event-flow/org.wso2.carbon.event.flow/pom.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8" standalone="no"?><!--
   ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,13 +12,12 @@
   ~ 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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.carbon.event-processing</groupId>
         <artifactId>event-flow</artifactId>
-        <version>2.2.14</version>
+        <version>2.2.17-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -98,4 +96,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/components/event-flow/pom.xml b/components/event-flow/pom.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8" standalone="no"?><!--
   ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,13 +12,12 @@
   ~ 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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.carbon.event-processing</groupId>
         <artifactId>carbon-event-processing</artifactId>
-        <version>2.2.14</version>
+        <version>2.2.17-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -34,4 +32,4 @@
         <module>org.wso2.carbon.event.flow.ui</module>
     </modules>
 
-</project>
+</project>
diff --git a/components/event-processor/org.wso2.carbon.event.processor.admin/pom.xml b/components/event-processor/org.wso2.carbon.event.processor.admin/pom.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8" standalone="no"?><!--
   ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,13 +12,12 @@
   ~ 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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.carbon.event-processing</groupId>
         <artifactId>event-processor</artifactId>
-        <version>2.2.14</version>
+        <version>2.2.17-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -102,4 +100,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/...admin/src/main/java/org/wso2/carbon/event/processor/admin/EventProcessorAdminService.java b/...admin/src/main/java/org/wso2/carbon/event/processor/admin/EventProcessorAdminService.java
@@ -159,25 +159,11 @@ public ExecutionPlanConfigurationDto[] getAllActiveExecutionPlanConfigurations()
                 ExecutionPlanConfigurationDto[] configurationDtos = new ExecutionPlanConfigurationDto[executionPlanConfigurations.size()];
 
                 int i = 0;
-                if (isDistributedProcessingEnabled()) {
-                    Map<String, String> executionPlanStatuses = eventProcessorService.getAllExecutionPlanStatusesInStorm();
-                    for (Map.Entry<String, ExecutionPlanConfiguration> entry : executionPlanConfigurations.entrySet()) {
-                        ExecutionPlanConfigurationDto dto = new ExecutionPlanConfigurationDto();
-                        String status = executionPlanStatuses.get(entry.getKey());
-                        if (status == null) {
-                            log.error("No distributed deployment status information available for execution plan " + entry.getKey());
-                        }
-                        copyConfigurationsToDto(entry.getValue(), dto, status);
-                        configurationDtos[i] = dto;
-                        i++;
-                    }
-                } else {
-                    for (ExecutionPlanConfiguration planConfiguration : executionPlanConfigurations.values()) {
-                        ExecutionPlanConfigurationDto dto = new ExecutionPlanConfigurationDto();
-                        copyConfigurationsToDto(planConfiguration, dto, null);
-                        configurationDtos[i] = dto;
-                        i++;
-                    }
+                for (ExecutionPlanConfiguration planConfiguration : executionPlanConfigurations.values()) {
+                    ExecutionPlanConfigurationDto dto = new ExecutionPlanConfigurationDto();
+                    copyConfigurationsToDto(planConfiguration, dto, null);
+                    configurationDtos[i] = dto;
+                    i++;
                 }
 
                 Arrays.sort(configurationDtos, new Comparator() {

diff --git a/.../java/org/wso2/carbon/event/processor/admin/internal/ds/EventProcessorAdminServiceDS.java b/.../java/org/wso2/carbon/event/processor/admin/internal/ds/EventProcessorAdminServiceDS.java
@@ -24,6 +24,7 @@
 import org.osgi.service.component.annotations.ReferenceCardinality;
 import org.osgi.service.component.annotations.ReferencePolicy;
 
+
 /**
  * This class is used to get the EventProcessor service.
  */

diff --git a/components/event-processor/org.wso2.carbon.event.processor.common/pom.xml b/components/event-processor/org.wso2.carbon.event.processor.common/pom.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!--
   ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,13 +12,12 @@
   ~ 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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.carbon.event-processing</groupId>
         <artifactId>event-processor</artifactId>
-        <version>2.2.14</version>
+        <version>2.2.17-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -29,11 +27,6 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>org.wso2.orbit.org.apache.storm</groupId>
-            <artifactId>storm-core</artifactId>
-            <version>${storm.orbit.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.wso2.siddhi</groupId>
             <artifactId>siddhi-core</artifactId>
@@ -125,4 +118,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/.../main/java/org/wso2/carbon/event/processor/common/storm/component/EventPublisherBolt.java b/.../main/java/org/wso2/carbon/event/processor/common/storm/component/EventPublisherBolt.java
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,7 @@ @@
     import org.osgi.service.component.annotations.ReferenceCardinality;
     import org.osgi.service.component.annotations.ReferencePolicy;
     /**
      * This class is used to get the EventProcessor service.
      */
@@ Expand Down @@