http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6d6c024f/src/site/markdown/versions/master/configuration.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/master/configuration.md 
b/src/site/markdown/versions/master/configuration.md
deleted file mode 100644
index a5d97fb..0000000
--- a/src/site/markdown/versions/master/configuration.md
+++ /dev/null
@@ -1,350 +0,0 @@
-<!--
-  ~ 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
-----------------------------
-
-Unomi secures some events by default. You can find the default configuration 
in the following file (created after the
-first server startup):
-
-    $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,updateProperties
-
-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
-
-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 webmas...@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.
-
-ElasticSearch X-Pack Support
---------------------------------------
-
-It is now possible to use X-Pack to connect to ElasticSearch. However, for 
licensing reasons this is not provided out 
-of the box. Here is the procedure to install X-Pack with Apache Unomi:
-
-#Important ! 
-
-Do not start Unomi directly with unomi:start, perform the following steps 
below first !
-
-#Installation steps
-
-1. Create a directory for all the JARs that you will download, we will call it 
XPACK_JARS_DIRECTORY
-2. Download 
https://artifacts.elastic.co/maven/org/elasticsearch/client/x-pack-transport/5.6.3/x-pack-transport-5.6.3.jar
 to XPACK_JARS_DIRECTORY
-3. Download 
https://artifacts.elastic.co/maven/org/elasticsearch/plugin/x-pack-api/5.6.3/x-pack-api-5.6.3.jar
 to XPACK_JARS_DIRECTORY
-4. Download 
http://central.maven.org/maven2/com/unboundid/unboundid-ldapsdk/3.2.0/unboundid-ldapsdk-3.2.0.jar
 to XPACK_JARS_DIRECTORY
-5. Download 
http://central.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.55/bcpkix-jdk15on-1.55.jar
 to XPACK_JARS_DIRECTORY
-6. Download 
http://central.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.55/bcprov-jdk15on-1.55.jar
 to XPACK_JARS_DIRECTORY
-7. Download 
http://central.maven.org/maven2/com/sun/mail/javax.mail/1.5.3/javax.mail-1.5.3.jar
 to XPACK_JARS_DIRECTORY
