You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2017/10/02 08:25:51 UTC
[2/2] incubator-unomi git commit: Update documentation for release
1.2.0-incubating
Update documentation for release 1.2.0-incubating
Signed-off-by: Serge Huber <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/e16a0bc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/e16a0bc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/e16a0bc3
Branch: refs/heads/master
Commit: e16a0bc30ca08ef001d21461cc4b887b39058e3d
Parents: 614af7f
Author: Serge Huber <sh...@apache.org>
Authored: Mon Oct 2 10:25:40 2017 +0200
Committer: Serge Huber <sh...@apache.org>
Committed: Mon Oct 2 10:25:40 2017 +0200
----------------------------------------------------------------------
src/site/markdown/main.md | 13 +-
.../versions/1.2/building-and-deploying.md | 217 ++++++++++
src/site/markdown/versions/1.2/clustering.md | 66 +++
src/site/markdown/versions/1.2/concepts.md | 209 ++++++++++
src/site/markdown/versions/1.2/configuration.md | 310 ++++++++++++++
src/site/markdown/versions/1.2/connectors.md | 26 ++
.../markdown/versions/1.2/custom-extensions.md | 369 +++++++++++++++++
.../markdown/versions/1.2/getting-started.md | 107 +++++
src/site/markdown/versions/1.2/login-sample.md | 56 +++
.../versions/1.2/salesforce-connector.md | 156 +++++++
src/site/markdown/versions/1.2/samples.md | 23 ++
.../markdown/versions/1.2/twitter-sample.md | 403 +++++++++++++++++++
.../versions/1.2/weather-update-sample.md | 19 +
13 files changed, 1973 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e16a0bc3/src/site/markdown/main.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/main.md b/src/site/markdown/main.md
index 18b8cd4..7c79ac5 100644
--- a/src/site/markdown/main.md
+++ b/src/site/markdown/main.md
@@ -19,7 +19,18 @@
In this section we regroup the documentation by Apache Unomi version.
-## Version 1.1 (current)
+## Version 1.2 (current)
+
+- [Building and deploying](versions/1.2/building-and-deploying.html)
+- [Getting started](versions/1.2/getting-started.html)
+- [Configuration](versions/1.2/configuration.html)
+- [Samples](versions/1.2/samples.html)
+- [Connectors](versions/1.2/connectors.html)
+- [Cluster setup](versions/1.2/clustering.html)
+- [Concepts](versions/1.2/concepts.html)
+- [Custom extensions](versions/1.2/custom-extensions.html)
+
+## Version 1.1
- [Building and deploying](versions/1.1/building-and-deploying.html)
- [Getting started](versions/1.1/getting-started.html)
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e16a0bc3/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
new file mode 100644
index 0000000..f4fbfb8
--- /dev/null
+++ b/src/site/markdown/versions/1.2/building-and-deploying.md
@@ -0,0 +1,217 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+Building
+========
+
+Initial Setup
+-------------
+
+1) Install J2SE 8.0 SDK (or later), which can be downloaded from
+ http://www.oracle.com/technetwork/java/javase/downloads/index.html
+
+2) Make sure that your JAVA_HOME environment variable is set to the newly installed
+ JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or
+ $JAVA_HOME$/bin (unix).
+
+3) Install Maven 3.0.3 (or later), which can be downloaded from
+ http://maven.apache.org/download.html. Make sure that your PATH includes
+ the MVN_HOME/bin directory.
+
+
+Building
+--------
+
+1) Change to the top level directory of Apache Unomi source distribution.
+2) Run
+
+ $> mvn clean install
+
+ This will compile Apache Unomi and run all of the tests in the
+ Apache Unomi source distribution. Alternatively, you can run
+
+ $> mvn -P \!integration-tests,\!performance-tests clean install
+
+ This will compile Apache Unomi without running the tests and takes less
+ time to build.
+
+3) The distributions will be available under "package/target" directory.
+
+Installing an ElasticSearch server
+----------------------------------
+
+Starting with version 1.2, Apache Unomi no longer embeds an ElasticSearch server as this is no longer supported by
+the developers of ElasticSearch. Therefore you will need to install a standalone ElasticSearch using the following steps:
+
+1. Download an ElasticSearch 5.x version (5.1.1 or more recent, but not 6.x) from the following site:
+
+ https://www.elastic.co/downloads/elasticsearch
+
+2. Uncompress the downloaded package into a directory and launch the server using
+
+ bin/elasticsearch (Mac, Linux)
+ bin\elasticsearch.bat (Windows)
+
+3. Check that the ElasticSearch is up and running by accessing the following URL :
+
+ http://localhost:9200
+
+Deploying the generated binary package
+--------------------------------------
+
+The "package" sub-project generates a pre-configured Apache Karaf installation that is the simplest way to get started.
+Simply uncompress the package/target/unomi-VERSION.tar.gz (for Linux or Mac OS X) or
+ package/target/unomi-VERSION.zip (for Windows) archive into the directory of your choice.
+
+You can then start the server simply by using the command on UNIX/Linux/MacOS X :
+
+ ./bin/karaf start
+
+or on Windows shell :
+
+ bin\karaf.bat start
+
+
+Deploying into an existing Karaf server
+---------------------------------------
+
+This is only needed if you didn't use the generated package. Also, this is the preferred way to install a development
+environment if you intend to re-deploy the context server KAR iteratively.
+
+Additional requirements:
+* Apache Karaf 3.x, http://karaf.apache.org
+
+1. Before deploying, make sure that you have Apache Karaf properly installed. You will also have to increase the
+default maximum memory size and perm gen size by adjusting the following environment values in the bin/setenv(.bat)
+files (at the end of the file):
+
+ ```
+ MY_DIRNAME=`dirname $0`
+ MY_KARAF_HOME=`cd "$MY_DIRNAME/.."; pwd`
+ export JAVA_MAX_MEM=3G
+ export JAVA_MAX_PERM_MEM=384M
+ ```
+
+2. Install the WAR support, CXF and Karaf Cellar into Karaf by doing the following in the Karaf command line:
+
+ ```
+ feature:repo-add cxf 3.0.2
+ feature:repo-add cellar 3.0.3
+ feature:repo-add mvn:org.apache.unomi/unomi-kar/VERSION/xml/features
+ feature:install unomi-kar
+ ```
+
+4. Create a new $MY_KARAF_HOME/etc/org.apache.cxf.osgi.cfg file and put the following property inside :
+
+ ```
+ org.apache.cxf.servlet.context=/cxs
+ ```
+
+5. If all went smoothly, you should be able to access the context script here : http://localhost:8181/cxs/cluster .
+ You should be able to login with karaf / karaf and see basic server information. If not something went wrong during the install.
+
+JDK Selection on Mac OS X
+-------------------------
+
+You might need to select the JDK to run the tests in the itests subproject. In order to do so you can list the
+installed JDKs with the following command :
+
+ /usr/libexec/java_home -V
+
+which will output something like this :
+
+ Matching Java Virtual Machines (7):
+ 1.7.0_51, x86_64: "Java SE 7" /Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home
+ 1.7.0_45, x86_64: "Java SE 7" /Library/Java/JavaVirtualMachines/jdk1.7.0_45.jdk/Contents/Home
+ 1.7.0_25, x86_64: "Java SE 7" /Library/Java/JavaVirtualMachines/jdk1.7.0_25.jdk/Contents/Home
+ 1.6.0_65-b14-462, x86_64: "Java SE 6" /Library/Java/JavaVirtualMachines/1.6.0_65-b14-462.jdk/Contents/Home
+ 1.6.0_65-b14-462, i386: "Java SE 6" /Library/Java/JavaVirtualMachines/1.6.0_65-b14-462.jdk/Contents/Home
+ 1.6.0_65-b14-462, x86_64: "Java SE 6" /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
+ 1.6.0_65-b14-462, i386: "Java SE 6" /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
+
+
+You can then select the one you want using :
+
+ export JAVA_HOME=`/usr/libexec/java_home -v 1.7.0_51`
+
+and then check that it was correctly referenced using:
+
+ java -version
+
+which should give you a result such as this:
+
+ java version "1.7.0_51"
+ Java(TM) SE Runtime Environment (build 1.7.0_51-b13)
+ Java HotSpot(TM) 64-Bit Server VM (build 24.51-b03, mixed mode)
+
+
+Running the integration tests
+-----------------------------
+
+The integration tests are not executed by default to make build time minimal, but it is recommended to run the
+integration tests at least once before using the server to make sure that everything is ok in the build. Another way
+to use these tests is to run them from a continuous integration server such as Jenkins, Apache Gump, Atlassian Bamboo or
+ others.
+
+Note : the integration tests require a JDK 7 or more recent !
+
+To run the tests simply activate the following profile :
+
+ mvn -P integration-tests clean install
+
+Running the performance tests
+-----------------------------
+
+Performance tests are based on Gatling. You need to have a running context server or cluster of servers before
+executing the tests.
+
+Test parameteres are editable in the performance-tests/src/test/scala/unomi/Parameters.scala file. baseUrls should
+contains the URLs of all your cluster nodes
+
+Run the test by using the gatling.conf file in performance-tests/src/test/resources :
+
+```
+ export GATLING_CONF=<path>/performance-tests/src/test/resources
+ gatling.sh
+```
+
+Reports are generated in performance-tests/target/results.
+
+Testing with an example page
+----------------------------
+
+A default test page is provided at the following URL:
+
+```
+ http://localhost:8181/index.html
+```
+
+This test page will trigger the loading of the /context.js script, which will try to retrieving the user context
+or create a new one if it doesn't exist yet. It also contains an experimental integration with Facebook Login, but it
+doesn't yet save the context back to the context server.
+
+Integrating onto a page
+-----------------------
+
+ Simply reference the context script in your HTML as in the following example:
+
+```javascript
+<script type="text/javascript">
+ (function(){ var u=(("https:" == document.location.protocol) ? "https://localhost:8181/" : "http://localhost:8181/");
+ var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; g.defer=true; g.async=true; g.src=u+'context.js';
+ s.parentNode.insertBefore(g,s); })();
+</script>
+```
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e16a0bc3/src/site/markdown/versions/1.2/clustering.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/1.2/clustering.md b/src/site/markdown/versions/1.2/clustering.md
new file mode 100644
index 0000000..1e5c27d
--- /dev/null
+++ b/src/site/markdown/versions/1.2/clustering.md
@@ -0,0 +1,66 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+Cluster setup
+=============
+
+Apache Karaf relies on Apache Karaf Cellar, which in turn uses Hazelcast to discover and configure its cluster.
+You just need to install multiple context servers on the same network, and then (optionally) change the Hazelcast
+ configuration in the following file :
+
+ etc/hazelcast.xml
+
+All nodes on the same network, sharing the same cluster name will be part of the same cluster.
+
+For the actual ElasticSearch configuration however, this must be done using the following file:
+
+ etc/org.apache.unomi.persistence.elasticsearch.cfg
+
+Depending on the cluster size, you will want to adjust the following parameters to make sure your setup is optimal in
+terms of performance and safety.
+
+#### 2 nodes configuration
+One node dedicated to context server, 1 node for elasticsearch storage.
+
+Node A :
+
+ numberOfReplicas=0
+ monthlyIndex.numberOfReplicas=0
+
+Node B :
+
+ numberOfReplicas=0
+ monthlyIndex.numberOfReplicas=0
+
+#### 3 nodes configuration
+One node dedicated to context server, 2 nodes for elasticsearch storage with fault-tolerance
+
+Node A :
+
+ numberOfReplicas=1
+ monthlyIndex.numberOfReplicas=1
+
+Node B :
+
+ numberOfReplicas=1
+ monthlyIndex.numberOfReplicas=1
+
+Node C :
+
+ numberOfReplicas=1
+ monthlyIndex.numberOfReplicas=1
+
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e16a0bc3/src/site/markdown/versions/1.2/concepts.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/1.2/concepts.md b/src/site/markdown/versions/1.2/concepts.md
new file mode 100644
index 0000000..6947c5b
--- /dev/null
+++ b/src/site/markdown/versions/1.2/concepts.md
@@ -0,0 +1,209 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+# Concepts
+
+Apache Unomi gathers information about users actions, information that is processed and stored by Unomi services. The collected information can then be used to personalize content, derive insights on user behavior, categorize the user profiles into segments along user-definable dimensions or acted upon by algorithms.
+
+## Items and types
+Unomi structures the information it collects using the concept of `Item` which provides the base information (an identifier and a type) the context server needs to process and store the data. Items are persisted according to their type (structure) and identifier (identity). This base structure can be extended, if needed, using properties in the form of key-value pairs.
+
+These properties are further defined by the `Item`’s type definition which explicits the `Item`’s structure and semantics. By defining new types, users specify which properties (including the type of values they accept) are available to items of that specific type.
+
+Unomi defines default value types: `date`, `email`, `integer` and `string`, all pretty self-explanatory. While you can think of these value types as "primitive" types, it is possible to extend Unomi by providing additional value types.
+
+
+Additionally, most items are also associated to a scope, which is a concept that Unomi uses to group together related items. A given scope is represented in Unomi by a simple string identifier and usually represents an application or set of applications from which Unomi gathers data, depending on the desired analysis granularity. In the context of web sites, a scope could, for example, represent a site or family of related sites being analyzed. Scopes allow clients accessing the context server to filter data to only see relevant data.
+
+*Base `Item` structure:*
+
+```json
+{
+ "itemType": <type of the item>,
+ "scope": <scope>,
+ "itemId": <item identifier>,
+ "properties": <optional properties>
+}
+```
+
+Some types can be dynamically defined at runtime by calling to the REST API while other extensions are done via Unomi plugins. Part of extending Unomi, therefore, is a matter of defining new types and specifying which kind of Unomi entity (e.g. profiles) they can be affected to. For example, the following JSON document can be passed to Unomi to declare a new property type identified (and named) `tweetNb`, tagged with the `social` tag, targeting profiles and using the `integer` value type.
+
+*Example JSON type definition:*
+
+```json
+{
+ "itemId": "tweetNb",
+ "itemType": "propertyType",
+ "metadata": {
+ "id": "tweetNb",
+ "name": "tweetNb"
+ },
+ "tags": ["social"],
+ "target": "profiles",
+ "type": "integer"
+}
+```
+
+
+>Unomi defines a built-in scope (called `systemscope`) that clients can use to share data across scopes.
+
+## Events
+Users' actions are conveyed from clients to the context server using events. Of course, the required information depends on what is collected and users' interactions with the observed systems but events minimally provide a type, a scope and source and target items. Additionally, events are timestamped. Conceptually, an event can be seen as a sentence, the event's type being the verb, the source the subject and the target the object.
+
+
+*Event structure:*
+
+```json
+{
+ "eventType": <type of the event>,
+ "scope": <scope of the event>,
+ "source": <Item>,
+ "target": <Item>,
+ "properties": <optional properties>
+}
+```
+
+Source and target can be any Unomi item but are not limited to them. In particular, as long as they can be described using properties and Unomi’s type mechanism and can be processed either natively or via extension plugins, source and target can represent just about anything. Events can also be triggered as part of Unomi’s internal processes for example when a rule is triggered.
+
+Events are sent to Unomi from client applications using the JSON format and a typical page view event from a web site could look something like the following:
+
+*Example page view event:*
+
+```json
+{
+ "eventType": "view",
+ "scope": "ACMESPACE",
+ "source": {
+ "itemType": "site",
+ "scope": "ACMESPACE",
+ "itemId": "c4761bbf-d85d-432b-8a94-37e866410375"
+ },
+ "target": {
+ "itemType": "page",
+ "scope": "ACMESPACE",
+ "itemId": "b6acc7b3-6b9d-4a9f-af98-54800ec13a71",
+ "properties": {
+ "pageInfo": {
+ "pageID": "b6acc7b3-6b9d-4a9f-af98-54800ec13a71",
+ "pageName": "Home",
+ "pagePath": "/sites/ACMESPACE/home",
+ "destinationURL": "http://localhost:8080/sites/ACMESPACE/home.html",
+ "referringURL": "http://localhost:8080/",
+ "language": "en"
+ },
+ "category": {},
+ "attributes": {}
+ }
+ }
+}
+```
+
+## Profiles
+By processing events, Unomi progressively builds a picture of who the user is and how they behave. This knowledge is embedded in `Profile` object. A profile is an `Item` with any number of properties and optional segments and scores. Unomi provides default properties to cover common data (name, last name, age, email, etc.) as well as default segments to categorize users. Unomi users are, however, free and even encouraged to create additional properties and segments to better suit their needs.
+
+Contrary to other Unomi items, profiles are not part of a scope since we want to be able to track the associated user across applications. For this reason, data collected for a given profile in a specific scope is still available to any scoped item that accesses the profile information.
+
+It is interesting to note that there is not necessarily a one to one mapping between users and profiles as users can be captured across applications and different observation contexts. As identifying information might not be available in all contexts in which data is collected, resolving profiles to a single physical user can become complex because physical users are not observed directly. Rather, their portrait is progressively patched together and made clearer as Unomi captures more and more traces of their actions. Unomi will merge related profiles as soon as collected data permits positive association between distinct profiles, usually as a result of the user performing some identifying action in a context where the user hadn’t already been positively identified.
+
+## Sessions
+A session represents a time-bounded interaction between a user (via their associated profile) and a Unomi-enabled application. A session represents the sequence of actions the user performed during its duration. For this reason, events are associated with the session during which they occurred. In the context of web applications, sessions are usually linked to HTTP sessions.
+
+# Extending Unomi via plugins
+Unomi is architected so that users can provided extensions in the form of plugins.
+
+## Types vs. instances
+Several extension points in Unomi rely on the concept of type: the extension defines a prototype for what the actual items will be once parameterized with values known only at runtime. This is similar to the concept of classes in object-oriented programming: types define classes, providing the expected structure and which fields are expected to be provided at runtime, that are then instantiated when needed with actual values.
+
+## Plugin structure
+Being built on top of Apache Karaf, Unomi leverages OSGi to support plugins. A Unomi plugin is, thus, an OSGi bundle specifying some specific metadata to tell Unomi the kind of entities it provides. A plugin can provide the following entities to extend Unomi, each with its associated definition (as a JSON file), located in a specific spot within the `META-INF/cxs/` directory of the bundle JAR file:
+
+
+| Entity | Location in `cxs` directory |
+| -------- | -------- |
+| ActionType | actions |
+| ConditionType | conditions |
+| Persona | personas |
+| PropertyMergeStrategyType | mergers |
+| PropertyType | properties then profiles or sessions subdirectory then `<category name>` directory |
+| Rule | rules |
+| Scoring | scorings |
+| Segment | segments |
+| Tag | tags then `<category name>` directory |
+| 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.
+
+The plugin otherwise follows a regular maven project layout and should depend on the Unomi API maven artifact:
+
+```xml
+<dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-api</artifactId>
+ <version>...</version>
+</dependency>
+```
+
+Some plugins consists only of JSON definitions that are used to instantiate the appropriate structures at runtime while some more involved plugins provide code that extends Unomi in deeper ways.
+
+In both cases, plugins can provide more that one type of extension. For example, a plugin could provide both `ActionType`s and `ConditionType`s.
+
+## Extension points
+
+### ActionType
+`ActionType`s define new actions that can be used as consequences of Rules being triggered. When a rule triggers, it creates new actions based on the event data and the rule internal processes, providing values for parameters defined in the associated `ActionType`. Example actions include: “Set user property x to value y” or “Send a message to service x”.
+
+### ConditionType
+`ConditionType`s define new conditions that can be applied to items (for example to decide whether a rule needs to be triggered or if a profile is considered as taking part in a campaign) or to perform queries against the stored Unomi data. They may be implemented in Java when attempting to define a particularly complex test or one that can better be optimized by coding it. They may also be defined as combination of other conditions. A simple condition could be: “User is male”, while a more generic condition with parameters may test whether a given property has a specific value: “User property x has value y”.
+
+### Persona
+A persona is a "virtual" profile used to represent categories of profiles, and may also be used to test how a personalized experience would look like using this virtual profile. A persona can define predefined properties and sessions. Persona definition make it possible to “emulate” a certain type of profile, e.g : US visitor, non-US visitor, etc.
+
+### PropertyMergeStrategyType
+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.
+
+### 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.
+
+### Scoring
+`Scoring`s are set of conditions associated with a value to assign to profiles when matching so that the associated users can be scored along that dimension. Each scoring element is evaluated and matching profiles' scores are incremented with the associated value.
+
+### Segments
+`Segment`s represent dynamically evaluated groups of similar profiles in order to categorize the associated users. To be considered part of a given segment, users must satisfies the segment’s condition. If they match, users are automatically added to the segment. Similarly, if at any given point during, they cease to satisfy the segment’s condition, they are automatically removed from it.
+
+### Tag
+`Tag`s are simple labels that are used to classify all other objects inside Unomi. Tags can define sub-tags.
+
+### ValueType
+Definition for values that can be assigned to properties ("primitive" types).
+
+## Other Unomi entities
+
+### UserList
+User list are simple static lists of users. The associated profile stores the lists it belongs to in a specific property.
+
+### Goal
+Goals represent tracked activities / actions that can be accomplished by site (or more precisely scope) visitors. These are tracked in general because they relate to specific business objectives or are relevant to measure site/scope performance.
+
+Goals can be defined at the scope level or in the context of a particular `Campaign`. Either types of goals behave exactly the same way with the exception of two notable differences:
+ - duration: scope-level goals are considered until removed while campaign-level goals are only considered for the campaign duration
+ - audience filtering: any visitor is considered for scope-level goals while campaign-level goals only consider visitors who match the campaign's conditions
+
+### Campaign
+A goal-oriented, time-limited marketing operation that needs to be evaluated for return on investment performance by tracking the ratio of visits to conversions.
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e16a0bc3/src/site/markdown/versions/1.2/configuration.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/1.2/configuration.md b/src/site/markdown/versions/1.2/configuration.md
new file mode 100644
index 0000000..7cc4c11
--- /dev/null
+++ b/src/site/markdown/versions/1.2/configuration.md
@@ -0,0 +1,310 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+Configuration
+=============
+
+Changing the default configuration
+----------------------------------
+
+If you want to change the default configuration, you can perform any modification you want in the $MY_KARAF_HOME/etc directory.
+
+The context server configuration is kept in the $MY_KARAF_HOME/etc/org.apache.unomi.cluster.cfg . It defines the
+addresses where it can be found :
+
+ contextserver.publicAddress=https://localhost:9443
+ contextserver.internalAddress=http://127.0.0.1:8181
+
+If you need to specify an Elasticsearch cluster name, or a host and port that are different than the default,
+it is recommended to do this BEFORE you start the server for the first time, or you will loose all the data
+you have stored previously.
+
+To change these settings, you will need to modify a file called
+
+ $MY_KARAF_HOME/etc/org.apache.unomi.persistence.elasticsearch.cfg
+
+with the following contents:
+
+ cluster.name=contextElasticSearch
+ # The elasticSearchAddresses may be a comma seperated list of host names and ports such as
+ # hostA:9300,hostB:9300
+ # Note: the port number must be repeated for each host.
+ elasticSearchAddresses=localhost:9300
+ index.name=context
+
+Secured events configuration
+---------------------------
+
+If you need to secure some events, that will be sent only by a trusted third party server, you can update the file :
+
+ $MY_KARAF_HOME/etc/org.apache.unomi.thirdparty.cfg
+
+Ususally, login events, which operate on profiles and do merge on protected properties, must be secured. For each
+trusted third party server, you need to add these 3 lines :
+
+ thirdparty.provider1.key=secret-key
+ thirdparty.provider1.ipAddresses=127.0.0.1,::1
+ thirdparty.provider1.allowedEvents=login,download
+
+The events set in allowedEvents will be secured and will only be accepted if the call comes from the specified IP
+address, and if the secret-key is passed in the X-Unomi-Peer header.
+
+Installing the MaxMind GeoIPLite2 IP lookup database
+----------------------------------------------------
+
+The Context Server requires an IP database in order to resolve IP addresses to user location.
+The GeoLite2 database can be downloaded from MaxMind here :
+http://dev.maxmind.com/geoip/geoip2/geolite2/
+
+Simply download the GeoLite2-City.mmdb file into the "etc" directory.
+
+Installing Geonames database
+----------------------------
+
+Context server includes a geocoding service based on the geonames database ( http://www.geonames.org/ ). It can be
+used to create conditions on countries or cities.
+
+In order to use it, you need to install the Geonames database into . Get the "allCountries.zip" database from here :
+http://download.geonames.org/export/dump/
+
+Download it and put it in the "etc" directory, without unzipping it.
+Edit $MY_KARAF_HOME/etc/org.apache.unomi.geonames.cfg and set request.geonamesDatabase.forceImport to true, import should start right away.
+Otherwise, import should start at the next startup. Import runs in background, but can take about 15 minutes.
+At the end, you should have about 4 million entries in the geonames index.
+
+REST API Security
+-----------------
+
+The Context Server REST API is protected using JAAS authentication and using Basic or Digest HTTP auth.
+By default, the login/password for the REST API full administrative access is "karaf/karaf".
+
+The generated package is also configured with a default SSL certificate. You can change it by following these steps :
+
+1. Replace the existing keystore in $MY_KARAF_HOME/etc/keystore by your own certificate :
+
+ http://wiki.eclipse.org/Jetty/Howto/Configure_SSL
+
+2. Update the keystore and certificate password in $MY_KARAF_HOME/etc/custom.properties file :
+
+```
+ org.osgi.service.http.secure.enabled = true
+ org.ops4j.pax.web.ssl.keystore=${karaf.etc}/keystore
+ org.ops4j.pax.web.ssl.password=changeme
+ org.ops4j.pax.web.ssl.keypassword=changeme
+ org.osgi.service.http.port.secure=9443
+```
+
+You should now have SSL setup on Karaf with your certificate, and you can test it by trying to access it on port 9443.
+
+3. Changing the default Karaf password can be done by modifying the etc/users.properties file
+
+4. You will also need to change the user/password information in the org.apache.unomi.cluster.cfg file :
+
+```
+ cluster.group=default
+ cluster.jmxUsername=karaf
+ cluster.jmxPassword=karaf
+ cluster.jmxPort=1099
+```
+
+Automatic profile merging
+-------------------------
+
+The context server is capable of merging profiles based on a common property value. In order to use this, you must
+add the MergeProfileOnPropertyAction to a rule (such as a login rule for example), and configure it with the name
+ of the property that will be used to identify the profiles to be merged. An example could be the "email" property,
+ meaning that if two (or more) profiles are found to have the same value for the "email" property they will be merged
+ by this action.
+
+Upon merge, the old profiles are marked with a "mergedWith" property that will be used on next profile access to delete
+the original profile and replace it with the merged profile (aka "master" profile). Once this is done, all cookie tracking
+will use the merged profile.
+
+To test, simply configure the action in the "login" or "facebookLogin" rules and set it up on the "email" property.
+Upon sending one of the events, all matching profiles will be merged.
+
+Securing a production environment
+---------------------------------
+
+Before going live with a project, you should *absolutely* read the following section that will help you setup a proper
+secure environment for running your context server.
+
+Step 1: Install and configure a firewall
+
+You should setup a firewall around your cluster of context servers and/or Elasticsearch nodes. If you have an
+application-level firewall you should only allow the following connections open to the whole world :
+
+ - http://localhost:8181/context.js
+ - http://localhost:8181/eventcollector
+
+All other ports should not be accessible to the world.
+
+For your Context Server client applications (such as the Jahia CMS), you will need to make the following ports
+accessible :
+
+ 8181 (Context Server HTTP port)
+ 9443 (Context Server HTTPS port)
+
+The context server actually requires HTTP Basic Auth for access to the Context Server administration REST API, so it is
+highly recommended that you design your client applications to use the HTTPS port for accessing the REST API.
+
+The user accounts to access the REST API are actually routed through Karaf's JAAS support, which you may find the
+documentation for here :
+
+ - http://karaf.apache.org/manual/latest/users-guide/security.html
+
+The default username/password is
+
+ karaf/karaf
+
+You should really change this default username/password as soon as possible. To do so, simply modify the following
+file :
+
+ $MY_KARAF_HOME/etc/users.properties
+
+For your context servers, and for any standalone Elasticsearch nodes you will need to open the following ports for proper
+node-to-node communication : 9200 (Elasticsearch REST API), 9300 (Elasticsearch TCP transport)
+
+Of course any ports listed here are the default ports configured in each server, you may adjust them if needed.
+
+Step 2 : Follow industry recommended best practices for securing Elasticsearch
+
+You may find more valuable recommendations here :
+
+- https://www.elastic.co/blog/found-elasticsearch-security
+- https://www.elastic.co/blog/scripting-security
+
+Step 4 : Setup a proxy in front of the context server
+
+As an alternative to an application-level firewall, you could also route all traffic to the context server through
+a proxy, and use it to filter any communication.
+
+Integrating with an Apache HTTP web server
+------------------------------------------
+
+If you want to setup an Apache HTTP web server in from of Apache Unomi, here is an example configuration using
+mod_proxy.
+
+In your Unomi package directory, in /etc/org.apache.unomi.cluster.cfg for unomi.apache.org
+
+ contextserver.publicAddress=https://unomi.apache.org/
+ contextserver.internalAddress=http://192.168.1.1:8181
+
+and you will also need to change the contextserver.domain in the /etc/org.apache.unomi.web.cfg file
+
+ contextserver.domain=apache.org
+
+Main virtual host config:
+
+ <VirtualHost *:80>
+ Include /var/www/vhosts/unomi.apache.org/conf/common.conf
+ </VirtualHost>
+
+ <IfModule mod_ssl.c>
+ <VirtualHost *:443>
+ Include /var/www/vhosts/unomi.apache.org/conf/common.conf
+
+ SSLEngine on
+
+ SSLCertificateFile /var/www/vhosts/unomi.apache.org/conf/ssl/24d5b9691e96eafa.crt
+ SSLCertificateKeyFile /var/www/vhosts/unomi.apache.org/conf/ssl/apache.org.key
+ SSLCertificateChainFile /var/www/vhosts/unomi.apache.org/conf/ssl/gd_bundle-g2-g1.crt
+
+
+ <FilesMatch "\.(cgi|shtml|phtml|php)$">
+ SSLOptions +StdEnvVars
+ </FilesMatch>
+ <Directory /usr/lib/cgi-bin>
+ SSLOptions +StdEnvVars
+ </Directory>
+ BrowserMatch "MSIE [2-6]" \
+ nokeepalive ssl-unclean-shutdown \
+ downgrade-1.0 force-response-1.0
+ BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
+
+ </VirtualHost>
+ </IfModule>
+
+common.conf:
+
+ ServerName unomi.apache.org
+ ServerAdmin webmaster@apache.org
+
+ DocumentRoot /var/www/vhosts/unomi.apache.org/html
+ CustomLog /var/log/apache2/access-unomi.apache.org.log combined
+ <Directory />
+ Options FollowSymLinks
+ AllowOverride None
+ </Directory>
+ <Directory /var/www/vhosts/unomi.apache.org/html>
+ Options FollowSymLinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ </Directory>
+ <Location /cxs>
+ Order deny,allow
+ deny from all
+ allow from 88.198.26.2
+ allow from www.apache.org
+ </Location>
+
+ RewriteEngine On
+ RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
+ RewriteRule .* - [F]
+ ProxyPreserveHost On
+ ProxyPass /server-status !
+ ProxyPass /robots.txt !
+
+ RewriteCond %{HTTP_USER_AGENT} Googlebot [OR]
+ RewriteCond %{HTTP_USER_AGENT} msnbot [OR]
+ RewriteCond %{HTTP_USER_AGENT} Slurp
+ RewriteRule ^.* - [F,L]
+
+ ProxyPass / http://localhost:8181/ connectiontimeout=20 timeout=300 ttl=120
+ ProxyPassReverse / http://localhost:8181/
+
+Changing the default tracking location
+--------------------------------------
+
+When performing localhost requests to Apache Unomi, a default location will be used to insert values into the session
+to make the location-based personalization still work. You can find the default location settings in the file :
+
+ org.apache.unomi.plugins.request.cfg
+
+that contains the following default settings:
+
+ # The following settings represent the default position that is used for localhost requests
+ defaultSessionCountryCode=CH
+ defaultSessionCountryName=Switzerland
+ defaultSessionCity=Geneva
+ defaultSessionAdminSubDiv1=2660645
+ defaultSessionAdminSubDiv2=6458783
+ defaultSessionIsp=Cablecom
+ defaultLatitude=46.1884341
+ defaultLongitude=6.1282508
+
+You might want to change these for testing or for demonstration purposes.
+
+Apache Karaf SSH Console
+--------------------------------------
+The Apache Karaf SSH console is available inside Apache Unomi, but the port has been changed from the default value of
+8101 to 8102 to avoid conflicts with other Karaf-based products. So to connect to the SSH console you should use:
+
+ ssh -p 8102 karaf@localhost
+
+or the user/password you have setup to protect the system if you have changed it.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e16a0bc3/src/site/markdown/versions/1.2/connectors.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/1.2/connectors.md b/src/site/markdown/versions/1.2/connectors.md
new file mode 100644
index 0000000..3f688f2
--- /dev/null
+++ b/src/site/markdown/versions/1.2/connectors.md
@@ -0,0 +1,26 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+# Connectors
+
+Apache Unomi provides the following connector:
+
+- [Salesforce CRM connector](salesforce-connector.html)
+
+## Call for contributors
+
+We are looking for help with the development of additional connectors. Any contribution (large or small) is more than welcome. Feel free to discuss this in our [mailing list](../../mail-lists.html).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e16a0bc3/src/site/markdown/versions/1.2/custom-extensions.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/1.2/custom-extensions.md b/src/site/markdown/versions/1.2/custom-extensions.md
new file mode 100644
index 0000000..355896a
--- /dev/null
+++ b/src/site/markdown/versions/1.2/custom-extensions.md
@@ -0,0 +1,369 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+# Custom extensions
+
+Apache Unomi is a pluggeable server that may be extended in many ways. This document assumes you are familiar with the
+[Apache Unomi concepts](concepts.html) . This document is mostly a reference document on the different things that may
+be used inside an extension. If you are looking for complete samples, please see the [samples page](samples.html).
+
+## Creating an extension
+
+An extension is simply a Maven project, with a Maven pom that looks like this:
+
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-extensions</artifactId>
+ <version>1.2.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>unomi-extension-example</artifactId>
+ <name>Apache Unomi :: Extensions :: Example</name>
+ <description>Service implementation for the Apache Unomi Context Server extension that integrates with the Geonames database</description>
+ <version>1.2.0-incubating-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <!-- This dependency is not required but generally used in extensions -->
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-api</artifactId>
+ <version>1.2.0-incubating-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+ <Import-Package>
+ sun.misc;resolution:=optional,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </project>
+
+An extension may contain many different kinds of Apache Unomi objects, as well as custom OSGi services or anything that
+is needed to build your application.
+
+## Predefined segments
+
+You may provide pre-defined segments by simply adding a JSON file in the src/main/resources/META-INF/cxs/segments directory of
+your Maven project. Here is an example of a pre-defined segment:
+
+ {
+ "metadata": {
+ "id": "leads",
+ "name": "Leads",
+ "scope": "systemscope",
+ "description": "You can customize the list below by editing the leads segment.",
+ "readOnly":true
+ },
+ "condition": {
+ "parameterValues": {
+ "subConditions": [
+ {
+ "parameterValues": {
+ "propertyName": "properties.leadAssignedTo",
+ "comparisonOperator": "exists"
+ },
+ "type": "profilePropertyCondition"
+ }
+ ],
+ "operator" : "and"
+ },
+ "type": "booleanCondition"
+ }
+ }
+
+Basically this segment uses a condition to test if the profile has a property `leadAssignedTo` that exists. All profiles
+that match this condition will be part of the pre-defined segment.
+
+## Predefined rules
+
+You may provide pre-defined rules by simply adding a JSON file in the src/main/resources/META-INF/cxs/rules directory of
+your Maven project. Here is an example of a pre-defined rule:
+
+ {
+ "metadata" : {
+ "id": "evaluateProfileSegments",
+ "name": "Evaluate segments",
+ "description" : "Evaluate segments when a profile is modified",
+ "readOnly":true
+ },
+
+ "condition" : {
+ "type": "profileUpdatedEventCondition",
+ "parameterValues": {
+ }
+ },
+
+ "actions" : [
+ {
+ "type": "evaluateProfileSegmentsAction",
+ "parameterValues": {
+ }
+ }
+ ]
+
+ }
+
+In this example we provide a rule that will execute when a predefined composed condition of type
+"profileUpdatedEventCondition" is received. See below to see how predefined composed conditions are declared.
+Once the condition is matched, the actions will be executed in sequence. In this example there is only a single
+action of type "evaluateProfileSegmentsAction" that is defined so it will be executed by Apache Unomi's rule engine.
+You can also see below how custom actions may be defined.
+
+## Predefined properties
+
+By default Apache Unomi comes with a set of pre-defined properties, but in many cases it is useful to add additional
+predefined property definitions. You can create property definitions for session or profile properties by creating them
+in different directories.
+
+For session properties you must create a JSON file in the following directory in your Maven project:
+
+ src/main/resources/META-INF/cxs/properties/sessions
+
+For profile properties you must create the JSON file inside the directory in your Maven project:
+
+ src/main/resources/META-INF/cxs/properties/profiles
+
+Here is an example of a property definition JSON file
+
+ {
+ "metadata": { "id": "city", "name": "City" },
+ "type": "string",
+ "tags": ["contactProfileProperties"],
+ "defaultValue": "",
+ "automaticMappingsFrom": [ ],
+ "rank": "304.0"
+ }
+
+## Predefined child conditions
+
+You can define new predefined conditions that are actually conditions inheriting from a parent condition and setting
+pre-defined parameter values. You can do this by creating a JSON file in:
+
+ src/main/resources/META-INF/cxs/conditions
+
+Here is an example of a JSON file that defines a profileUpdateEventCondition that inherits from a parent condition of
+type eventTypeCondition.
+
+ {
+ "metadata": {
+ "id": "profileUpdatedEventCondition",
+ "name": "profileUpdatedEventCondition",
+ "description": "",
+ "tags": [
+ "event",
+ "eventCondition"
+ ],
+ "readOnly": true
+ },
+ "parentCondition": {
+ "type": "eventTypeCondition",
+ "parameterValues": {
+ "eventTypeId": "profileUpdated"
+ }
+ },
+
+ "parameters": [
+ ]
+ }
+
+## Predefined personas
+
+Personas may also be pre-defined by creating JSON files in the following directory:
+
+ src/main/resources/META-INF/cxs/personas
+
+Here is an example of a persona definition JSON file:
+
+ {
+ "persona": {
+ "itemId": "usVisitor",
+ "properties": {
+ "description": "Represents a visitor browsing from inside the continental US",
+ "firstName": "U.S.",
+ "lastName": "Visitor"
+ },
+ "segments": []
+ },
+ "sessions": [
+ {
+ "itemId": "aa3b04bd-8f4d-4a07-8e96-d33ffa04d3d9",
+ "profileId": "usVisitor",
+ "properties": {
+ "operatingSystemName": "OS X 10.9 Mavericks",
+ "sessionCountryName": "United States",
+ "location": {
+ "lat":37.422,
+ "lon":-122.084058
+ },
+ "userAgentVersion": "37.0.2062.120",
+ "sessionCountryCode": "US",
+ "deviceCategory": "Personal computer",
+ "operatingSystemFamily": "OS X",
+ "userAgentName": "Chrome",
+ "sessionCity": "Mountain View",
+ "remoteHost": "www.google.com",
+ "remoteAddr": "66.249.66.1"
+ },
+ "timeStamp": "2014-09-18T11:40:54Z",
+ "lastEventDate": "2014-09-18T11:40:59Z",
+ "duration": 4790
+ }
+ ]
+ }
+
+You can see that it's also possible to define sessions for personas.
+
+## Custom actions
+
+Custom actions are a powerful way to integrate with external systems by being able to define custom logic that will
+be executed by an Apache Unomi rule. An action is defined by a JSON file created in the following directory:
+
+ src/main/resources/META-INF/cxs/actions
+
+Here is an example of a JSON action definition:
+
+ {
+ "metadata": {
+ "id": "addToListsAction",
+ "name": "addToListsAction",
+ "description": "",
+ "tags": [
+ "demographic",
+ "hidden.availableToEndUser"
+ ],
+ "readOnly": true
+ },
+ "actionExecutor": "addToLists",
+ "parameters": [
+ {
+ "id": "listIdentifiers",
+ "type": "string",
+ "multivalued": true
+ }
+ ]
+ }
+
+The `actionExecutor` identifier refers to a service property that is defined in the OSGi Blueprint service registration.
+Note that any OSGi service registration may be used, but in these examples we use OSGi Blueprint. The definition for the
+above JSON file will be found in a file called `src/main/resources/OSGI-INF/blueprint/blueprint.xml` with the following
+content:
+
+ <?xml version="1.0" encoding="UTF-8"?>
+ <blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
+
+ <reference id="profileService" interface="org.apache.unomi.api.services.ProfileService"/>
+ <reference id="eventService" interface="org.apache.unomi.api.services.EventService"/>
+
+ <!-- Action executors -->
+
+ <service auto-export="interfaces">
+ <service-properties>
+ <entry key="actionExecutorId" value="addToLists"/>
+ </service-properties>
+ <bean class="org.apache.unomi.lists.actions.AddToListsAction">
+ <property name="profileService" ref="profileService"/>
+ <property name="eventService" ref="eventService"/>
+ </bean>
+ </service>
+
+ </blueprint>
+
+You can note here the `actionExecutorId` that corresponds to the `actionExecutor` in the JSON file.
+
+The implementation of the action is available here : [org.apache.unomi.lists.actions.AddToListsAction](https://github.com/apache/incubator-unomi/blob/master/extensions/lists-extension/actions/src/main/java/org/apache/unomi/lists/actions/AddToListsAction.java)
+
+## Custom conditions
+
+Custom conditions are different from predefined child conditions because they implement their logic using Java classes.
+They are also declared by adding a JSON file into the conditions directory:
+
+ src/main/resources/META-INF/cxs/conditions
+
+Here is an example of JSON custom condition definition:
+
+ {
+ "metadata": {
+ "id": "matchAllCondition",
+ "name": "matchAllCondition",
+ "description": "",
+ "tags": [
+ "logical",
+ "profileCondition",
+ "eventCondition",
+ "sessionCondition",
+ "sourceEventCondition"
+ ],
+ "readOnly": true
+ },
+ "conditionEvaluator": "matchAllConditionEvaluator",
+ "queryBuilder": "matchAllConditionESQueryBuilder",
+
+ "parameters": [
+ ]
+ }
+
+Note the `conditionEvaluator` and the `queryBuilder` values. These reference OSGi service properties that are declared
+in an OSGi Blueprint configuration file (other service definitions may also be used such as Declarative Services or even
+Java registered services). Here is an example of an OSGi Blueprint definition corresponding to the above JSON condition
+definition file.
+
+ src/main/resources/OSGI-INF/blueprint/blueprint.xml
+
+ <blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
+
+ <service
+ interface="org.apache.unomi.persistence.elasticsearch.conditions.ConditionESQueryBuilder">
+ <service-properties>
+ <entry key="queryBuilderId" value="matchAllConditionESQueryBuilder"/>
+ </service-properties>
+ <bean class="org.apache.unomi.plugins.baseplugin.conditions.MatchAllConditionESQueryBuilder"/>
+ </service>
+
+ <service interface="org.apache.unomi.persistence.elasticsearch.conditions.ConditionEvaluator">
+ <service-properties>
+ <entry key="conditionEvaluatorId" value="matchAllConditionEvaluator"/>
+ </service-properties>
+ <bean class="org.apache.unomi.plugins.baseplugin.conditions.MatchAllConditionEvaluator"/>
+ </service>
+
+ </blueprint>
+
+You can find the implementation of the two classes here :
+
+- [org.apache.unomi.plugins.baseplugin.conditions.MatchAllConditionESQueryBuilder](https://github.com/apache/incubator-unomi/blob/master/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/MatchAllConditionESQueryBuilder.java)
+- [org.apache.unomi.plugins.baseplugin.conditions.MatchAllConditionEvaluator](https://github.com/apache/incubator-unomi/blob/master/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/MatchAllConditionEvaluator.java)
+
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e16a0bc3/src/site/markdown/versions/1.2/getting-started.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/1.2/getting-started.md b/src/site/markdown/versions/1.2/getting-started.md
new file mode 100644
index 0000000..6c4380d
--- /dev/null
+++ b/src/site/markdown/versions/1.2/getting-started.md
@@ -0,0 +1,107 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+# Getting started with Unomi
+
+We will first get you up and running with an example. We will then lift the corner of the cover somewhat and explain in greater details what just happened.
+
+## Prerequisites
+This document assumes that you are already familiar with Unomi's [concepts](concepts.html). On the technical side, we also assume working knowledge of [git](https://git-scm.com/) to be able to retrieve the code for Unomi and the example. Additionnally, you will require a working Java 7 or above install. Refer to http://www.oracle.com/technetwork/java/javase/ for details on how to download and install Java SE 7 or greater.
+
+## Running Unomi
+
+### Building Unomi
+
+1. Get the code: `git clone https://git-wip-us.apache.org/repos/asf/incubator-unomi.git`
+2. Build and install according to the [instructions](building-and-deploying.html) and install Unomi.
+
+### Start Unomi
+Start Unomi according to the [instructions](building-and-deploying.html#Deploying_the_generated_package). Once you have Karaf running,
+ you should wait until you see the following messages on the Karaf console:
+
+```
+Initializing user list service endpoint...
+Initializing geonames service endpoint...
+Initializing segment service endpoint...
+Initializing scoring service endpoint...
+Initializing campaigns service endpoint...
+Initializing rule service endpoint...
+Initializing profile service endpoint...
+Initializing cluster service endpoint...
+```
+
+This indicates that all the Unomi services are started and ready to react to requests. You can then open a browser and go to `http://localhost:8181/cxs` to see the list of
+available RESTful services or retrieve an initial context at `http://localhost:8181/context.json` (which isn't very useful at this point).
+
+### Request examples
+
+#### Retrieving your first context
+
+You can retrieve a context using curl like this :
+
+ curl http://localhost:8181/context.js?sessionId=1234
+
+This will retrieve a JavaScript script that contains a `cxs` object that contains the context with the current user
+profile, segments, scores as well as functions that makes it easier to perform further requests (such as collecting
+events using the cxs.collectEvents() function).
+
+#### Retrieving a context as a JSON object.
+
+If you prefer to retrieve a pure JSON object, you can simply use a request formed like this:
+
+ curl http://localhost:8181/context.json?sessionId=1234
+
+#### Accessing profile properties in a context
+
+By default, in order to optimize the amount of data sent over the network, Apache Unomi will not send the content of
+the profile or session properties. If you need this data, you must send a JSON object to configure the resulting output
+of the context.js(on) servlet.
+
+Here is an example that will retrieve all the session and profile properties.
+
+ curl -H "Content-Type: application/json" -X POST -d '{"source":{"itemId":"homepage","itemType":"page","scope":"example"},"requiredProfileProperties":["*"],"requiredSessionProperties":["*"],"requireSegments":true}' http://localhost:8181/context.json?sessionId=1234
+
+The `requiredProfileProperties` and `requiredSessionProperties` are properties that take an array of property names
+that should be retrieved. In this case we use the wildcard character '*' to say we want to retrieve all the available
+properties. The structure of the JSON object that you should send is a JSON-serialized version of the [ContextRequest](http://unomi.incubator.apache.org/unomi-api/apidocs/org/apache/unomi/api/ContextRequest.html)
+Java class.
+
+#### Sending events using the context servlet
+
+At the same time as you are retrieving the context, you can also directly send events in the ContextRequest object as
+illustrated in the following example:
+
+ curl -H "Content-Type: application/json" -X POST -d '{"source":{"itemId":"homepage","itemType":"page","scope":"example"},"events":[{"eventType":"view","scope": "example","source":{"itemType": "site","scope":"example","itemId": "mysite"},"target":{"itemType":"page","scope":"example","itemId":"homepage","properties":{"pageInfo":{"referringURL":""}}}}]}' http://localhost:8181/context.json?sessionId=1234
+
+Upon received events, Apache Unomi will execute all the rules that match the current context, and return an updated context.
+This way of sending events is usually used upon first loading of a page. If you want to send events after the page has
+finished loading you could either do a second call and get an updating context, or if you don't need the context and want
+to send events in a network optimal way you can use the eventcollector servlet (see below).
+
+#### Sending events using the eventcollector servlet
+
+If you only need to send events without retrieving a context, you should use the eventcollector servlet that is optimized
+respond quickly and minimize network traffic. Here is an example of using this servlet:
+
+ curl -H "Content-Type: application/json" -X POST -d '{"events":[{"eventType":"view","scope": "example","source":{"itemType": "site","scope":"example","itemId": "mysite"},"target":{"itemType":"page","scope":"example","itemId":"homepage","properties":{"pageInfo":{"referringURL":""}}}}]}' http://localhost:8181/eventcollector?sessionId=1234
+
+Note that the eventcollector executes the rules but does not return a context. If is generally used after a page is loaded
+to send additional events.
+
+### Where to go from here
+
+- Read the [Twitter sample](twitter-sample.html) documentation that contains a detailed example of how to integrate with Apache Unomi.
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e16a0bc3/src/site/markdown/versions/1.2/login-sample.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/1.2/login-sample.md b/src/site/markdown/versions/1.2/login-sample.md
new file mode 100644
index 0000000..ac5df25
--- /dev/null
+++ b/src/site/markdown/versions/1.2/login-sample.md
@@ -0,0 +1,56 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+Login sample
+============
+
+This sample is an example of what is involved in integrated a login with Apache Unomi.
+
+Warning !
+---------
+
+The example code uses client-side Javascript code to send the login event. This is only
+done this way for the sake of sample simplicity but if should NEVER BE DONE THIS WAY in real cases.
+
+The login event should always be sent from the server performing the actual login since it must
+only be sent if the user has authenticated properly, and only the authentication server can validate this.
+
+Installing the sample
+---------------------
+
+1. Login into the Unomi Karaf SSH shell using something like this :
+
+ ssh -p 8102 karaf@localhost (default password is karaf)
+
+2. Install the login sample using the following command:
+
+ bundle:install mvn:org.apache.unomi/login-integration-sample/1.2.0-incubating-SNAPSHOT
+
+ when the bundle is successfully install you will get an bundle ID back we will call it BUNDLE_ID.
+
+3. You can then do:
+
+ bundle:start BUNDLE_ID
+
+4. If all went well you can access the login sample HTML page here :
+
+ http://localhost:8181/login/index.html
+
+5. You can fill in the form to test it. Note that the hardcoded password is:
+
+ test1234
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e16a0bc3/src/site/markdown/versions/1.2/salesforce-connector.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/1.2/salesforce-connector.md b/src/site/markdown/versions/1.2/salesforce-connector.md
new file mode 100644
index 0000000..d87d722
--- /dev/null
+++ b/src/site/markdown/versions/1.2/salesforce-connector.md
@@ -0,0 +1,156 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+Apache Unomi Salesforce Connector
+=================================
+
+This connector makes it possible to push and pull data to/from the Salesforce CRM. It can copy information between
+Apache Unomi profiles and Salesforce Leads.
+
+## Getting started
+
+1. Create a new developer account here:
+
+ https://developer.salesforce.com/signup
+
+2. Create a new Connected App, by going into Setup -> App Manager and click "Create Connected App"
+
+3. In the settings, make sure you do the following:
+
+ Enable OAuth settings -> Activated
+ Enable for device flow -> Activated (no need for a callback URL)
+ Add all the selected OAuth scopes you want (or put all of them)
+ Make sure Require Secret for Web Server flow is activated
+
+4. Make sure you retrieve the following information once you have created the app in the API (Enable OAuth Settings):
+
+ Consumer key
+ Consumer secret (click to see it)
+
+5. You must also retrieve your user's security token, or create it if you don't have one already. To do this simply
+click on your user at the top right, select "Settings", the click on "Reset my security token". You will receive an email
+with the security token.
+
+6. You are now ready to configure the Apache Unomi Salesforce Connector. In the etc/org.apache.unomi.sfdc.cfg file
+change the following settings:
+
+ sfdc.user.username=YOUR_USER_NAME
+ sfdc.user.password=YOUR_PASSWORD
+ sfdc.user.securityToken=YOUR_USER_SECURITY_TOKEN
+ sfdc.consumer.key=CONNECTED_APP_CONSUMER_KEY
+ sfdc.consumer.secret=CONNECTED_APP_SECRET
+
+7. Connected to the Apache Unomi Karaf Shell using :
+
+ ssh -p 8102 karaf@localhost (default password is karaf)
+
+7. Deploy into Apache Unomi using the following commands from the Apache Karaf shell:
+
+ feature:repo-add mvn:org.apache.unomi/unomi-salesforce-connector-karaf-kar/1.2.0-incubating-SNAPSHOT/xml/features
+ feature:install unomi-salesforce-connector-karaf-kar
+
+8. You can then test the connection to Salesforce by accessing the following URLs:
+
+ https://localhost:9443/cxs/sfdc/version
+ https://localhost:9443/cxs/sfdc/limits
+
+ The first URL will give you information about the version of the connector, so this makes it easy to check that the
+ plugin is properly deployed, started and the correct version. The second URL will actually make a request to the
+ Salesforce REST API to retrieve the limits of the Salesforce API.
+
+ Both URLs are password protected by the Apache Unomi (Karaf) password. You can find this user and password information
+ in the etc/users.properties file.
+
+9. You can now use the connector's defined actions in rules to push or pull data to/from the Salesforce CRM. You can
+ find more information about rules in the [Concepts](concepts.html) and the [Getting Started](getting-started.html) pages.
+
+## Upgrading the Salesforce connector
+
+If you followed all the steps in the Getting Started section, you can upgrade the Salesforce connector by using the following steps:
+
+1. Compile the connector using:
+
+ cd extensions/salesforce-connector
+ mvn clean install
+
+2. Login to the Unomi Karaf Shell using:
+
+ ssh -p 8102 karaf@localhost (password by default is karaf)
+
+3. Execute the following commands in the Karaf shell
+
+ feature:repo-refresh
+ feature:uninstall unomi-salesforce-connector-karaf-feature
+ feature:install unomi-salesforce-connector-karaf-feature
+
+4. You can then check that the new version is properly deployed by accessing the following URL and checking the build date:
+
+ https://localhost:9443/cxs/sfdc/version
+
+ (if asked for a password it's the same karaf/karaf default)
+
+## Using the Salesforce Workbench for testing REST API
+
+The Salesforce Workbench contains a REST API Explorer that is very useful to test requests. You may find it here :
+
+ https://workbench.developerforce.com/restExplorer.php
+
+## Setting up Streaming Push queries
+
+Using the Salesforce Workbench, you can setting streaming push queries (Queries->Streaming push topics) such as the
+following example:
+
+ Name: LeadUpdates
+ Query : SELECT Id,FirstName,LastName,Email,Company FROM Lead
+
+## Executing the unit tests
+
+Before running the tests, make sure you have completed all the steps above, including the streaming push queries setup.
+
+By default the unit tests will not run as they need proper Salesforce credentials to run. To set this up create a
+properties file like the following one:
+
+test.properties
+
+ #
+ # Licensed to the Apache Software Foundation (ASF) under one or more
+ # contributor license agreements. See the NOTICE file distributed with
+ # this work for additional information regarding copyright ownership.
+ # The ASF licenses this file to You under the Apache License, Version 2.0
+ # (the "License"); you may not use this file except in compliance with
+ # the License. You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ #
+ sfdc.user.username=YOUR_USER_NAME
+ sfdc.user.password=YOUR_PASSWORD
+ sfdc.user.securityToken=YOUR_USER_SECURITY_TOKEN
+ sfdc.consumer.key=CONNECTED_APP_CONSUMER_KEY
+ sfdc.consumer.secret=CONNECTED_APP_SECRET
+
+and then use the following command line to reference the file:
+
+ cd extensions/salesforce-connector
+ mvn clean install -DsfdcProperties=../test.properties
+
+(in case you're wondering the ../ is because the test is located in the services sub-directory)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e16a0bc3/src/site/markdown/versions/1.2/samples.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/1.2/samples.md b/src/site/markdown/versions/1.2/samples.md
new file mode 100644
index 0000000..4f2e262
--- /dev/null
+++ b/src/site/markdown/versions/1.2/samples.md
@@ -0,0 +1,23 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+# Samples
+
+Apache Unomi provides the following samples:
+
+- [Twitter integration](twitter-sample.html)
+- [Login integration](login-sample.html)