You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by am...@apache.org on 2017/11/03 14:41:46 UTC
[2/3] incubator-unomi git commit: Merge remote-tracking branch
'upstream/master'
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/edf38686
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/edf38686
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/edf38686
Branch: refs/heads/master
Commit: edf386866bc35282b6f0a57046f39eac39764e5b
Parents: d04794c adbb62a
Author: Dinesh <di...@ynov.com>
Authored: Thu Nov 2 09:40:14 2017 +0100
Committer: Dinesh <di...@ynov.com>
Committed: Thu Nov 2 09:40:14 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/unomi/api/Consent.java | 72 ++++++++++
.../java/org/apache/unomi/api/ConsentGrant.java | 22 +++
.../org/apache/unomi/api/ContextResponse.java | 23 ++++
.../main/java/org/apache/unomi/api/Profile.java | 48 ++++++-
.../router/api/ImportExportConfiguration.java | 20 ---
.../ImportExportConfigurationService.java | 1 +
.../src/main/feature/feature.xml | 3 -
.../java/org/apache/unomi/itests/AllITs.java | 2 +-
.../apache/unomi/itests/ProfileExportIT.java | 19 +--
.../unomi/itests/ProfileImportActorsIT.java | 15 +-
.../unomi/itests/ProfileImportBasicIT.java | 3 +-
.../unomi/itests/ProfileImportRankingIT.java | 15 +-
.../itests/ProfileImportSurfersDeleteIT.java | 25 +---
.../unomi/itests/ProfileImportSurfersIT.java | 15 +-
.../itests/ProfileImportSurfersOverwriteIT.java | 15 +-
.../itests/ProfilePropertiesUpdateActionIT.java | 114 ---------------
.../unomi/itests/PropertiesUpdateActionIT.java | 114 +++++++++++++++
.../actions/ModifyConsentsAction.java | 67 +++++++++
.../baseplugin/actions/SetPropertyAction.java | 8 +-
.../actions/UpdateProfilePropertiesAction.java | 125 -----------------
.../actions/UpdatePropertiesAction.java | 138 +++++++++++++++++++
.../cxs/actions/modifyConsentsAction.json | 16 +++
.../actions/updateProfilePropertiesAction.json | 16 ---
.../cxs/actions/updatePropertiesAction.json | 16 +++
.../modifyConsentsEventCondition.json | 23 ++++
.../updateProfilePropertiesEventCondition.json | 6 +-
.../cxs/rules/updateProfileProperties.json | 23 ----
.../META-INF/cxs/rules/updateProperties.json | 23 ++++
.../resources/OSGI-INF/blueprint/blueprint.xml | 12 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 2 +-
.../resources/org.apache.unomi.thirdparty.cfg | 6 +-
.../markdown/versions/master/configuration.md | 2 +-
tools/shell-commands/pom.xml | 4 +-
.../org/apache/unomi/web/ContextServlet.java | 1 +
34 files changed, 594 insertions(+), 420 deletions(-)
----------------------------------------------------------------------