[jgitflow-maven-plugin]merging 'feature-UNOMI-70-ES5X' into '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/b1c88c4c Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/b1c88c4c Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/b1c88c4c
Branch: refs/heads/master Commit: b1c88c4c4c7ba91090a496e8b9f2aa7ec1ecaa61 Parents: a4955ca 544d2d4 Author: Serge Huber <[email protected]> Authored: Mon Jan 9 17:11:30 2017 +0100 Committer: Serge Huber <[email protected]> Committed: Mon Jan 9 17:11:30 2017 +0100 ---------------------------------------------------------------------- .gitignore | 3 + README.md | 71 +- .../java/org/apache/unomi/api/PartialList.java | 25 + .../apache/unomi/api/conditions/Condition.java | 10 + .../unomi/api/services/ClusterService.java | 1 - buildAndRunNoTests.sh | 42 + extensions/geonames/rest/pom.xml | 5 - .../unomi/geonames/services/GeonameEntry.java | 4 +- .../geonames/services/GeonamesServiceImpl.java | 101 +- .../META-INF/cxs/mappings/geonameEntry.json | 62 +- extensions/lists-extension/rest/pom.xml | 5 - .../META-INF/cxs/mappings/userList.json | 36 - extensions/privacy-extension/rest/pom.xml | 5 - itests/pom.xml | 55 +- .../java/org/apache/unomi/itests/AllITs.java | 38 + .../java/org/apache/unomi/itests/AllTests.java | 37 - .../java/org/apache/unomi/itests/BaseIT.java | 108 + .../java/org/apache/unomi/itests/BaseTest.java | 100 - .../java/org/apache/unomi/itests/BasicIT.java | 99 + .../java/org/apache/unomi/itests/BasicTest.java | 99 - .../unomi/itests/ConditionESQueryBuilderIT.java | 59 + .../itests/ConditionESQueryBuilderTest.java | 59 - .../unomi/itests/ConditionEvaluatorIT.java | 178 + .../unomi/itests/ConditionEvaluatorTest.java | 178 - .../apache/unomi/itests/ProfileServiceIT.java | 53 + .../java/org/apache/unomi/itests/SegmentIT.java | 48 + .../org/apache/unomi/itests/SegmentTest.java | 48 - kar/pom.xml | 31 +- kar/src/main/feature/feature.xml | 18 +- package/pom.xml | 51 +- package/src/main/resources/bin/setenv | 2 - package/src/main/resources/bin/setenv.bat | 1 - persistence-elasticsearch/core/pom.xml | 256 +- .../ElasticSearchPersistenceServiceImpl.java | 1002 +++-- .../conditions/ConditionContextHelper.java | 35 +- .../conditions/ConditionESQueryBuilder.java | 4 +- .../ConditionESQueryBuilderDispatcher.java | 42 +- .../ConditionEvaluatorDispatcher.java | 24 +- .../META-INF/cxs/mappings/_default_.json | 22 + .../META-INF/cxs/mappings/actionType.json | 16 - .../META-INF/cxs/mappings/campaign.json | 58 +- .../META-INF/cxs/mappings/campaignevent.json | 51 +- .../META-INF/cxs/mappings/conditionType.json | 16 - .../resources/META-INF/cxs/mappings/event.json | 39 +- .../resources/META-INF/cxs/mappings/goal.json | 45 +- .../META-INF/cxs/mappings/persona.json | 16 - .../META-INF/cxs/mappings/personaSession.json | 27 +- .../META-INF/cxs/mappings/profile.json | 39 +- .../META-INF/cxs/mappings/propertyType.json | 68 - .../resources/META-INF/cxs/mappings/rule.json | 36 - .../META-INF/cxs/mappings/scoring.json | 41 +- .../META-INF/cxs/mappings/segment.json | 38 +- .../META-INF/cxs/mappings/session.json | 40 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 53 +- .../core/src/main/resources/elasticsearch.yml | 379 -- .../core/src/main/resources/log4j2.xml | 29 + .../src/main/resources/mapping-FoldToASCII.txt | 3813 ++++++++++++++++++ ...g.apache.unomi.persistence.elasticsearch.cfg | 17 +- .../plugin/security/SecurityPlugin.java | 38 +- .../plugin/security/SecurityPluginModule.java | 3 +- .../plugin/security/SecurityPluginService.java | 11 +- .../persistence/spi/PersistenceService.java | 77 +- .../BooleanConditionESQueryBuilder.java | 34 +- ...onByPointSessionConditionESQueryBuilder.java | 16 +- .../MatchAllConditionESQueryBuilder.java | 8 +- .../conditions/NotConditionESQueryBuilder.java | 8 +- .../PastEventConditionESQueryBuilder.java | 8 +- .../PropertyConditionESQueryBuilder.java | 66 +- .../conditions/PropertyConditionEvaluator.java | 12 +- ...rceEventPropertyConditionESQueryBuilder.java | 27 +- .../HoverEventConditionESQueryBuilder.java | 23 +- pom.xml | 46 +- rest/pom.xml | 5 - services/pom.xml | 32 +- .../actions/ActionExecutorDispatcher.java | 24 +- .../services/services/ClusterServiceImpl.java | 304 ++ .../services/services/GoalsServiceImpl.java | 13 +- .../services/services/RulesServiceImpl.java | 37 +- .../services/services/SegmentServiceImpl.java | 99 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 55 +- services/src/main/resources/hazelcast.xml | 219 + .../main/resources/org.apache.unomi.cluster.cfg | 20 + .../resources/org.apache.unomi.services.cfg | 6 +- src/site/markdown/clustering.md | 32 +- src/site/markdown/configuration.md | 27 +- 85 files changed, 6551 insertions(+), 2537 deletions(-) ----------------------------------------------------------------------
