You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2015/04/02 08:31:56 UTC

stratos git commit: update CEP event processor feature. Commit on behalf of Dinithi

Repository: stratos
Updated Branches:
  refs/heads/master 8feaca284 -> 8985d96eb


update CEP event processor feature. Commit on behalf of Dinithi


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8985d96e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8985d96e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8985d96e

Branch: refs/heads/master
Commit: 8985d96eb811aa8e9ce2c114f1856b4c4e20517b
Parents: 8feaca2
Author: Udara Liyanage <ud...@wso2.com>
Authored: Thu Apr 2 12:01:32 2015 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Apr 2 12:01:32 2015 +0530

----------------------------------------------------------------------
 extensions/cep/stratos-cep-extension/pom.xml    |   2 +-
 .../pom.xml                                     |  89 +++++++++++
 .../pom.xml                                     | 159 +++++++++++++++++++
 features/cep/pom.xml                            |  44 +++++
 features/pom.xml                                |   1 +
 products/stratos/modules/p2-profile-gen/pom.xml |   6 +-
 6 files changed, 297 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/8985d96e/extensions/cep/stratos-cep-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/stratos-cep-extension/pom.xml b/extensions/cep/stratos-cep-extension/pom.xml
index 6a76014..7fc3d25 100644
--- a/extensions/cep/stratos-cep-extension/pom.xml
+++ b/extensions/cep/stratos-cep-extension/pom.xml
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.wso2.siddhi</groupId>
             <artifactId>siddhi-core</artifactId>
-            <version>2.0.0-wso2v4</version>
+            <version>2.0.0-wso2v5</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>

http://git-wip-us.apache.org/repos/asf/stratos/blob/8985d96e/features/cep/org.apache.stratos.event.processor.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cep/org.apache.stratos.event.processor.feature/pom.xml b/features/cep/org.apache.stratos.event.processor.feature/pom.xml
new file mode 100644
index 0000000..a252780
--- /dev/null
+++ b/features/cep/org.apache.stratos.event.processor.feature/pom.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (c) 2005-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. licenses this file to you 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.
+ -->
+
+<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.apache.stratos</groupId>
+        <artifactId>cep-features</artifactId>
+        <version>4.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+        <version>4.1.0-SNAPSHOT</version>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.stratos.event.processor.feature</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Stratos - Event Processor Aggregator Feature</name>
+    <url>http://wso2.org</url>
+    <description>
+        This feature contains the bundles required for Event Processor feature.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.stratos</groupId>
+            <artifactId>org.apache.stratos.event.processor.server.feature</artifactId>
+            <version>4.1.0-SNAPSHOT</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.event.processor.ui.feature</artifactId>
+            <version>1.0.0</version>
+            <type>zip</type>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>4-p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>org.apache.stratos.event.processor</id>
+                            <propertiesFile>../../../../etc/feature.properties</propertiesFile>
+                            <importFeatures>
+                                <importFeatureDef>org.wso2.carbon.core:${carbon.version}
+                                </importFeatureDef>
+                            </importFeatures>
+                            <includedFeatures>
+                                <includedFeatureDef>
+                                    org.apache.stratos:org.apache.stratos.event.processor.server.feature:4.1.0-SNAPSHOT
+                                </includedFeatureDef>
+                                <includedFeatureDef>
+                                    org.wso2.carbon:org.wso2.carbon.event.processor.ui.feature:1.0.0
+                                </includedFeatureDef>
+                            </includedFeatures>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

