Merge remote-tracking branch 'origin/master' into UNOMI-28-ES-2-X-UPGRADE

# Conflicts:
#       
persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
#       
plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/BooleanConditionESQueryBuilder.java


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

Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE
Commit: 91c9c20bf427be8012163f10962c968d4f78a417
Parents: 3ebc65b f40318a
Author: Serge Huber <shu...@apache.org>
Authored: Wed Sep 14 17:44:45 2016 +0200
Committer: Serge Huber <shu...@apache.org>
Committed: Wed Sep 14 17:44:45 2016 +0200

----------------------------------------------------------------------
 .../org/apache/unomi/api/ContextResponse.java   |  18 ++
 .../java/org/apache/unomi/api/PropertyType.java |  16 +-
 .../unomi/api/segments/DependentMetadata.java   |  53 ++++
 .../unomi/api/services/PrivacyService.java      |   8 +-
 .../unomi/api/services/ProfileService.java      |  16 ++
 .../unomi/api/services/SegmentService.java      |  41 ++-
 .../META-INF/cxs/mappings/userList.json         |  44 ++-
 .../privacy/rest/PrivacyServiceEndPoint.java    |  19 +-
 extensions/privacy-extension/services/pom.xml   |  26 ++
 .../privacy/internal/PrivacyServiceImpl.java    |  63 +++--
 .../resources/OSGI-INF/blueprint/blueprint.xml  |  10 +-
 .../main/resources/org.apache.unomi.privacy.cfg |  18 ++
 kar/src/main/feature/feature.xml                |   1 +
 .../ElasticSearchPersistenceServiceImpl.java    |  34 ++-
 .../META-INF/cxs/mappings/scoring.json          |  62 +++++
 .../persistence/spi/PersistenceService.java     |   9 +-
 .../AllEventToProfilePropertiesAction.java      |  16 +-
 .../actions/EventToProfilePropertyAction.java   |  11 +-
 .../actions/MergeProfilesOnPropertyAction.java  |  32 ++-
 .../baseplugin/actions/SendEventAction.java     |   1 +
 .../baseplugin/actions/SetPropertyAction.java   |  13 +-
 .../cxs/conditions/goalMatchCondition.json      |   8 +-
 .../cxs/conditions/newVisitorCondition.json     |   2 +-
 .../conditions/returningVisitorCondition.json   |   2 +-
 .../cxs/conditions/scoringCondition.json        |  40 +++
 .../conditions/sessionDurationCondition.json    |   2 +-
 .../conditions/sessionPropertyCondition.json    |   2 +-
 .../resources/OSGI-INF/blueprint/blueprint.xml  |  11 +-
 .../unomi/rest/ProfileServiceEndPoint.java      |  23 +-
 .../unomi/rest/ScoringServiceEndPoint.java      |  29 +-
 .../unomi/rest/SegmentServiceEndPoint.java      |  23 +-
 .../services/services/EventServiceImpl.java     |   9 +-
 .../services/services/ProfileServiceImpl.java   |  98 ++++++-
 .../services/services/SegmentServiceImpl.java   | 266 ++++++++++++++++---
 .../org/apache/unomi/web/ContextServlet.java    | 155 ++++++-----
 .../unomi/web/EventsCollectorServlet.java       |  50 ++--
 36 files changed, 976 insertions(+), 255 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/91c9c20b/kar/src/main/feature/feature.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/91c9c20b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
----------------------------------------------------------------------
diff --cc 
persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
index f2242b4,9e59f63..34c0d9f
--- 
a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
+++ 
b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
@@@ -331,7 -280,9 +331,10 @@@ public class ElasticSearchPersistenceSe
  
                      internalCreateIndex(indexName, indexMappings);
                  } else {
 +                    logger.info("Found index {}, ElasticSearch started 
successfully.", indexName);
+                     for (Map.Entry<String, String> entry : 
mappings.entrySet()) {
+                         createMapping(entry.getKey(), entry.getValue());
+                     }
                  }
  
                  client.admin().indices().preparePutTemplate(indexName + 
"_monthlyindex")

Reply via email to