Repository: incubator-unomi
Updated Branches:
  refs/heads/feature-UNOMI-117 cd730387c -> 6a4a7e60e


UNOMI-117 move tags to system tags in json files, fix issue with entry point 
generating a 500 instead of not found or null


Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/6a4a7e60
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/6a4a7e60
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/6a4a7e60

Branch: refs/heads/feature-UNOMI-117
Commit: 6a4a7e60e70e5a0bf078c5d21e77b12d26765929
Parents: cd73038
Author: dgaillard <[email protected]>
Authored: Fri Sep 29 17:26:36 2017 +0200
Committer: dgaillard <[email protected]>
Committed: Fri Sep 29 17:26:36 2017 +0200

----------------------------------------------------------------------
 .../main/resources/META-INF/cxs/actions/addToLists.json   |  4 ++--
 .../META-INF/cxs/actions/sfdcCreateOrUpdateLead.json      |  4 ++--
 .../META-INF/cxs/actions/sfdcUpdateProfileFromLead.json   |  4 ++--
 .../META-INF/cxs/actions/UpdateWeatherAction.json         |  6 +++---
 .../cxs/properties/sessions/weather/weatherLike.json      |  2 +-
 .../cxs/properties/sessions/weather/weatherTemp.json      |  2 +-
 .../properties/sessions/weather/weatherWindDirection.json |  2 +-
 .../cxs/properties/sessions/weather/weatherWindSpeed.json |  2 +-
 .../cxs/actions/allEventToProfilePropertiesAction.json    |  2 +-
 .../META-INF/cxs/actions/evaluateProfileAgeAction.json    |  2 +-
 .../cxs/actions/evaluateProfileSegmentsAction.json        |  2 +-
 .../cxs/actions/eventToProfilePropertyAction.json         |  2 +-
 .../cxs/actions/mergeProfilesOnPropertyAction.json        |  2 +-
 .../resources/META-INF/cxs/actions/sendEventAction.json   |  2 +-
 .../cxs/actions/setEventOccurenceCountAction.json         |  2 +-
 .../resources/META-INF/cxs/actions/setPropertyAction.json |  6 +++---
 .../META-INF/cxs/conditions/booleanCondition.json         |  2 +-
 .../META-INF/cxs/conditions/eventPropertyCondition.json   |  2 +-
 .../META-INF/cxs/conditions/eventTypeCondition.json       |  2 +-
 .../META-INF/cxs/conditions/formEventCondition.json       |  2 +-
 .../conditions/geoLocationByPointSessionCondition.json    |  2 +-
 .../cxs/conditions/geoLocationSessionCondition.json       |  2 +-
 .../META-INF/cxs/conditions/goalMatchCondition.json       |  2 +-
 .../META-INF/cxs/conditions/matchAllCondition.json        |  2 +-
 .../META-INF/cxs/conditions/newVisitorCondition.json      |  2 +-
 .../resources/META-INF/cxs/conditions/notCondition.json   |  2 +-
 .../META-INF/cxs/conditions/pastEventCondition.json       |  2 +-
 .../META-INF/cxs/conditions/profilePropertyCondition.json |  2 +-
 .../META-INF/cxs/conditions/profileSegmentCondition.json  |  2 +-
 .../cxs/conditions/profileUpdatedEventCondition.json      |  2 +-
 .../META-INF/cxs/conditions/profileUserListCondition.json |  2 +-
 .../cxs/conditions/returningVisitorCondition.json         |  2 +-
 .../META-INF/cxs/conditions/scoringCondition.json         |  2 +-
 .../cxs/conditions/sessionCreatedEventCondition.json      |  2 +-
 .../META-INF/cxs/conditions/sessionDurationCondition.json |  2 +-
 .../META-INF/cxs/conditions/sessionPropertyCondition.json |  2 +-
 .../cxs/conditions/sourceEventPropertyCondition.json      |  2 +-
 .../META-INF/cxs/conditions/videoViewEventCondition.json  |  2 +-
 .../META-INF/cxs/conditions/hoverEventCondition.json      |  2 +-
 .../resources/META-INF/cxs/actions/sendMailAction.json    |  6 +++---
 .../cxs/actions/requestHeaderToProfilePropertyAction.json |  2 +-
 .../actions/requestParameterToProfilePropertyAction.json  |  2 +-
 .../META-INF/cxs/actions/setRemoteHostInfoAction.json     |  2 +-
 .../org/apache/unomi/rest/DefinitionsServiceEndPoint.java |  4 ++--
 .../META-INF/cxs/actions/trainingNotifAction.json         |  2 +-
 .../META-INF/cxs/actions/incrementTweetNumberAction.json  |  2 +-
 .../META-INF/cxs/properties/profiles/basic/firstName.json |  2 +-
 .../META-INF/cxs/properties/profiles/basic/gender.json    |  2 +-
 .../META-INF/cxs/properties/profiles/basic/lastName.json  |  2 +-
 .../cxs/properties/profiles/basic/nationality.json        |  2 +-
 .../META-INF/cxs/properties/profiles/contact/address.json |  2 +-
 .../META-INF/cxs/properties/profiles/contact/city.json    |  2 +-
 .../cxs/properties/profiles/contact/countryName.json      |  2 +-
 .../META-INF/cxs/properties/profiles/contact/email.json   |  2 +-
 .../cxs/properties/profiles/contact/phoneNumber.json      |  2 +-
 .../META-INF/cxs/properties/profiles/contact/zipCode.json |  2 +-
 .../cxs/properties/profiles/lead/leadAssignedTo.json      |  2 +-
 .../META-INF/cxs/properties/profiles/personal/age.json    |  2 +-
 .../cxs/properties/profiles/personal/birthDate.json       |  2 +-
 .../META-INF/cxs/properties/profiles/personal/kids.json   |  2 +-
 .../cxs/properties/profiles/personal/maritalStatus.json   |  2 +-
 .../cxs/properties/profiles/social/facebookId.json        |  2 +-
 .../META-INF/cxs/properties/profiles/social/googleid.json |  2 +-
 .../cxs/properties/profiles/social/linkedInId.json        |  2 +-
 .../cxs/properties/profiles/social/twitterId.json         |  2 +-
 .../cxs/properties/profiles/system/firstVisit.json        |  2 +-
 .../cxs/properties/profiles/system/lastVisit.json         |  2 +-
 .../cxs/properties/profiles/system/nbOfVisits.json        |  2 +-
 .../cxs/properties/profiles/system/previousVisit.json     |  2 +-
 .../META-INF/cxs/properties/profiles/work/company.json    |  2 +-
 .../META-INF/cxs/properties/profiles/work/income.json     |  2 +-
 .../META-INF/cxs/properties/profiles/work/jobTitle.json   |  2 +-
 .../cxs/properties/sessions/geographic/latitude.json      |  2 +-
 .../cxs/properties/sessions/geographic/longitude.json     |  2 +-
 .../sessions/geographic/sessionAdminSubDiv1.json          |  2 +-
 .../sessions/geographic/sessionAdminSubDiv2.json          |  2 +-
 .../cxs/properties/sessions/geographic/sessionCity.json   |  2 +-
 .../sessions/geographic/sessionCountryCode.json           |  2 +-
 .../sessions/geographic/sessionCountryName.json           |  2 +-
 .../cxs/properties/sessions/technical/deviceCategory.json |  2 +-
 .../sessions/technical/operatingSystemFamily.json         |  2 +-
 .../sessions/technical/operatingSystemName.json           |  2 +-
 .../properties/sessions/technical/pageReferringURL.json   |  2 +-
 .../cxs/properties/sessions/technical/remoteAddr.json     |  2 +-
 .../cxs/properties/sessions/technical/remoteHost.json     |  2 +-
 .../cxs/properties/sessions/technical/userAgentName.json  |  2 +-
 .../properties/sessions/technical/userAgentVersion.json   |  2 +-
 src/site/markdown/versions/1.1/concepts.md                |  2 +-
 src/site/markdown/versions/1.1/getting-started.md         |  2 +-
 src/site/markdown/versions/master/concepts.md             |  2 +-
 src/site/markdown/versions/master/custom-extensions.md    | 10 +++++-----
 src/site/markdown/versions/master/twitter-sample.md       |  2 +-
 92 files changed, 106 insertions(+), 106 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 ec4a531..b717d2e 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