-8. Edit etc/org.apache.unomi.persistence.elasticsearch.cfg to add the 
following settings:
-
-        
transportClientClassName=org.elasticsearch.xpack.client.PreBuiltXPackTransportClient
-        transportClientJarDirectory=XPACK_JARS_DIRECTORY
-        transportClientProperties=xpack.security.user=elastic:changeme
-
-    You can setup more properties (for example for SSL/TLS support) by 
seperating the properties with commas, 
-    as in the following example:
-    
-        
transportClientProperties=xpack.security.user=elastic:changeme,xpack.ssl.key=/home/user/elasticsearch-5.6.3/config/x-pack/localhost/localhost.key,xpack.ssl.certificate=/home/user/elasticsearch-5.6.3/config/x-pack/localhost/localhost.crt,xpack.ssl.certificate_authorities=/home/user/elasticsearch-5.6.3/config/x-pack/ca/ca.crt,xpack.security.transport.ssl.enabled=true
-
-9. Launch Karaf and launch unomi using the command from the shell :
-
-        unomi:start
-        
-Alternatively you could edit the configuration directly from the Karaf shell 
using the following commands:
-        
-    config:edit org.apache.unomi.persistence.elasticsearch
-    config:property-set transportClientClassName 
org.elasticsearch.xpack.client.PreBuiltXPackTransportClient
-    config:property-set transportClientJarDirectory XPACK_JARS_DIRECTORY
-    config:property-set transportClientProperties 
xpack.security.user=elastic:changeme
-    config:update
-    unomi:start
-
-You can setup more properties (for example for SSL/TLS support) by seperating 
the properties with commas, 
-as in the following example:
-    
-    config:property-set transportClientProperties 
xpack.security.user=elastic:changeme,xpack.ssl.key=/home/user/elasticsearch-5.6.3/config/x-pack/localhost/localhost.key,xpack.ssl.certificate=/home/user/elasticsearch-5.6.3/config/x-pack/localhost/localhost.crt,xpack.ssl.certificate_authorities=/home/user/elasticsearch-5.6.3/config/x-pack/ca/ca.crt,xpack.security.transport.ssl.enabled=true

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6d6c024f/src/site/markdown/versions/master/connectors.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/master/connectors.md 
b/src/site/markdown/versions/master/connectors.md
deleted file mode 100644
index 3f688f2..0000000
--- a/src/site/markdown/versions/master/connectors.md
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-  ~ 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/6d6c024f/src/site/markdown/versions/master/consent-api.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/master/consent-api.md 
b/src/site/markdown/versions/master/consent-api.md
deleted file mode 100644
index 43f39db..0000000
--- a/src/site/markdown/versions/master/consent-api.md
+++ /dev/null
@@ -1,135 +0,0 @@
-<!--
-  ~ 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.
-  -->
-Consent API
-===========
-
-Starting with Apache Unomi 1.3 (still in development), a new API for consent 
management is now available. This API
-is designed to be able to store/retrieve/update visitor consents in order to 
comply with new 
-privacy regulations such as the 
[GDPR](https://en.wikipedia.org/wiki/General_Data_Protection_Regulation).
-
-Profiles with consents
-----------------------
-
-Visitor profiles now contain a new Consent object that contains the following 
information:
-
-- a scope
-- a type identifier for the consent. This can be any key to reference a 
consent. Note that Unomi does not manage consent 
-definitions, it only stores/retrieves consents for each profile based on this 
type
-- a status : GRANT, DENY or REVOKED
-- a status date (the date at which the status was updated)
-- a revocation date, in order to comply with GDPR this is usually set at two 
years
-
-Here is an example of a Profile with a consent attached to it:
-
-    {
-        "profileId": "8cbe380f-57bb-419d-97bf-24bf30178550",
-        "sessionId": "0d755f4e-154a-45c8-9169-e852e1d706d9",
-        "consents": {
-            "example/newsletter": {
-                "scope": "example",
-                "typeIdentifier": "newsletter",
-                "status": "GRANTED",
-                "statusDate": "2018-05-22T09:44:33Z",
-                "revokeDate": "2020-05-21T09:44:33Z"
-            }
-        }
-    }
-
-It is of course possible to have multiple consents defined for a single 
visitor profile.
-
-Consent type definitions
-------------------------
-
-Apache Unomi does not manage consent definitions, it leaves that to an 
external system (for example a CMS) so that it 
-can handle user-facing UIs to create, update, internationalize and present 
consent definitions to end users. 
-
-The only thing that is import to Apache Unomi to manage visitor consents is a 
globally unique key, that is called the
-consent type.
-
-Creating / update a visitor consent
------------------------------------
-
-A new built-in event type called "modifyConsent" can be sent to Apache Unomi 
to update a consent for the current
-profile.
-
-Here is an example of such an event:
-
-    {
-      "events": [
-        {
-          "scope": "example",
-          "eventType": "modifyConsent",
-          "source": {
-            "itemType": "page",
-            "scope": "example",
-            "itemId": "anItemId"
-          },
-          "target": {
-            "itemType": "anyType",
-            "scope": "example",
-            "itemId": "anyItemId"
-          },
-          "properties": {
-            "consent": {
-              "typeIdentifier": "newsletter",
-              "scope": "example",
-              "status": "GRANTED",
-              "statusDate": "2018-05-22T09:27:09.473Z",
-              "revokeDate": "2020-05-21T09:27:09.473Z"
-            }
-          }
-        }
-      ]
-    }
-
-You could send it using the following curl request:
-
-    curl -H "Content-Type: application/json" -X POST -d 
'{"source":{"itemId":"homepage","itemType":"page","scope":"example"},"events":[{"scope":"example","eventType":"modifyConsent","source":{"itemType":"page","scope":"example","itemId":"anItemId"},"target":{"itemType":"anyType","scope":"example","itemId":"anyItemId"},"properties":{"consent":{"typeIdentifier":"newsletter","scope":"example","status":"GRANTED","statusDate":"2018-05-22T09:27:09.473Z","revokeDate":"2020-05-21T09:27:09.473Z"}}}]}'
 http://localhost:8181/context.json?sessionId=1234
-
-How it works (internally)
--------------------------
-
-Upon receiving this event, Apache Unomi will trigger the modifyAnyConsent rule 
that has the following definition:
-
-    {
-      "metadata" : {
-        "id": "modifyAnyConsent",
-        "name": "Modify any consent",
-        "description" : "Modify any consent and sets the consent in the 
profile",
-        "readOnly":true
-      },
-    
-      "condition" : {
-        "type": "modifyAnyConsentEventCondition",
-        "parameterValues": {
-        }
-      },
-    
-      "actions" : [
-        {
-          "type": "modifyConsentAction",
-          "parameterValues": {
-          }
-        }
-      ]
-    
-    }
-    
-As we can see this rule is pretty simple it will simply execute the 
modifyConsentAction that is implemented by the 
-[ModifyConsentAction Java 
class](https://github.com/apache/incubator-unomi/blob/9f1bab437fd93826dc54d318ed00d3b2e3161437/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/ModifyConsentAction.java)
-
-This class will update the current visitor profile to add/update/revoke any 
consents that are included in the event.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6d6c024f/src/site/markdown/versions/master/custom-extensions.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/master/custom-extensions.md 
b/src/site/markdown/versions/master/custom-extensions.md
deleted file mode 100644
index d288663..0000000
--- a/src/site/markdown/versions/master/custom-extensions.md
+++ /dev/null
@@ -1,376 +0,0 @@
-<!--
-  ~ 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>${project.version}</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>${project.version}</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>${project.version}</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.
-
-## Deployment and custom definition
-
-When you deploy a custom bundle with a custom definition (see "Predefined xxx" 
chapters under) for the first time, the definition will automatically be 
deployed at your bundle start event **if it does not exist**, after that if you 
redeploy the same bundle there are two cases:
-1. Your bundle **is a SNAPSHOT** then every time you redeploy it the 
definition will be redeployed
-2. Your bundle **is NOT a SNAPSHOT** then the definition will not be 
redeployed, but you can redeploy it manually using the command 
`unomi:deploy-definition <bundleId> <fileName>`
-
-## 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",
-            "systemTags": ["properties", "profileProperties", 
"contactProfileProperties"]
-        },
-        "type": "string",
-        "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": "",
-        "systemTags": [
-          "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"
-                },
-                "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": "",
-        "systemTags": [
-          "demographic",
-          "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 interface="org.apache.unomi.api.actions.ActionExecutor">
-            <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": "",
-        "systemTags": [
-          "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/6d6c024f/src/site/markdown/versions/master/getting-started.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/master/getting-started.md 
b/src/site/markdown/versions/master/getting-started.md
deleted file mode 100644
index 6c4380d..0000000
--- a/src/site/markdown/versions/master/getting-started.md
+++ /dev/null
@@ -1,107 +0,0 @@
-<!--
-  ~ 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/6d6c024f/src/site/markdown/versions/master/login-sample.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/master/login-sample.md 
b/src/site/markdown/versions/master/login-sample.md
deleted file mode 100644
index 7c55e78..0000000
--- a/src/site/markdown/versions/master/login-sample.md
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--
-  ~ 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/${project.version}
-        
-    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/6d6c024f/src/site/markdown/versions/master/salesforce-connector.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/master/salesforce-connector.md 
b/src/site/markdown/versions/master/salesforce-connector.md
deleted file mode 100644
index 4a3e6b9..0000000
--- a/src/site/markdown/versions/master/salesforce-connector.md
+++ /dev/null
@@ -1,156 +0,0 @@
-<!--
-  ~ 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/${project.version}/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/6d6c024f/src/site/markdown/versions/master/samples.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/master/samples.md 
b/src/site/markdown/versions/master/samples.md
deleted file mode 100644
index 4f2e262..0000000
--- a/src/site/markdown/versions/master/samples.md
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-  ~ 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)

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6d6c024f/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
deleted file mode 100644
index d07b512..0000000
--- a/src/site/markdown/versions/master/twitter-sample.md
+++ /dev/null
@@ -1,403 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-Twitter sample
-==============
-
-## Overview
-We will examine how a simple HTML page can interact with Unomi to enrich a 
user's profile. The use case we will follow 
-is a rather simple one: we use a Twitter button to record the number of times 
the visitor tweeted (as a `tweetNb` profile 
-integer property) as well as the URLs they tweeted from (as a `tweetedFrom` 
multi-valued string profile property). 
-A javascript script will use the Twitter API to react to clicks on this button 
-and update the user profile using a `ContextServlet` request triggering a 
custom event. This event will, in turn, 
-trigger a Unomi action on the server implemented using a Unomi plugin, a 
standard extension point for the server.
-
-### Building the tweet button sample
-In your local copy of the Unomi repository and run:
-
-```
-cd samples/tweet-button-plugin
-mvn clean install
-```
-
-This will compile and create the OSGi bundle that can be deployed on Unomi to 
extend it.
-
-### Deploying the tweet button sample
-In standard Karaf fashion, you will need to copy the sample bundle to your 
Karaf `deploy` directory.
-
-If you are using the packaged version of Unomi (as opposed to deploying it to 
your own Karaf version), you can simply run, assuming your current directory is 
`samples/tweet-button-plugin` and that you uncompressed the archive in the 
directory it was created:
-
-```
-cp target/tweet-button-plugin-1.0.0-incubating-SNAPSHOT.jar 
../../package/target/unomi-1.0.0-incubating-SNAPSHOT/deploy
-```
-
-
-### Testing the sample
-You can now go to http://localhost:8181/index.html to test the sample code. 
The page is very simple, you will see a Twitter button, which, once clicked, 
will open a new window to tweet about the current page.  The original page 
should be updated with the new values of the properties coming from Unomi. 
Additionnally, the raw JSON response is displayed.
-
-We will now explain in greater details some concepts and see how the example 
works.
-
-## Interacting with the context server
-There are essentially two modalities to interact with the context server, 
reflecting different types of Unomi users: context server clients and context 
server integrators.
-
-**Context server clients** are usually web applications or content management 
systems. They interact with Unomi by providing raw, uninterpreted contextual 
data in the form of events and associated metadata. That contextual data is 
then processed by the context server to be fed to clients once actionable. In 
that sense context server clients are both consumers and producers of 
contextual data. Context server clients will mostly interact with Unomi using a 
single entry point called the `ContextServlet`, requesting context for the 
current user and providing any triggered events along the way.
-
-On the other hand, **context server integrators** provide ways to feed more 
structured data to the context server either to integrate with third party 
services or to provide analysis of the uninterpreted data provided by context 
server clients. Such integration will mostly be done using Unomi's API either 
directly using Unomi plugins or via the provided REST APIs. However, access to 
REST APIs is restricted due for security reasons, requiring privileged access 
to the Unomi server, making things a little more complex to set up.
-
-For simplicity's sake, this document will focus solely on the first use case 
and will interact only with the context servlet.
-
-## Retrieving context information from Unomi using the context servlet
-Unomi provides two ways to retrieve context: either as a pure JSON object 
containing strictly context information or as a couple of JSON objects 
augmented with javascript functions that can be used to interact with the Unomi 
server using the `<context server base URL>/context.json` or `<context server 
base URL>/context.js` URLs, respectively.
-
-Below is an example of asynchronously loading the initial context using the 
javascript version, assuming a default Unomi install running on 
`http://localhost:8181`:
-
-```javascript
-// Load context from Unomi asynchronously
-(function (document, elementToCreate, id) {
-    var js, fjs = document.getElementsByTagName(elementToCreate)[0];
-    if (document.getElementById(id)) return;
-    js = document.createElement(elementToCreate);
-    js.id = id;
-    js.src = 'http://localhost:8181/context.js';
-    fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'context'));
-
-```
-
-This initial context results in a javascript file providing some functions to 
interact with the context server from javascript along with two objects: a 
`cxs` object containing
-information about the context for the current user and a `digitalData` object 
that is injected into the browser’s `window` object (leveraging the
-[Customer Experience Digital Data 
Layer](http://www.w3.org/2013/12/ceddl-201312.pdf) standard). Note that this 
last object is not under control of the context server and clients
- are free to use it or not. Our example will not make use of it.
-
-On the other hand, the `cxs` top level object contains interesting contextual 
information about the current user:
-
-```json
-{
-  "profileId":<identifier of the profile associated with the current user>,
-  "sessionId":<identifier of the current user session>,
-  "profileProperties":<requested profile properties, if any>,
-  "sessionProperties":<requested session properties, if any>,
-  "profileSegments":<segments the profile is part of if requested>,
-  "filteringResults":<result of the evaluation of personalization filters>,
-  "trackedConditions":<tracked conditions in the source page, if any>
-}
-```
-
-We will look at the details of the context request and response later.
-
-# Example
-
-
-## HTML page
-The code for the HTML page with our Tweet button can be found at 
https://github.com/apache/incubator-unomi/blob/master/wab/src/main/webapp/index.html.
-
-This HTML page is fairly straightforward: we create a tweet button using the 
Twitter API while a Javascript script performs the actual logic.
-
-## Javascript
-
-Globally, the script loads both the twitter widget and the initial context 
asynchronously (as shown previously). This is accomplished using fairly 
standard javascript code and we won't look at it here. Using the Twitter API, 
we react to the `tweet` event and call the Unomi server to update the user's 
profile with the required information, triggering a custom `tweetEvent` event. 
This is accomplished using a `contextRequest` function which is an extended 
version of a classic `AJAX` request:
-
-```javascript
-function contextRequest(successCallback, errorCallback, payload) {
-    var data = JSON.stringify(payload);
-    // if we don't already have a session id, generate one
-    var sessionId = cxs.sessionId || generateUUID();
-    var url = 'http://localhost:8181/context.json?sessionId=' + sessionId;
-    var xhr = new XMLHttpRequest();
-    var isGet = data.length < 100;
-    if (isGet) {
-        xhr.withCredentials = true;
-        xhr.open("GET", url + "&payload=" + encodeURIComponent(data), true);
-    } else if ("withCredentials" in xhr) {
-        xhr.open("POST", url, true);
-        xhr.withCredentials = true;
-    } else if (typeof XDomainRequest != "undefined") {
-        xhr = new XDomainRequest();
-        xhr.open("POST", url);
-    }
-    xhr.onreadystatechange = function () {
-        if (xhr.readyState != 4) {
-            return;
-        }
-        if (xhr.status == 200) {
-            var response = xhr.responseText ? JSON.parse(xhr.responseText) : 
undefined;
-            if (response) {
-                cxs.sessionId = response.sessionId;
-                successCallback(response);
-            }
-        } else {
-            console.log("contextserver: " + xhr.status + " ERROR: " + 
xhr.statusText);
-            if (errorCallback) {
-                errorCallback(xhr);
-            }
-        }
-    };
-    xhr.setRequestHeader("Content-Type", "text/plain;charset=UTF-8"); // Use 
text/plain to avoid CORS preflight
-    if (isGet) {
-        xhr.send();
-    } else {
-        xhr.send(data);
-    }
-}
-```
-
-There are a couple of things to note here:
-
- - If we specify a payload, it is expected to use the JSON format so we 
`stringify` it and encode it if passed as a URL parameter in a `GET` request.
- - We need to make a 
[`CORS`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS) 
 request since the Unomi server is most likely not running on the same host 
than the one from which the request originates. The specific details are fairly 
standard and we will not explain them here.
- - We need to either retrieve (from the initial context we retrieved 
previously using `cxs.sessionId`) or generate a session identifier for our 
request since Unomi currently requires one.
- - We're calling the `ContextServlet` using the default install URI, 
specifying the session identifier:  
`http://localhost:8181/context.json?sessionId=' + sessionId`. This URI requests 
context from Unomi, resulting in an updated `cxs` object in the javascript 
global scope. The context server can reply to this request either by returning 
a JSON-only object containing solely the context information as is the case 
when the requested URI is `context.json`. However, if the client requests 
`context.js` then useful functions to interact with Unomi are added to the 
`cxs` object in addition to the context information as depicted above.
- - We don't need to provide any authentication at all to interact with this 
part of Unomi since we only have access to read-only data (as well as providing 
events as we shall see later on). If we had been using the REST API, we would 
have needed to provide authentication information as well.
-
-### Context request and response structure
-The interesting part, though, is the payload. This is where we provide Unomi 
with contextual information as well as ask for data in return. This allows 
clients to specify which type of information they are interested in getting 
from the context server as well as specify incoming events or content filtering 
or property/segment overrides for personalization or impersonation. This 
conditions what the context server will return with its response.
-
-Let's look at the context request structure:
-
-```json
-{
-    source: <Item source of the context request>,
-    events: <optional array of triggered events>,
-    requiredProfileProperties: <optional array of property identifiers>,
-    requiredSessionProperties: <optional array of property identifiers>,
-    filters: <optional array of filters to evaluate>,
-    profileOverrides: <optional profile containing segments,scores or profile 
properties to override>,
-            - segments: <optional array of segment identifiers>,
-            - profileProperties: <optional map of property name / value pairs>,
-            - scores: <optional map of score id / value pairs>
-    sessionPropertiesOverrides: <optional map of property name / value pairs>,
-    requireSegments: <boolean, whether to return the associated segments>
-}
-```
-
-We will now look at each part in greater details.
-
-#### Source
-A context request payload needs to at least specify some information about the 
source of the request in the form of an `Item` (meaning identifier, type and 
scope plus any additional properties we might have to provide), via the 
`source` property of the payload. Of course the more information can be 
provided about the source, the better.
-
-#### Filters
-A client wishing to perform content personalization might also specify 
filtering conditions to be evaluated by the context server so that it can tell 
the client whether the content associated with the filter should be activated 
for this profile/session. This is accomplished by providing a list of filter 
definitions to be evaluated by the context server via the `filters` field of 
the payload. If provided, the evaluation results will be provided in the 
`filteringResults` field of the resulting `cxs` object the context server will 
send.
-
-#### Overrides
-It is also possible for clients wishing to perform user impersonation to 
specify properties or segments to override the proper ones so as to emulate a 
specific profile, in which case the overridden value will temporarily replace 
the proper values so that all rules will be evaluated with these values instead 
of the proper ones. The `segments` (array of segment identifiers), 
`profileProperties` (maps of property name and associated object value) and 
`scores` (maps of score id and value) all wrapped in a profileOverrides object 
and the `sessionPropertiesOverrides` (maps of property name and associated 
object value) fields allow to provide such information. Providing such 
overrides will, of course, impact content filtering results and segments 
matching for this specific request.
-
-#### Controlling the content of the response
-The clients can also specify which information to include in the response by 
setting the `requireSegments` property to true if segments the current profile 
matches should be returned or provide an array of property identifiers for 
`requiredProfileProperties` or `requiredSessionProperties` fields to ask the 
context server to return the values for the specified profile or session 
properties, respectively. This information is provided by the 
`profileProperties`, `sessionProperties` and `profileSegments` fields of the 
context server response.
-
-Additionally, the context server will also returns any tracked conditions 
associated with the source of the context request. Upon evaluating the incoming 
request, the context server will determine if there are any rules marked with 
the `trackedCondition` tag and which source condition matches the source of the 
incoming request and return these tracked conditions to the client. The client 
can use these tracked conditions to learn that the context server can react to 
events matching the tracked condition and coming from that source. This is, in 
particular, used to implement form mapping (a solution that allows clients to 
update user profiles based on values provided when a form is submitted).
-
-#### Events
-Finally, the client can specify any events triggered by the user actions, so 
that the context server can process them, via the `events` field of the context 
request.
-
-#### Default response
-If no payload is specified, the context server will simply return the minimal 
information deemed necessary for client applications to properly function: 
profile identifier, session identifier and any tracked conditions that might 
exist for the source of the request.
-
-### Context request for our example
-Now that we've seen the structure of the request and what we can expect from 
the context response, let's examine the request our component is doing.
-
-In our case, our `source` item looks as follows: we specify a scope for our 
application (`unomi-tweet-button-sample`), specify that the item type (i.e. the 
kind of element that is the source of our event) is a `page` (which 
corresponds, as would be expected, to a web page), provide an identifier (in 
our case, a Base-64 encoded version of the page's URL) and finally, specify 
extra properties (here, simply a `url` property corresponding to the page's URL 
that will be used when we process our event in our Unomi extension).
-
-```javascript
-var scope = 'unomi-tweet-button-sample';
-var itemId = btoa(window.location.href);
-var source = {
-    itemType: 'page',
-    scope: scope,
-    itemId: itemId,
-    properties: {
-        url: window.location.href
-    }
-};
-```
-
-We also specify that we want the context server to return the values of the 
`tweetNb` and `tweetedFrom` profile properties in its response. Finally, we 
provide a custom event of type `tweetEvent` with associated scope and source 
information, which matches the source of our context request in this case.
-
-```javascript
-var contextPayload = {
-    source: source,
-    events: [
-        {
-            eventType: 'tweetEvent',
-            scope: scope,
-            source: source
-        }
-    ],
-    requiredProfileProperties: [
-        'tweetNb',
-        'tweetedFrom'
-    ]
-};
-```
-
-The `tweetEvent` event type is not defined by default in Unomi. This is where 
our Unomi plugin comes into play since we need to tell Unomi how to react when 
it encounters such events.
-
-### Unomi plugin overview
-
-In order to react to `tweetEvent` events, we will define a new Unomi rule 
since this is exactly what Unomi rules are supposed to do. Rules are guarded by 
conditions and if these
- conditions match, the associated set of actions will be executed. In our 
case, we want our new
- 
[`incrementTweetNumber`](https://github.com/apache/incubator-unomi/blob/master/samples/tweet-button-plugin/src/main/resources/META-INF/cxs/rules/incrementTweetNumber.json)
 rule to only react to `tweetEvent` events and
-  we want it to perform the profile update accordingly: create the property 
types for our custom properties if they don't exist and update them. To do so, 
we will create a
-  custom
-  
[`incrementTweetNumberAction`](https://github.com/apache/incubator-unomi/blob/master/samples/tweet-button-plugin/src/main/resources/META-INF/cxs/actions/incrementTweetNumberAction.json)
 action that will be triggered any time our rule matches. An action is some 
custom code that is deployed in the context server and can access the
-  Unomi API to perform what it is that it needs to do.
-
-
-### Rule definition
-Let's look at how our custom 
[`incrementTweetNumber`](https://github.com/apache/incubator-unomi/blob/master/samples/tweet-button-plugin/src/main/resources/META-INF/cxs/rules/incrementTweetNumber.json)
 rule is defined:
-
-```json
-{
-  "metadata": {
-    "id": "smp:incrementTweetNumber",
-    "name": "Increment tweet number",
-    "description": "Increments the number of times a user has tweeted after 
they click on a tweet button"
-  },
-  "raiseEventOnlyOnceForSession": false,
-  "condition": {
-    "type": "eventTypeCondition",
-    "parameterValues": {
-      "eventTypeId": "tweetEvent"
-    }
-  },
-  "actions": [
-    {
-      "type": "incrementTweetNumberAction",
-      "parameterValues": {}
-    }
-  ]
-}
-```
-
-Rules define a metadata section where we specify the rule name, identifier and 
description.
-
-When rules trigger, a specific event is raised so that other parts of Unomi 
can react to it accordingly. We can control how that event should be raised. 
Here we specify that the event should be raised each time the rule triggers and 
not only once per session by setting `raiseEventOnlyOnceForSession` to `false`, 
which is not strictly required since that is the default. A similar setting 
(`raiseEventOnlyOnceForProfile`) can be used to specify that the event should 
only be raised once per profile if needed.
-
-We could also specify a priority for our rule in case it needs to be executed 
before other ones when similar conditions match. This is accomplished using the 
`priority` property. We're using the default priority here since we don't have 
other rules triggering on `tweetEvent`s and don't need any special ordering.
-
-We then tell Unomi which condition should trigger the rule via the `condition` 
property. Here, we specify that we want our rule to trigger on an 
`eventTypeCondition` condition. Unomi can be extended by adding new condition 
types that can enrich how matching or querying is performed. The condition type 
definition file specifies which parameters are expected for our condition to be 
complete. In our case, we use the built-in event type condition that will match 
if Unomi receives an event of the type specified in the condition's 
`eventTypeId` parameter value: `tweetEvent` here.
-
-Finally, we specify a list of actions that should be performed as consequences 
of the rule matching. We only need one action of type 
`incrementTweetNumberAction` that doesn't require any parameters.
-
-### Action definition
-Let's now look at our custom 
[`incrementTweetNumberAction`](https://github.com/apache/incubator-unomi/blob/master/samples/tweet-button-plugin/src/main/resources/META-INF/cxs/actions/incrementTweetNumberAction.json)
 action type definition:
-
-```json
-{
-  "id": "incrementTweetNumberAction",
-  "actionExecutor": "incrementTweetNumber",
-  "systemTags": [
-    "event"
-  ],
-  "parameters": []
-}
-```
-
-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`.
-
-### Action executor definition
-The action executor references the actual implementation of the action as 
defined in our [blueprint 
definition](https://github.com/apache/incubator-unomi/blob/master/samples/tweet-button-plugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml):
-
-```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";>
-
-    <reference id="profileService" 
interface="org.apache.unomi.api.services.ProfileService"/>
-
-    <!-- Action executor -->
-    <service id="incrementTweetNumberAction" 
interface="org.apache.unomi.api.actions.ActionExecutor">
-        <service-properties>
-            <entry key="actionExecutorId" value="incrementTweetNumber"/>
-        </service-properties>
-        <bean 
class="org.apache.unomi.examples.unomi_tweet_button_plugin.actions.IncrementTweetNumberAction">
-            <property name="profileService" ref="profileService"/>
-        </bean>
-    </service>
-</blueprint>
-```
-
-In standard Blueprint fashion, we specify that we will need the 
`profileService` defined by Unomi and then define a service of our own to be 
exported for Unomi to use. Our service specifies one property: 
`actionExecutorId` which matches the identifier we specified in our action 
definition. We then inject the profile service in our executor and we're done 
for the configuration side of things!
-
-### Action executor implementation
-Our action executor definition specifies that the bean providing the service 
is implemented in the [`org.apache.unomi.samples.tweet_button_plugin.actions
-.IncrementTweetNumberAction`](https://github.com/apache/incubator-unomi/blob/master/samples/tweet-button-plugin/src/main/java/org/apache/unomi/samples/tweet_button_plugin/actions/IncrementTweetNumberAction.java)
 class. This class implements the Unomi `ActionExecutor` interface which 
provides a single `int execute(Action action, Event event)` method: the 
executor gets the action instance to execute along with the event that 
triggered it, performs its work and returns an integer status corresponding to 
what happened as defined by public constants of the `EventService` interface of 
Unomi: `NO_CHANGE`, `SESSION_UPDATED` or `PROFILE_UPDATED`.
-
-Let's now look at the implementation of the method:
-
-```java
-final Profile profile = event.getProfile();
-Integer tweetNb = (Integer) profile.getProperty(TWEET_NB_PROPERTY);
-List<String> tweetedFrom = (List<String>) 
profile.getProperty(TWEETED_FROM_PROPERTY);
-
-if (tweetNb == null || tweetedFrom == null) {
-    // create tweet number property type
-    PropertyType propertyType = new PropertyType(new 
Metadata(event.getScope(), TWEET_NB_PROPERTY, TWEET_NB_PROPERTY, "Number of 
times a user tweeted"));
-    propertyType.setValueTypeId("integer");
-    service.createPropertyType(propertyType);
-
-    // create tweeted from property type
-    propertyType = new PropertyType(new Metadata(event.getScope(), 
TWEETED_FROM_PROPERTY, TWEETED_FROM_PROPERTY, "The list of pages a user tweeted 
from"));
-    propertyType.setValueTypeId("string");
-    propertyType.setMultivalued(true);
-    service.createPropertyType(propertyType);
-
-    tweetNb = 0;
-    tweetedFrom = new ArrayList<>();
-}
-
-profile.setProperty(TWEET_NB_PROPERTY, tweetNb + 1);
-final String sourceURL = extractSourceURL(event);
-if (sourceURL != null) {
-    tweetedFrom.add(sourceURL);
-}
-profile.setProperty(TWEETED_FROM_PROPERTY, tweetedFrom);
-
-return EventService.PROFILE_UPDATED;
-```
-
- It is fairly straightforward: we retrieve the profile associated with the 
event that triggered the rule and check whether it already has the properties 
we are interested in. If not, we create the associated property types and 
initialize the property values.
-
->Note that it is not an issue to attempt to create the same property type 
multiple times as Unomi will not add a new property type if an identical type 
already exists.
-
-Once this is done, we update our profile with the new property values based on 
the previous values and the metadata extracted from the event using the 
`extractSourceURL` method which uses our `url` property that we've specified 
for our event source. We then return that the profile was updated as a result 
of our action and Unomi will properly save it for us when appropriate. That's 
it!
-
-For reference, here's the `extractSourceURL` method implementation:
-
-```java
-private String extractSourceURL(Event event) {
-    final Item sourceAsItem = event.getSource();
-    if (sourceAsItem instanceof CustomItem) {
-        CustomItem source = (CustomItem) sourceAsItem;
-        final String url = (String) source.getProperties().get("url");
-        if (url != null) {
-            return url;
-        }
-    }
-
-    return null;
-}
-```
-
-# Conclusion
-We have seen a simple example how to interact with Unomi using a combination 
of client-side code and Unomi plugin. Hopefully, this provided an introduction 
to the power of what Unomi can do and how it can be extended to suit your needs.
-
-# Annex
-Here is an overview of how Unomi processes incoming requests to the 
`ContextServlet`.
-![Unomi request overview](../../images/unomi-request.png)
-

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6d6c024f/src/site/markdown/versions/master/weather-update-sample.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/master/weather-update-sample.md 
b/src/site/markdown/versions/master/weather-update-sample.md
deleted file mode 100644
index 2845ecd..0000000
--- a/src/site/markdown/versions/master/weather-update-sample.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-Weather update sample
-=====================

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6d6c024f/src/site/resources/images/apache-unomi-380x85.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/apache-unomi-380x85.png 
b/src/site/resources/images/apache-unomi-380x85.png
deleted file mode 100644
index 3da0642..0000000
Binary files a/src/site/resources/images/apache-unomi-380x85.png and /dev/null 
differ

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6d6c024f/src/site/resources/images/apache-unomi-571x128.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/apache-unomi-571x128.png 
b/src/site/resources/images/apache-unomi-571x128.png
deleted file mode 100644
index bc6b2fc..0000000
Binary files a/src/site/resources/images/apache-unomi-571x128.png and /dev/null 
differ

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6d6c024f/src/site/resources/images/apache-unomi-large.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/apache-unomi-large.png 
b/src/site/resources/images/apache-unomi-large.png
deleted file mode 100644
index dad5d53..0000000
Binary files a/src/site/resources/images/apache-unomi-large.png and /dev/null 
differ

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6d6c024f/src/site/resources/images/incubator-logo.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/incubator-logo.png 
b/src/site/resources/images/incubator-logo.png
deleted file mode 100644
index 714dbd7..0000000
Binary files a/src/site/resources/images/incubator-logo.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6d6c024f/src/site/resources/images/unomi-100x99.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/unomi-100x99.png 
b/src/site/resources/images/unomi-100x99.png
deleted file mode 100644
index 5c06e27..0000000
Binary files a/src/site/resources/images/unomi-100x99.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/6d6c024f/src/site/resources/images/unomi-200x56.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/unomi-200x56.png 
b/src/site/resources/images/unomi-200x56.png
deleted file mode 100644
index 9ffa016..0000000
Binary files a/src/site/resources/images/unomi-200x56.png and /dev/null differ


Reply via email to