Merge pull request #3 from apache/master Fork update
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/b389232e Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/b389232e Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/b389232e Branch: refs/heads/1_0_1_rc Commit: b389232ec72544ad97cf2583f7ca14ef0d4cba40 Parents: 0b9f2c0 86c379e Author: Thomas Draier <[email protected]> Authored: Thu Apr 28 14:03:54 2016 +0200 Committer: Thomas Draier <[email protected]> Committed: Thu Apr 28 14:03:54 2016 +0200 ---------------------------------------------------------------------- README.md | 75 ++++++++++------- .../java/org/apache/unomi/api/PropertyType.java | 2 +- .../java/org/apache/unomi/api/query/Query.java | 2 +- .../unomi/api/services/ProfileService.java | 4 +- .../ElasticSearchPersistenceServiceImpl.java | 9 ++- .../resources/OSGI-INF/blueprint/blueprint.xml | 2 + ...g.apache.unomi.persistence.elasticsearch.cfg | 3 +- .../actions/IncrementInterestsValuesAction.java | 63 --------------- .../actions/incrementInterestValuesAction.json | 14 ---- .../cxs/conditions/downloadEventCondition.json | 43 ---------- .../cxs/conditions/loginEventCondition.json | 21 ----- .../cxs/conditions/pageViewEventCondition.json | 60 -------------- .../conditions/profileInterestCondition.json | 33 -------- .../META-INF/cxs/rules/advancedSearchForm.json | 34 -------- .../META-INF/cxs/rules/incrementInterests.json | 39 --------- .../resources/META-INF/cxs/rules/login.json | 37 --------- .../META-INF/cxs/rules/searchForm.json | 37 --------- .../META-INF/cxs/rules/sessionPageReferrer.json | 3 +- .../META-INF/cxs/rules/sessionReferrer.json | 3 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 7 -- .../unomi/rest/ProfileServiceEndPoint.java | 33 +++++--- .../actions/IncrementTweetNumberAction.java | 4 +- .../services/services/EventServiceImpl.java | 11 +-- .../services/services/ProfileServiceImpl.java | 85 ++++++++++---------- .../properties/profiles/basic/firstName.json | 2 +- .../cxs/properties/profiles/basic/gender.json | 2 +- .../cxs/properties/profiles/basic/lastName.json | 2 +- .../cxs/properties/profiles/contact/city.json | 2 +- .../cxs/properties/profiles/contact/email.json | 2 +- .../properties/profiles/personal/birthDate.json | 2 +- .../properties/profiles/social/facebookId.json | 2 +- .../properties/profiles/social/linkedInId.json | 2 +- .../properties/profiles/social/twitterId.json | 2 +- .../cxs/properties/profiles/work/income.json | 2 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 3 +- .../resources/org.apache.unomi.thirdparty.cfg | 12 ++- 36 files changed, 158 insertions(+), 501 deletions(-) ----------------------------------------------------------------------