@@ -3,10 +3,10 @@
     "id": "addToListsAction",
     "name": "addToListsAction",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "demographic",
-      "hidden.availableToEndUser"
+      "availableToEndUser"
     ],
     "readOnly": true
   },

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 f5b9bf5..eede8ba 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
@@ -3,10 +3,10 @@
     "id": "sfdcCreateOrUpdateLeadAction",
     "name": "sfdcCreateOrUpdateLeadAction",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "demographic",
-      "hidden.availableToEndUser"
+      "availableToEndUser"
     ],
     "readOnly": true
   },

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 f53501f..4ba1856 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
@@ -3,10 +3,10 @@
     "id": "sfdcUpdateProfileFromLeadAction",
     "name": "sfdcUpdateProfileFromLeadAction",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "demographic",
-      "hidden.availableToEndUser"
+      "availableToEndUser"
     ],
     "readOnly": true
   },

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/extensions/weather-update/core/src/main/resources/META-INF/cxs/actions/UpdateWeatherAction.json
----------------------------------------------------------------------
diff --git 
a/extensions/weather-update/core/src/main/resources/META-INF/cxs/actions/UpdateWeatherAction.json
 
b/extensions/weather-update/core/src/main/resources/META-INF/cxs/actions/UpdateWeatherAction.json
index 339291b..5ab40df 100755
--- 
a/extensions/weather-update/core/src/main/resources/META-INF/cxs/actions/UpdateWeatherAction.json
+++ 
b/extensions/weather-update/core/src/main/resources/META-INF/cxs/actions/UpdateWeatherAction.json
@@ -3,10 +3,10 @@
     "id": "weatherUpdateAction",
     "name": "Update session with local weather information",
     "description": "This action will retrieve the weather associated with the 
