You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by dg...@apache.org on 2017/08/08 12:39:54 UTC
[1/3] incubator-unomi git commit: [jgitflow-maven-plugin]updating
poms for unomi_117 version
Repository: incubator-unomi
Updated Branches:
refs/heads/feature-UNOMI-117 [created] a9d01d800
[jgitflow-maven-plugin]updating poms for unomi_117 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/12557248
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/12557248
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/12557248
Branch: refs/heads/feature-UNOMI-117
Commit: 125572488809223f78991aa82ba1453b669ccc0f
Parents: bc06486
Author: dgaillard <dg...@jahia.com>
Authored: Wed Aug 2 15:53:39 2017 +0200
Committer: dgaillard <dg...@jahia.com>
Committed: Wed Aug 2 15:53:39 2017 +0200
----------------------------------------------------------------------
api/pom.xml | 2 +-
extensions/geonames/pom.xml | 2 +-
extensions/geonames/rest/pom.xml | 8 ++---
extensions/geonames/services/pom.xml | 8 ++---
extensions/lists-extension/actions/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 ++---
extensions/router/pom.xml | 2 +-
extensions/router/router-api/pom.xml | 2 +-
extensions/router/router-core/pom.xml | 2 +-
extensions/router/router-karaf-feature/pom.xml | 2 +-
extensions/router/router-rest/pom.xml | 2 +-
extensions/router/router-service/pom.xml | 2 +-
extensions/salesforce-connector/actions/pom.xml | 6 ++--
.../salesforce-connector/karaf-kar/pom.xml | 10 +++---
extensions/salesforce-connector/pom.xml | 2 +-
extensions/salesforce-connector/rest/pom.xml | 8 ++---
.../salesforce-connector/services/pom.xml | 6 ++--
kar/pom.xml | 32 ++++++++++----------
lifecycle-watcher/pom.xml | 2 +-
package/pom.xml | 6 ++--
persistence-elasticsearch/core/pom.xml | 6 ++--
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/login-integration/pom.xml | 4 +--
samples/pom.xml | 2 +-
samples/tweet-button-plugin/pom.xml | 4 +--
services/pom.xml | 6 ++--
wab/pom.xml | 6 ++--
44 files changed, 115 insertions(+), 115 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 6662b6f..24cbef9 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_117-SNAPSHOT</version>
</parent>
<artifactId>unomi-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/geonames/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml
index f601a7c..5e0537d 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_117-SNAPSHOT</version>
</parent>
<artifactId>cxs-geonames</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/geonames/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml
index cec5546..0789697 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_117-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_117-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_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/geonames/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml
index e1e7310..c5e5dac 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_117-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_117-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_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/lists-extension/actions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/actions/pom.xml b/extensions/lists-extension/actions/pom.xml
index 91c0e8e..f7bbfa9 100644
--- a/extensions/lists-extension/actions/pom.xml
+++ b/extensions/lists-extension/actions/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_117-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,21 +28,21 @@
<name>Apache Unomi :: Extensions :: Lists :: Actions</name>
<description>List extension rule actions for the Apache Unomi Context Server</description>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-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_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/lists-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/pom.xml b/extensions/lists-extension/pom.xml
index 6542575..8020ad9 100644
--- a/extensions/lists-extension/pom.xml
+++ b/extensions/lists-extension/pom.xml
@@ -28,12 +28,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-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_117-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/lists-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/rest/pom.xml b/extensions/lists-extension/rest/pom.xml
index e4e9414..f4d78a0 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_117-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_117-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_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/lists-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml
index d7ebedb..22e8e55 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_117-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_117-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_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 07608b3..d08bfb8 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_117-SNAPSHOT</version>
</parent>
<artifactId>unomi-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/privacy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/pom.xml b/extensions/privacy-extension/pom.xml
index 46e4315..63b9445 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_117-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_117-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/privacy-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/rest/pom.xml b/extensions/privacy-extension/rest/pom.xml
index 0388a60..6058ee2 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_117-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_117-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_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/privacy-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml
index 4afcde8..7b27654 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_117-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_117-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_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/router/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/pom.xml b/extensions/router/pom.xml
index d45fd05..4d08684 100644
--- a/extensions/router/pom.xml
+++ b/extensions/router/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-SNAPSHOT</version>
</parent>
<artifactId>unomi-router</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/router/router-api/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-api/pom.xml b/extensions/router/router-api/pom.xml
index c7d06f7..5c91ef9 100644
--- a/extensions/router/router-api/pom.xml
+++ b/extensions/router/router-api/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/router/router-core/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/pom.xml b/extensions/router/router-core/pom.xml
index 96c1c01..379ec31 100644
--- a/extensions/router/router-core/pom.xml
+++ b/extensions/router/router-core/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/router/router-karaf-feature/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-karaf-feature/pom.xml b/extensions/router/router-karaf-feature/pom.xml
index 6aa6d49..d0021f2 100644
--- a/extensions/router/router-karaf-feature/pom.xml
+++ b/extensions/router/router-karaf-feature/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/router/router-rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-rest/pom.xml b/extensions/router/router-rest/pom.xml
index d3528ba..e8227f9 100644
--- a/extensions/router/router-rest/pom.xml
+++ b/extensions/router/router-rest/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/router/router-service/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-service/pom.xml b/extensions/router/router-service/pom.xml
index ed96bb1..c2d8d2d 100644
--- a/extensions/router/router-service/pom.xml
+++ b/extensions/router/router-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/salesforce-connector/actions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/actions/pom.xml b/extensions/salesforce-connector/actions/pom.xml
index f0b47b9..a640f4d 100644
--- a/extensions/salesforce-connector/actions/pom.xml
+++ b/extensions/salesforce-connector/actions/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/salesforce-connector/karaf-kar/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/karaf-kar/pom.xml b/extensions/salesforce-connector/karaf-kar/pom.xml
index 577f4bf..00d7139 100644
--- a/extensions/salesforce-connector/karaf-kar/pom.xml
+++ b/extensions/salesforce-connector/karaf-kar/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -50,17 +50,17 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-rest</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-actions</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-SNAPSHOT</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/salesforce-connector/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/pom.xml b/extensions/salesforce-connector/pom.xml
index da00cf9..4e98609 100644
--- a/extensions/salesforce-connector/pom.xml
+++ b/extensions/salesforce-connector/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-SNAPSHOT</version>
</parent>
<artifactId>unomi-salesforce-connector</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/salesforce-connector/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/rest/pom.xml b/extensions/salesforce-connector/rest/pom.xml
index 2420cc5..b1367e9 100644
--- a/extensions/salesforce-connector/rest/pom.xml
+++ b/extensions/salesforce-connector/rest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -83,7 +83,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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/extensions/salesforce-connector/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/services/pom.xml b/extensions/salesforce-connector/services/pom.xml
index 6508f58..206f056 100644
--- a/extensions/salesforce-connector/services/pom.xml
+++ b/extensions/salesforce-connector/services/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index 20d4257..7dfe8b1 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_117-SNAPSHOT</version>
</parent>
<artifactId>unomi-kar</artifactId>
@@ -34,77 +34,77 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-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_117-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_117-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_117-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_117-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_117-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_117-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_117-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_117-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_117-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-actions</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-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_117-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_117-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_117-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_117-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/lifecycle-watcher/pom.xml
----------------------------------------------------------------------
diff --git a/lifecycle-watcher/pom.xml b/lifecycle-watcher/pom.xml
index c28d36b..f472b22 100644
--- a/lifecycle-watcher/pom.xml
+++ b/lifecycle-watcher/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>unomi-root</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index da235b2..72f4838 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_117-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_117-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-router-karaf-feature</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/core/pom.xml b/persistence-elasticsearch/core/pom.xml
index eb169ef..fb0aa77 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_117-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_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/persistence-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml
index 70a85ea..a46d73b 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_117-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/persistence-spi/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index 976f46c..cb9295a 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_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/plugins/baseplugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml
index 6efb0e5..45cc739 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_117-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_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/plugins/hover-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hover-event/pom.xml b/plugins/hover-event/pom.xml
index d83c662..4807d52 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_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/plugins/mail/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/mail/pom.xml b/plugins/mail/pom.xml
index e7dfdf6..35a2ed5 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_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/plugins/optimization-test/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/optimization-test/pom.xml b/plugins/optimization-test/pom.xml
index 445e457..c755507 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_117-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-optimization-test</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/plugins/past-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/past-event/pom.xml b/plugins/past-event/pom.xml
index eb37f52..738b0ec 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_117-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_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 5de8cfb..fe94eee 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_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/plugins/request/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml
index cd17202..7d6f158 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_117-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-request</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/plugins/tracked-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tracked-event/pom.xml b/plugins/tracked-event/pom.xml
index 68d3fdd..a7d0079 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_117-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_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 376cf21..783bfae 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_117-SNAPSHOT</version>
<packaging>pom</packaging>
<licenses>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/rest/pom.xml
----------------------------------------------------------------------
diff --git a/rest/pom.xml b/rest/pom.xml
index f089dc0..48c28f1 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_117-SNAPSHOT</version>
</parent>
<artifactId>unomi-rest</artifactId>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-unomi_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -84,7 +84,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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!--<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/samples/login-integration/pom.xml
----------------------------------------------------------------------
diff --git a/samples/login-integration/pom.xml b/samples/login-integration/pom.xml
index 675807f..7c2c177 100644
--- a/samples/login-integration/pom.xml
+++ b/samples/login-integration/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_117-SNAPSHOT</version>
</parent>
<artifactId>login-integration-sample</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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 67e0d6f..c7afbae 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_117-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/samples/tweet-button-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/pom.xml b/samples/tweet-button-plugin/pom.xml
index c1725d5..c4a4616 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_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index 2d5f345..76b32c5 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_117-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_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12557248/wab/pom.xml
----------------------------------------------------------------------
diff --git a/wab/pom.xml b/wab/pom.xml
index cb29c05..f27990f 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_117-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_117-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_117-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
[2/3] incubator-unomi git commit: UNOMI-117 refactor tags as an open
string, removed tags definitions,
removed tags hierarchy and associated functions,
add previously parent tag to children
Posted by dg...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/java/org/apache/unomi/services/services/DefinitionsServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/DefinitionsServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/DefinitionsServiceImpl.java
index caaadf5..a419c8f 100644
--- a/services/src/main/java/org/apache/unomi/services/services/DefinitionsServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/DefinitionsServiceImpl.java
@@ -19,7 +19,6 @@ package org.apache.unomi.services.services;
import org.apache.unomi.api.PluginType;
import org.apache.unomi.api.PropertyMergeStrategyType;
-import org.apache.unomi.api.Tag;
import org.apache.unomi.api.ValueType;
import org.apache.unomi.api.actions.ActionType;
import org.apache.unomi.api.conditions.Condition;
@@ -44,12 +43,10 @@ public class DefinitionsServiceImpl implements DefinitionsService, SynchronousBu
private PersistenceService persistenceService;
- private Map<String, Tag> tags = new HashMap<>();
- private Set<Tag> rootTags = new LinkedHashSet<>();
private Map<String, ConditionType> conditionTypeById = new HashMap<>();
private Map<String, ActionType> actionTypeById = new HashMap<>();
private Map<String, ValueType> valueTypeById = new HashMap<>();
- private Map<Tag, Set<ValueType>> valueTypeByTag = new HashMap<>();
+ private Map<String, Set<ValueType>> valueTypeByTag = new HashMap<>();
private Map<Long, List<PluginType>> pluginTypes = new HashMap<>();
private Map<String, PropertyMergeStrategyType> propertyMergeStrategyTypeById = new HashMap<>();
@@ -89,8 +86,6 @@ public class DefinitionsServiceImpl implements DefinitionsService, SynchronousBu
pluginTypes.put(bundleContext.getBundle().getBundleId(), new ArrayList<PluginType>());
- loadPredefinedTags(bundleContext);
-
loadPredefinedConditionTypes(bundleContext);
loadPredefinedActionTypes(bundleContext);
loadPredefinedValueTypes(bundleContext);
@@ -108,55 +103,21 @@ public class DefinitionsServiceImpl implements DefinitionsService, SynchronousBu
if (type instanceof ValueType) {
ValueType valueType = (ValueType) type;
valueTypeById.remove(valueType.getId());
- for (Tag tag : valueType.getTags()) {
- valueTypeByTag.get(tag).remove(valueType);
+ for (String tag : valueType.getTags()) {
+ if (valueTypeByTag.containsKey(tag)) {
+ valueTypeByTag.get(tag).remove(valueType);
+ }
}
}
}
}
}
-
public void preDestroy() {
bundleContext.removeBundleListener(this);
logger.info("Definitions service shutdown.");
}
- private void loadPredefinedTags(BundleContext bundleContext) {
- Enumeration<URL> predefinedTagEntries = bundleContext.getBundle().findEntries("META-INF/cxs/tags", "*.json", true);
- if (predefinedTagEntries == null) {
- return;
- }
- while (predefinedTagEntries.hasMoreElements()) {
- URL predefinedTagURL = predefinedTagEntries.nextElement();
- logger.debug("Found predefined tags at " + predefinedTagURL + ", loading... ");
-
- try {
- Tag tag = CustomObjectMapper.getObjectMapper().readValue(predefinedTagURL, Tag.class);
- tag.setPluginId(bundleContext.getBundle().getBundleId());
- tags.put(tag.getId(), tag);
- } catch (IOException e) {
- logger.error("Error while loading segment definition " + predefinedTagEntries, e);
- }
- }
-
- // now let's resolve all the children.
- resolveTagsChildren();
- }
-
- private void resolveTagsChildren() {
- for (Tag tag : tags.values()) {
- if (tag.getParentId() != null && tag.getParentId().length() > 0) {
- Tag parentTag = tags.get(tag.getParentId());
- if (parentTag != null) {
- parentTag.getSubTags().add(tag);
- }
- } else {
- rootTags.add(tag);
- }
- }
- }
-
private void loadPredefinedConditionTypes(BundleContext bundleContext) {
Enumeration<URL> predefinedConditionEntries = bundleContext.getBundle().findEntries("META-INF/cxs/conditions", "*.json", true);
if (predefinedConditionEntries == null) {
@@ -211,8 +172,7 @@ public class DefinitionsServiceImpl implements DefinitionsService, SynchronousBu
valueType.setPluginId(bundleContext.getBundle().getBundleId());
valueTypeById.put(valueType.getId(), valueType);
pluginTypeArrayList.add(valueType);
- for (String tagId : valueType.getTagIds()) {
- Tag tag = tags.get(tagId);
+ for (String tag : valueType.getTags()) {
if (tag != null) {
valueType.getTags().add(tag);
Set<ValueType> valueTypes = valueTypeByTag.get(tag);
@@ -223,7 +183,7 @@ public class DefinitionsServiceImpl implements DefinitionsService, SynchronousBu
valueTypeByTag.put(tag, valueTypes);
} else {
// we found a tag that is not defined, we will define it automatically
- logger.warn("Unknown tag " + tagId + " used in property type definition " + predefinedPropertyURL);
+ logger.debug("Unknown tag " + tag + " used in property type definition " + predefinedPropertyURL);
}
}
} catch (Exception e) {
@@ -233,26 +193,6 @@ public class DefinitionsServiceImpl implements DefinitionsService, SynchronousBu
}
- public Set<Tag> getAllTags() {
- return new HashSet<Tag>(tags.values());
- }
-
- public Set<Tag> getRootTags() {
- return rootTags;
- }
-
- public Tag getTag(String tagId) {
- Tag completeTag = tags.get(tagId);
- return completeTag;
- }
-
- public void addTag(Tag tag) {
- tag.setPluginId(bundleContext.getBundle().getBundleId());
- tags.put(tag.getId(), tag);
- // now let's resolve all the children.
- resolveTagsChildren();
- }
-
public Map<Long, List<PluginType>> getTypesByPlugin() {
return pluginTypes;
}
@@ -267,21 +207,15 @@ public class DefinitionsServiceImpl implements DefinitionsService, SynchronousBu
return all;
}
- public Set<ConditionType> getConditionTypesByTag(Tag tag, boolean includeFromSubtags) {
+ public Set<ConditionType> getConditionTypesByTag(String tag) {
Set<ConditionType> conditionTypes = new LinkedHashSet<ConditionType>();
- List<ConditionType> directConditionTypes = persistenceService.query("metadata.tags",tag.getId(),null, ConditionType.class);
+ List<ConditionType> directConditionTypes = persistenceService.query("metadata.tags", tag,null, ConditionType.class);
for (ConditionType type : directConditionTypes) {
if (type.getParentCondition() != null) {
ParserHelper.resolveConditionType(this, type.getParentCondition());
}
}
conditionTypes.addAll(directConditionTypes);
- if (includeFromSubtags) {
- for (Tag subTag : tag.getSubTags()) {
- Set<ConditionType> childConditionTypes = getConditionTypesByTag(subTag, true);
- conditionTypes.addAll(childConditionTypes);
- }
- }
return conditionTypes;
}
@@ -314,16 +248,11 @@ public class DefinitionsServiceImpl implements DefinitionsService, SynchronousBu
return persistenceService.getAllItems(ActionType.class);
}
- public Set<ActionType> getActionTypeByTag(Tag tag, boolean includeFromSubtags) {
+ public Set<ActionType> getActionTypeByTag(String tag) {
Set<ActionType> actionTypes = new LinkedHashSet<ActionType>();
- List<ActionType> directActionTypes = persistenceService.query("metadata.tags",tag.getId(),null, ActionType.class);
+ List<ActionType> directActionTypes = persistenceService.query("metadata.tags", tag,null, ActionType.class);
actionTypes.addAll(directActionTypes);
- if (includeFromSubtags) {
- for (Tag subTag : tag.getSubTags()) {
- Set<ActionType> childActionTypes = getActionTypeByTag(subTag, true);
- actionTypes.addAll(childActionTypes);
- }
- }
+
return actionTypes;
}
@@ -350,18 +279,12 @@ public class DefinitionsServiceImpl implements DefinitionsService, SynchronousBu
return valueTypeById.values();
}
- public Set<ValueType> getValueTypeByTag(Tag tag, boolean includeFromSubtags) {
+ public Set<ValueType> getValueTypeByTag(String tag) {
Set<ValueType> valueTypes = new LinkedHashSet<ValueType>();
- Set<ValueType> directValueTypes = valueTypeByTag.get(tag);
- if (directValueTypes != null) {
- valueTypes.addAll(directValueTypes);
- }
- if (includeFromSubtags) {
- for (Tag subTag : tag.getSubTags()) {
- Set<ValueType> childValueTypes = getValueTypeByTag(subTag, true);
- valueTypes.addAll(childValueTypes);
- }
+ if (valueTypeByTag.containsKey(tag)) {
+ valueTypes.addAll(valueTypeByTag.get(tag));
}
+
return valueTypes;
}
@@ -422,13 +345,13 @@ public class DefinitionsServiceImpl implements DefinitionsService, SynchronousBu
}
}
- public Condition extractConditionByTag(Condition rootCondition, String tagId) {
+ public Condition extractConditionByTag(Condition rootCondition, String tag) {
if (rootCondition.containsParameter("subConditions")) {
@SuppressWarnings("unchecked")
List<Condition> subConditions = (List<Condition>) rootCondition.getParameter("subConditions");
List<Condition> matchingConditions = new ArrayList<Condition>();
for (Condition condition : subConditions) {
- Condition c = extractConditionByTag(condition, tagId);
+ Condition c = extractConditionByTag(condition, tag);
if (c != null) {
matchingConditions.add(c);
}
@@ -449,7 +372,7 @@ public class DefinitionsServiceImpl implements DefinitionsService, SynchronousBu
}
}
throw new IllegalArgumentException();
- } else if (rootCondition.getConditionType() != null && rootCondition.getConditionType().getMetadata().getTags().contains(tagId)) {
+ } else if (rootCondition.getConditionType() != null && rootCondition.getConditionType().getMetadata().getTags().contains(tag)) {
return rootCondition;
} else {
return null;
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/java/org/apache/unomi/services/services/GoalsServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/GoalsServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/GoalsServiceImpl.java
index ac6a9d2..a12a768 100644
--- a/services/src/main/java/org/apache/unomi/services/services/GoalsServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/GoalsServiceImpl.java
@@ -57,7 +57,7 @@ public class GoalsServiceImpl implements GoalsService, SynchronousBundleListener
private RulesService rulesService;
- private Map<Tag, Set<Goal>> goalByTag = new HashMap<>();
+ private Map<String, Set<Goal>> goalByTag = new HashMap<>();
public void setBundleContext(BundleContext bundleContext) {
this.bundleContext = bundleContext;
@@ -121,9 +121,8 @@ public class GoalsServiceImpl implements GoalsService, SynchronousBundleListener
goal.getMetadata().setScope("systemscope");
}
if (getGoal(goal.getMetadata().getId()) == null) {
- for (String tagId : goal.getMetadata().getTags()) {
- Tag tag = definitionsService.getTag(tagId);
- if (tag != null) {
+ for (String tag : goal.getMetadata().getTags()) {
+ if (goalByTag.containsKey(tag)) {
Set<Goal> goals = goalByTag.get(tag);
if (goals == null) {
goals = new LinkedHashSet<>();
@@ -132,7 +131,7 @@ public class GoalsServiceImpl implements GoalsService, SynchronousBundleListener
goalByTag.put(tag, goals);
} else {
// we found a tag that is not defined, we will define it automatically
- logger.warn("Unknown tag " + tagId + " used in goal definition " + predefinedGoalURL);
+ logger.debug("Unknown tag " + tag + " used in goal definition " + predefinedGoalURL);
}
}
@@ -540,18 +539,13 @@ public class GoalsServiceImpl implements GoalsService, SynchronousBundleListener
return report;
}
- public Set<Goal> getGoalByTag(Tag tag, boolean recursive) {
+ public Set<Goal> getGoalByTag(String tag) {
Set<Goal> goals = new LinkedHashSet<>();
Set<Goal> directGoals = goalByTag.get(tag);
if (directGoals != null) {
goals.addAll(directGoals);
}
- if (recursive) {
- for (Tag subTag : tag.getSubTags()) {
- Set<Goal> childGoals = getGoalByTag(subTag, true);
- goals.addAll(childGoals);
- }
- }
+
return goals;
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java
index 4aed515..4efa7ed 100644
--- a/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java
@@ -294,10 +294,10 @@ public class ProfileServiceImpl implements ProfileService, SynchronousBundleList
}
@Override
- public Set<PropertyType> getExistingProperties(String tagId, String itemType) {
+ public Set<PropertyType> getExistingProperties(String tag, String itemType) {
Set<PropertyType> filteredProperties = new LinkedHashSet<PropertyType>();
// TODO: here we limit the result to the definition we have, but what if some properties haven't definition but exist in ES mapping ?
- Set<PropertyType> profileProperties = getPropertyTypeByTag(tagId, true);
+ Set<PropertyType> profileProperties = getPropertyTypeByTag(tag);
Map<String, Map<String, Object>> itemMapping = persistenceService.getPropertiesMapping(itemType);
if (itemMapping == null || itemMapping.isEmpty() || itemMapping.get("properties") == null || itemMapping.get("properties").get("properties") == null) {
@@ -585,9 +585,6 @@ public class ProfileServiceImpl implements ProfileService, SynchronousBundleList
for (Profile profile : profiles) {
if (PropertyHelper.setProperty(profile, update.getPropertyName(), update.getPropertyValue(), update.getStrategy())) {
-// Event profileUpdated = new Event("profileUpdated", null, profile, null, null, profile, new Date());
-// profileUpdated.setPersistent(false);
-// eventService.send(profileUpdated);
save(profile);
}
}
@@ -634,22 +631,14 @@ public class ProfileServiceImpl implements ProfileService, SynchronousBundleList
return propertyTypes;
}
- public Set<PropertyType> getPropertyTypeByTag(String tagId, boolean includeFromSubtags) {
+ public Set<PropertyType> getPropertyTypeByTag(String tag) {
Set<PropertyType> propertyTypes = new LinkedHashSet<PropertyType>();
- Collection<PropertyType> directPropertyTypes = persistenceService.query("tags", tagId, "rank", PropertyType.class);
+ Collection<PropertyType> directPropertyTypes = persistenceService.query("tags", tag, "rank", PropertyType.class);
if (directPropertyTypes != null) {
propertyTypes.addAll(directPropertyTypes);
}
- if (includeFromSubtags) {
- Tag tag = definitionsService.getTag(tagId);
- if (tag != null) {
- for (Tag subTag : tag.getSubTags()) {
- Set<PropertyType> childPropertyTypes = getPropertyTypeByTag(subTag.getId(), true);
- propertyTypes.addAll(childPropertyTypes);
- }
- }
- }
+
return propertyTypes;
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/basic/firstName.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/basic/firstName.json b/services/src/main/resources/META-INF/cxs/properties/profiles/basic/firstName.json
index 6ed8836..a538e3e 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/basic/firstName.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/basic/firstName.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "firstName", "name": "First name" },
"type": "string",
- "tags": [ "basicProfileProperties" ],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "basicProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "101.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/basic/gender.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/basic/gender.json b/services/src/main/resources/META-INF/cxs/properties/profiles/basic/gender.json
index 610a548..425b6bd 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/basic/gender.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/basic/gender.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "gender", "name": "Gender" },
"type": "string",
- "tags": [ "basicProfileProperties" ],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "basicProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "104.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/basic/lastName.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/basic/lastName.json b/services/src/main/resources/META-INF/cxs/properties/profiles/basic/lastName.json
index 6468c17..ae43fc4 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/basic/lastName.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/basic/lastName.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "lastName", "name": "Last name" },
"type": "string",
- "tags": [ "basicProfileProperties" ],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "basicProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "102.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/basic/nationality.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/basic/nationality.json b/services/src/main/resources/META-INF/cxs/properties/profiles/basic/nationality.json
index 66748bb..72f3dee 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/basic/nationality.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/basic/nationality.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "nationality", "name": "Nationality" },
"type": "string",
- "tags": [ "basicProfileProperties" ],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "basicProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "103.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/contact/address.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/contact/address.json b/services/src/main/resources/META-INF/cxs/properties/profiles/contact/address.json
index 17791d0..ad1cac4 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/contact/address.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/contact/address.json
@@ -1,7 +1,11 @@
{
"metadata": {"id": "address", "name": "Address"},
"type": "string",
- "tags": ["contactProfileProperties"],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "contactProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [],
"rank": "303.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/contact/city.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/contact/city.json b/services/src/main/resources/META-INF/cxs/properties/profiles/contact/city.json
index 4cd698d..e8bfe3a 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/contact/city.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/contact/city.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "city", "name": "City" },
"type": "string",
- "tags": ["contactProfileProperties"],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "contactProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "304.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/contact/countryName.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/contact/countryName.json b/services/src/main/resources/META-INF/cxs/properties/profiles/contact/countryName.json
index 1d1fd6e..5c5b1ae 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/contact/countryName.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/contact/countryName.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "countryName", "name": "Country" },
"type": "string",
- "tags": ["contactProfileProperties"],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "contactProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "305.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/contact/email.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/contact/email.json b/services/src/main/resources/META-INF/cxs/properties/profiles/contact/email.json
index aecd6af..3cd1d15 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/contact/email.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/contact/email.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "email", "name": "Email" },
"type": "email",
- "tags": ["contactProfileProperties"],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "contactProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "301.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/contact/phoneNumber.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/contact/phoneNumber.json b/services/src/main/resources/META-INF/cxs/properties/profiles/contact/phoneNumber.json
index e8dc563..bd4319f 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/contact/phoneNumber.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/contact/phoneNumber.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "phoneNumber", "name": "Phone number" },
"type": "string",
- "tags": ["contactProfileProperties"],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "contactProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "302.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/contact/zipCode.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/contact/zipCode.json b/services/src/main/resources/META-INF/cxs/properties/profiles/contact/zipCode.json
index 5d9d272..081313a 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/contact/zipCode.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/contact/zipCode.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "zipCode", "name": "ZIP Code" },
"type": "string",
- "tags": ["contactProfileProperties"],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "contactProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "306.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/lead/leadAssignedTo.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/lead/leadAssignedTo.json b/services/src/main/resources/META-INF/cxs/properties/profiles/lead/leadAssignedTo.json
index 00c5c48..4e445bd 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/lead/leadAssignedTo.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/lead/leadAssignedTo.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "leadAssignedTo", "name": "Assigned to" },
"type": "string",
- "tags": [ "leadProfileProperties" ],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "leadProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "201.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/personal/age.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/personal/age.json b/services/src/main/resources/META-INF/cxs/properties/profiles/personal/age.json
index fbed245..2f155f2 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/personal/age.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/personal/age.json
@@ -4,7 +4,11 @@
"name": "Age"
},
"type": "integer",
- "tags": ["personalProfileProperties"],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "personalProfileProperties"
+ ],
"defaultValue": "",
"numericRanges": [
{"key":"*_10", "to" : 10 },
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/personal/birthDate.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/personal/birthDate.json b/services/src/main/resources/META-INF/cxs/properties/profiles/personal/birthDate.json
index 203d48d..2d1101d 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/personal/birthDate.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/personal/birthDate.json
@@ -4,7 +4,11 @@
"name": "Birth Date"
},
"type": "date",
- "tags": ["personalProfileProperties"],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "personalProfileProperties"
+ ],
"defaultValue": "",
"dateRanges": [
{"key":"*_10", "from": "now-10y/y" },
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/personal/kids.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/personal/kids.json b/services/src/main/resources/META-INF/cxs/properties/profiles/personal/kids.json
index 0141d2e..0a58820 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/personal/kids.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/personal/kids.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "kids", "name": "Kids" },
"type": "integer",
- "tags": ["personalProfileProperties"],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "personalProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "504.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/personal/maritalStatus.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/personal/maritalStatus.json b/services/src/main/resources/META-INF/cxs/properties/profiles/personal/maritalStatus.json
index 8e2e9c9..5bcd149 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/personal/maritalStatus.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/personal/maritalStatus.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "maritalStatus", "name": "Marital status" },
"type": "string",
- "tags": ["personalProfileProperties"],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "personalProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "503.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/social/facebookId.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/social/facebookId.json b/services/src/main/resources/META-INF/cxs/properties/profiles/social/facebookId.json
index 2596440..b325f19 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/social/facebookId.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/social/facebookId.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "facebookId", "name": "Facebook ID" },
"type": "string",
- "tags": [ "socialProfileProperties" ],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "socialProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "401.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/social/googleid.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/social/googleid.json b/services/src/main/resources/META-INF/cxs/properties/profiles/social/googleid.json
index a0fc1de..48d54b8 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/social/googleid.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/social/googleid.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "googleId", "name": "Google ID" },
"type": "string",
- "tags": [ "socialProfileProperties" ],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "socialProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "403.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/social/linkedInId.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/social/linkedInId.json b/services/src/main/resources/META-INF/cxs/properties/profiles/social/linkedInId.json
index e57a8e5..a6947e1 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/social/linkedInId.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/social/linkedInId.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "linkedInId", "name": "LinkedIn ID" },
"type": "string",
- "tags": [ "socialProfileProperties" ],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "socialProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "402.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/social/twitterId.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/social/twitterId.json b/services/src/main/resources/META-INF/cxs/properties/profiles/social/twitterId.json
index e47668f..40fad1d 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/social/twitterId.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/social/twitterId.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "twitterId", "name": "Twitter ID" },
"type": "string",
- "tags": [ "socialProfileProperties" ],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "socialProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "404.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/system/firstVisit.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/system/firstVisit.json b/services/src/main/resources/META-INF/cxs/properties/profiles/system/firstVisit.json
index d5a4aab..e1f4f32 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/system/firstVisit.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/system/firstVisit.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "firstVisit", "name": "First visit" },
"type": "date",
- "tags": [ "systemProfileProperties" ],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "systemProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"mergeStrategy": "oldestMergeStrategy",
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/system/lastVisit.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/system/lastVisit.json b/services/src/main/resources/META-INF/cxs/properties/profiles/system/lastVisit.json
index 3af2a94..db2ffb9 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/system/lastVisit.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/system/lastVisit.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "lastVisit", "name": "Last visit" },
"type": "date",
- "tags": [ "systemProfileProperties" ],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "systemProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"mergeStrategy": "mostRecentMergeStrategy",
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/system/nbOfVisits.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/system/nbOfVisits.json b/services/src/main/resources/META-INF/cxs/properties/profiles/system/nbOfVisits.json
index 921fca9..94a9123 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/system/nbOfVisits.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/system/nbOfVisits.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "nbOfVisits", "name": "Number of visits" },
"type": "integer",
- "tags": [ "systemProfileProperties" ],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "systemProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"numericRanges": [
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/system/previousVisit.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/system/previousVisit.json b/services/src/main/resources/META-INF/cxs/properties/profiles/system/previousVisit.json
index 6094746..a06f26f 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/system/previousVisit.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/system/previousVisit.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "previousVisit", "name": "Previous visit" },
"type": "date",
- "tags": [ "systemProfileProperties" ],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "systemProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"mergeStrategy": "mostRecentMergeStrategy",
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/work/company.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/work/company.json b/services/src/main/resources/META-INF/cxs/properties/profiles/work/company.json
index d94c3eb..940792b 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/work/company.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/work/company.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "company", "name": "Company" },
"type": "string",
- "tags": [ "workProfileProperties" ],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "workProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "601.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/work/income.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/work/income.json b/services/src/main/resources/META-INF/cxs/properties/profiles/work/income.json
index bebad96..47df006 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/work/income.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/work/income.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "income", "name": "Income" },
"type": "integer",
- "tags": [ "workProfileProperties" ],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "workProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "603.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/profiles/work/jobTitle.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/profiles/work/jobTitle.json b/services/src/main/resources/META-INF/cxs/properties/profiles/work/jobTitle.json
index d23fad4..22cc39f 100644
--- a/services/src/main/resources/META-INF/cxs/properties/profiles/work/jobTitle.json
+++ b/services/src/main/resources/META-INF/cxs/properties/profiles/work/jobTitle.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "jobTitle", "name": "Job Title" },
"type": "string",
- "tags": [ "workProfileProperties" ],
+ "tags": [
+ "properties",
+ "profileProperties",
+ "workProfileProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "602.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/latitude.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/latitude.json b/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/latitude.json
index 2c1b078..1f8c92c 100644
--- a/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/latitude.json
+++ b/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/latitude.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "latitude", "name": "Latitude" },
"type": "string",
- "tags": ["geographicSessionProperties"],
+ "tags": [
+ "properties",
+ "sessionProperties",
+ "geographicSessionProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "4.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/longitude.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/longitude.json b/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/longitude.json
index 7ddca37..f983d52 100644
--- a/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/longitude.json
+++ b/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/longitude.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "longitude", "name": "Longitude" },
"type": "string",
- "tags": ["geographicSessionProperties"],
+ "tags": [
+ "properties",
+ "sessionProperties",
+ "geographicSessionProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "5.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionAdminSubDiv1.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionAdminSubDiv1.json b/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionAdminSubDiv1.json
index 5383fae..7591485 100644
--- a/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionAdminSubDiv1.json
+++ b/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionAdminSubDiv1.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "sessionAdminSubDiv1", "name": "State/Region/Province" },
"type": "string",
- "tags": ["geographicSessionProperties"],
+ "tags": [
+ "properties",
+ "sessionProperties",
+ "geographicSessionProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "2.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionAdminSubDiv2.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionAdminSubDiv2.json b/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionAdminSubDiv2.json
index 816dc2e..2f7a7e2 100644
--- a/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionAdminSubDiv2.json
+++ b/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionAdminSubDiv2.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "sessionAdminSubDiv2", "name": "SubRegion/County" },
"type": "string",
- "tags": ["geographicSessionProperties"],
+ "tags": [
+ "properties",
+ "sessionProperties",
+ "geographicSessionProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "2.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionCity.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionCity.json b/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionCity.json
index 947a817..2f353e5 100644
--- a/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionCity.json
+++ b/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionCity.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "sessionCity", "name": "City" },
"type": "string",
- "tags": ["geographicSessionProperties"],
+ "tags": [
+ "properties",
+ "sessionProperties",
+ "geographicSessionProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "3.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionCountryCode.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionCountryCode.json b/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionCountryCode.json
index 9ed3f89..47cbe2c 100644
--- a/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionCountryCode.json
+++ b/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionCountryCode.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "sessionCountryCode", "name": "Country code" },
"type": "string",
- "tags": ["geographicSessionProperties"],
+ "tags": [
+ "properties",
+ "sessionProperties",
+ "geographicSessionProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ "j:country" ],
"rank": "1.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionCountryName.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionCountryName.json b/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionCountryName.json
index 44bae0e..4198d30 100644
--- a/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionCountryName.json
+++ b/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionCountryName.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "sessionCountryName", "name": "Country" },
"type": "string",
- "tags": ["geographicSessionProperties"],
+ "tags": [
+ "properties",
+ "sessionProperties",
+ "geographicSessionProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "2.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/sessions/technical/deviceCategory.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/deviceCategory.json b/services/src/main/resources/META-INF/cxs/properties/sessions/technical/deviceCategory.json
index 508734e..3795e96 100644
--- a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/deviceCategory.json
+++ b/services/src/main/resources/META-INF/cxs/properties/sessions/technical/deviceCategory.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "deviceCategory", "name": "Device category" },
"type": "string",
- "tags": ["technicalSessionProperties"],
+ "tags": [
+ "properties",
+ "sessionProperties",
+ "technicalSessionProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "105.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/sessions/technical/operatingSystemFamily.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/operatingSystemFamily.json b/services/src/main/resources/META-INF/cxs/properties/sessions/technical/operatingSystemFamily.json
index eff2d68..b1f9653 100644
--- a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/operatingSystemFamily.json
+++ b/services/src/main/resources/META-INF/cxs/properties/sessions/technical/operatingSystemFamily.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "operatingSystemFamily", "name": "Operating system family" },
"type": "string",
- "tags": ["technicalSessionProperties"],
+ "tags": [
+ "properties",
+ "sessionProperties",
+ "technicalSessionProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "101.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/sessions/technical/operatingSystemName.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/operatingSystemName.json b/services/src/main/resources/META-INF/cxs/properties/sessions/technical/operatingSystemName.json
index a00aa94..bf08a07 100644
--- a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/operatingSystemName.json
+++ b/services/src/main/resources/META-INF/cxs/properties/sessions/technical/operatingSystemName.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "operatingSystemName", "name": "Operating system name" },
"type": "string",
- "tags": ["technicalSessionProperties"],
+ "tags": [
+ "properties",
+ "sessionProperties",
+ "technicalSessionProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "102.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/sessions/technical/pageReferringURL.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/pageReferringURL.json b/services/src/main/resources/META-INF/cxs/properties/sessions/technical/pageReferringURL.json
index d19b808..c971bc9 100644
--- a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/pageReferringURL.json
+++ b/services/src/main/resources/META-INF/cxs/properties/sessions/technical/pageReferringURL.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "pageReferringURL", "name": "Previous page URL" },
"type": "string",
- "tags": ["technicalSessionProperties"],
+ "tags": [
+ "properties",
+ "sessionProperties",
+ "technicalSessionProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "108.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/sessions/technical/remoteAddr.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/remoteAddr.json b/services/src/main/resources/META-INF/cxs/properties/sessions/technical/remoteAddr.json
index e255fda..71531de 100644
--- a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/remoteAddr.json
+++ b/services/src/main/resources/META-INF/cxs/properties/sessions/technical/remoteAddr.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "remoteAddr", "name": "Remote IP address" },
"type": "string",
- "tags": ["technicalSessionProperties"],
+ "tags": [
+ "properties",
+ "sessionProperties",
+ "technicalSessionProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "106.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/sessions/technical/remoteHost.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/remoteHost.json b/services/src/main/resources/META-INF/cxs/properties/sessions/technical/remoteHost.json
index a12e948..1864348 100644
--- a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/remoteHost.json
+++ b/services/src/main/resources/META-INF/cxs/properties/sessions/technical/remoteHost.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "remoteHost", "name": "Remote host address" },
"type": "string",
- "tags": ["technicalSessionProperties"],
+ "tags": [
+ "properties",
+ "sessionProperties",
+ "technicalSessionProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "107.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/sessions/technical/userAgentName.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/userAgentName.json b/services/src/main/resources/META-INF/cxs/properties/sessions/technical/userAgentName.json
index d48b042..8849081 100644
--- a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/userAgentName.json
+++ b/services/src/main/resources/META-INF/cxs/properties/sessions/technical/userAgentName.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "userAgentName", "name": "Browser user agent name" },
"type": "string",
- "tags": ["technicalSessionProperties"],
+ "tags": [
+ "properties",
+ "sessionProperties",
+ "technicalSessionProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "103.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/properties/sessions/technical/userAgentVersion.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/userAgentVersion.json b/services/src/main/resources/META-INF/cxs/properties/sessions/technical/userAgentVersion.json
index 4b1177c..343f3bf 100644
--- a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/userAgentVersion.json
+++ b/services/src/main/resources/META-INF/cxs/properties/sessions/technical/userAgentVersion.json
@@ -1,7 +1,11 @@
{
"metadata": { "id": "userAgentVersion", "name": "Browser user agent version" },
"type": "string",
- "tags": ["technicalSessionProperties"],
+ "tags": [
+ "properties",
+ "sessionProperties",
+ "technicalSessionProperties"
+ ],
"defaultValue": "",
"automaticMappingsFrom": [ ],
"rank": "104.0"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/aggregated.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/aggregated.json b/services/src/main/resources/META-INF/cxs/tags/aggregated.json
deleted file mode 100644
index 83f417c..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/aggregated.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "aggregated",
- "parent": "profileTags"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/autocompleted.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/autocompleted.json b/services/src/main/resources/META-INF/cxs/tags/autocompleted.json
deleted file mode 100644
index 089bf12..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/autocompleted.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "autocompleted",
- "parent": "profileTags"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/campaign/campaign.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/campaign/campaign.json b/services/src/main/resources/META-INF/cxs/tags/campaign/campaign.json
deleted file mode 100644
index 8681c0e..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/campaign/campaign.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "campaign",
- "parent": "root"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/campaign/landingCampaign.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/campaign/landingCampaign.json b/services/src/main/resources/META-INF/cxs/tags/campaign/landingCampaign.json
deleted file mode 100644
index d329ff0..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/campaign/landingCampaign.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "landing",
- "parent": "campaign"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/campaign/parameterCampaign.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/campaign/parameterCampaign.json b/services/src/main/resources/META-INF/cxs/tags/campaign/parameterCampaign.json
deleted file mode 100644
index e9abade..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/campaign/parameterCampaign.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "parameter",
- "parent": "campaign"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/campaign/referrerCampaign.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/campaign/referrerCampaign.json b/services/src/main/resources/META-INF/cxs/tags/campaign/referrerCampaign.json
deleted file mode 100644
index 50a2bee..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/campaign/referrerCampaign.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "referrer",
- "parent": "campaign"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/conditions/condition.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/conditions/condition.json b/services/src/main/resources/META-INF/cxs/tags/conditions/condition.json
deleted file mode 100644
index e37ddc7..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/conditions/condition.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "condition",
- "parent": "root"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/conditions/eventCondition.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/conditions/eventCondition.json b/services/src/main/resources/META-INF/cxs/tags/conditions/eventCondition.json
deleted file mode 100644
index 287678f..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/conditions/eventCondition.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "eventCondition",
- "parent": "condition"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/conditions/profileCondition.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/conditions/profileCondition.json b/services/src/main/resources/META-INF/cxs/tags/conditions/profileCondition.json
deleted file mode 100644
index bade28c..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/conditions/profileCondition.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "profileCondition",
- "parent": "condition"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/conditions/sessionCondition.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/conditions/sessionCondition.json b/services/src/main/resources/META-INF/cxs/tags/conditions/sessionCondition.json
deleted file mode 100644
index bca7a98..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/conditions/sessionCondition.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "sessionCondition",
- "parent": "condition"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/conditions/sourceEventCondition.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/conditions/sourceEventCondition.json b/services/src/main/resources/META-INF/cxs/tags/conditions/sourceEventCondition.json
deleted file mode 100644
index ee72d19..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/conditions/sourceEventCondition.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "sourceEventCondition",
- "parent": "condition"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/conditions/trackedCondition.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/conditions/trackedCondition.json b/services/src/main/resources/META-INF/cxs/tags/conditions/trackedCondition.json
deleted file mode 100644
index f4e0f66..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/conditions/trackedCondition.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "trackedCondition",
- "parent": "condition"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/conditions/usableInPastEventCondition.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/conditions/usableInPastEventCondition.json b/services/src/main/resources/META-INF/cxs/tags/conditions/usableInPastEventCondition.json
deleted file mode 100644
index 428c3b1..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/conditions/usableInPastEventCondition.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "usableInPastEventCondition",
- "parent": "condition"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/demographic.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/demographic.json b/services/src/main/resources/META-INF/cxs/tags/demographic.json
deleted file mode 100644
index cb7078d..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/demographic.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "demographic",
- "parent": "profileTags"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/event.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/event.json b/services/src/main/resources/META-INF/cxs/tags/event.json
deleted file mode 100644
index 734540c..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/event.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "event",
- "parent": "profileTags"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/geographic.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/geographic.json b/services/src/main/resources/META-INF/cxs/tags/geographic.json
deleted file mode 100644
index 5e5b03e..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/geographic.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "geographic",
- "parent": "profileTags"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/goals/downloadGoal.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/goals/downloadGoal.json b/services/src/main/resources/META-INF/cxs/tags/goals/downloadGoal.json
deleted file mode 100644
index a7bd401..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/goals/downloadGoal.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "downloadGoal",
- "parent": "goal"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/goals/formGoal.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/goals/formGoal.json b/services/src/main/resources/META-INF/cxs/tags/goals/formGoal.json
deleted file mode 100644
index c0628af..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/goals/formGoal.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "formGoal",
- "parent": "goal"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/goals/funnelGoal.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/goals/funnelGoal.json b/services/src/main/resources/META-INF/cxs/tags/goals/funnelGoal.json
deleted file mode 100644
index a6bbc12..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/goals/funnelGoal.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "funnelGoal",
- "parent": "goal"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/goals/goal.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/goals/goal.json b/services/src/main/resources/META-INF/cxs/tags/goals/goal.json
deleted file mode 100644
index fee565a..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/goals/goal.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "goal",
- "parent": "root"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/goals/landingPageGoal.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/goals/landingPageGoal.json b/services/src/main/resources/META-INF/cxs/tags/goals/landingPageGoal.json
deleted file mode 100644
index 2f9fe9a..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/goals/landingPageGoal.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "landingPageGoal",
- "parent": "goal"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/goals/pageVisitGoal.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/goals/pageVisitGoal.json b/services/src/main/resources/META-INF/cxs/tags/goals/pageVisitGoal.json
deleted file mode 100644
index eca6077..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/goals/pageVisitGoal.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "pageVisitGoal",
- "parent": "goal"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/goals/videoGoal.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/goals/videoGoal.json b/services/src/main/resources/META-INF/cxs/tags/goals/videoGoal.json
deleted file mode 100644
index 1712367..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/goals/videoGoal.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "videoGoal",
- "parent": "goal"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/logical.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/logical.json b/services/src/main/resources/META-INF/cxs/tags/logical.json
deleted file mode 100644
index 22ecec9..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/logical.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "logical",
- "parent": "profileTags"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/profileTags.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/profileTags.json b/services/src/main/resources/META-INF/cxs/tags/profileTags.json
deleted file mode 100644
index 7b4e02f..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/profileTags.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "profileTags",
- "parent": "root"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/properties/profiles/basicProfileProperties.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/properties/profiles/basicProfileProperties.json b/services/src/main/resources/META-INF/cxs/tags/properties/profiles/basicProfileProperties.json
deleted file mode 100644
index a445b4f..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/properties/profiles/basicProfileProperties.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "id": "basicProfileProperties",
- "parent": "profileProperties",
- "rank": "2.0",
- "hidden": true
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/properties/profiles/contactProfileProperties.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/properties/profiles/contactProfileProperties.json b/services/src/main/resources/META-INF/cxs/tags/properties/profiles/contactProfileProperties.json
deleted file mode 100644
index 9f5c9e9..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/properties/profiles/contactProfileProperties.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "id": "contactProfileProperties",
- "parent": "profileProperties",
- "rank": "4.0"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/properties/profiles/leadProfileProperties.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/properties/profiles/leadProfileProperties.json b/services/src/main/resources/META-INF/cxs/tags/properties/profiles/leadProfileProperties.json
deleted file mode 100644
index 37b0f0b..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/properties/profiles/leadProfileProperties.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "id": "leadProfileProperties",
- "parent": "profileProperties",
- "rank": "3.0",
- "hidden": true
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/properties/profiles/personalProfileProperties.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/properties/profiles/personalProfileProperties.json b/services/src/main/resources/META-INF/cxs/tags/properties/profiles/personalProfileProperties.json
deleted file mode 100644
index 5fba6a0..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/properties/profiles/personalProfileProperties.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "id": "personalProfileProperties",
- "parent": "profileProperties",
- "rank": "6.0"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/properties/profiles/profileProperties.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/properties/profiles/profileProperties.json b/services/src/main/resources/META-INF/cxs/tags/properties/profiles/profileProperties.json
deleted file mode 100644
index b8eeeba..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/properties/profiles/profileProperties.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "profileProperties",
- "parent": "properties"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/properties/profiles/socialProfileProperties.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/properties/profiles/socialProfileProperties.json b/services/src/main/resources/META-INF/cxs/tags/properties/profiles/socialProfileProperties.json
deleted file mode 100644
index 2469130..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/properties/profiles/socialProfileProperties.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "id": "socialProfileProperties",
- "parent": "profileProperties",
- "rank": "5.0",
- "hidden": true
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/properties/profiles/systemProfileProperties.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/properties/profiles/systemProfileProperties.json b/services/src/main/resources/META-INF/cxs/tags/properties/profiles/systemProfileProperties.json
deleted file mode 100644
index 55c3d06..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/properties/profiles/systemProfileProperties.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "id": "systemProfileProperties",
- "parent": "profileProperties",
- "rank": "1.0",
- "hidden": true
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/properties/profiles/workProfileProperties.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/properties/profiles/workProfileProperties.json b/services/src/main/resources/META-INF/cxs/tags/properties/profiles/workProfileProperties.json
deleted file mode 100644
index b6b3cd2..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/properties/profiles/workProfileProperties.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "id": "workProfileProperties",
- "parent": "profileProperties",
- "rank": "7.0"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/properties/properties.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/properties/properties.json b/services/src/main/resources/META-INF/cxs/tags/properties/properties.json
deleted file mode 100644
index b9fb703..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/properties/properties.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "properties",
- "parent": "root"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/properties/sessions/geographicSessionProperties.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/properties/sessions/geographicSessionProperties.json b/services/src/main/resources/META-INF/cxs/tags/properties/sessions/geographicSessionProperties.json
deleted file mode 100644
index b2cf9e4..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/properties/sessions/geographicSessionProperties.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "id": "geographicSessionProperties",
- "parent": "sessionProperties",
- "rank": "1.0"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/properties/sessions/sessionProperties.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/properties/sessions/sessionProperties.json b/services/src/main/resources/META-INF/cxs/tags/properties/sessions/sessionProperties.json
deleted file mode 100644
index eea2e7e..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/properties/sessions/sessionProperties.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "sessionProperties",
- "parent": "properties"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/properties/sessions/technicalSessionProperties.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/properties/sessions/technicalSessionProperties.json b/services/src/main/resources/META-INF/cxs/tags/properties/sessions/technicalSessionProperties.json
deleted file mode 100644
index dc7a821..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/properties/sessions/technicalSessionProperties.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "id": "technicalSessionProperties",
- "parent": "sessionProperties",
- "rank": "2.0"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/root.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/root.json b/services/src/main/resources/META-INF/cxs/tags/root.json
deleted file mode 100644
index 47f108a..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/root.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "root",
- "parent": ""
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/services/src/main/resources/META-INF/cxs/tags/rules/formMappingRule.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/tags/rules/formMappingRule.json b/services/src/main/resources/META-INF/cxs/tags/rules/formMappingRule.json
deleted file mode 100644
index aa42de4..0000000
--- a/services/src/main/resources/META-INF/cxs/tags/rules/formMappingRule.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "id": "formMappingRule",
- "parent": "root"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/src/site/markdown/versions/1.1/concepts.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/1.1/concepts.md b/src/site/markdown/versions/1.1/concepts.md
index 6947c5b..56a7e7c 100644
--- a/src/site/markdown/versions/1.1/concepts.md
+++ b/src/site/markdown/versions/1.1/concepts.md
@@ -142,7 +142,7 @@ Being built on top of Apache Karaf, Unomi leverages OSGi to support plugins. A U
| Rule | rules |
| Scoring | scorings |
| Segment | segments |
-| Tag | tags then `<category name>` directory |
+| Tag | tags |
| ValueType | values |
[Blueprint](http://aries.apache.org/modules/blueprint.html) is used to declare what the plugin provides and inject any required dependency. The Blueprint file is located, as usual, at `OSGI-INF/blueprint/blueprint.xml` in the bundle JAR file.
@@ -188,7 +188,7 @@ Definition for a profile or session property, specifying how possible values are
`Segment`s represent dynamically evaluated groups of similar profiles in order to categorize the associated users. To be considered part of a given segment, users must satisfies the segment’s condition. If they match, users are automatically added to the segment. Similarly, if at any given point during, they cease to satisfy the segment’s condition, they are automatically removed from it.
### Tag
-`Tag`s are simple labels that are used to classify all other objects inside Unomi. Tags can define sub-tags.
+`Tag`s are simple labels that are used to classify all other objects inside Unomi.
### ValueType
Definition for values that can be assigned to properties ("primitive" types).
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/src/site/markdown/versions/master/concepts.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/master/concepts.md b/src/site/markdown/versions/master/concepts.md
index 6947c5b..57ef1e2 100644
--- a/src/site/markdown/versions/master/concepts.md
+++ b/src/site/markdown/versions/master/concepts.md
@@ -142,7 +142,7 @@ Being built on top of Apache Karaf, Unomi leverages OSGi to support plugins. A U
| Rule | rules |
| Scoring | scorings |
| Segment | segments |
-| Tag | tags then `<category name>` directory |
+| Tag | tags |
| ValueType | values |
[Blueprint](http://aries.apache.org/modules/blueprint.html) is used to declare what the plugin provides and inject any required dependency. The Blueprint file is located, as usual, at `OSGI-INF/blueprint/blueprint.xml` in the bundle JAR file.
@@ -188,7 +188,7 @@ Definition for a profile or session property, specifying how possible values are
`Segment`s represent dynamically evaluated groups of similar profiles in order to categorize the associated users. To be considered part of a given segment, users must satisfies the segment’s condition. If they match, users are automatically added to the segment. Similarly, if at any given point during, they cease to satisfy the segment’s condition, they are automatically removed from it.
### Tag
-`Tag`s are simple labels that are used to classify all other objects inside Unomi. Tags can define sub-tags.
+`Tag`s are simple labels that are used to classify all other objects inside Unomi.
### ValueType
Definition for values that can be assigned to properties ("primitive" types).
[3/3] incubator-unomi git commit: UNOMI-117 refactor tags as an open
string, removed tags definitions,
removed tags hierarchy and associated functions,
add previously parent tag to children
Posted by dg...@apache.org.
UNOMI-117 refactor tags as an open string, removed tags definitions, removed tags hierarchy and associated functions, add previously parent tag to children
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/a9d01d80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/a9d01d80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/a9d01d80
Branch: refs/heads/feature-UNOMI-117
Commit: a9d01d8002150e2887d3812a62ea0839aead6b77
Parents: 1255724
Author: dgaillard <dg...@jahia.com>
Authored: Tue Aug 8 14:39:30 2017 +0200
Committer: dgaillard <dg...@jahia.com>
Committed: Tue Aug 8 14:39:30 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/unomi/api/Metadata.java | 10 +-
.../java/org/apache/unomi/api/PropertyType.java | 27 +--
api/src/main/java/org/apache/unomi/api/Tag.java | 190 -------------------
.../java/org/apache/unomi/api/ValueType.java | 29 +--
.../unomi/api/services/DefinitionsService.java | 41 +---
.../unomi/api/services/ProfileService.java | 7 +-
.../META-INF/cxs/actions/addToLists.json | 1 +
.../cxs/actions/sfdcCreateOrUpdateLead.json | 1 +
.../cxs/actions/sfdcUpdateProfileFromLead.json | 1 +
.../src/test/scala/unomi/AdminScenario.scala | 2 +-
.../allEventToProfilePropertiesAction.json | 1 +
.../cxs/actions/evaluateProfileAgeAction.json | 1 +
.../actions/evaluateProfileSegmentsAction.json | 1 +
.../actions/eventToProfilePropertyAction.json | 1 +
.../actions/mergeProfilesOnPropertyAction.json | 1 +
.../META-INF/cxs/actions/sendEventAction.json | 1 +
.../actions/setEventOccurenceCountAction.json | 1 +
.../META-INF/cxs/actions/setPropertyAction.json | 1 +
.../cxs/conditions/booleanCondition.json | 2 +
.../cxs/conditions/eventPropertyCondition.json | 2 +
.../cxs/conditions/eventTypeCondition.json | 2 +
.../cxs/conditions/formEventCondition.json | 2 +
.../geoLocationByPointSessionCondition.json | 2 +
.../conditions/geoLocationSessionCondition.json | 2 +
.../cxs/conditions/goalMatchCondition.json | 2 +
.../cxs/conditions/matchAllCondition.json | 2 +
.../cxs/conditions/newVisitorCondition.json | 2 +
.../META-INF/cxs/conditions/notCondition.json | 2 +
.../cxs/conditions/pastEventCondition.json | 2 +
.../conditions/profilePropertyCondition.json | 2 +
.../cxs/conditions/profileSegmentCondition.json | 2 +
.../profileUpdatedEventCondition.json | 2 +
.../conditions/profileUserListCondition.json | 2 +
.../conditions/returningVisitorCondition.json | 2 +
.../cxs/conditions/scoringCondition.json | 2 +
.../sessionCreatedEventCondition.json | 2 +
.../conditions/sessionDurationCondition.json | 2 +
.../conditions/sessionPropertyCondition.json | 2 +
.../sourceEventPropertyCondition.json | 1 +
.../cxs/conditions/videoViewEventCondition.json | 2 +
.../cxs/conditions/hoverEventCondition.json | 2 +
.../META-INF/cxs/actions/sendMailAction.json | 1 +
.../requestHeaderToProfilePropertyAction.json | 1 +
...requestParameterToProfilePropertyAction.json | 1 +
.../cxs/actions/setRemoteHostInfoAction.json | 1 +
.../unomi/rest/DefinitionsServiceEndPoint.java | 89 ++-------
.../apache/unomi/rest/LocalizationHelper.java | 59 +-----
.../unomi/rest/ProfileServiceEndPoint.java | 15 +-
.../org/apache/unomi/rest/RESTActionType.java | 8 +-
.../apache/unomi/rest/RESTConditionType.java | 11 +-
.../java/org/apache/unomi/rest/RESTTag.java | 84 --------
.../org/apache/unomi/rest/RESTValueType.java | 8 +-
.../training/TrainedNotificationAction.java | 2 +-
.../cxs/actions/trainingNotifAction.json | 1 +
.../actions/IncrementTweetNumberAction.java | 4 +-
.../cxs/actions/incrementTweetNumberAction.json | 1 +
.../services/DefinitionsServiceImpl.java | 115 ++---------
.../services/services/GoalsServiceImpl.java | 18 +-
.../services/services/ProfileServiceImpl.java | 21 +-
.../properties/profiles/basic/firstName.json | 6 +-
.../cxs/properties/profiles/basic/gender.json | 6 +-
.../cxs/properties/profiles/basic/lastName.json | 6 +-
.../properties/profiles/basic/nationality.json | 6 +-
.../properties/profiles/contact/address.json | 6 +-
.../cxs/properties/profiles/contact/city.json | 6 +-
.../profiles/contact/countryName.json | 6 +-
.../cxs/properties/profiles/contact/email.json | 6 +-
.../profiles/contact/phoneNumber.json | 6 +-
.../properties/profiles/contact/zipCode.json | 6 +-
.../profiles/lead/leadAssignedTo.json | 6 +-
.../cxs/properties/profiles/personal/age.json | 6 +-
.../properties/profiles/personal/birthDate.json | 6 +-
.../cxs/properties/profiles/personal/kids.json | 6 +-
.../profiles/personal/maritalStatus.json | 6 +-
.../properties/profiles/social/facebookId.json | 6 +-
.../properties/profiles/social/googleid.json | 6 +-
.../properties/profiles/social/linkedInId.json | 6 +-
.../properties/profiles/social/twitterId.json | 6 +-
.../properties/profiles/system/firstVisit.json | 6 +-
.../properties/profiles/system/lastVisit.json | 6 +-
.../properties/profiles/system/nbOfVisits.json | 6 +-
.../profiles/system/previousVisit.json | 6 +-
.../cxs/properties/profiles/work/company.json | 6 +-
.../cxs/properties/profiles/work/income.json | 6 +-
.../cxs/properties/profiles/work/jobTitle.json | 6 +-
.../sessions/geographic/latitude.json | 6 +-
.../sessions/geographic/longitude.json | 6 +-
.../geographic/sessionAdminSubDiv1.json | 6 +-
.../geographic/sessionAdminSubDiv2.json | 6 +-
.../sessions/geographic/sessionCity.json | 6 +-
.../sessions/geographic/sessionCountryCode.json | 6 +-
.../sessions/geographic/sessionCountryName.json | 6 +-
.../sessions/technical/deviceCategory.json | 6 +-
.../technical/operatingSystemFamily.json | 6 +-
.../sessions/technical/operatingSystemName.json | 6 +-
.../sessions/technical/pageReferringURL.json | 6 +-
.../sessions/technical/remoteAddr.json | 6 +-
.../sessions/technical/remoteHost.json | 6 +-
.../sessions/technical/userAgentName.json | 6 +-
.../sessions/technical/userAgentVersion.json | 6 +-
.../resources/META-INF/cxs/tags/aggregated.json | 4 -
.../META-INF/cxs/tags/autocompleted.json | 4 -
.../META-INF/cxs/tags/campaign/campaign.json | 4 -
.../cxs/tags/campaign/landingCampaign.json | 4 -
.../cxs/tags/campaign/parameterCampaign.json | 4 -
.../cxs/tags/campaign/referrerCampaign.json | 4 -
.../META-INF/cxs/tags/conditions/condition.json | 4 -
.../cxs/tags/conditions/eventCondition.json | 4 -
.../cxs/tags/conditions/profileCondition.json | 4 -
.../cxs/tags/conditions/sessionCondition.json | 4 -
.../tags/conditions/sourceEventCondition.json | 4 -
.../cxs/tags/conditions/trackedCondition.json | 4 -
.../conditions/usableInPastEventCondition.json | 4 -
.../META-INF/cxs/tags/demographic.json | 4 -
.../main/resources/META-INF/cxs/tags/event.json | 4 -
.../resources/META-INF/cxs/tags/geographic.json | 4 -
.../META-INF/cxs/tags/goals/downloadGoal.json | 4 -
.../META-INF/cxs/tags/goals/formGoal.json | 4 -
.../META-INF/cxs/tags/goals/funnelGoal.json | 4 -
.../resources/META-INF/cxs/tags/goals/goal.json | 4 -
.../cxs/tags/goals/landingPageGoal.json | 4 -
.../META-INF/cxs/tags/goals/pageVisitGoal.json | 4 -
.../META-INF/cxs/tags/goals/videoGoal.json | 4 -
.../resources/META-INF/cxs/tags/logical.json | 4 -
.../META-INF/cxs/tags/profileTags.json | 4 -
.../profiles/basicProfileProperties.json | 6 -
.../profiles/contactProfileProperties.json | 5 -
.../profiles/leadProfileProperties.json | 6 -
.../profiles/personalProfileProperties.json | 5 -
.../properties/profiles/profileProperties.json | 4 -
.../profiles/socialProfileProperties.json | 6 -
.../profiles/systemProfileProperties.json | 6 -
.../profiles/workProfileProperties.json | 5 -
.../cxs/tags/properties/properties.json | 4 -
.../sessions/geographicSessionProperties.json | 5 -
.../properties/sessions/sessionProperties.json | 4 -
.../sessions/technicalSessionProperties.json | 5 -
.../main/resources/META-INF/cxs/tags/root.json | 4 -
.../cxs/tags/rules/formMappingRule.json | 4 -
src/site/markdown/versions/1.1/concepts.md | 4 +-
src/site/markdown/versions/master/concepts.md | 4 +-
141 files changed, 356 insertions(+), 869 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/api/src/main/java/org/apache/unomi/api/Metadata.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/Metadata.java b/api/src/main/java/org/apache/unomi/api/Metadata.java
index 4c326f4..22216c9 100644
--- a/api/src/main/java/org/apache/unomi/api/Metadata.java
+++ b/api/src/main/java/org/apache/unomi/api/Metadata.java
@@ -145,9 +145,9 @@ public class Metadata implements Comparable<Metadata> {
}
/**
- * Retrieves a set of {@link Tag} names associated with this Metadata
+ * Retrieves a set of {@link String} tag names associated with this Metadata
*
- * @return a set of {@link Tag} names associated with this Metadata
+ * @return a set of {@link String} tag names associated with this Metadata
*/
public Set<String> getTags() {
return tags;
@@ -156,10 +156,10 @@ public class Metadata implements Comparable<Metadata> {
/**
* Sets the tags.
*
- * @param tagIDs the tag i ds
+ * @param tags the tag i ds
*/
- public void setTags(Set<String> tagIDs) {
- this.tags = tagIDs;
+ public void setTags(Set<String> tags) {
+ this.tags = tags;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/api/src/main/java/org/apache/unomi/api/PropertyType.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/PropertyType.java b/api/src/main/java/org/apache/unomi/api/PropertyType.java
index 4d5bf6f..01bc934 100644
--- a/api/src/main/java/org/apache/unomi/api/PropertyType.java
+++ b/api/src/main/java/org/apache/unomi/api/PropertyType.java
@@ -46,8 +46,7 @@ public class PropertyType extends MetadataItem {
private Set<String> automaticMappingsFrom = new HashSet<>();
private Double rank;
private String mergeStrategy;
- private Set<Tag> tags = new TreeSet<Tag>();
- private Set<String> tagIds = new LinkedHashSet<String>();
+ private Set<String> tags = new LinkedHashSet<>();
private Boolean multivalued;
private Boolean protekted;
@@ -133,8 +132,7 @@ public class PropertyType extends MetadataItem {
*
* @return the tags used by this PropertyType
*/
- @XmlTransient
- public Set<Tag> getTags() {
+ public Set<String> getTags() {
return tags;
}
@@ -143,30 +141,11 @@ public class PropertyType extends MetadataItem {
*
* @param tags the tags used by this PropertyType
*/
- public void setTags(Set<Tag> tags) {
+ public void setTags(Set<String> tags) {
this.tags = tags;
}
/**
- * Retrieves the identifiers of the tags used by this PropertyType.
- *
- * @return the identifiers of the tags used by this PropertyType
- */
- @XmlElement(name = "tags")
- public Set<String> getTagIds() {
- return tagIds;
- }
-
- /**
- * Sets the identifiers of the tags used by this PropertyType.
- *
- * @param tagIds the identifiers of the tags used by this PropertyType
- */
- public void setTagIds(Set<String> tagIds) {
- this.tagIds = tagIds;
- }
-
- /**
* Retrieves the default value defined for property using this PropertyType.
*
* @return the default value defined for property using this PropertyType
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/api/src/main/java/org/apache/unomi/api/Tag.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/Tag.java b/api/src/main/java/org/apache/unomi/api/Tag.java
deleted file mode 100644
index 8802786..0000000
--- a/api/src/main/java/org/apache/unomi/api/Tag.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.unomi.api;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
-import java.util.Set;
-import java.util.TreeSet;
-
-/**
- * A tag to help categorize entities. A tag can have sub-tags.
- */
-public class Tag implements PluginType, Comparable<Tag> {
-
- private Set<Tag> subTags = new TreeSet<>();
- private String id;
- private String nameKey;
- private String descriptionKey;
- private String parentId;
- private double rank = 0.0;
- private long pluginId;
- private boolean hidden = false;
-
- /**
- * Instantiates a new Tag.
- */
- public Tag() {
- }
-
- /**
- * Instantiates a new Tag.
- *
- * @param id the identifier
- * @param nameKey the {@link java.util.ResourceBundle} key used to localize this Tag's name
- * @param descriptionKey the {@link java.util.ResourceBundle} key used to localize this Tag's description
- * @param parentId the identifier of this Tag's parent Tag
- */
- public Tag(String id, String nameKey, String descriptionKey, String parentId) {
- this.id = id;
- this.nameKey = nameKey;
- this.descriptionKey = descriptionKey;
- this.parentId = parentId;
- }
-
- /**
- * Retrieves this Tag's identifier.
- *
- * @return the id
- */
- public String getId() {
- return id;
- }
-
- /**
- * Retrieves the {@link java.util.ResourceBundle} key used to localize this Tag's name.
- *
- * @return the {@link java.util.ResourceBundle} key used to localize this Tag's name
- */
- public String getNameKey() {
- if (nameKey == null) {
- nameKey = "tag." + id + ".name";
- }
- return nameKey;
- }
-
- /**
- * Retrieves the {@link java.util.ResourceBundle} key used to localize this Tag's description.
- *
- * @return the {@link java.util.ResourceBundle} key used to localize this Tag's name
- */
- public String getDescriptionKey() {
- if (descriptionKey == null) {
- descriptionKey = "tag." + id + ".description";
- }
- return descriptionKey;
- }
-
- /**
- * Retrieves the identifier of this Tag's parent Tag.
- *
- * @return the identifier of this Tag's parent Tag
- */
- @XmlElement(name = "parent")
- public String getParentId() {
- return parentId;
- }
-
- /**
- * Retrieves the sub tags.
- *
- * @return the sub tags
- */
- public Set<Tag> getSubTags() {
- return subTags;
- }
-
- /**
- * Sets the sub tags.
- *
- * @param subTags the sub tags
- */
- public void setSubTags(Set<Tag> subTags) {
- this.subTags = subTags;
- }
-
- /**
- * Retrieves the rank of this PropertyType for ordering purpose.
- *
- * @return the rank of this PropertyType for ordering purpose
- */
- public double getRank() {
- return rank;
- }
-
- /**
- * Specifies the rank of this PropertyType for ordering purpose.
- *
- * @param rank the rank of this PropertyType for ordering purpose
- */
- public void setRank(double rank) {
- this.rank = rank;
- }
-
- /**
- * Whether this Tag is considered for internal purposes only and should therefore be hidden to accessing UIs.
- *
- * @return {@code true} if the Tag needs to be hidden, {@code false} otherwise
- */
- public boolean isHidden() {
- return hidden;
- }
-
- /**
- * Specifies whether this Tag is hidden.
- *
- * @param hidden {@code true} if the Tag needs to be hidden, {@code false} otherwise
- */
- public void setHidden(boolean hidden) {
- this.hidden = hidden;
- }
-
- @XmlTransient
- public long getPluginId() {
- return pluginId;
- }
-
- public void setPluginId(long pluginId) {
- this.pluginId = pluginId;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- Tag that = (Tag) o;
-
- return !(id != null ? !id.equals(that.id) : that.id != null);
-
- }
-
- @Override
- public int hashCode() {
- int result = id != null ? id.hashCode() : 0;
- return result;
- }
-
- public int compareTo(Tag otherRank) {
- int rankCompare = Double.compare(rank, otherRank.rank);
- if (rankCompare != 0) {
- return rankCompare;
- }
- return id.compareTo(otherRank.id);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/api/src/main/java/org/apache/unomi/api/ValueType.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/ValueType.java b/api/src/main/java/org/apache/unomi/api/ValueType.java
index b2fa5f1..d90321d 100644
--- a/api/src/main/java/org/apache/unomi/api/ValueType.java
+++ b/api/src/main/java/org/apache/unomi/api/ValueType.java
@@ -17,12 +17,10 @@
package org.apache.unomi.api;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import java.util.LinkedHashSet;
import java.util.Set;
-import java.util.TreeSet;
/**
* A value type to be used to constrain property values.
@@ -34,8 +32,7 @@ public class ValueType implements PluginType {
private String nameKey;
private String descriptionKey;
private long pluginId;
- private Set<Tag> tags = new TreeSet<>();
- private Set<String> tagIds = new LinkedHashSet<>();
+ private Set<String> tags = new LinkedHashSet<>();
/**
* Instantiates a new Value type.
@@ -126,8 +123,7 @@ public class ValueType implements PluginType {
*
* @return the tags used by this ValueType
*/
- @XmlTransient
- public Set<Tag> getTags() {
+ public Set<String> getTags() {
return tags;
}
@@ -136,29 +132,10 @@ public class ValueType implements PluginType {
*
* @param tags the tags used by this ValueType
*/
- public void setTags(Set<Tag> tags) {
+ public void setTags(Set<String> tags) {
this.tags = tags;
}
- /**
- * Retrieves the identifiers of the tags used by this ValueType.
- *
- * @return the identifiers of the tags used by this ValueType
- */
- @XmlElement(name = "tags")
- public Set<String> getTagIds() {
- return tagIds;
- }
-
- /**
- * Sets the identifiers of the tags used by this ValueType.
- *
- * @param tagIds the identifiers of the tags used by this ValueType
- */
- public void setTagIds(Set<String> tagIds) {
- this.tagIds = tagIds;
- }
-
@Override
public boolean equals(Object o) {
if (this == o) return true;
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/api/src/main/java/org/apache/unomi/api/services/DefinitionsService.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/services/DefinitionsService.java b/api/src/main/java/org/apache/unomi/api/services/DefinitionsService.java
index 221b3ad..1e30a25 100644
--- a/api/src/main/java/org/apache/unomi/api/services/DefinitionsService.java
+++ b/api/src/main/java/org/apache/unomi/api/services/DefinitionsService.java
@@ -19,7 +19,6 @@ package org.apache.unomi.api.services;
import org.apache.unomi.api.PluginType;
import org.apache.unomi.api.PropertyMergeStrategyType;
-import org.apache.unomi.api.Tag;
import org.apache.unomi.api.ValueType;
import org.apache.unomi.api.actions.ActionType;
import org.apache.unomi.api.conditions.Condition;
@@ -34,33 +33,6 @@ import java.util.Set;
* A service to retrieve definition information about core context server entities such as conditions, actions and values.
*/
public interface DefinitionsService {
- /**
- * Retrieves all known tags.
- *
- * @return the set of all known tags
- */
- Set<Tag> getAllTags();
-
- /**
- * Retrieves the set of all root tags from which all other tags are derived via sub-tags.
- *
- * @return the set of all root tags
- */
- Set<Tag> getRootTags();
-
- /**
- * Retrieves the tag with the specified identifier.
- *
- * @param tagId the identifier of the tag to retrieve
- * @return the tag with the specified identifier
- */
- Tag getTag(String tagId);
-
- /**
- * Add a new tag to the list of tags
- * @param tag the tag to add
- */
- void addTag(Tag tag);
/**
* Retrieves all condition types.
@@ -73,10 +45,9 @@ public interface DefinitionsService {
* Retrieves the set of condition types with the specified tag also retrieving condition types from sub-tags if so specified.
*
* @param tag the tag marking the condition types we want to retrieve
- * @param includeFromSubtags {@code true} if we want to also include condition types marked by sub-tags of the specified tag
* @return the set of condition types with the specified tag (and its sub-tags, if specified)
*/
- Set<ConditionType> getConditionTypesByTag(Tag tag, boolean includeFromSubtags);
+ Set<ConditionType> getConditionTypesByTag(String tag);
/**
* Retrieves the condition type associated with the specified identifier.
@@ -111,10 +82,9 @@ public interface DefinitionsService {
* Retrieves the set of action types with the specified tag also retrieving action types from sub-tags if so specified.
*
* @param tag the tag marking the action types we want to retrieve
- * @param includeFromSubtags {@code true} if we want to also include action types marked by sub-tags of the specified tag
* @return the set of action types with the specified tag (and its sub-tags, if specified)
*/
- Set<ActionType> getActionTypeByTag(Tag tag, boolean includeFromSubtags);
+ Set<ActionType> getActionTypeByTag(String tag);
/**
* Retrieves the action type associated with the specified identifier.
@@ -149,10 +119,9 @@ public interface DefinitionsService {
* Retrieves the set of value types with the specified tag also retrieving value types from sub-tags if so specified.
*
* @param tag the tag marking the value types we want to retrieve
- * @param includeFromSubtags {@code true} if we want to also include value types marked by sub-tags of the specified tag
* @return the set of value types with the specified tag (and its sub-tags, if specified)
*/
- Set<ValueType> getValueTypeByTag(Tag tag, boolean includeFromSubtags);
+ Set<ValueType> getValueTypeByTag(String tag);
/**
* Retrieves the value type associated with the specified identifier.
@@ -195,10 +164,10 @@ public interface DefinitionsService {
* TODO: purpose and behavior not clear
*
* @param rootCondition
- * @param tagId
+ * @param tag
* @return
*/
- Condition extractConditionByTag(Condition rootCondition, String tagId);
+ Condition extractConditionByTag(Condition rootCondition, String tag);
/**
* Resolves (if possible) the {@link ConditionType}s for the specified condition and its sub-conditions (if any) from the type identifiers existing on the specified condition
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/api/src/main/java/org/apache/unomi/api/services/ProfileService.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/unomi/api/services/ProfileService.java b/api/src/main/java/org/apache/unomi/api/services/ProfileService.java
index f400746..7b07fcf 100644
--- a/api/src/main/java/org/apache/unomi/api/services/ProfileService.java
+++ b/api/src/main/java/org/apache/unomi/api/services/ProfileService.java
@@ -260,10 +260,9 @@ public interface ProfileService {
* TODO: move to a different class
*
* @param tag the tag name marking property types we want to retrieve
- * @param includeFromSubtags {@code true} if sub-tags of the specified tag should also be considered, {@code false} otherwise
* @return a Set of the property types with the specified tag
*/
- Set<PropertyType> getPropertyTypeByTag(String tag, boolean includeFromSubtags);
+ Set<PropertyType> getPropertyTypeByTag(String tag);
/**
* TODO
@@ -310,11 +309,11 @@ public interface ProfileService {
*
* TODO: move to a different class
*
- * @param tagId the tag we're interested in
+ * @param tag the tag we're interested in
* @param itemType the String representation of the item type we want to retrieve the count of, as defined by its class' {@code ITEM_TYPE} field
* @return all property types defined for the specified item type and with the specified tag
*/
- Set<PropertyType> getExistingProperties(String tagId, String itemType);
+ Set<PropertyType> getExistingProperties(String tag, String itemType);
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/extensions/lists-extension/actions/src/main/resources/META-INF/cxs/actions/addToLists.json
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/actions/src/main/resources/META-INF/cxs/actions/addToLists.json b/extensions/lists-extension/actions/src/main/resources/META-INF/cxs/actions/addToLists.json
index 7c7e096..ec4a531 100644
--- a/extensions/lists-extension/actions/src/main/resources/META-INF/cxs/actions/addToLists.json
+++ b/extensions/lists-extension/actions/src/main/resources/META-INF/cxs/actions/addToLists.json
@@ -4,6 +4,7 @@
"name": "addToListsAction",
"description": "",
"tags": [
+ "profileTags",
"demographic",
"hidden.availableToEndUser"
],
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/extensions/salesforce-connector/actions/src/main/resources/META-INF/cxs/actions/sfdcCreateOrUpdateLead.json
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/actions/src/main/resources/META-INF/cxs/actions/sfdcCreateOrUpdateLead.json b/extensions/salesforce-connector/actions/src/main/resources/META-INF/cxs/actions/sfdcCreateOrUpdateLead.json
index 55c7da3..f5b9bf5 100644
--- a/extensions/salesforce-connector/actions/src/main/resources/META-INF/cxs/actions/sfdcCreateOrUpdateLead.json
+++ b/extensions/salesforce-connector/actions/src/main/resources/META-INF/cxs/actions/sfdcCreateOrUpdateLead.json
@@ -4,6 +4,7 @@
"name": "sfdcCreateOrUpdateLeadAction",
"description": "",
"tags": [
+ "profileTags",
"demographic",
"hidden.availableToEndUser"
],
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/extensions/salesforce-connector/actions/src/main/resources/META-INF/cxs/actions/sfdcUpdateProfileFromLead.json
----------------------------------------------------------------------
diff --git a/extensions/salesforce-connector/actions/src/main/resources/META-INF/cxs/actions/sfdcUpdateProfileFromLead.json b/extensions/salesforce-connector/actions/src/main/resources/META-INF/cxs/actions/sfdcUpdateProfileFromLead.json
index 598edb7..f53501f 100644
--- a/extensions/salesforce-connector/actions/src/main/resources/META-INF/cxs/actions/sfdcUpdateProfileFromLead.json
+++ b/extensions/salesforce-connector/actions/src/main/resources/META-INF/cxs/actions/sfdcUpdateProfileFromLead.json
@@ -4,6 +4,7 @@
"name": "sfdcUpdateProfileFromLeadAction",
"description": "",
"tags": [
+ "profileTags",
"demographic",
"hidden.availableToEndUser"
],
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/performance-tests/src/test/scala/unomi/AdminScenario.scala
----------------------------------------------------------------------
diff --git a/performance-tests/src/test/scala/unomi/AdminScenario.scala b/performance-tests/src/test/scala/unomi/AdminScenario.scala
index f71540c..74be4d0 100644
--- a/performance-tests/src/test/scala/unomi/AdminScenario.scala
+++ b/performance-tests/src/test/scala/unomi/AdminScenario.scala
@@ -105,7 +105,7 @@ object AdminScenario {
.headers(adminHeaders)
.check(jsonPath("$..id").find.is("profileTags")))
- .exec(http("Existing profile properties").get("/cxs/profiles/existingProperties?tagId=profileProperties&itemType=profile")
+ .exec(http("Existing profile properties").get("/cxs/profiles/existingProperties?tag=profileProperties&itemType=profile")
.headers(adminHeaders)
.check(jsonPath("$..itemId").find.exists))
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/allEventToProfilePropertiesAction.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/allEventToProfilePropertiesAction.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/allEventToProfilePropertiesAction.json
index adb62e6..869a287 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/allEventToProfilePropertiesAction.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/allEventToProfilePropertiesAction.json
@@ -4,6 +4,7 @@
"name": "allEventToProfilePropertiesAction",
"description": "",
"tags": [
+ "profileTags",
"event"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/evaluateProfileAgeAction.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/evaluateProfileAgeAction.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/evaluateProfileAgeAction.json
index 553f021..0ed9ebd 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/evaluateProfileAgeAction.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/evaluateProfileAgeAction.json
@@ -4,6 +4,7 @@
"name": "evaluateProfileAgeAction",
"description": "",
"tags": [
+ "profileTags",
"event"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/evaluateProfileSegmentsAction.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/evaluateProfileSegmentsAction.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/evaluateProfileSegmentsAction.json
index e5a86e2..188f547 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/evaluateProfileSegmentsAction.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/evaluateProfileSegmentsAction.json
@@ -4,6 +4,7 @@
"name": "evaluateProfileSegmentsAction",
"description": "",
"tags": [
+ "profileTags",
"event"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/eventToProfilePropertyAction.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/eventToProfilePropertyAction.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/eventToProfilePropertyAction.json
index 5539e1d..a3a045d 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/eventToProfilePropertyAction.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/eventToProfilePropertyAction.json
@@ -4,6 +4,7 @@
"name": "eventToProfilePropertyAction",
"description": "",
"tags": [
+ "profileTags",
"event"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/mergeProfilesOnPropertyAction.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/mergeProfilesOnPropertyAction.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/mergeProfilesOnPropertyAction.json
index 62d3719..77d9969 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/mergeProfilesOnPropertyAction.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/mergeProfilesOnPropertyAction.json
@@ -4,6 +4,7 @@
"name": "mergeProfilesOnPropertyAction",
"description": "",
"tags": [
+ "profileTags",
"demographic"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/sendEventAction.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/sendEventAction.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/sendEventAction.json
index ef8535c..d7a8d09 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/sendEventAction.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/sendEventAction.json
@@ -4,6 +4,7 @@
"name": "sendEventAction",
"description": "",
"tags": [
+ "profileTags",
"event"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/setEventOccurenceCountAction.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/setEventOccurenceCountAction.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/setEventOccurenceCountAction.json
index 9a48874..4bd77bb 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/setEventOccurenceCountAction.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/setEventOccurenceCountAction.json
@@ -4,6 +4,7 @@
"name": "setEventOccurenceCountAction",
"description": "",
"tags": [
+ "profileTags",
"demographic"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/setPropertyAction.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/setPropertyAction.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/setPropertyAction.json
index 53c1b64..25cf616 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/setPropertyAction.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/actions/setPropertyAction.json
@@ -4,6 +4,7 @@
"name": "setPropertyAction",
"description": "",
"tags": [
+ "profileTags",
"demographic",
"hidden.availableToEndUser",
"hidden.allowMultipleInstances"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/booleanCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/booleanCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/booleanCondition.json
index ba3b806..a12a0dd 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/booleanCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/booleanCondition.json
@@ -4,7 +4,9 @@
"name": "booleanCondition",
"description": "",
"tags": [
+ "profileTags",
"logical",
+ "condition",
"profileCondition",
"eventCondition",
"sessionCondition",
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/eventPropertyCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/eventPropertyCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/eventPropertyCondition.json
index 6c3ef41..45482cc 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/eventPropertyCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/eventPropertyCondition.json
@@ -4,7 +4,9 @@
"name": "eventPropertyCondition",
"description": "",
"tags": [
+ "profileTags",
"demographic",
+ "condition",
"eventCondition"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/eventTypeCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/eventTypeCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/eventTypeCondition.json
index 0715f7a..0a104e4 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/eventTypeCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/eventTypeCondition.json
@@ -4,7 +4,9 @@
"name": "eventTypeCondition",
"description": "",
"tags": [
+ "profileTags",
"event",
+ "condition",
"eventCondition"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/formEventCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/formEventCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/formEventCondition.json
index e375267..b1e4fff 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/formEventCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/formEventCondition.json
@@ -4,7 +4,9 @@
"name": "formEventCondition",
"description": "",
"tags": [
+ "profileTags",
"event",
+ "condition",
"eventCondition",
"usableInPastEventCondition",
"trackedCondition"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/geoLocationByPointSessionCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/geoLocationByPointSessionCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/geoLocationByPointSessionCondition.json
index 4c77df3..cdc340d 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/geoLocationByPointSessionCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/geoLocationByPointSessionCondition.json
@@ -4,7 +4,9 @@
"name": "geoLocationByPointSessionCondition",
"description": "",
"tags": [
+ "profileTags",
"geographic",
+ "condition",
"sessionCondition"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/geoLocationSessionCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/geoLocationSessionCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/geoLocationSessionCondition.json
index 4468079..c3206ae 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/geoLocationSessionCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/geoLocationSessionCondition.json
@@ -4,7 +4,9 @@
"name": "geoLocationSessionCondition",
"description": "",
"tags": [
+ "profileTags",
"geographic",
+ "condition",
"sessionCondition"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/goalMatchCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/goalMatchCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/goalMatchCondition.json
index 417f01d..8d9743b 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/goalMatchCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/goalMatchCondition.json
@@ -4,7 +4,9 @@
"name": "goalMatchCondition",
"description": "",
"tags": [
+ "condition",
"profileCondition",
+ "profileTags",
"event"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/matchAllCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/matchAllCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/matchAllCondition.json
index c10446e..b866e48 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/matchAllCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/matchAllCondition.json
@@ -4,7 +4,9 @@
"name": "matchAllCondition",
"description": "",
"tags": [
+ "profileTags",
"logical",
+ "condition",
"profileCondition",
"eventCondition",
"sessionCondition",
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/newVisitorCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/newVisitorCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/newVisitorCondition.json
index 6bdb2f6..c90ce4f 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/newVisitorCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/newVisitorCondition.json
@@ -4,7 +4,9 @@
"name": "newVisitorCondition",
"description": "",
"tags": [
+ "profileTags",
"event",
+ "condition",
"sessionCondition"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/notCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/notCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/notCondition.json
index 4776d4d..3ab26b3 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/notCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/notCondition.json
@@ -4,7 +4,9 @@
"name": "notCondition",
"description": "",
"tags": [
+ "profileTags",
"logical",
+ "condition",
"profileCondition",
"eventCondition",
"sessionCondition",
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/pastEventCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/pastEventCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/pastEventCondition.json
index a0e280e..52c9d5e 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/pastEventCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/pastEventCondition.json
@@ -4,7 +4,9 @@
"name": "pastEventCondition",
"description": "",
"tags": [
+ "profileTags",
"event",
+ "condition",
"profileCondition"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profilePropertyCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profilePropertyCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profilePropertyCondition.json
index abaabd5..06ae965 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profilePropertyCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profilePropertyCondition.json
@@ -4,7 +4,9 @@
"name": "profilePropertyCondition",
"description": "",
"tags": [
+ "profileTags",
"demographic",
+ "condition",
"profileCondition"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profileSegmentCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profileSegmentCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profileSegmentCondition.json
index 40235e0..b1a40e1 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profileSegmentCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profileSegmentCondition.json
@@ -4,7 +4,9 @@
"name": "profileSegmentCondition",
"description": "",
"tags": [
+ "profileTags",
"aggregated",
+ "condition",
"profileCondition"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profileUpdatedEventCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profileUpdatedEventCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profileUpdatedEventCondition.json
index b2efa0b..7910a13 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profileUpdatedEventCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profileUpdatedEventCondition.json
@@ -4,7 +4,9 @@
"name": "profileUpdatedEventCondition",
"description": "",
"tags": [
+ "profileTags",
"event",
+ "condition",
"eventCondition"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profileUserListCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profileUserListCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profileUserListCondition.json
index 221f5f9..4891a5a 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profileUserListCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/profileUserListCondition.json
@@ -4,7 +4,9 @@
"name": "profileUserListCondition",
"description": "",
"tags": [
+ "profileTags",
"aggregated",
+ "condition",
"profileCondition"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/returningVisitorCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/returningVisitorCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/returningVisitorCondition.json
index 2ecf315..165ee4a 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/returningVisitorCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/returningVisitorCondition.json
@@ -4,7 +4,9 @@
"name": "returningVisitorCondition",
"description": "",
"tags": [
+ "profileTags",
"event",
+ "condition",
"sessionCondition"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/scoringCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/scoringCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/scoringCondition.json
index 6ef37fc..89c176f 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/scoringCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/scoringCondition.json
@@ -4,7 +4,9 @@
"name": "scoringCondition",
"description": "",
"tags": [
+ "profileTags",
"aggregated",
+ "condition",
"profileCondition"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionCreatedEventCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionCreatedEventCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionCreatedEventCondition.json
index 25f1818..fb43b88 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionCreatedEventCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionCreatedEventCondition.json
@@ -4,7 +4,9 @@
"name": "sessionCreatedEventCondition",
"description": "",
"tags": [
+ "profileTags",
"event",
+ "condition",
"eventCondition"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionDurationCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionDurationCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionDurationCondition.json
index f55b85c..47b214b 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionDurationCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionDurationCondition.json
@@ -4,7 +4,9 @@
"name": "sessionDurationCondition",
"description": "",
"tags": [
+ "profileTags",
"event",
+ "condition",
"sessionCondition"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionPropertyCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionPropertyCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionPropertyCondition.json
index 3c3328a..c613839 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionPropertyCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sessionPropertyCondition.json
@@ -4,7 +4,9 @@
"name": "sessionPropertyCondition",
"description": "",
"tags": [
+ "profileTags",
"event",
+ "condition",
"sessionCondition"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sourceEventPropertyCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sourceEventPropertyCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sourceEventPropertyCondition.json
index d977dbc..1aaf934 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sourceEventPropertyCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/sourceEventPropertyCondition.json
@@ -4,6 +4,7 @@
"name": "sourceEventPropertyCondition",
"description": "",
"tags": [
+ "condition",
"sourceEventCondition"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/videoViewEventCondition.json
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/videoViewEventCondition.json b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/videoViewEventCondition.json
index cc74144..8efc923 100644
--- a/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/videoViewEventCondition.json
+++ b/plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/videoViewEventCondition.json
@@ -4,7 +4,9 @@
"name": "videoViewEventCondition",
"description": "",
"tags": [
+ "profileTags",
"event",
+ "condition",
"eventCondition",
"usableInPastEventCondition",
"trackedCondition"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/hover-event/src/main/resources/META-INF/cxs/conditions/hoverEventCondition.json
----------------------------------------------------------------------
diff --git a/plugins/hover-event/src/main/resources/META-INF/cxs/conditions/hoverEventCondition.json b/plugins/hover-event/src/main/resources/META-INF/cxs/conditions/hoverEventCondition.json
index 711eb61..a205b9c 100644
--- a/plugins/hover-event/src/main/resources/META-INF/cxs/conditions/hoverEventCondition.json
+++ b/plugins/hover-event/src/main/resources/META-INF/cxs/conditions/hoverEventCondition.json
@@ -4,7 +4,9 @@
"name": "hoverEventCondition",
"description": "",
"tags": [
+ "profileTags",
"event",
+ "condition",
"eventCondition",
"usableInPastEventCondition"
],
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/mail/src/main/resources/META-INF/cxs/actions/sendMailAction.json
----------------------------------------------------------------------
diff --git a/plugins/mail/src/main/resources/META-INF/cxs/actions/sendMailAction.json b/plugins/mail/src/main/resources/META-INF/cxs/actions/sendMailAction.json
index ffe346a..fd3c8e9 100644
--- a/plugins/mail/src/main/resources/META-INF/cxs/actions/sendMailAction.json
+++ b/plugins/mail/src/main/resources/META-INF/cxs/actions/sendMailAction.json
@@ -4,6 +4,7 @@
"name": "sendMailAction",
"description": "",
"tags": [
+ "profileTags",
"event",
"hidden.availableToEndUser",
"hidden.allowMultipleInstances"
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/request/src/main/resources/META-INF/cxs/actions/requestHeaderToProfilePropertyAction.json
----------------------------------------------------------------------
diff --git a/plugins/request/src/main/resources/META-INF/cxs/actions/requestHeaderToProfilePropertyAction.json b/plugins/request/src/main/resources/META-INF/cxs/actions/requestHeaderToProfilePropertyAction.json
index fbe702f..3bd5d81 100644
--- a/plugins/request/src/main/resources/META-INF/cxs/actions/requestHeaderToProfilePropertyAction.json
+++ b/plugins/request/src/main/resources/META-INF/cxs/actions/requestHeaderToProfilePropertyAction.json
@@ -4,6 +4,7 @@
"name": "requestHeaderToProfilePropertyAction",
"description": "",
"tags": [
+ "profileTags",
"event"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/request/src/main/resources/META-INF/cxs/actions/requestParameterToProfilePropertyAction.json
----------------------------------------------------------------------
diff --git a/plugins/request/src/main/resources/META-INF/cxs/actions/requestParameterToProfilePropertyAction.json b/plugins/request/src/main/resources/META-INF/cxs/actions/requestParameterToProfilePropertyAction.json
index b7eba57..0288056 100644
--- a/plugins/request/src/main/resources/META-INF/cxs/actions/requestParameterToProfilePropertyAction.json
+++ b/plugins/request/src/main/resources/META-INF/cxs/actions/requestParameterToProfilePropertyAction.json
@@ -4,6 +4,7 @@
"name": "requestParameterToProfilePropertyAction",
"description": "",
"tags": [
+ "profileTags",
"event"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/plugins/request/src/main/resources/META-INF/cxs/actions/setRemoteHostInfoAction.json
----------------------------------------------------------------------
diff --git a/plugins/request/src/main/resources/META-INF/cxs/actions/setRemoteHostInfoAction.json b/plugins/request/src/main/resources/META-INF/cxs/actions/setRemoteHostInfoAction.json
index 803b2e5..09935f5 100644
--- a/plugins/request/src/main/resources/META-INF/cxs/actions/setRemoteHostInfoAction.json
+++ b/plugins/request/src/main/resources/META-INF/cxs/actions/setRemoteHostInfoAction.json
@@ -4,6 +4,7 @@
"name": "setRemoteHostInfoAction",
"description": "",
"tags": [
+ "profileTags",
"event"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/rest/src/main/java/org/apache/unomi/rest/DefinitionsServiceEndPoint.java
----------------------------------------------------------------------
diff --git a/rest/src/main/java/org/apache/unomi/rest/DefinitionsServiceEndPoint.java b/rest/src/main/java/org/apache/unomi/rest/DefinitionsServiceEndPoint.java
index ae660ea..2fd415a 100644
--- a/rest/src/main/java/org/apache/unomi/rest/DefinitionsServiceEndPoint.java
+++ b/rest/src/main/java/org/apache/unomi/rest/DefinitionsServiceEndPoint.java
@@ -20,7 +20,6 @@ package org.apache.unomi.rest;
import org.apache.cxf.rs.security.cors.CrossOriginResourceSharing;
import org.apache.unomi.api.PluginType;
import org.apache.unomi.api.PropertyMergeStrategyType;
-import org.apache.unomi.api.Tag;
import org.apache.unomi.api.ValueType;
import org.apache.unomi.api.actions.ActionType;
import org.apache.unomi.api.conditions.ConditionType;
@@ -60,58 +59,6 @@ public class DefinitionsServiceEndPoint {
}
/**
- * Retrieves all known tags localized using the specified language.
- *
- * @param language the language to use to localize
- * @return the set of all known tags
- */
- @GET
- @Path("/tags")
- public Collection<RESTTag> getAllTags(@HeaderParam("Accept-Language") String language) {
- return localizationHelper.generateTags(definitionsService.getAllTags(), language);
- }
-
- /**
- * Retrieves the set of all root tags from which all other tags are derived via sub-tags localized using the specified language.
- *
- * @param language the language to use to localize.
- * @return the set of all root tags
- */
- @GET
- @Path("/rootTags")
- public Collection<RESTTag> getRootTags(@HeaderParam("Accept-Language") String language) {
- return localizationHelper.generateTags(definitionsService.getRootTags(), language);
- }
-
- /**
- * Retrieves the tag with the specified identifier localized using the specified language.
- *
- * @param language the language to use to localize.
- * @param tagId the identifier of the tag to retrieve
- * @param filterHidden {@code true} if hidden sub-tags should be filtered out, {@code false} otherwise
- * @return the tag with the specified identifier
- */
- @GET
- @Path("/tags/{tagId}")
- public RESTTag getTag(@PathParam("tagId") String tagId, @QueryParam("filterHidden") @DefaultValue("false") boolean filterHidden, @HeaderParam("Accept-Language") String language) {
- Tag tag = definitionsService.getTag(tagId);
- if (tag == null) {
- throw new NotFoundException(new NoSuchElementException(tagId)); // return 404 when tag is not found
- }
- return localizationHelper.generateTag(tag, language, filterHidden);
- }
-
- /**
- * Add a new tag to the list of tags
- * @param tag the tag to add
- */
- @POST
- @Path("/tags")
- public void addTag(Tag tag) {
- definitionsService.addTag(tag);
- }
-
- /**
* Retrieves all condition types localized using the specified language.
*
* @param language the language to use to localize.
@@ -129,19 +76,15 @@ public class DefinitionsServiceEndPoint {
*
* @param language the language to use to localize.
* @param tags a comma-separated list of tag identifiers
- * @param recursive {@code true} if we want to also include condition types marked by sub-tags of the specified tag
* @return the set of condition types with the specified tag (and its sub-tags, if specified)
*/
@GET
- @Path("/conditions/tags/{tagId}")
- public Collection<RESTConditionType> getConditionTypesByTag(@PathParam("tagId") String tags, @QueryParam("recursive") @DefaultValue("false") boolean recursive, @HeaderParam("Accept-Language") String language) {
+ @Path("/conditions/tags/{tags}")
+ public Collection<RESTConditionType> getConditionTypesByTag(@PathParam("tags") String tags, @HeaderParam("Accept-Language") String language) {
String[] tagsArray = tags.split(",");
Set<ConditionType> results = new LinkedHashSet<>();
- for (String s : tagsArray) {
- Tag tag = definitionsService.getTag(s);
- if (tag != null) {
- results.addAll(definitionsService.getConditionTypesByTag(tag, recursive));
- }
+ for (String tag : tagsArray) {
+ results.addAll(definitionsService.getConditionTypesByTag(tag));
}
return localizationHelper.generateConditions(results, language);
}
@@ -200,19 +143,15 @@ public class DefinitionsServiceEndPoint {
*
* @param language the language to use to localize.
* @param tags the tag marking the action types we want to retrieve
- * @param recursive {@code true} if we want to also include action types marked by sub-tags of the specified tag
* @return the set of action types with the specified tag (and its sub-tags, if specified)
*/
@GET
- @Path("/actions/tags/{tagId}")
- public Collection<RESTActionType> getActionTypeByTag(@PathParam("tagId") String tags, @QueryParam("recursive") @DefaultValue("false") boolean recursive, @HeaderParam("Accept-Language") String language) {
+ @Path("/actions/tags/{tags}")
+ public Collection<RESTActionType> getActionTypeByTag(@PathParam("tags") String tags, @HeaderParam("Accept-Language") String language) {
String[] tagsArray = tags.split(",");
Set<ActionType> results = new LinkedHashSet<>();
- for (String s : tagsArray) {
- Tag tag = definitionsService.getTag(s);
- if (tag != null) {
- results.addAll(definitionsService.getActionTypeByTag(tag, recursive));
- }
+ for (String tag : tagsArray) {
+ results.addAll(definitionsService.getActionTypeByTag(tag));
}
return localizationHelper.generateActions(results, language);
}
@@ -270,19 +209,15 @@ public class DefinitionsServiceEndPoint {
*
* @param language the language to use to localize.
* @param tags the tag marking the value types we want to retrieve
- * @param recursive {@code true} if we want to also include value types marked by sub-tags of the specified tag
* @return the set of value types with the specified tag (and its sub-tags, if specified)
*/
@GET
- @Path("/values/tags/{tagId}")
- public Collection<RESTValueType> getValueTypeByTag(@PathParam("tagId") String tags, @QueryParam("recursive") @DefaultValue("false") boolean recursive, @HeaderParam("Accept-Language") String language) {
+ @Path("/values/tags/{tags}")
+ public Collection<RESTValueType> getValueTypeByTag(@PathParam("tags") String tags, @HeaderParam("Accept-Language") String language) {
String[] tagsArray = tags.split(",");
Set<ValueType> results = new LinkedHashSet<>();
- for (String s : tagsArray) {
- Tag tag = definitionsService.getTag(s);
- if (tag != null) {
- results.addAll(definitionsService.getValueTypeByTag(tag, recursive));
- }
+ for (String tag : tagsArray) {
+ results.addAll(definitionsService.getValueTypeByTag(tag));
}
return localizationHelper.generateValueTypes(results, language);
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/rest/src/main/java/org/apache/unomi/rest/LocalizationHelper.java
----------------------------------------------------------------------
diff --git a/rest/src/main/java/org/apache/unomi/rest/LocalizationHelper.java b/rest/src/main/java/org/apache/unomi/rest/LocalizationHelper.java
index 6cb5d89..426c82e 100644
--- a/rest/src/main/java/org/apache/unomi/rest/LocalizationHelper.java
+++ b/rest/src/main/java/org/apache/unomi/rest/LocalizationHelper.java
@@ -18,7 +18,6 @@
package org.apache.unomi.rest;
import org.apache.unomi.api.Parameter;
-import org.apache.unomi.api.Tag;
import org.apache.unomi.api.ValueType;
import org.apache.unomi.api.actions.ActionType;
import org.apache.unomi.api.conditions.ConditionType;
@@ -173,63 +172,7 @@ public class LocalizationHelper {
ResourceBundle bundle = resourceBundleHelper.getResourceBundle(valueType, language);
result.setName(resourceBundleHelper.getResourceBundleValue(bundle, valueType.getNameKey()));
result.setDescription(resourceBundleHelper.getResourceBundleValue(bundle, valueType.getDescriptionKey()));
- result.setTags(generateTags(valueType.getTags(), language));
- return result;
- }
-
- /**
- * Same as generateTages(tags, language, false).
- */
- public Collection<RESTTag> generateTags(Collection<Tag> tags, String language) {
- return generateTags(tags, language, false);
- }
-
- /**
- * Creates {@link RESTTag}s, localized using the specified language, based on the specified {@link Tag}s.
- *
- * @param tags the {@link Tag}s to be localized
- * @param language the language to use to localize {@link Tag}s
- * @param filterHidden {@code true} to filter out hidden tags, {@code false} otherwise
- * @return a collection of {@link RESTTag}s based on the specified {@link Tag}s and localized using the specified language
- */
- public Collection<RESTTag> generateTags(Collection<Tag> tags, String language, boolean filterHidden) {
- List<RESTTag> result = new ArrayList<RESTTag>();
- for (Tag tag : tags) {
- RESTTag subTag = generateTag(tag, language, filterHidden);
- if (subTag != null) {
- result.add(subTag);
- }
- }
- return result;
- }
-
- /**
- * Same as generateTag(tag, language, false).
- */
- public RESTTag generateTag(Tag tag, String language) {
- return generateTag(tag, language, false);
- }
-
- /**
- * Creates a {@link RESTTag}, localized using the specified language, based on the specified {@link Tag}.
- *
- * @param tag the {@link Tag} to be localized
- * @param language the language to use to localize the {@link Tag}
- * @param filterHidden {@code true} to filter out hidden sub-tags, {@code false} otherwise
- * @return a {@link RESTTag} based on the specified {@link Tag} and localized using the specified language
- */
- public RESTTag generateTag(Tag tag, String language, boolean filterHidden) {
- if (tag == null || (filterHidden && tag.isHidden())) {
- return null;
- }
- RESTTag result = new RESTTag();
- result.setId(tag.getId());
- ResourceBundle bundle = resourceBundleHelper.getResourceBundle(tag, language);
- result.setName(resourceBundleHelper.getResourceBundleValue(bundle, tag.getNameKey()));
- result.setDescription(resourceBundleHelper.getResourceBundleValue(bundle, tag.getDescriptionKey()));
- result.setParentId(tag.getParentId());
- result.setRank(tag.getRank());
- result.setSubTags(generateTags(tag.getSubTags(), language, filterHidden));
+ result.setTags(valueType.getTags());
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/rest/src/main/java/org/apache/unomi/rest/ProfileServiceEndPoint.java
----------------------------------------------------------------------
diff --git a/rest/src/main/java/org/apache/unomi/rest/ProfileServiceEndPoint.java b/rest/src/main/java/org/apache/unomi/rest/ProfileServiceEndPoint.java
index 3b234b2..27a8324 100644
--- a/rest/src/main/java/org/apache/unomi/rest/ProfileServiceEndPoint.java
+++ b/rest/src/main/java/org/apache/unomi/rest/ProfileServiceEndPoint.java
@@ -443,15 +443,15 @@ public class ProfileServiceEndPoint {
*
* TODO: move to a different class
*
- * @param tagId the tag we're interested in
+ * @param tag the tag we're interested in
* @param itemType the String representation of the item type we want to retrieve the count of, as defined by its class' {@code ITEM_TYPE} field
* @param language the value of the {@code Accept-Language} header to specify in which locale the properties description should be returned TODO unused
* @return all property types defined for the specified item type and with the specified tag
*/
@GET
@Path("/existingProperties")
- public Collection<PropertyType> getExistingProperties(@QueryParam("tagId") String tagId, @QueryParam("itemType") String itemType, @HeaderParam("Accept-Language") String language) {
- Set<PropertyType> properties = profileService.getExistingProperties(tagId, itemType);
+ public Collection<PropertyType> getExistingProperties(@QueryParam("tag") String tag, @QueryParam("itemType") String itemType, @HeaderParam("Accept-Language") String language) {
+ Set<PropertyType> properties = profileService.getExistingProperties(tag, itemType);
return properties;
}
@@ -491,17 +491,16 @@ public class ProfileServiceEndPoint {
* TODO: passing a list of tags via a comma-separated list is not very RESTful
*
* @param tags a comma-separated list of tag identifiers
- * @param recursive {@code true} if sub-tags of the specified tag should also be considered, {@code false} otherwise
* @param language the value of the {@code Accept-Language} header to specify in which locale the properties description should be returned TODO unused
* @return a Set of the property types with the specified tag
*/
@GET
- @Path("/properties/tags/{tagId}")
- public Collection<PropertyType> getPropertyTypeByTag(@PathParam("tagId") String tags, @QueryParam("recursive") @DefaultValue("false") boolean recursive, @HeaderParam("Accept-Language") String language) {
+ @Path("/properties/tags/{tags}")
+ public Collection<PropertyType> getPropertyTypeByTag(@PathParam("tags") String tags, @HeaderParam("Accept-Language") String language) {
String[] tagsArray = tags.split(",");
Set<PropertyType> results = new LinkedHashSet<>();
- for (String s : tagsArray) {
- results.addAll(profileService.getPropertyTypeByTag(s, recursive));
+ for (String tag : tagsArray) {
+ results.addAll(profileService.getPropertyTypeByTag(tag));
}
return results;
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/rest/src/main/java/org/apache/unomi/rest/RESTActionType.java
----------------------------------------------------------------------
diff --git a/rest/src/main/java/org/apache/unomi/rest/RESTActionType.java b/rest/src/main/java/org/apache/unomi/rest/RESTActionType.java
index 5e73a0f..b135adc 100644
--- a/rest/src/main/java/org/apache/unomi/rest/RESTActionType.java
+++ b/rest/src/main/java/org/apache/unomi/rest/RESTActionType.java
@@ -19,8 +19,8 @@ package org.apache.unomi.rest;
import org.apache.unomi.api.actions.ActionType;
-import java.util.Collection;
import java.util.List;
+import java.util.Set;
/**
* A representation of an {@link ActionType} better suited for definitions.
@@ -29,7 +29,7 @@ public class RESTActionType {
private String id;
private String name;
private String description;
- private Collection<String> tags;
+ private Set<String> tags;
private List<RESTParameter> parameters;
public String getId() {
@@ -56,11 +56,11 @@ public class RESTActionType {
this.description = description;
}
- public Collection<String> getTags() {
+ public Set<String> getTags() {
return tags;
}
- public void setTags(Collection<String> tags) {
+ public void setTags(Set<String> tags) {
this.tags = tags;
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/rest/src/main/java/org/apache/unomi/rest/RESTConditionType.java
----------------------------------------------------------------------
diff --git a/rest/src/main/java/org/apache/unomi/rest/RESTConditionType.java b/rest/src/main/java/org/apache/unomi/rest/RESTConditionType.java
index e37156f..6ffce83 100644
--- a/rest/src/main/java/org/apache/unomi/rest/RESTConditionType.java
+++ b/rest/src/main/java/org/apache/unomi/rest/RESTConditionType.java
@@ -19,10 +19,7 @@ package org.apache.unomi.rest;
import org.apache.unomi.api.conditions.ConditionType;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.TreeSet;
+import java.util.*;
/**
* A representation of a {@link ConditionType} better suited for definitions.
@@ -31,7 +28,7 @@ public class RESTConditionType {
private String id;
private String name;
private String description;
- private Collection<String> tags = new TreeSet<String>();
+ private Set<String> tags = new LinkedHashSet<>();
private List<RESTParameter> parameters = new ArrayList<RESTParameter>();
public RESTConditionType() {
@@ -61,11 +58,11 @@ public class RESTConditionType {
this.description = description;
}
- public Collection<String> getTags() {
+ public Set<String> getTags() {
return tags;
}
- public void setTags(Collection<String> tags) {
+ public void setTags(Set<String> tags) {
this.tags = tags;
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/rest/src/main/java/org/apache/unomi/rest/RESTTag.java
----------------------------------------------------------------------
diff --git a/rest/src/main/java/org/apache/unomi/rest/RESTTag.java b/rest/src/main/java/org/apache/unomi/rest/RESTTag.java
deleted file mode 100644
index 07cf11c..0000000
--- a/rest/src/main/java/org/apache/unomi/rest/RESTTag.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.unomi.rest;
-
-import org.apache.unomi.api.Tag;
-
-import java.util.Collection;
-import java.util.TreeSet;
-
-/**
- * A representation of a {@link Tag} better suited for definitions.
- */
-public class RESTTag {
- private String id;
- private String name;
- private String description;
- private String parentId;
- private double rank = 0.0;
- private Collection<RESTTag> subTags = new TreeSet<RESTTag>();
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getParentId() {
- return parentId;
- }
-
- public void setParentId(String parentId) {
- this.parentId = parentId;
- }
-
- public double getRank() {
- return rank;
- }
-
- public void setRank(double rank) {
- this.rank = rank;
- }
-
- public Collection<RESTTag> getSubTags() {
- return subTags;
- }
-
- public void setSubTags(Collection<RESTTag> subTags) {
- this.subTags = subTags;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/rest/src/main/java/org/apache/unomi/rest/RESTValueType.java
----------------------------------------------------------------------
diff --git a/rest/src/main/java/org/apache/unomi/rest/RESTValueType.java b/rest/src/main/java/org/apache/unomi/rest/RESTValueType.java
index 95edadf..3891a35 100644
--- a/rest/src/main/java/org/apache/unomi/rest/RESTValueType.java
+++ b/rest/src/main/java/org/apache/unomi/rest/RESTValueType.java
@@ -19,7 +19,7 @@ package org.apache.unomi.rest;
import org.apache.unomi.api.ValueType;
-import java.util.Collection;
+import java.util.Set;
/**
* A representation of a {@link ValueType} better suited for definitions.
@@ -29,7 +29,7 @@ public class RESTValueType {
private String id;
private String name;
private String description;
- private Collection<RESTTag> tags;
+ private Set<String> tags;
public RESTValueType() {
}
@@ -58,11 +58,11 @@ public class RESTValueType {
this.description = description;
}
- public Collection<RESTTag> getTags() {
+ public Set<String> getTags() {
return tags;
}
- public void setTags(Collection<RESTTag> tags) {
+ public void setTags(Set<String> tags) {
this.tags = tags;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/samples/trainingplugin/src/main/java/org/apache/unomi/training/TrainedNotificationAction.java
----------------------------------------------------------------------
diff --git a/samples/trainingplugin/src/main/java/org/apache/unomi/training/TrainedNotificationAction.java b/samples/trainingplugin/src/main/java/org/apache/unomi/training/TrainedNotificationAction.java
index 7f64cbd..d9493b0 100644
--- a/samples/trainingplugin/src/main/java/org/apache/unomi/training/TrainedNotificationAction.java
+++ b/samples/trainingplugin/src/main/java/org/apache/unomi/training/TrainedNotificationAction.java
@@ -50,7 +50,7 @@ public class TrainedNotificationAction implements ActionExecutor {
// create trained flag property type
PropertyType propertyType = new PropertyType(new Metadata(event.getScope(), TRAINED_NB_PROPERTY, TRAINED_NB_PROPERTY, "Am I trained"));
propertyType.setValueTypeId("boolean");
- propertyType.setTagIds(Collections.singleton("training"));
+ propertyType.setTags(Collections.singleton("training"));
propertyType.setTarget(TARGET);
service.setPropertyType(propertyType);
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/samples/trainingplugin/src/main/resources/META-INF/cxs/actions/trainingNotifAction.json
----------------------------------------------------------------------
diff --git a/samples/trainingplugin/src/main/resources/META-INF/cxs/actions/trainingNotifAction.json b/samples/trainingplugin/src/main/resources/META-INF/cxs/actions/trainingNotifAction.json
index 2ac9763..a14a343 100644
--- a/samples/trainingplugin/src/main/resources/META-INF/cxs/actions/trainingNotifAction.json
+++ b/samples/trainingplugin/src/main/resources/META-INF/cxs/actions/trainingNotifAction.json
@@ -4,6 +4,7 @@
"name": "Training Action",
"description": "",
"tags": [
+ "profileTags",
"event"
],
"readOnly": true
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/samples/tweet-button-plugin/src/main/java/org/apache/unomi/samples/tweet_button_plugin/actions/IncrementTweetNumberAction.java
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/src/main/java/org/apache/unomi/samples/tweet_button_plugin/actions/IncrementTweetNumberAction.java b/samples/tweet-button-plugin/src/main/java/org/apache/unomi/samples/tweet_button_plugin/actions/IncrementTweetNumberAction.java
index c459519..d291f09 100644
--- a/samples/tweet-button-plugin/src/main/java/org/apache/unomi/samples/tweet_button_plugin/actions/IncrementTweetNumberAction.java
+++ b/samples/tweet-button-plugin/src/main/java/org/apache/unomi/samples/tweet_button_plugin/actions/IncrementTweetNumberAction.java
@@ -45,14 +45,14 @@ public class IncrementTweetNumberAction implements ActionExecutor {
// create tweet number property type
PropertyType propertyType = new PropertyType(new Metadata(event.getScope(), TWEET_NB_PROPERTY, TWEET_NB_PROPERTY, "Number of times a user tweeted"));
propertyType.setValueTypeId("integer");
- propertyType.setTagIds(Collections.singleton("social"));
+ propertyType.setTags(Collections.singleton("social"));
propertyType.setTarget(TARGET);
service.setPropertyType(propertyType);
// create tweeted from property type
propertyType = new PropertyType(new Metadata(event.getScope(), TWEETED_FROM_PROPERTY, TWEETED_FROM_PROPERTY, "The list of pages a user tweeted from"));
propertyType.setValueTypeId("string");
- propertyType.setTagIds(Collections.singleton("social"));
+ propertyType.setTags(Collections.singleton("social"));
propertyType.setTarget(TARGET);
propertyType.setMultivalued(true);
service.setPropertyType(propertyType);
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a9d01d80/samples/tweet-button-plugin/src/main/resources/META-INF/cxs/actions/incrementTweetNumberAction.json
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/src/main/resources/META-INF/cxs/actions/incrementTweetNumberAction.json b/samples/tweet-button-plugin/src/main/resources/META-INF/cxs/actions/incrementTweetNumberAction.json
index 473cda8..81c468a 100644
--- a/samples/tweet-button-plugin/src/main/resources/META-INF/cxs/actions/incrementTweetNumberAction.json
+++ b/samples/tweet-button-plugin/src/main/resources/META-INF/cxs/actions/incrementTweetNumberAction.json
@@ -4,6 +4,7 @@
"name": "incrementTweetNumberAction",
"description": "",
"tags": [
+ "profileTags",
"event"
],
"readOnly": true