You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2016/12/05 09:43:45 UTC
[2/4] incubator-unomi git commit: Merge remote-tracking branch
'origin/feature-UNOMI-28-ES2X' into feature-UNOMI-70-ES5X
Merge remote-tracking branch 'origin/feature-UNOMI-28-ES2X' into feature-UNOMI-70-ES5X
# Conflicts:
# api/pom.xml
# extensions/geonames/pom.xml
# extensions/geonames/rest/pom.xml
# extensions/geonames/services/pom.xml
# extensions/lists-extension/pom.xml
# extensions/lists-extension/rest/pom.xml
# extensions/lists-extension/services/pom.xml
# extensions/pom.xml
# extensions/privacy-extension/pom.xml
# extensions/privacy-extension/rest/pom.xml
# extensions/privacy-extension/services/pom.xml
# itests/pom.xml
# kar/pom.xml
# package/pom.xml
# performance-tests/pom.xml
# persistence-elasticsearch/core/pom.xml
# persistence-elasticsearch/plugins/pom.xml
# persistence-elasticsearch/plugins/security/pom.xml
# persistence-elasticsearch/pom.xml
# persistence-spi/pom.xml
# plugins/baseplugin/pom.xml
# plugins/hover-event/pom.xml
# plugins/mail/pom.xml
# plugins/optimization-test/pom.xml
# plugins/past-event/pom.xml
# plugins/pom.xml
# plugins/request/pom.xml
# plugins/tracked-event/pom.xml
# pom.xml
# rest/pom.xml
# samples/pom.xml
# samples/tweet-button-plugin/pom.xml
# services/pom.xml
# wab/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/90eb893c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/90eb893c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/90eb893c
Branch: refs/heads/feature-UNOMI-70-ES5X
Commit: 90eb893c747259cb1d44a32b4c2c4e2258bc6777
Parents: ff87e2f 2263da9
Author: Serge Huber <sh...@apache.org>
Authored: Mon Dec 5 10:00:32 2016 +0100
Committer: Serge Huber <sh...@apache.org>
Committed: Mon Dec 5 10:00:32 2016 +0100
----------------------------------------------------------------------
.../META-INF/cxs/mappings/geonameEntry.json | 2 +-
itests/pom.xml | 5 +-
.../java/org/apache/unomi/itests/AllTests.java | 11 +-
.../apache/unomi/itests/ProfileServiceTest.java | 53 +++
kar/src/main/feature/feature.xml | 12 +-
package/pom.xml | 53 ++-
persistence-elasticsearch/core/pom.xml | 202 +++------
.../ElasticSearchPersistenceServiceImpl.java | 423 ++++++++++++++++---
.../conditions/ConditionContextHelper.java | 4 +-
.../conditions/ConditionESQueryBuilder.java | 4 +-
.../ConditionESQueryBuilderDispatcher.java | 16 +-
.../META-INF/cxs/mappings/campaign.json | 4 +-
.../META-INF/cxs/mappings/campaignevent.json | 2 +-
.../resources/META-INF/cxs/mappings/event.json | 2 +-
.../META-INF/cxs/mappings/profile.json | 2 +-
.../META-INF/cxs/mappings/session.json | 4 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 13 +
.../core/src/main/resources/elasticsearch.yml | 381 +++--------------
...g.apache.unomi.persistence.elasticsearch.cfg | 10 +
.../plugin/security/SecurityPlugin.java | 14 +-
.../plugin/security/SecurityPluginModule.java | 3 +-
.../plugin/security/SecurityPluginService.java | 4 +-
.../BooleanConditionESQueryBuilder.java | 20 +-
...onByPointSessionConditionESQueryBuilder.java | 10 +-
.../MatchAllConditionESQueryBuilder.java | 8 +-
.../conditions/NotConditionESQueryBuilder.java | 8 +-
.../PastEventConditionESQueryBuilder.java | 8 +-
.../PropertyConditionESQueryBuilder.java | 63 +--
.../conditions/PropertyConditionEvaluator.java | 3 +-
...rceEventPropertyConditionESQueryBuilder.java | 27 +-
.../HoverEventConditionESQueryBuilder.java | 23 +-
pom.xml | 8 +-
.../services/services/SegmentServiceImpl.java | 22 +-
33 files changed, 727 insertions(+), 697 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/90eb893c/itests/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/90eb893c/package/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/90eb893c/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/90eb893c/pom.xml
----------------------------------------------------------------------