resolved location of the user (from his IP address)",
-    "tags": [
+    "systemTags": [
       "event",
-      "hidden.availableToEndUser",
-      "hidden.hasNoTemplate"
+      "availableToEndUser",
+      "hasNoTemplate"
     ],
     "readOnly": true
   },

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherLike.json
----------------------------------------------------------------------
diff --git 
a/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherLike.json
 
b/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherLike.json
index 5f9a5bf..ad23875 100755
--- 
a/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherLike.json
+++ 
b/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherLike.json
@@ -2,7 +2,7 @@
   "metadata": {
     "id": "weatherLike",
     "name": "Weather Description",
-    "tags": [
+    "systemTags": [
       "properties",
       "sessionProperties"
     ]

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherTemp.json
----------------------------------------------------------------------
diff --git 
a/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherTemp.json
 
b/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherTemp.json
index 11865d8..bae8ceb 100755
--- 
a/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherTemp.json
+++ 
b/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherTemp.json
@@ -2,7 +2,7 @@
   "metadata": {
     "id": "weatherTemperature",
     "name": "Weather Temperature",
-    "tags": [
+    "systemTags": [
       "properties",
       "sessionProperties"
     ]

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherWindDirection.json
----------------------------------------------------------------------
diff --git 
a/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherWindDirection.json
 
b/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherWindDirection.json
index 8e99d87..f0629dc 100755
--- 
a/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherWindDirection.json
+++ 
b/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherWindDirection.json
@@ -2,7 +2,7 @@
   "metadata": {
     "id": "weatherWindDirection",
     "name": "Weather Wind Direction",
-    "tags": [
+    "systemTags": [
       "properties",
       "sessionProperties"
     ]

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherWindSpeed.json
----------------------------------------------------------------------
diff --git 
a/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherWindSpeed.json
 
b/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherWindSpeed.json
index 422090d..4b668f5 100755
--- 
a/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherWindSpeed.json
+++ 
b/extensions/weather-update/core/src/main/resources/META-INF/cxs/properties/sessions/weather/weatherWindSpeed.json
@@ -2,7 +2,7 @@
   "metadata": {
     "id": "weatherWindSpeed",
     "name": "Weather Wind Speed",
-    "tags": [
+    "systemTags": [
       "properties",
       "sessionProperties"
     ]

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 869a287..35d4ade 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
@@ -3,7 +3,7 @@
     "id": "allEventToProfilePropertiesAction",
     "name": "allEventToProfilePropertiesAction",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event"
     ],

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 0ed9ebd..b26cde5 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
@@ -3,7 +3,7 @@
     "id": "evaluateProfileAgeAction",
     "name": "evaluateProfileAgeAction",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event"
     ],

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 188f547..8cf3947 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
@@ -3,7 +3,7 @@
     "id": "evaluateProfileSegmentsAction",
     "name": "evaluateProfileSegmentsAction",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event"
     ],

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 a3a045d..5db3059 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
@@ -3,7 +3,7 @@
     "id": "eventToProfilePropertyAction",
     "name": "eventToProfilePropertyAction",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event"
     ],

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 77d9969..6082f9f 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
@@ -3,7 +3,7 @@
     "id": "mergeProfilesOnPropertyAction",
     "name": "mergeProfilesOnPropertyAction",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "demographic"
     ],

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 d7a8d09..e10f1e4 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
@@ -3,7 +3,7 @@
     "id": "sendEventAction",
     "name": "sendEventAction",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event"
     ],

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 4bd77bb..3e10c92 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
@@ -3,7 +3,7 @@
     "id": "setEventOccurenceCountAction",
     "name": "setEventOccurenceCountAction",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "demographic"
     ],

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 25cf616..dad270d 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
@@ -3,11 +3,11 @@
     "id": "setPropertyAction",
     "name": "setPropertyAction",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "demographic",
-      "hidden.availableToEndUser",
-      "hidden.allowMultipleInstances"
+      "availableToEndUser",
+      "allowMultipleInstances"
     ],
     "readOnly": true
   },

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 a12a0dd..45464ab 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
@@ -3,7 +3,7 @@
     "id": "booleanCondition",
     "name": "booleanCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "logical",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 45482cc..024c3a3 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
