You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2017/01/09 16:21:38 UTC
[04/50] [abbrv] incubator-unomi git commit: Merge branch
'UNOMI-28-ES-2-X-UPGRADE' into feature-UNOMI-28-ES2X
Merge branch 'UNOMI-28-ES-2-X-UPGRADE' into feature-UNOMI-28-ES2X
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/73efe571
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/73efe571
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/73efe571
Branch: refs/heads/master
Commit: 73efe571cd8aa289dedc5cad1426c32b22e0c56e
Parents: 9493c70 ca1462d
Author: Serge Huber <sh...@apache.org>
Authored: Wed Nov 16 14:32:57 2016 +0100
Committer: Serge Huber <sh...@apache.org>
Committed: Wed Nov 16 14:32:57 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 | 344 ++++++++++++++---
.../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 | 6 +
.../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 | 51 +--
.../conditions/PropertyConditionEvaluator.java | 3 +-
...rceEventPropertyConditionESQueryBuilder.java | 27 +-
.../HoverEventConditionESQueryBuilder.java | 23 +-
pom.xml | 8 +-
.../services/services/SegmentServiceImpl.java | 8 +-
33 files changed, 629 insertions(+), 686 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/73efe571/itests/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/73efe571/package/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/73efe571/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/73efe571/pom.xml
----------------------------------------------------------------------