Repository: incubator-unomi Updated Branches: refs/heads/unomi-1.3.x c06620437 -> d5d845046
UNOMI-186 clean markdown documentation Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/d5d84504 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/d5d84504 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/d5d84504 Branch: refs/heads/unomi-1.3.x Commit: d5d845046ac3e4778dd4e3805a4d9bff4d7bb19a Parents: c066204 Author: dgaillard <[email protected]> Authored: Fri Jun 29 11:29:33 2018 +0200 Committer: dgaillard <[email protected]> Committed: Fri Jun 29 11:29:33 2018 +0200 ---------------------------------------------------------------------- src/site/markdown/versions/1.1/building-and-deploying.md | 4 ++-- src/site/markdown/versions/1.1/concepts.md | 2 +- src/site/markdown/versions/1.1/getting-started.md | 2 +- src/site/markdown/versions/1.2/building-and-deploying.md | 4 ++-- src/site/markdown/versions/master/building-and-deploying.md | 4 ++-- src/site/markdown/versions/master/concepts.md | 3 +-- src/site/markdown/versions/master/twitter-sample.md | 2 +- 7 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/d5d84504/src/site/markdown/versions/1.1/building-and-deploying.md ---------------------------------------------------------------------- diff --git a/src/site/markdown/versions/1.1/building-and-deploying.md b/src/site/markdown/versions/1.1/building-and-deploying.md index 6b3c525..7d39902 100644 --- a/src/site/markdown/versions/1.1/building-and-deploying.md +++ b/src/site/markdown/versions/1.1/building-and-deploying.md @@ -38,11 +38,11 @@ Simply uncompress the `package/target/unomi-VERSION.tar.gz` (for Linux or Mac OS You can then start the server simply by using the command on UNIX/Linux/MacOS X : - ./bin/karaf start + ./bin/karaf or on Windows shell : - bin\karaf.bat start + bin\karaf.bat Deploying into an existing Karaf server http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/d5d84504/src/site/markdown/versions/1.1/concepts.md ---------------------------------------------------------------------- diff --git a/src/site/markdown/versions/1.1/concepts.md b/src/site/markdown/versions/1.1/concepts.md index 79cb748..4f4e7be 100644 --- a/src/site/markdown/versions/1.1/concepts.md +++ b/src/site/markdown/versions/1.1/concepts.md @@ -51,7 +51,7 @@ Some types can be dynamically defined at runtime by calling to the REST API whil "metadata": { "id": "tweetNb", "name": "tweetNb", - "systemTags": ["social"] + "tags": ["social"] }, "target": "profiles", "type": "integer" http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/d5d84504/src/site/markdown/versions/1.1/getting-started.md ---------------------------------------------------------------------- diff --git a/src/site/markdown/versions/1.1/getting-started.md b/src/site/markdown/versions/1.1/getting-started.md index 6303c78..809a75b 100644 --- a/src/site/markdown/versions/1.1/getting-started.md +++ b/src/site/markdown/versions/1.1/getting-started.md @@ -322,7 +322,7 @@ Let's now look at our custom [`incrementTweetNumberAction`](https://github.com/a { "id": "incrementTweetNumberAction", "actionExecutor": "incrementTweetNumber", - "systemTags": [ + "tags": [ "event" ], "parameters": [] http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/d5d84504/src/site/markdown/versions/1.2/building-and-deploying.md ---------------------------------------------------------------------- diff --git a/src/site/markdown/versions/1.2/building-and-deploying.md b/src/site/markdown/versions/1.2/building-and-deploying.md index f5a2fb2..253fd0b 100644 --- a/src/site/markdown/versions/1.2/building-and-deploying.md +++ b/src/site/markdown/versions/1.2/building-and-deploying.md @@ -86,11 +86,11 @@ Simply uncompress the package/target/unomi-VERSION.tar.gz (for Linux or Mac OS X You can then start the server simply by using the command on UNIX/Linux/MacOS X : - ./bin/karaf start + ./bin/karaf or on Windows shell : - bin\karaf.bat start + bin\karaf.bat Deploying into an existing Karaf server http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/d5d84504/src/site/markdown/versions/master/building-and-deploying.md ---------------------------------------------------------------------- diff --git a/src/site/markdown/versions/master/building-and-deploying.md b/src/site/markdown/versions/master/building-and-deploying.md index a62bccd..042201b 100644 --- a/src/site/markdown/versions/master/building-and-deploying.md +++ b/src/site/markdown/versions/master/building-and-deploying.md @@ -86,11 +86,11 @@ Simply uncompress the package/target/unomi-VERSION.tar.gz (for Linux or Mac OS X You can then start the server simply by using the command on UNIX/Linux/MacOS X : - ./bin/karaf start + ./bin/karaf or on Windows shell : - bin\karaf.bat start + bin\karaf.bat You will then need to launch (only on the first Karaf start) the Apache Unomi packages using the following Apache Karaf shell command: http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/d5d84504/src/site/markdown/versions/master/concepts.md ---------------------------------------------------------------------- diff --git a/src/site/markdown/versions/master/concepts.md b/src/site/markdown/versions/master/concepts.md index 13fe485..cea56a3 100644 --- a/src/site/markdown/versions/master/concepts.md +++ b/src/site/markdown/versions/master/concepts.md @@ -142,7 +142,6 @@ Being built on top of Apache Karaf, Unomi leverages OSGi to support plugins. A U | Rule | rules | | Scoring | scorings | | Segment | segments | -| Tag | tags | | ValueType | values | [Blueprint](http://aries.apache.org/modules/blueprint.html) is used to declare what the plugin provides and inject any required dependency. The Blueprint file is located, as usual, at `OSGI-INF/blueprint/blueprint.xml` in the bundle JAR file. @@ -176,7 +175,7 @@ A persona is a "virtual" profile used to represent categories of profiles, and m A strategy to resolve how to merge properties when merging profile together. ### PropertyType -Definition for a profile or session property, specifying how possible values are constrained, if the value is multi-valued (a vector of values as opposed to a scalar value). `PropertyType`s can also be categorized using tags or file system structure, using sub-directories to organize definition files. +Definition for a profile or session property, specifying how possible values are constrained, if the value is multi-valued (a vector of values as opposed to a scalar value). `PropertyType`s can also be categorized using systemTags or file system structure, using sub-directories to organize definition files. ### Rule `Rule`s are conditional sets of actions to be executed in response to incoming events. Triggering of rules is guarded by a condition: the rule is only triggered if the associated condition is satisfied. That condition can test the event itself, but also the profile or the session. Once a rule triggers, a list of actions can be performed as consequences. Also, when rules trigger, a specific event is raised so that other parts of Unomi can react accordingly. http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/d5d84504/src/site/markdown/versions/master/twitter-sample.md ---------------------------------------------------------------------- diff --git a/src/site/markdown/versions/master/twitter-sample.md b/src/site/markdown/versions/master/twitter-sample.md index 5d6c25c..d07b512 100644 --- a/src/site/markdown/versions/master/twitter-sample.md +++ b/src/site/markdown/versions/master/twitter-sample.md @@ -306,7 +306,7 @@ Let's now look at our custom [`incrementTweetNumberAction`](https://github.com/a } ``` -We specify the identifier for the action type, a list of tags if needed: here we say that our action is a consequence of events using the `event` tag. Our actions does not require any parameters so we don't define any. +We specify the identifier for the action type, a list of systemTags if needed: here we say that our action is a consequence of events using the `event` tag. Our actions does not require any parameters so we don't define any. Finally, we provide a mysterious `actionExecutor` identifier: `incrementTweetNumber`.
