You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2017/01/30 19:25:17 UTC
[1/2] incubator-unomi git commit: [jgitflow-maven-plugin]updating
poms for unomi_5_karaf_4 version
Repository: incubator-unomi
Updated Branches:
refs/heads/feature-UNOMI-5-KARAF4 [created] b55639933
[jgitflow-maven-plugin]updating poms for unomi_5_karaf_4 version
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/41e57839
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/41e57839
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/41e57839
Branch: refs/heads/feature-UNOMI-5-KARAF4
Commit: 41e578395b4d2619c252690354ccc47ce3c5981d
Parents: 81d5e3a
Author: Serge Huber <sh...@apache.org>
Authored: Mon Jan 30 20:16:04 2017 +0100
Committer: Serge Huber <sh...@apache.org>
Committed: Mon Jan 30 20:16:04 2017 +0100
----------------------------------------------------------------------
api/pom.xml | 2 +-
extensions/geonames/pom.xml | 2 +-
extensions/geonames/rest/pom.xml | 8 +++---
extensions/geonames/services/pom.xml | 8 +++---
extensions/lists-extension/pom.xml | 4 +--
extensions/lists-extension/rest/pom.xml | 8 +++---
extensions/lists-extension/services/pom.xml | 8 +++---
extensions/pom.xml | 2 +-
extensions/privacy-extension/pom.xml | 4 +--
extensions/privacy-extension/rest/pom.xml | 8 +++---
extensions/privacy-extension/services/pom.xml | 8 +++---
kar/pom.xml | 30 ++++++++++----------
lifecycle-watcher/pom.xml | 6 ++--
package/pom.xml | 4 +--
persistence-elasticsearch/core/pom.xml | 6 ++--
persistence-elasticsearch/plugins/pom.xml | 2 +-
.../plugins/security/pom.xml | 2 +-
persistence-elasticsearch/pom.xml | 2 +-
persistence-spi/pom.xml | 4 +--
plugins/baseplugin/pom.xml | 6 ++--
plugins/hover-event/pom.xml | 4 +--
plugins/mail/pom.xml | 4 +--
plugins/optimization-test/pom.xml | 2 +-
plugins/past-event/pom.xml | 6 ++--
plugins/pom.xml | 4 +--
plugins/request/pom.xml | 2 +-
plugins/tracked-event/pom.xml | 6 ++--
pom.xml | 2 +-
rest/pom.xml | 6 ++--
samples/pom.xml | 2 +-
samples/tweet-button-plugin/pom.xml | 4 +--
services/pom.xml | 6 ++--
wab/pom.xml | 6 ++--
33 files changed, 88 insertions(+), 90 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 6662b6f..e162a36 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/extensions/geonames/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml
index f601a7c..9e9d215 100644
--- a/extensions/geonames/pom.xml
+++ b/extensions/geonames/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>cxs-geonames</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/extensions/geonames/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml
index cec5546..244682a 100644
--- a/extensions/geonames/rest/pom.xml
+++ b/extensions/geonames/rest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/extensions/geonames/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml
index e1e7310..273e697 100644
--- a/extensions/geonames/services/pom.xml
+++ b/extensions/geonames/services/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,20 +28,20 @@
<artifactId>cxs-geonames-services</artifactId>
<name>Apache Unomi :: Extensions :: Geonames Database :: Service</name>
<description>Service implementation for the Apache Unomi Context Server extension that integrates with the Geonames database</description>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/extensions/lists-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/pom.xml b/extensions/lists-extension/pom.xml
index d348ad9..801eeb3 100644
--- a/extensions/lists-extension/pom.xml
+++ b/extensions/lists-extension/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>cxs-lists-extension</artifactId>
<name>Apache Unomi :: Extensions :: Lists</name>
<description>List extension for the Apache Unomi Context Server</description>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/extensions/lists-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/rest/pom.xml b/extensions/lists-extension/rest/pom.xml
index e4e9414..cc10c7e 100644
--- a/extensions/lists-extension/rest/pom.xml
+++ b/extensions/lists-extension/rest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>cxs-lists-extension</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,14 +34,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/extensions/lists-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml
index d7ebedb..c481bf7 100644
--- a/extensions/lists-extension/services/pom.xml
+++ b/extensions/lists-extension/services/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>cxs-lists-extension</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,20 +28,20 @@
<name>Apache Unomi :: Extensions :: Lists :: Service</name>
<description>List extension service implementation for the Apache Unomi Context Server</description>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 7126b61..1ad8744 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/extensions/privacy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/pom.xml b/extensions/privacy-extension/pom.xml
index 46e4315..7b8a401 100644
--- a/extensions/privacy-extension/pom.xml
+++ b/extensions/privacy-extension/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>cxs-privacy-extension</artifactId>
<name>Apache Unomi :: Extensions :: Privacy</name>
<description>Privacy management extension for the Apache Unomi Context Server</description>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/extensions/privacy-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/rest/pom.xml b/extensions/privacy-extension/rest/pom.xml
index 0388a60..75e1230 100644
--- a/extensions/privacy-extension/rest/pom.xml
+++ b/extensions/privacy-extension/rest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>cxs-privacy-extension</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/extensions/privacy-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml
index 4afcde8..65ccfc1 100644
--- a/extensions/privacy-extension/services/pom.xml
+++ b/extensions/privacy-extension/services/pom.xml
@@ -20,27 +20,27 @@
<parent>
<artifactId>cxs-privacy-extension</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cxs-privacy-extension-services</artifactId>
<name>Apache Unomi :: Extensions :: Privacy :: Services</name>
<description>Privacy management extension service implementation for the Apache Unomi Context Server</description>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index 623d362..5f6fbb1 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi-kar</artifactId>
@@ -34,72 +34,72 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-base</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-request</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-mail</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-optimization-test</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-rest</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-rest</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-rest</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/lifecycle-watcher/pom.xml
----------------------------------------------------------------------
diff --git a/lifecycle-watcher/pom.xml b/lifecycle-watcher/pom.xml
index 419f7bf..0ea80f1 100644
--- a/lifecycle-watcher/pom.xml
+++ b/lifecycle-watcher/pom.xml
@@ -16,13 +16,11 @@
~ 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>
<artifactId>unomi-root</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index 7ed9ecf..c7bc8ce 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi</artifactId>
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/core/pom.xml b/persistence-elasticsearch/core/pom.xml
index eb169ef..e520fa3 100644
--- a/persistence-elasticsearch/core/pom.xml
+++ b/persistence-elasticsearch/core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
@@ -45,13 +45,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/persistence-elasticsearch/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/pom.xml b/persistence-elasticsearch/plugins/pom.xml
index 9114ece..556c7e4 100644
--- a/persistence-elasticsearch/plugins/pom.xml
+++ b/persistence-elasticsearch/plugins/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/persistence-elasticsearch/plugins/security/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/security/pom.xml b/persistence-elasticsearch/plugins/security/pom.xml
index c980ba2..90af370 100644
--- a/persistence-elasticsearch/plugins/security/pom.xml
+++ b/persistence-elasticsearch/plugins/security/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins-security</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/persistence-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml
index 5d25fd5..1d6091f 100644
--- a/persistence-elasticsearch/pom.xml
+++ b/persistence-elasticsearch/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/persistence-spi/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index 976f46c..531da43 100644
--- a/persistence-spi/pom.xml
+++ b/persistence-spi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-spi</artifactId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/plugins/baseplugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml
index 6efb0e5..a1acb9a 100644
--- a/plugins/baseplugin/pom.xml
+++ b/plugins/baseplugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-base</artifactId>
@@ -56,13 +56,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/plugins/hover-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hover-event/pom.xml b/plugins/hover-event/pom.xml
index d83c662..790d53f 100644
--- a/plugins/hover-event/pom.xml
+++ b/plugins/hover-event/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-hover-event</artifactId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/plugins/mail/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/mail/pom.xml b/plugins/mail/pom.xml
index e7dfdf6..c54adf7 100644
--- a/plugins/mail/pom.xml
+++ b/plugins/mail/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-mail</artifactId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/plugins/optimization-test/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/optimization-test/pom.xml b/plugins/optimization-test/pom.xml
index 445e457..7f9e5ab 100644
--- a/plugins/optimization-test/pom.xml
+++ b/plugins/optimization-test/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-optimization-test</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/plugins/past-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/past-event/pom.xml b/plugins/past-event/pom.xml
index eb37f52..de6607f 100644
--- a/plugins/past-event/pom.xml
+++ b/plugins/past-event/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-past-event</artifactId>
@@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 5de8cfb..d86a16e 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins</artifactId>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/plugins/request/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml
index cd17202..42a6f45 100644
--- a/plugins/request/pom.xml
+++ b/plugins/request/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-request</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/plugins/tracked-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tracked-event/pom.xml b/plugins/tracked-event/pom.xml
index 68d3fdd..23212ab 100644
--- a/plugins/tracked-event/pom.xml
+++ b/plugins/tracked-event/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-tracked-event</artifactId>
@@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 960c64b..8ebc875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
event tracking server.
</description>
<url>http://unomi.incubator.apache.org</url>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<packaging>pom</packaging>
<licenses>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/rest/pom.xml
----------------------------------------------------------------------
diff --git a/rest/pom.xml b/rest/pom.xml
index 9675d23..6fc054f 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi-rest</artifactId>
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!--<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 8941427..76b8405 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>unomi-root</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/samples/tweet-button-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/pom.xml b/samples/tweet-button-plugin/pom.xml
index c1725d5..608c388 100644
--- a/samples/tweet-button-plugin/pom.xml
+++ b/samples/tweet-button-plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>tweet-button-plugin</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index 2d5f345..69a120b 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi-services</artifactId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/41e57839/wab/pom.xml
----------------------------------------------------------------------
diff --git a/wab/pom.xml b/wab/pom.xml
index cb29c05..735cf7a 100644
--- a/wab/pom.xml
+++ b/wab/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
</parent>
<artifactId>unomi-wab</artifactId>
@@ -43,13 +43,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_5_karaf_4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
[2/2] incubator-unomi git commit: UNOMI-5 Upgrade to Karaf 4
Posted by sh...@apache.org.
UNOMI-5 Upgrade to Karaf 4
Signed-off-by: Serge Huber <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/b5563993
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/b5563993
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/b5563993
Branch: refs/heads/feature-UNOMI-5-KARAF4
Commit: b55639933c0f73dde5d0e70e24ece5ef1e9c37d6
Parents: 41e5783
Author: Serge Huber <sh...@apache.org>
Authored: Mon Jan 30 20:24:45 2017 +0100
Committer: Serge Huber <sh...@apache.org>
Committed: Mon Jan 30 20:24:45 2017 +0100
----------------------------------------------------------------------
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
kar/src/main/feature/feature.xml | 2 +-
package/pom.xml | 43 +++++++++++++++-----
.../resources/OSGI-INF/blueprint/blueprint.xml | 16 ++++----
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 4 +-
pom.xml | 19 ++++++---
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
services/pom.xml | 5 ---
.../services/services/SegmentServiceImpl.java | 33 ---------------
.../resources/OSGI-INF/blueprint/blueprint.xml | 26 ++++++------
src/site/markdown/getting-started.md | 2 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 14 ++++++-
15 files changed, 87 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b5563993/extensions/geonames/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/geonames/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 95a7366..767cc09 100644
--- a/extensions/geonames/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/geonames/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -44,6 +44,6 @@
<property name="pathToGeonamesDatabase" value="${request.geonamesDatabase.location}"/>
<property name="forceDbImport" value="${request.geonamesDatabase.forceImport}"/>
</bean>
- <service id="geonamesService" ref="geonamesServiceImpl" auto-export="interfaces"/>
+ <service id="geonamesService" ref="geonamesServiceImpl" interface="org.apache.unomi.geonames.services.GeonamesService"/>
</blueprint>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b5563993/extensions/lists-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/lists-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 9b1f44b..9398d0e 100644
--- a/extensions/lists-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/lists-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -31,5 +31,5 @@
<property name="persistenceService" ref="persistenceService"/>
<property name="definitionsService" ref="definitionsService"/>
</bean>
- <service id="userListService" ref="userListServiceImpl" auto-export="interfaces"/>
+ <service id="userListService" ref="userListServiceImpl" interface="org.apache.unomi.services.UserListService"/>
</blueprint>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b5563993/extensions/privacy-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/privacy-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 2755772..06302db 100644
--- a/extensions/privacy-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/privacy-extension/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -45,5 +45,5 @@
<property name="defaultDeniedProperties" value="${defaultDeniedProperties}" />
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <service id="privacyService" ref="privacyServiceImpl" auto-export="interfaces"/>
+ <service id="privacyService" ref="privacyServiceImpl" interface="org.apache.unomi.api.services.PrivacyService"/>
</blueprint>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b5563993/kar/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/kar/src/main/feature/feature.xml b/kar/src/main/feature/feature.xml
index e3351b7..a692461 100644
--- a/kar/src/main/feature/feature.xml
+++ b/kar/src/main/feature/feature.xml
@@ -16,7 +16,7 @@
~ limitations under the License.
-->
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="unomi-kar">
+<features name="unomi-kar" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
<feature description="unomi-kar" version="${project.version}" name="unomi-kar"
start-level="70">
<feature>war</feature>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b5563993/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index c7bc8ce..592af1f 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -36,6 +36,8 @@
<dependencies>
+ <!-- Standard Apache Karaf Features -->
+
<dependency>
<!-- scope is compile so all features (there is only one) are installed into startup.properties and the feature repo itself is not installed -->
<groupId>org.apache.karaf.features</groupId>
@@ -45,13 +47,19 @@
<dependency>
<!-- scope is runtime so the feature repo is listed in the features service config file, and features may be installed using the karaf-maven-plugin configuration -->
<groupId>org.apache.karaf.features</groupId>
- <artifactId>standard</artifactId>
+ <artifactId>framework</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
+ <artifactId>standard</artifactId>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
<artifactId>spring</artifactId>
<classifier>features</classifier>
<type>xml</type>
@@ -65,7 +73,8 @@
<scope>runtime</scope>
</dependency>
- <!--
+ <!-- Aditionnal Apache Unomi features -->
+
<dependency>
<groupId>org.apache.cxf.karaf</groupId>
<artifactId>apache-cxf</artifactId>
@@ -73,7 +82,6 @@
<type>xml</type>
<scope>runtime</scope>
</dependency>
- -->
<dependency>
<groupId>org.apache.karaf.cellar</groupId>
<artifactId>apache-karaf-cellar</artifactId>
@@ -258,16 +266,16 @@
<artifactId>karaf-maven-plugin</artifactId>
<executions>
<execution>
- <id>install-kar</id>
- <phase>compile</phase>
+ <id>process-resources</id>
+ <phase>process-resources</phase>
<goals>
- <goal>install-kars</goal>
+ <goal>assembly</goal>
</goals>
</execution>
<execution>
<id>package</id>
<goals>
- <goal>instance-create-archive</goal>
+ <goal>archive</goal>
</goals>
</execution>
</executions>
@@ -276,13 +284,26 @@
<feature>wrapper</feature>
</installedFeatures>
<bootFeatures>
- <feature>standard</feature>
- <feature>management</feature>
+ <feature>framework</feature>
+ <feature>wrap</feature>
+ <feature>aries-blueprint</feature>
+ <feature>shell</feature>
+ <feature>shell-compat</feature>
+ <feature>feature</feature>
+ <feature>jaas</feature>
<feature>ssh</feature>
+ <feature>management</feature>
+ <feature>bundle</feature>
<feature>config</feature>
- <feature>region</feature>
- <feature>package</feature>
+ <feature>deployer</feature>
+ <feature>diagnostic</feature>
+ <feature>feature</feature>
+ <feature>instance</feature>
<feature>kar</feature>
+ <feature>log</feature>
+ <feature>package</feature>
+ <feature>service</feature>
+ <feature>system</feature>
<feature>war</feature>
<feature>cxf</feature>
<feature>cellar</feature>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b5563993/plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index d6c1b10..263881e 100644
--- a/plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -144,7 +144,7 @@
<!-- Action executors -->
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="allEventToProfileProperties"/>
</service-properties>
@@ -154,7 +154,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="eventToProfileProperty"/>
</service-properties>
@@ -163,7 +163,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="setProperty"/>
</service-properties>
@@ -172,7 +172,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="evaluateProfileSegments"/>
</service-properties>
@@ -181,14 +181,14 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="evaluateProfileAge"/>
</service-properties>
<bean class="org.apache.unomi.plugins.baseplugin.actions.EvaluateProfileAgeAction"/>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="setEventOccurenceCount"/>
</service-properties>
@@ -198,7 +198,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="sendEvent"/>
</service-properties>
@@ -207,7 +207,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="mergeProfilesOnProperty"/>
</service-properties>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b5563993/plugins/mail/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/plugins/mail/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/plugins/mail/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index e8e1849..0d9fa50 100644
--- a/plugins/mail/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/plugins/mail/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -42,7 +42,7 @@
<property name="mailServerPassword" value="${mail.server.password}"/>
<property name="mailServerSSLOnConnect" value="${mail.server.sslOnConnect}"/>
</bean>
- <service id="sendMailAction" ref="sendMailActionImpl" auto-export="interfaces">
+ <service id="sendMailAction" ref="sendMailActionImpl" interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="sendMail"/>
</service-properties>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b5563993/plugins/request/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/plugins/request/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/plugins/request/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 3f20637..b7dd5d6 100644
--- a/plugins/request/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/plugins/request/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -35,7 +35,7 @@
class="org.apache.unomi.plugins.request.actions.RequestHeaderToProfilePropertyAction">
</bean>
<service id="requestHeaderToProfilePropertyAction" ref="requestHeaderToProfilePropertyActionImpl"
- auto-export="interfaces">
+ interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="requestHeaderToProfileProperty"/>
</service-properties>
@@ -45,7 +45,7 @@
class="org.apache.unomi.plugins.request.actions.RequestParameterToProfilePropertyAction">
</bean>
<service id="RequestParameterToProfilePropertyAction" ref="requestParameterToProfilePropertyActionImpl"
- auto-export="interfaces">
+ interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="requestParameterToProfileProperty"/>
</service-properties>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b5563993/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8ebc875..2b1dcd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,12 +64,12 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.version>3.0.2</cxf.version>
+ <cxf.version>3.1.0</cxf.version>
<version.jackson.core>2.6.6</version.jackson.core> <!-- version used by CXF -->
<version.jackson.jaxb>2.6.6</version.jackson.jaxb> <!-- version used by CXF -->
- <version.karaf>3.0.8</version.karaf>
- <version.karaf.cellar>3.0.3</version.karaf.cellar>
- <version.pax.exam>4.9.1</version.pax.exam>
+ <version.karaf>4.0.8</version.karaf>
+ <version.karaf.cellar>4.0.3</version.karaf.cellar>
+ <version.pax.exam>4.9.2</version.pax.exam>
<elasticsearch.version>5.1.1</elasticsearch.version>
<maven.compiler.source>1.7</maven.compiler.source>
@@ -612,14 +612,20 @@
<!-- Apache Karaf dependencies -->
<dependency>
- <!-- scope is compile so all features (there is only one) are installed into startup.properties and the feature repo itself is not installed -->
<groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId>
<version>${version.karaf}</version>
<type>kar</type>
</dependency>
<dependency>
- <!-- scope is runtime so the feature repo is listed in the features service config file, and features may be installed using the karaf-maven-plugin configuration -->
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
+ <classifier>features</classifier>
+ <version>${version.karaf}</version>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>standard</artifactId>
<classifier>features</classifier>
@@ -863,6 +869,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.2.0</version>
+ <extensions>true</extensions>
<configuration>
<instructions>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b5563993/samples/tweet-button-plugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/samples/tweet-button-plugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 101c07c..0059ec7 100644
--- a/samples/tweet-button-plugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/samples/tweet-button-plugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -23,7 +23,7 @@
<reference id="profileService" interface="org.apache.unomi.api.services.ProfileService"/>
<!-- Action executor -->
- <service id="incrementTweetNumberAction" auto-export="interfaces">
+ <service id="incrementTweetNumberAction" interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="incrementTweetNumber"/>
</service-properties>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b5563993/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index 69a120b..5c097dd 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -80,11 +80,6 @@
</dependency>
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.json</artifactId>
- </dependency>
-
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<scope>provided</scope>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b5563993/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
index 770936d..64370c9 100644
--- a/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/SegmentServiceImpl.java
@@ -39,7 +39,6 @@ import org.osgi.framework.SynchronousBundleListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.json.*;
import java.io.IOException;
import java.net.URL;
import java.security.MessageDigest;
@@ -69,38 +68,6 @@ public class SegmentServiceImpl implements SegmentService, SynchronousBundleList
logger.info("Initializing segment service...");
}
- public static void dumpJSON(JsonValue tree, String key, String depthPrefix) {
- if (key != null)
- logger.info(depthPrefix + "Key " + key + ": ");
- switch (tree.getValueType()) {
- case OBJECT:
- logger.info(depthPrefix + "OBJECT");
- JsonObject object = (JsonObject) tree;
- for (String name : object.keySet())
- dumpJSON(object.get(name), name, depthPrefix + " ");
- break;
- case ARRAY:
- logger.info(depthPrefix + "ARRAY");
- JsonArray array = (JsonArray) tree;
- for (JsonValue val : array)
- dumpJSON(val, null, depthPrefix + " ");
- break;
- case STRING:
- JsonString st = (JsonString) tree;
- logger.info(depthPrefix + "STRING " + st.getString());
- break;
- case NUMBER:
- JsonNumber num = (JsonNumber) tree;
- logger.info(depthPrefix + "NUMBER " + num.toString());
- break;
- case TRUE:
- case FALSE:
- case NULL:
- logger.info(depthPrefix + tree.getValueType().toString());
- break;
- }
- }
-
public void setBundleContext(BundleContext bundleContext) {
this.bundleContext = bundleContext;
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b5563993/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 23af746..fdf7e71 100644
--- a/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -62,7 +62,7 @@
<property name="persistenceService" ref="persistenceService"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <service id="definitionsService" ref="definitionsServiceImpl" auto-export="interfaces"/>
+ <service id="definitionsService" ref="definitionsServiceImpl" interface="org.apache.unomi.api.services.DefinitionsService"/>
<bean id="eventServiceImpl" class="org.apache.unomi.services.services.EventServiceImpl"
init-method="init" destroy-method="destroy">
@@ -90,7 +90,7 @@
<cm:cm-properties persistent-id="org.apache.unomi.thirdparty" update="true" />
</property>
</bean>
- <service id="eventService" ref="eventServiceImpl" auto-export="interfaces"/>
+ <service id="eventService" ref="eventServiceImpl" interface="org.apache.unomi.api.services.EventService"/>
<bean id="goalsServiceImpl" class="org.apache.unomi.services.services.GoalsServiceImpl"
init-method="postConstruct" destroy-method="preDestroy">
@@ -99,7 +99,7 @@
<property name="rulesService" ref="rulesServiceImpl"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <service id="goalsService" ref="goalsServiceImpl" auto-export="interfaces"/>
+ <service id="goalsService" ref="goalsServiceImpl" interface="org.apache.unomi.api.services.GoalsService"/>
<bean id="actionExecutorDispatcherImpl"
class="org.apache.unomi.services.actions.ActionExecutorDispatcher">
@@ -113,7 +113,7 @@
<property name="actionExecutorDispatcher" ref="actionExecutorDispatcherImpl"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <service id="rulesService" ref="rulesServiceImpl" auto-export="interfaces"/>
+ <service id="rulesService" ref="rulesServiceImpl" interface="org.apache.unomi.api.services.RulesService"/>
<bean id="segmentServiceImpl" class="org.apache.unomi.services.services.SegmentServiceImpl"
init-method="postConstruct" destroy-method="preDestroy">
@@ -125,7 +125,7 @@
<property name="taskExecutionPeriod" value="86400000"/>
<property name="segmentUpdateBatchSize" value="${services.segment.update.batchSize}" />
</bean>
- <service id="segmentService" ref="segmentServiceImpl" auto-export="interfaces"/>
+ <service id="segmentService" ref="segmentServiceImpl" interface="org.apache.unomi.api.services.SegmentService"/>
<bean id="profileServiceImpl" class="org.apache.unomi.services.services.ProfileServiceImpl"
init-method="postConstruct" destroy-method="preDestroy">
@@ -139,14 +139,14 @@
<property name="purgeProfileExistTime" value="${services.profile.purge.existTime}"/>
<property name="purgeSessionsAndEventsTime" value="${services.event.purge.existTime}"/>
</bean>
- <service id="profileService" ref="profileServiceImpl" auto-export="interfaces"/>
+ <service id="profileService" ref="profileServiceImpl" interface="org.apache.unomi.api.services.ProfileService"/>
<bean id="queryServiceImpl" class="org.apache.unomi.services.services.QueryServiceImpl"
init-method="postConstruct" destroy-method="preDestroy">
<property name="persistenceService" ref="persistenceService"/>
<property name="definitionsService" ref="definitionsServiceImpl"/>
</bean>
- <service id="queryService" ref="queryServiceImpl" auto-export="interfaces"/>
+ <service id="queryService" ref="queryServiceImpl" interface="org.apache.unomi.api.services.QueryService"/>
<bean id="clusterServiceImpl" class="org.apache.unomi.services.services.ClusterServiceImpl"
init-method="init" destroy-method="destroy">
@@ -164,7 +164,7 @@
<property name="karafJMXPassword" value="${cluster.jmxPassword}" />
<property name="karafJMXPort" value="${cluster.jmxPort}" />
</bean>
- <service id="clusterService" ref="clusterServiceImpl" auto-export="interfaces"/>
+ <service id="clusterService" ref="clusterServiceImpl" interface="org.apache.unomi.api.services.ClusterService"/>
<!-- We use a listener here because using the list directly for listening to proxies coming from the same bundle didn't seem to work -->
<reference-list id="eventListenerServices"
@@ -183,7 +183,7 @@
<!-- Property merge strategy executors -->
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.PropertyMergeStrategyExecutor">
<service-properties>
<entry key="propertyMergeStrategyExecutorId" value="defaultPropertyMergeStrategyExecutor"/>
</service-properties>
@@ -191,7 +191,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.PropertyMergeStrategyExecutor">
<service-properties>
<entry key="propertyMergeStrategyExecutorId" value="addPropertyMergeStrategyExecutor"/>
</service-properties>
@@ -199,7 +199,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.PropertyMergeStrategyExecutor">
<service-properties>
<entry key="propertyMergeStrategyExecutorId" value="mostRecentPropertyMergeStrategyExecutor"/>
</service-properties>
@@ -207,7 +207,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.PropertyMergeStrategyExecutor">
<service-properties>
<entry key="propertyMergeStrategyExecutorId" value="oldestPropertyMergeStrategyExecutor"/>
</service-properties>
@@ -215,7 +215,7 @@
</bean>
</service>
- <service auto-export="interfaces">
+ <service interface="org.apache.unomi.api.PropertyMergeStrategyExecutor">
<service-properties>
<entry key="propertyMergeStrategyExecutorId" value="nonEmptyPropertyMergeStrategyExecutor"/>
</service-properties>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b5563993/src/site/markdown/getting-started.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/getting-started.md b/src/site/markdown/getting-started.md
index f052649..04d3ca7 100644
--- a/src/site/markdown/getting-started.md
+++ b/src/site/markdown/getting-started.md
@@ -342,7 +342,7 @@ The action executor references the actual implementation of the action as define
<reference id="profileService" interface="org.apache.unomi.api.services.ProfileService"/>
<!-- Action executor -->
- <service id="incrementTweetNumberAction" auto-export="interfaces">
+ <service id="incrementTweetNumberAction" interface="org.apache.unomi.api.actions.ActionExecutor">
<service-properties>
<entry key="actionExecutorId" value="incrementTweetNumber"/>
</service-properties>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b5563993/wab/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/wab/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/wab/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 6103121..8acfb67 100644
--- a/wab/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/wab/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -42,7 +42,12 @@
<property name="profileIdCookieDomain" value="${web.contextserver.domain}" />
</bean>
- <service id="contextServletService" auto-export="interfaces" ref="contextServlet">
+ <service id="contextServletService" ref="contextServlet">
+ <interfaces>
+ <value>javax.servlet.Servlet</value>
+ <value>javax.servlet.ServletConfig</value>
+ <value>java.io.Serializable</value>
+ </interfaces>
<service-properties>
<entry key="urlPatterns">
<array value-type="java.lang.String">
@@ -58,7 +63,12 @@
<property name="eventService" ref="eventService"/>
<property name="privacyService" ref="privacyService" />
</bean>
- <service id="eventsCollectorServletService" auto-export="interfaces" ref="eventsCollectorServlet">
+ <service id="eventsCollectorServletService" ref="eventsCollectorServlet">
+ <interfaces>
+ <value>javax.servlet.Servlet</value>
+ <value>javax.servlet.ServletConfig</value>
+ <value>java.io.Serializable</value>
+ </interfaces>
<service-properties>
<entry key="urlPatterns" value="/eventcollector"/>
</service-properties>