Skip to content

Commit 802c7bb

Browse files
AnuGayanAnuGayan
committed
Prepare for 2.2.17 release
1 parent b556fb5 commit 802c7bb

File tree

81 files changed

+197
-11438
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+197
-11438
lines changed

‎components/event-flow/org.wso2.carbon.event.flow.ui/pom.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
1+
<?xml version="1.0" encoding="utf-8" standalone="no"?><!--
32
~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
43
~
54
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,13 +12,12 @@
1312
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1413
~ See the License for the specific language governing permissions and
1514
~ limitations under the License.
16-
-->
17-
<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">
15+
--><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">
1816

1917
<parent>
2018
<groupId>org.wso2.carbon.event-processing</groupId>
2119
<artifactId>event-flow</artifactId>
22-
<version>2.2.14</version>
20+
<version>2.2.17-SNAPSHOT</version>
2321
<relativePath>../pom.xml</relativePath>
2422
</parent>
2523

@@ -74,4 +72,4 @@
7472
</dependency>
7573
</dependencies>
7674

77-
</project>
75+
</project>

‎components/event-flow/org.wso2.carbon.event.flow/pom.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
1+
<?xml version="1.0" encoding="utf-8" standalone="no"?><!--
32
~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
43
~
54
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,13 +12,12 @@
1312
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1413
~ See the License for the specific language governing permissions and
1514
~ limitations under the License.
16-
-->
17-
<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">
15+
--><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">
1816

1917
<parent>
2018
<groupId>org.wso2.carbon.event-processing</groupId>
2119
<artifactId>event-flow</artifactId>
22-
<version>2.2.14</version>
20+
<version>2.2.17-SNAPSHOT</version>
2321
<relativePath>../pom.xml</relativePath>
2422
</parent>
2523

@@ -98,4 +96,4 @@
9896
</dependency>
9997
</dependencies>
10098

101-
</project>
99+
</project>

‎components/event-flow/pom.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
1+
<?xml version="1.0" encoding="utf-8" standalone="no"?><!--
32
~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
43
~
54
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,13 +12,12 @@
1312
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1413
~ See the License for the specific language governing permissions and
1514
~ limitations under the License.
16-
-->
17-
<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">
15+
--><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">
1816

1917
<parent>
2018
<groupId>org.wso2.carbon.event-processing</groupId>
2119
<artifactId>carbon-event-processing</artifactId>
22-
<version>2.2.14</version>
20+
<version>2.2.17-SNAPSHOT</version>
2321
<relativePath>../../pom.xml</relativePath>
2422
</parent>
2523

@@ -34,4 +32,4 @@
3432
<module>org.wso2.carbon.event.flow.ui</module>
3533
</modules>
3634

37-
</project>
35+
</project>

‎components/event-processor/org.wso2.carbon.event.processor.admin/pom.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
1+
<?xml version="1.0" encoding="utf-8" standalone="no"?><!--
32
~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
43
~
54
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,13 +12,12 @@
1312
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1413
~ See the License for the specific language governing permissions and
1514
~ limitations under the License.
16-
-->
17-
<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">
15+
--><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">
1816

1917
<parent>
2018
<groupId>org.wso2.carbon.event-processing</groupId>
2119
<artifactId>event-processor</artifactId>
22-
<version>2.2.14</version>
20+
<version>2.2.17-SNAPSHOT</version>
2321
<relativePath>../pom.xml</relativePath>
2422
</parent>
2523

@@ -102,4 +100,4 @@
102100
</plugins>
103101
</build>
104102

105-
</project>
103+
</project>

‎components/event-processor/org.wso2.carbon.event.processor.admin/src/main/java/org/wso2/carbon/event/processor/admin/EventProcessorAdminService.java‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -159,25 +159,11 @@ public ExecutionPlanConfigurationDto[] getAllActiveExecutionPlanConfigurations()
159159
ExecutionPlanConfigurationDto[] configurationDtos = new ExecutionPlanConfigurationDto[executionPlanConfigurations.size()];
160160

161161
int i = 0;
162-
if (isDistributedProcessingEnabled()) {
163-
Map<String, String> executionPlanStatuses = eventProcessorService.getAllExecutionPlanStatusesInStorm();
164-
for (Map.Entry<String, ExecutionPlanConfiguration> entry : executionPlanConfigurations.entrySet()) {
165-
ExecutionPlanConfigurationDto dto = new ExecutionPlanConfigurationDto();
166-
String status = executionPlanStatuses.get(entry.getKey());
167-
if (status == null) {
168-
log.error("No distributed deployment status information available for execution plan " + entry.getKey());
169-
}
170-
copyConfigurationsToDto(entry.getValue(), dto, status);
171-
configurationDtos[i] = dto;
172-
i++;
173-
}
174-
} else {
175-
for (ExecutionPlanConfiguration planConfiguration : executionPlanConfigurations.values()) {
176-
ExecutionPlanConfigurationDto dto = new ExecutionPlanConfigurationDto();
177-
copyConfigurationsToDto(planConfiguration, dto, null);
178-
configurationDtos[i] = dto;
179-
i++;
180-
}
162+
for (ExecutionPlanConfiguration planConfiguration : executionPlanConfigurations.values()) {
163+
ExecutionPlanConfigurationDto dto = new ExecutionPlanConfigurationDto();
164+
copyConfigurationsToDto(planConfiguration, dto, null);
165+
configurationDtos[i] = dto;
166+
i++;
181167
}
182168

183169
Arrays.sort(configurationDtos, new Comparator() {

‎components/event-processor/org.wso2.carbon.event.processor.admin/src/main/java/org/wso2/carbon/event/processor/admin/internal/ds/EventProcessorAdminServiceDS.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.osgi.service.component.annotations.ReferenceCardinality;
2525
import org.osgi.service.component.annotations.ReferencePolicy;
2626

27+
2728
/**
2829
* This class is used to get the EventProcessor service.
2930
*/

‎components/event-processor/org.wso2.carbon.event.processor.common/pom.xml‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><!--
32
~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
43
~
54
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,13 +12,12 @@
1312
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1413
~ See the License for the specific language governing permissions and
1514
~ limitations under the License.
16-
-->
17-
<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">
15+
--><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">
1816

1917
<parent>
2018
<groupId>org.wso2.carbon.event-processing</groupId>
2119
<artifactId>event-processor</artifactId>
22-
<version>2.2.14</version>
20+
<version>2.2.17-SNAPSHOT</version>
2321
<relativePath>../pom.xml</relativePath>
2422
</parent>
2523

@@ -29,11 +27,6 @@
2927
<packaging>bundle</packaging>
3028

3129
<dependencies>
32-
<dependency>
33-
<groupId>org.wso2.orbit.org.apache.storm</groupId>
34-
<artifactId>storm-core</artifactId>
35-
<version>${storm.orbit.version}</version>
36-
</dependency>
3730
<dependency>
3831
<groupId>org.wso2.siddhi</groupId>
3932
<artifactId>siddhi-core</artifactId>
@@ -125,4 +118,4 @@
125118
</plugin>
126119
</plugins>
127120
</build>
128-
</project>
121+
</project>

‎components/event-processor/org.wso2.carbon.event.processor.common/src/main/java/org/wso2/carbon/event/processor/common/storm/component/EventPublisherBolt.java‎

Lines changed: 0 additions & 185 deletions
This file was deleted.

0 commit comments

Comments
 (0)