@@ -3,7 +3,7 @@
     "id": "eventPropertyCondition",
     "name": "eventPropertyCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "demographic",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 0a104e4..161ff42 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
@@ -3,7 +3,7 @@
     "id": "eventTypeCondition",
     "name": "eventTypeCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 b1e4fff..8abaf09 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
@@ -3,7 +3,7 @@
     "id": "formEventCondition",
     "name": "formEventCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 cdc340d..809d690 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
@@ -3,7 +3,7 @@
     "id": "geoLocationByPointSessionCondition",
     "name": "geoLocationByPointSessionCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "geographic",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 c3206ae..693bb0e 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
@@ -3,7 +3,7 @@
     "id": "geoLocationSessionCondition",
     "name": "geoLocationSessionCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "geographic",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 8d9743b..4e4bf6f 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
@@ -3,7 +3,7 @@
     "id": "goalMatchCondition",
     "name": "goalMatchCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "condition",
       "profileCondition",
       "profileTags",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 b866e48..19fa065 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
@@ -3,7 +3,7 @@
     "id": "matchAllCondition",
     "name": "matchAllCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "logical",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 c90ce4f..aa8f667 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
@@ -3,7 +3,7 @@
     "id": "newVisitorCondition",
     "name": "newVisitorCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 3ab26b3..e030e62 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
@@ -3,7 +3,7 @@
     "id": "notCondition",
     "name": "notCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "logical",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 52c9d5e..71a87f3 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
@@ -3,7 +3,7 @@
     "id": "pastEventCondition",
     "name": "pastEventCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 06ae965..3506ca7 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
@@ -3,7 +3,7 @@
     "id": "profilePropertyCondition",
     "name": "profilePropertyCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "demographic",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 b1a40e1..3bd1e57 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
@@ -3,7 +3,7 @@
     "id": "profileSegmentCondition",
     "name": "profileSegmentCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "aggregated",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 7910a13..184ee5f 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
@@ -3,7 +3,7 @@
     "id": "profileUpdatedEventCondition",
     "name": "profileUpdatedEventCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 4891a5a..8744e12 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
@@ -3,7 +3,7 @@
     "id": "profileUserListCondition",
     "name": "profileUserListCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "aggregated",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 165ee4a..b475d1a 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
@@ -3,7 +3,7 @@
     "id": "returningVisitorCondition",
     "name": "returningVisitorCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 89c176f..a323d14 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
@@ -3,7 +3,7 @@
     "id": "scoringCondition",
     "name": "scoringCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "aggregated",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 fb43b88..2d49049 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
@@ -3,7 +3,7 @@
     "id": "sessionCreatedEventCondition",
     "name": "sessionCreatedEventCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 47b214b..0208ca5 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
@@ -3,7 +3,7 @@
     "id": "sessionDurationCondition",
     "name": "sessionDurationCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 c613839..b963b39 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
@@ -3,7 +3,7 @@
     "id": "sessionPropertyCondition",
     "name": "sessionPropertyCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 1aaf934..fb61dd2 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
