You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by dg...@apache.org on 2017/10/06 13:33:39 UTC
[15/15] incubator-unomi git commit: [jgitflow-maven-plugin]merging
'feature-UNOMI-117' into 'master'
[jgitflow-maven-plugin]merging 'feature-UNOMI-117' 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/abffc918
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/abffc918
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/abffc918
Branch: refs/heads/master
Commit: abffc918eafaab053620ba7713c3227216dbc9d1
Parents: 8baf626 6a01edc
Author: dgaillard <dg...@jahia.com>
Authored: Fri Oct 6 15:33:06 2017 +0200
Committer: dgaillard <dg...@jahia.com>
Committed: Fri Oct 6 15:33:06 2017 +0200
----------------------------------------------------------------------
.../main/java/org/apache/unomi/api/Item.java | 9 +
.../java/org/apache/unomi/api/Metadata.java | 29 ++-
.../java/org/apache/unomi/api/PropertyType.java | 49 ----
api/src/main/java/org/apache/unomi/api/Tag.java | 193 ----------------
.../java/org/apache/unomi/api/ValueType.java | 38 +--
.../unomi/api/services/DefinitionsService.java | 96 ++------
.../unomi/api/services/ProfileService.java | 32 ++-
.../META-INF/cxs/actions/addToLists.json | 5 +-
.../src/main/feature/feature.xml | 42 ++++
.../cxs/actions/sfdcCreateOrUpdateLead.json | 5 +-
.../cxs/actions/sfdcUpdateProfileFromLead.json | 5 +-
.../cxs/actions/UpdateWeatherAction.json | 6 +-
.../sessions/weather/weatherLike.json | 9 +-
.../sessions/weather/weatherTemp.json | 9 +-
.../sessions/weather/weatherWindDirection.json | 9 +-
.../sessions/weather/weatherWindSpeed.json | 9 +-
itests/pom.xml | 2 +-
kar/src/main/feature/feature.xml | 35 +--
performance-tests/pom.xml | 2 +-
.../src/test/scala/unomi/AdminScenario.scala | 8 +-
.../elasticsearch/ESCustomObjectMapper.java | 43 ++++
.../persistence/elasticsearch/ESItemMixIn.java | 30 +++
.../ElasticSearchPersistenceServiceImpl.java | 22 +-
.../allEventToProfilePropertiesAction.json | 3 +-
.../cxs/actions/evaluateProfileAgeAction.json | 3 +-
.../actions/evaluateProfileSegmentsAction.json | 3 +-
.../actions/eventToProfilePropertyAction.json | 3 +-
.../actions/mergeProfilesOnPropertyAction.json | 3 +-
.../META-INF/cxs/actions/sendEventAction.json | 3 +-
.../actions/setEventOccurenceCountAction.json | 3 +-
.../META-INF/cxs/actions/setPropertyAction.json | 7 +-
.../cxs/conditions/booleanCondition.json | 4 +-
.../cxs/conditions/eventPropertyCondition.json | 4 +-
.../cxs/conditions/eventTypeCondition.json | 4 +-
.../cxs/conditions/formEventCondition.json | 4 +-
.../geoLocationByPointSessionCondition.json | 4 +-
.../conditions/geoLocationSessionCondition.json | 4 +-
.../cxs/conditions/goalMatchCondition.json | 4 +-
.../cxs/conditions/matchAllCondition.json | 4 +-
.../cxs/conditions/newVisitorCondition.json | 4 +-
.../META-INF/cxs/conditions/notCondition.json | 4 +-
.../cxs/conditions/pastEventCondition.json | 4 +-
.../conditions/profilePropertyCondition.json | 4 +-
.../cxs/conditions/profileSegmentCondition.json | 4 +-
.../profileUpdatedEventCondition.json | 4 +-
.../conditions/profileUserListCondition.json | 4 +-
.../conditions/returningVisitorCondition.json | 4 +-
.../cxs/conditions/scoringCondition.json | 4 +-
.../sessionCreatedEventCondition.json | 4 +-
.../conditions/sessionDurationCondition.json | 4 +-
.../conditions/sessionPropertyCondition.json | 4 +-
.../sourceEventPropertyCondition.json | 3 +-
.../cxs/conditions/videoViewEventCondition.json | 4 +-
.../cxs/conditions/hoverEventCondition.json | 4 +-
.../META-INF/cxs/actions/sendMailAction.json | 7 +-
.../requestHeaderToProfilePropertyAction.json | 3 +-
...requestParameterToProfilePropertyAction.json | 3 +-
.../cxs/actions/setRemoteHostInfoAction.json | 3 +-
pom.xml | 1 +
.../unomi/rest/DefinitionsServiceEndPoint.java | 147 +++++-------
.../apache/unomi/rest/LocalizationHelper.java | 69 +-----
.../unomi/rest/ProfileServiceEndPoint.java | 85 +++++--
.../org/apache/unomi/rest/RESTActionType.java | 26 ++-
.../apache/unomi/rest/RESTConditionType.java | 29 ++-
.../java/org/apache/unomi/rest/RESTTag.java | 87 -------
.../org/apache/unomi/rest/RESTValueType.java | 8 +-
samples/trainingplugin/pom.xml | 4 +-
.../training/TrainedNotificationAction.java | 2 +-
.../cxs/actions/trainingNotifAction.json | 3 +-
.../actions/IncrementTweetNumberAction.java | 4 +-
.../cxs/actions/incrementTweetNumberAction.json | 3 +-
.../services/DefinitionsServiceImpl.java | 170 +++-----------
.../services/services/GoalsServiceImpl.java | 44 ----
.../services/services/ProfileServiceImpl.java | 44 ++--
.../services/services/RulesServiceImpl.java | 4 +-
.../properties/profiles/basic/firstName.json | 11 +-
.../cxs/properties/profiles/basic/gender.json | 11 +-
.../cxs/properties/profiles/basic/lastName.json | 11 +-
.../properties/profiles/basic/nationality.json | 11 +-
.../properties/profiles/contact/address.json | 19 +-
.../cxs/properties/profiles/contact/city.json | 11 +-
.../profiles/contact/countryName.json | 11 +-
.../cxs/properties/profiles/contact/email.json | 11 +-
.../profiles/contact/phoneNumber.json | 11 +-
.../properties/profiles/contact/zipCode.json | 11 +-
.../profiles/lead/leadAssignedTo.json | 11 +-
.../cxs/properties/profiles/personal/age.json | 8 +-
.../properties/profiles/personal/birthDate.json | 8 +-
.../cxs/properties/profiles/personal/kids.json | 11 +-
.../profiles/personal/maritalStatus.json | 11 +-
.../properties/profiles/social/facebookId.json | 11 +-
.../properties/profiles/social/googleid.json | 11 +-
.../properties/profiles/social/linkedInId.json | 11 +-
.../properties/profiles/social/twitterId.json | 11 +-
.../properties/profiles/system/firstVisit.json | 11 +-
.../properties/profiles/system/lastVisit.json | 11 +-
.../properties/profiles/system/nbOfVisits.json | 11 +-
.../profiles/system/previousVisit.json | 11 +-
.../cxs/properties/profiles/work/company.json | 11 +-
.../cxs/properties/profiles/work/income.json | 11 +-
.../cxs/properties/profiles/work/jobTitle.json | 11 +-
.../sessions/geographic/latitude.json | 11 +-
.../sessions/geographic/longitude.json | 11 +-
.../geographic/sessionAdminSubDiv1.json | 11 +-
.../geographic/sessionAdminSubDiv2.json | 11 +-
.../sessions/geographic/sessionCity.json | 11 +-
.../sessions/geographic/sessionCountryCode.json | 11 +-
.../sessions/geographic/sessionCountryName.json | 11 +-
.../sessions/technical/deviceCategory.json | 11 +-
.../technical/operatingSystemFamily.json | 11 +-
.../sessions/technical/operatingSystemName.json | 11 +-
.../sessions/technical/pageReferringURL.json | 11 +-
.../sessions/technical/remoteAddr.json | 11 +-
.../sessions/technical/remoteHost.json | 11 +-
.../sessions/technical/userAgentName.json | 11 +-
.../sessions/technical/userAgentVersion.json | 11 +-
.../resources/META-INF/cxs/tags/aggregated.json | 4 -
.../META-INF/cxs/tags/autocompleted.json | 4 -
.../META-INF/cxs/tags/campaign/campaign.json | 4 -
.../cxs/tags/campaign/landingCampaign.json | 4 -
.../cxs/tags/campaign/parameterCampaign.json | 4 -
.../cxs/tags/campaign/referrerCampaign.json | 4 -
.../META-INF/cxs/tags/conditions/condition.json | 4 -
.../cxs/tags/conditions/eventCondition.json | 4 -
.../cxs/tags/conditions/profileCondition.json | 4 -
.../cxs/tags/conditions/sessionCondition.json | 4 -
.../tags/conditions/sourceEventCondition.json | 4 -
.../cxs/tags/conditions/trackedCondition.json | 4 -
.../conditions/usableInPastEventCondition.json | 4 -
.../META-INF/cxs/tags/demographic.json | 4 -
.../main/resources/META-INF/cxs/tags/event.json | 4 -
.../resources/META-INF/cxs/tags/geographic.json | 4 -
.../META-INF/cxs/tags/goals/downloadGoal.json | 4 -
.../META-INF/cxs/tags/goals/formGoal.json | 4 -
.../META-INF/cxs/tags/goals/funnelGoal.json | 4 -
.../resources/META-INF/cxs/tags/goals/goal.json | 4 -
.../cxs/tags/goals/landingPageGoal.json | 4 -
.../META-INF/cxs/tags/goals/pageVisitGoal.json | 4 -
.../META-INF/cxs/tags/goals/videoGoal.json | 4 -
.../resources/META-INF/cxs/tags/logical.json | 4 -
.../META-INF/cxs/tags/profileTags.json | 4 -
.../profiles/basicProfileProperties.json | 6 -
.../profiles/contactProfileProperties.json | 5 -
.../profiles/leadProfileProperties.json | 6 -
.../profiles/personalProfileProperties.json | 5 -
.../properties/profiles/profileProperties.json | 4 -
.../profiles/socialProfileProperties.json | 6 -
.../profiles/systemProfileProperties.json | 6 -
.../profiles/workProfileProperties.json | 5 -
.../cxs/tags/properties/properties.json | 4 -
.../sessions/geographicSessionProperties.json | 5 -
.../properties/sessions/sessionProperties.json | 4 -
.../sessions/technicalSessionProperties.json | 5 -
.../main/resources/META-INF/cxs/tags/root.json | 4 -
.../cxs/tags/rules/formMappingRule.json | 4 -
src/site/markdown/versions/1.1/concepts.md | 8 +-
.../markdown/versions/1.1/getting-started.md | 2 +-
src/site/markdown/versions/master/concepts.md | 8 +-
.../versions/master/custom-extensions.md | 21 +-
.../markdown/versions/master/login-sample.md | 2 +-
.../markdown/versions/master/twitter-sample.md | 2 +-
tools/pom.xml | 36 +++
tools/shell-commands/pom.xml | 106 +++++++++
.../org/apache/unomi/shell/actions/Start.java | 37 +++
.../org/apache/unomi/shell/actions/Stop.java | 37 +++
.../org/apache/unomi/shell/actions/Version.java | 29 +++
.../apache/unomi/shell/migration/Migration.java | 50 ++++
.../unomi/shell/migration/actions/Migrate.java | 80 +++++++
.../shell/migration/impl/MigrationTo130.java | 230 +++++++++++++++++++
.../shell/migration/utils/ConsoleUtils.java | 82 +++++++
.../unomi/shell/migration/utils/HttpUtils.java | 163 +++++++++++++
.../shell/migration/utils/MigrationUtils.java | 47 ++++
.../shell/services/UnomiManagementService.java | 38 +++
.../internal/UnomiManagementServiceImpl.java | 88 +++++++
.../resources/OSGI-INF/blueprint/blueprint.xml | 83 +++++++
175 files changed, 2097 insertions(+), 1226 deletions(-)
----------------------------------------------------------------------