Merge pull request #2 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/0b9f2c01 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/0b9f2c01 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/0b9f2c01 Branch: refs/heads/1_0_1_rc Commit: 0b9f2c01dec3ae23eb6bc01eaa3d4a503f405cd3 Parents: d8c6208 79198c4 Author: Thomas Draier <[email protected]> Authored: Mon Apr 25 09:39:34 2016 +0200 Committer: Thomas Draier <[email protected]> Committed: Mon Apr 25 09:39:34 2016 +0200 ---------------------------------------------------------------------- BUILDING | 54 + DISCLAIMER | 10 + KEYS | 46 + NOTICE | 1118 +----------------- NOTICE.template | 2 +- README.md | 34 +- .../org/apache/unomi/api/actions/Action.java | 2 +- .../apache/unomi/api/actions/ActionType.java | 126 +- .../apache/unomi/api/conditions/Condition.java | 2 +- .../unomi/api/conditions/ConditionType.java | 147 +-- .../conditions/initializers/I18nSupport.java | 27 - .../unomi/api/services/DefinitionsService.java | 28 + .../apache/unomi/api/services/EventService.java | 14 + buildAndRun.sh | 2 +- generate-package.sh | 2 +- itests/pom.xml | 8 +- kar/src/main/feature/feature.xml | 1 + package/pom.xml | 49 +- package/src/main/descriptors/src.xml | 15 +- package/src/main/resources/LICENSE | 704 +++++++++++ package/src/main/resources/NOTICE | 995 ++++++++++++++++ .../lib/sigar/libsigar-amd64-freebsd-6.so | Bin 210641 -> 0 bytes .../resources/lib/sigar/libsigar-amd64-linux.so | Bin 246605 -> 0 bytes .../lib/sigar/libsigar-amd64-solaris.so | Bin 251360 -> 0 bytes .../resources/lib/sigar/libsigar-ia64-linux.so | Bin 494929 -> 0 bytes .../lib/sigar/libsigar-sparc-solaris.so | Bin 285004 -> 0 bytes .../lib/sigar/libsigar-sparc64-solaris.so | Bin 261896 -> 0 bytes .../lib/sigar/libsigar-universal-macosx.dylib | Bin 377668 -> 0 bytes .../lib/sigar/libsigar-universal64-macosx.dylib | Bin 397440 -> 0 bytes .../lib/sigar/libsigar-x86-freebsd-5.so | Bin 179751 -> 0 bytes .../lib/sigar/libsigar-x86-freebsd-6.so | Bin 179379 -> 0 bytes .../resources/lib/sigar/libsigar-x86-linux.so | Bin 233385 -> 0 bytes .../resources/lib/sigar/libsigar-x86-solaris.so | Bin 242880 -> 0 bytes .../resources/lib/sigar/sigar-amd64-winnt.dll | Bin 402432 -> 0 bytes .../resources/lib/sigar/sigar-x86-winnt.dll | Bin 266240 -> 0 bytes .../resources/lib/sigar/sigar-x86-winnt.lib | Bin 99584 -> 0 bytes performance-tests/pom.xml | 4 +- .../ElasticSearchPersistenceServiceImpl.java | 8 +- .../META-INF/cxs/mappings/actionType.json | 16 + .../META-INF/cxs/mappings/campaign.json | 71 +- .../META-INF/cxs/mappings/campaignevent.json | 63 +- .../META-INF/cxs/mappings/conditionType.json | 16 + .../resources/META-INF/cxs/mappings/event.json | 62 +- .../resources/META-INF/cxs/mappings/goal.json | 76 +- .../META-INF/cxs/mappings/persona.json | 28 +- .../META-INF/cxs/mappings/personaSession.json | 52 +- .../META-INF/cxs/mappings/profile.json | 52 +- .../META-INF/cxs/mappings/propertyType.json | 123 +- .../resources/META-INF/cxs/mappings/rule.json | 79 +- .../META-INF/cxs/mappings/segment.json | 70 +- .../META-INF/cxs/mappings/session.json | 79 +- persistence-elasticsearch/pom.xml | 1 - .../persistence/spi/CustomObjectMapper.java | 30 +- .../actions/MergeProfilesOnPropertyAction.java | 157 ++- .../PastEventConditionESQueryBuilder.java | 3 +- .../conditions/PastEventConditionEvaluator.java | 3 +- .../allEventToProfilePropertiesAction.json | 15 +- .../cxs/actions/evaluateProfileAgeAction.json | 15 +- .../actions/evaluateProfileSegmentsAction.json | 15 +- .../actions/eventToProfilePropertyAction.json | 39 +- .../actions/incrementInterestValuesAction.json | 16 +- .../actions/mergeProfilesOnPropertyAction.json | 27 +- .../META-INF/cxs/actions/sendEventAction.json | 35 +- .../actions/setEventOccurenceCountAction.json | 25 +- .../META-INF/cxs/actions/setPropertyAction.json | 65 +- .../cxs/conditions/booleanCondition.json | 43 +- .../cxs/conditions/downloadEventCondition.json | 66 +- .../cxs/conditions/eventPropertyCondition.json | 123 +- .../cxs/conditions/eventTypeCondition.json | 42 +- .../cxs/conditions/formEventCondition.json | 21 +- .../geoLocationByPointSessionCondition.json | 99 +- .../conditions/geoLocationSessionCondition.json | 40 +- .../cxs/conditions/goalMatchCondition.json | 41 +- .../cxs/conditions/loginEventCondition.json | 27 +- .../cxs/conditions/matchAllCondition.json | 22 +- .../cxs/conditions/newVisitorCondition.json | 19 +- .../META-INF/cxs/conditions/notCondition.json | 16 +- .../cxs/conditions/pageViewEventCondition.json | 93 +- .../cxs/conditions/pastEventCondition.json | 59 +- .../conditions/profileInterestCondition.json | 49 +- .../conditions/profilePropertyCondition.json | 120 +- .../cxs/conditions/profileSegmentCondition.json | 51 +- .../profileUpdatedEventCondition.json | 27 +- .../conditions/returningVisitorCondition.json | 18 +- .../sessionCreatedEventCondition.json | 26 +- .../conditions/sessionDurationCondition.json | 55 +- .../conditions/sessionPropertyCondition.json | 120 +- .../sourceEventPropertyCondition.json | 58 +- .../cxs/conditions/videoViewEventCondition.json | 21 +- .../resources/META-INF/cxs/rules/login.json | 9 +- .../META-INF/cxs/rules/newSession.json | 24 - .../META-INF/cxs/rules/sessionAssigned.json | 59 + .../cxs/conditions/hoverEventCondition.json | 37 +- .../META-INF/cxs/actions/sendMailAction.json | 78 +- .../requestHeaderToProfilePropertyAction.json | 57 +- ...requestParameterToProfilePropertyAction.json | 57 +- .../cxs/actions/setRemoteHostInfoAction.json | 15 +- pom.xml | 19 + release-audit.sh | 2 +- rest/pom.xml | 6 +- .../unomi/rest/DefinitionsServiceEndPoint.java | 44 + .../apache/unomi/rest/LocalizationHelper.java | 53 +- samples/pom.xml | 17 + samples/tweet-button-plugin/README.md | 16 + samples/tweet-button-plugin/pom.xml | 10 +- .../actions/IncrementTweetNumberAction.java | 31 +- .../cxs/actions/incrementTweetNumberAction.json | 13 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 33 +- .../src/main/resources/messages_en.properties | 16 + services/pom.xml | 7 + ...ComparisonOperatorChoiceListInitializer.java | 3 +- .../EventTypeIdChoiceListInitializer.java | 3 +- .../services/DefinitionsServiceImpl.java | 142 ++- .../services/services/EventServiceImpl.java | 71 +- .../services/services/GoalsServiceImpl.java | 26 - .../services/services/ProfileServiceImpl.java | 25 +- .../services/services/RulesServiceImpl.java | 61 +- .../services/services/SegmentServiceImpl.java | 42 +- .../services/services/ThirdPartyServer.java | 67 ++ .../cxs/properties/profiles/personal/age.json | 10 +- .../properties/profiles/personal/birthDate.json | 12 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 15 +- .../resources/org.apache.unomi.thirdparty.cfg | 20 + src/site/markdown/building-and-deploying.md | 4 +- src/site/markdown/download.md | 30 + src/site/markdown/getting-started.md | 84 +- src/site/markdown/index.md | 9 +- src/site/markdown/license.md | 30 + src/site/site.xml | 11 +- update-notice.sh | 2 +- .../org/apache/unomi/web/ContextServlet.java | 24 +- .../unomi/web/EventsCollectorServlet.java | 13 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 1 + wab/src/main/webapp/index.html | 45 +- 134 files changed, 4462 insertions(+), 2778 deletions(-) ----------------------------------------------------------------------