http://git-wip-us.apache.org/repos/asf/stratos/blob/8985d96e/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml b/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml
new file mode 100644
index 0000000..0260e8c
--- /dev/null
+++ b/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (c) 2005-2011, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. licenses this file to you 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../../feature.properties
+ ~ 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">
+    <parent>
+        <groupId>org.apache.stratos</groupId>
+        <artifactId>cep-features</artifactId>
+        <version>4.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+        <version>4.1.0-SNAPSHOT</version>
+    <artifactId>org.apache.stratos.event.processor.server.feature</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Stratos  - Event Processor Server Feature</name>
+    <url>http://apache.org</url>
+    <description>This feature contains the core bundles required for Back-end Event Processor functionality
+    </description>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.event.processor.core</artifactId>
+            <version>${siddhi.event.processor.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.event.processor.admin</artifactId>
+            <version>${siddhi.event.processor.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.event.processor.siddhi.extension</artifactId>
+            <version>${siddhi.event.processor.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.event.processor.api</artifactId>
+            <version>${siddhi.event.processor.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.wso2.siddhi</groupId>
+            <artifactId>siddhi-core</artifactId>
+            <version>${siddhi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.siddhi</groupId>
+            <artifactId>siddhi-api</artifactId>
+            <version>${siddhi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.siddhi</groupId>
+            <artifactId>siddhi-query</artifactId>
+            <version>${siddhi.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>src/main/resources</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>resources</directory>
+                                    <includes>
+                                        <include>build.properties</include>
+                                        <!--<include>conf/broker-manager-config.xml</include>-->
+                                        <!--<include>conf/broker-manager-config.xsd</include>-->
+                                        <include>p2.inf</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>4-p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>org.apache.stratos.event.processor.server</id>
+                            <propertiesFile>../../../../etc/feature.properties</propertiesFile>
+                            <adviceFile>
+                                <properties>
+                                    <propertyDef>org.wso2.carbon.p2.category.type:server
+                                    </propertyDef>
+                                    <propertyDef>org.eclipse.equinox.p2.type.group:false
+                                    </propertyDef>
+                                </properties>
+                            </adviceFile>
+                            <bundles>
+                                <bundleDef>org.wso2.carbon:org.wso2.carbon.event.processor.core:${siddhi.event.processor.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.wso2.carbon:org.wso2.carbon.event.processor.admin:${siddhi.event.processor.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.wso2.carbon:org.wso2.carbon.event.processor.siddhi.extension:${siddhi.event.processor.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.wso2.carbon:org.wso2.carbon.event.processor.api:${siddhi.event.processor.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.wso2.siddhi:siddhi-core:${siddhi.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.wso2.siddhi:siddhi-api:${siddhi.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.wso2.siddhi:siddhi-query:${siddhi.version}
+                                </bundleDef>
+                            </bundles>
+                            <importFeatures>
+                                <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef>
+                            </importFeatures>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

http://git-wip-us.apache.org/repos/asf/stratos/blob/8985d96e/features/cep/pom.xml
----------------------------------------------------------------------
diff --git a/features/cep/pom.xml b/features/cep/pom.xml
new file mode 100644
index 0000000..3bc6b5d
--- /dev/null
+++ b/features/cep/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you 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.
+  -->
+<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.apache.stratos</groupId>
+        <artifactId>stratos-features-parent</artifactId>
+        <version>4.1.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>cep-features</artifactId>
+    <packaging>pom</packaging>
+    <name>Apache Stratos - CEP Features</name>
+    <url>http://apache.org</url>
+
+    <modules>
+        <module>org.apache.stratos.event.processor.server.feature</module>
+        <module>org.apache.stratos.event.processor.feature</module>
+    </modules>
+    <properties>
+        <carbon.version>4.2.0</carbon.version>
+        <siddhi.version>2.0.0-wso2v5</siddhi.version>
+        <siddhi.event.processor.version>1.0.0</siddhi.event.processor.version>
+    </properties>
+
+</project>
+

http://git-wip-us.apache.org/repos/asf/stratos/blob/8985d96e/features/pom.xml
----------------------------------------------------------------------
diff --git a/features/pom.xml b/features/pom.xml
index 1d9fd98..5a24714 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -40,6 +40,7 @@
         <module>manager</module>
         <module>messaging</module>
         <module>common</module>
+        <module>cep</module>
     </modules>
 
     <build>

http://git-wip-us.apache.org/repos/asf/stratos/blob/8985d96e/products/stratos/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml
index f0fe056..a4301e4 100644
--- a/products/stratos/modules/p2-profile-gen/pom.xml
+++ b/products/stratos/modules/p2-profile-gen/pom.xml
@@ -441,7 +441,7 @@
                                 </featureArtifactDef>
                                 <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.formatter.feature:1.0.0
                                 </featureArtifactDef>
-                                <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.processor.feature:1.0.0
+                                <featureArtifactDef>org.apache.stratos:org.apache.stratos.event.processor.feature:${project.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.tracer.feature:1.0.0
                                 </featureArtifactDef>
@@ -1158,8 +1158,8 @@
                                     <version>1.0.0</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.event.processor.feature.group</id>
-                                    <version>1.0.0</version>
+                                    <id>org.apache.stratos.event.processor.feature.group</id>
+                                    <version>${project.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.event.tracer.feature.group</id>