Merge pull request #321 from tharindu1st/log4j1-removal

Log4j1 removal
wso2 · Jan 30, 2022 · 33a748d · 33a748d
2 parents b8dec54 + 4c88cf2
commit 33a748d
Show file tree

Hide file tree

Showing 40 changed files with 24 additions and 11,156 deletions.
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/components/event-processor/org.wso2.carbon.event.processor.common/pom.xml b/components/event-processor/org.wso2.carbon.event.processor.common/pom.xml
@@ -29,11 +29,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>

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