@@ -3,7 +3,7 @@
     "id": "sourceEventPropertyCondition",
     "name": "sourceEventPropertyCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "condition",
       "sourceEventCondition"
     ],

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 8efc923..dad63bd 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
@@ -3,7 +3,7 @@
     "id": "videoViewEventCondition",
     "name": "videoViewEventCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 a205b9c..d67e690 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
@@ -3,7 +3,7 @@
     "id": "hoverEventCondition",
     "name": "hoverEventCondition",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event",
       "condition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 fd3c8e9..d7314b9 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
@@ -3,11 +3,11 @@
     "id": "sendMailAction",
     "name": "sendMailAction",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event",
-      "hidden.availableToEndUser",
-      "hidden.allowMultipleInstances"
+      "availableToEndUser",
+      "allowMultipleInstances"
     ],
     "readOnly": true
   },

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 3bd5d81..54d7b6f 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
@@ -3,7 +3,7 @@
     "id": "requestHeaderToProfilePropertyAction",
     "name": "requestHeaderToProfilePropertyAction",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event"
     ],

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 0288056..d151280 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
@@ -3,7 +3,7 @@
     "id": "requestParameterToProfilePropertyAction",
     "name": "requestParameterToProfilePropertyAction",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event"
     ],

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 09935f5..925f6ea 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
@@ -3,7 +3,7 @@
     "id": "setRemoteHostInfoAction",
     "name": "setRemoteHostInfoAction",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event"
     ],

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 577bde3..b2afa07 100644
--- a/rest/src/main/java/org/apache/unomi/rest/DefinitionsServiceEndPoint.java
+++ b/rest/src/main/java/org/apache/unomi/rest/DefinitionsServiceEndPoint.java
@@ -118,7 +118,7 @@ public class DefinitionsServiceEndPoint {
     @Path("/conditions/{conditionId}")
     public RESTConditionType getConditionType(@PathParam("conditionId") String 
id, @HeaderParam("Accept-Language") String language) {
         ConditionType conditionType = definitionsService.getConditionType(id);
-        return localizationHelper.generateCondition(conditionType, language);
+        return conditionType != null ? 
localizationHelper.generateCondition(conditionType, language) : null;
     }
 
     /**
@@ -203,7 +203,7 @@ public class DefinitionsServiceEndPoint {
     @Path("/actions/{actionId}")
     public RESTActionType getActionType(@PathParam("actionId") String id, 
@HeaderParam("Accept-Language") String language) {
         ActionType actionType = definitionsService.getActionType(id);
-        return localizationHelper.generateAction(actionType, language);
+        return actionType != null ? 
localizationHelper.generateAction(actionType, language) : null;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 a14a343..2f5b8f3 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
@@ -3,7 +3,7 @@
     "id": "trainingNotifAction",
     "name": "Training Action",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event"
     ],

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 81c468a..2420ed7 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
@@ -3,7 +3,7 @@
     "id": "incrementTweetNumberAction",
     "name": "incrementTweetNumberAction",
     "description": "",
-    "tags": [
+    "systemTags": [
       "profileTags",
       "event"
     ],

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 1104066..865f7f6 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "firstName",
         "name": "First name",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "basicProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 5a39b39..ec84eb6 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "gender",
         "name": "Gender",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "basicProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 b7aaa1c..e745550 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "lastName",
         "name": "Last name",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "basicProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 06fa815..6cc1070 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "nationality",
         "name": "Nationality",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "basicProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 4bab6c8..5b5799e 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "address",
         "name": "Address",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "contactProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 166baba..ec9966b 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "city",
         "name": "City",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "contactProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 1e34b94..ad50753 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "countryName",
         "name": "Country",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "contactProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 028eee3..662358c 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "email",
         "name": "Email",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "contactProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 3c40ff1..8b7a2bf 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "phoneNumber",
         "name": "Phone number",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "contactProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 ff1f676..3469042 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "zipCode",
         "name": "ZIP Code",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "contactProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 7d1f66d..46db4d9 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "leadAssignedTo",
         "name": "Assigned to",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "leadProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 cd0f03d..d0ef96e 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
@@ -2,7 +2,7 @@
   "metadata": {
     "id": "age",
     "name": "Age",
-    "tags": [
+    "systemTags": [
       "properties",
       "profileProperties",
       "personalProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 ef6dee5..c23a05a 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
@@ -2,7 +2,7 @@
   "metadata": {
     "id": "birthDate",
     "name": "Birth Date",
-    "tags": [
+    "systemTags": [
       "properties",
       "profileProperties",
       "personalProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 f422883..04d3f8a 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "kids",
         "name": "Kids",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "personalProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 774f8f5..6a3d4df 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "maritalStatus",
         "name": "Marital status",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "personalProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 5f912ee..157c4dd 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "facebookId",
         "name": "Facebook ID",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "socialProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 6b1806a..c0f0c12 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "googleId",
         "name": "Google ID",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "socialProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 d6b6ad6..c8ec497 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "linkedInId",
         "name": "LinkedIn ID",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "socialProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 a3789c6..f4a75b3 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "twitterId",
         "name": "Twitter ID",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "socialProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 058bcbe..3c04897 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "firstVisit",
         "name": "First visit",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "systemProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 d784f5c..96da5d8 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "lastVisit",
         "name": "Last visit",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "systemProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 5759e36..25180f1 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
@@ -2,7 +2,7 @@
     "metadata": {
       "id": "nbOfVisits",
       "name": "Number of visits",
-      "tags": [
+      "systemTags": [
         "properties",
         "profileProperties",
         "systemProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 4aa04a1..eb1287e 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
@@ -2,7 +2,7 @@
   "metadata": {
     "id": "previousVisit",
     "name": "Previous visit",
-    "tags": [
+    "systemTags": [
       "properties",
       "profileProperties",
       "systemProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 18a4ee2..201955f 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "company",
         "name": "Company",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "workProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 d9a88a0..109c1f9 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "income",
         "name": "Income",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "workProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 fc0ca15..b0173f5 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "jobTitle",
         "name": "Job Title",
-        "tags": [
+        "systemTags": [
             "properties",
             "profileProperties",
             "workProfileProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 0f72c88..b92fb70 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "latitude",
         "name": "Latitude",
-        "tags": [
+        "systemTags": [
             "properties",
             "sessionProperties",
             "geographicSessionProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 7cbcd7a..4cddffc 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "longitude",
         "name": "Longitude",
-        "tags": [
+        "systemTags": [
             "properties",
             "sessionProperties",
             "geographicSessionProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 c8939ce..eb85afb 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
@@ -2,7 +2,7 @@
   "metadata": {
     "id": "sessionAdminSubDiv1",
     "name": "State/Region/Province",
-    "tags": [
+    "systemTags": [
       "properties",
       "sessionProperties",
       "geographicSessionProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 bad2a10..20e999e 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
@@ -2,7 +2,7 @@
   "metadata": {
     "id": "sessionAdminSubDiv2",
     "name": "SubRegion/County",
-    "tags": [
+    "systemTags": [
       "properties",
       "sessionProperties",
       "geographicSessionProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 57632ca..7d1c33e 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "sessionCity",
         "name": "City",
-        "tags": [
+        "systemTags": [
             "properties",
             "sessionProperties",
             "geographicSessionProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 38e7680..e837ed1 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "sessionCountryCode",
         "name": "Country code",
-        "tags": [
+        "systemTags": [
             "properties",
             "sessionProperties",
             "geographicSessionProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 ff61cc0..3f2ac75 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "sessionCountryName",
         "name": "Country",
-        "tags": [
+        "systemTags": [
             "properties",
             "sessionProperties",
             "geographicSessionProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 706915f..faed07f 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "deviceCategory",
         "name": "Device category",
-        "tags": [
+        "systemTags": [
             "properties",
             "sessionProperties",
             "technicalSessionProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 bce7688..2e4f830 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "operatingSystemFamily",
         "name": "Operating system family",
-        "tags": [
+        "systemTags": [
             "properties",
             "sessionProperties",
             "technicalSessionProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 5d77863..9ccf424 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "operatingSystemName",
         "name": "Operating system name",
-        "tags": [
+        "systemTags": [
             "properties",
             "sessionProperties",
             "technicalSessionProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 378a97c..b351ff8 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "pageReferringURL",
         "name": "Previous page URL",
-        "tags": [
+        "systemTags": [
             "properties",
             "sessionProperties",
             "technicalSessionProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 8231c2f..c851caf 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "remoteAddr",
         "name": "Remote IP address",
-        "tags": [
+        "systemTags": [
             "properties",
             "sessionProperties",
             "technicalSessionProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 b33265e..f9cb4e0 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "remoteHost",
         "name": "Remote host address",
-        "tags": [
+        "systemTags": [
             "properties",
             "sessionProperties",
             "technicalSessionProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 1a2855d..2d4b79d 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "userAgentName",
         "name": "Browser user agent name",
-        "tags": [
+        "systemTags": [
             "properties",
             "sessionProperties",
             "technicalSessionProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 0675427..c131d71 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
@@ -2,7 +2,7 @@
     "metadata": {
         "id": "userAgentVersion",
         "name": "Browser user agent version",
-        "tags": [
+        "systemTags": [
             "properties",
             "sessionProperties",
             "technicalSessionProperties"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 4f4e7be..79cb748 100644
--- a/src/site/markdown/versions/1.1/concepts.md
+++ b/src/site/markdown/versions/1.1/concepts.md
@@ -51,7 +51,7 @@ Some types can be dynamically defined at runtime by calling 
to the REST API whil
     "metadata": {
         "id": "tweetNb",
         "name": "tweetNb",
-        "tags": ["social"]
+        "systemTags": ["social"]
     },
     "target": "profiles",
     "type": "integer"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/src/site/markdown/versions/1.1/getting-started.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/1.1/getting-started.md 
b/src/site/markdown/versions/1.1/getting-started.md
index 0f0e220..35aedc2 100644
--- a/src/site/markdown/versions/1.1/getting-started.md
+++ b/src/site/markdown/versions/1.1/getting-started.md
@@ -322,7 +322,7 @@ Let's now look at our custom 
[`incrementTweetNumberAction`](https://github.com/a
 {
   "id": "incrementTweetNumberAction",
   "actionExecutor": "incrementTweetNumber",
-  "tags": [
+  "systemTags": [
     "event"
   ],
   "parameters": []

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/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 8b33c89..13fe485 100644
--- a/src/site/markdown/versions/master/concepts.md
+++ b/src/site/markdown/versions/master/concepts.md
@@ -51,7 +51,7 @@ Some types can be dynamically defined at runtime by calling 
to the REST API whil
     "metadata": {
         "id": "tweetNb",
         "name": "tweetNb",
-        "tags": ["social"]
+        "systemTags": ["social"]
     },
     "target": "profiles",
     "type": "integer"

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/src/site/markdown/versions/master/custom-extensions.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/master/custom-extensions.md 
b/src/site/markdown/versions/master/custom-extensions.md
index e08cfca..43b3635 100644
--- a/src/site/markdown/versions/master/custom-extensions.md
+++ b/src/site/markdown/versions/master/custom-extensions.md
@@ -161,7 +161,7 @@ Here is an example of a property definition JSON file
         "metadata": {
             "id": "city",
             "name": "City",
-            "tags": ["properties", "profileProperties", 
"contactProfileProperties"]
+            "systemTags": ["properties", "profileProperties", 
"contactProfileProperties"]
         },
         "type": "string",
         "defaultValue": "",
@@ -184,7 +184,7 @@ type eventTypeCondition.
         "id": "profileUpdatedEventCondition",
         "name": "profileUpdatedEventCondition",
         "description": "",
-        "tags": [
+        "systemTags": [
           "event",
           "eventCondition"
         ],
@@ -262,9 +262,9 @@ Here is an example of a JSON action definition:
         "id": "addToListsAction",
         "name": "addToListsAction",
         "description": "",
-        "tags": [
+        "systemTags": [
           "demographic",
-          "hidden.availableToEndUser"
+          "availableToEndUser"
         ],
         "readOnly": true
       },
@@ -322,7 +322,7 @@ Here is an example of JSON custom condition definition:
         "id": "matchAllCondition",
         "name": "matchAllCondition",
         "description": "",
-        "tags": [
+        "systemTags": [
           "logical",
           "profileCondition",
           "eventCondition",

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6a4a7e60/src/site/markdown/versions/master/twitter-sample.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/master/twitter-sample.md 
b/src/site/markdown/versions/master/twitter-sample.md
index f4829df..cf80da2 100644
--- a/src/site/markdown/versions/master/twitter-sample.md
+++ b/src/site/markdown/versions/master/twitter-sample.md
@@ -299,7 +299,7 @@ Let's now look at our custom 
[`incrementTweetNumberAction`](https://github.com/a
 {
   "id": "incrementTweetNumberAction",
   "actionExecutor": "incrementTweetNumber",
-  "tags": [
+  "systemTags": [
     "event"
   ],
   "parameters": []


Reply via email to