You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/12/15 17:37:46 UTC

syncope git commit: [SYNCOPE-740] All but release process is done

Repository: syncope
Updated Branches:
  refs/heads/master 1b3e8ea8f -> ce7cad4e1


[SYNCOPE-740] All but release process is done


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ce7cad4e
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ce7cad4e
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ce7cad4e

Branch: refs/heads/master
Commit: ce7cad4e11ce58a86c16f3279254ca5adde14c70
Parents: 1b3e8ea
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Dec 15 17:37:31 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Dec 15 17:37:31 2015 +0100

----------------------------------------------------------------------
 pom.xml                                         |  17 +-
 src/main/asciidoc/images/iam-scenario.png       | Bin 0 -> 114653 bytes
 src/main/asciidoc/introduction.adoc             |  58 ++++--
 .../images/apache-syncope-architecture.png      | Bin 65030 -> 0 bytes
 src/site/resources/images/application-pdf.png   | Bin 0 -> 525 bytes
 src/site/resources/images/text-html.png         | Bin 0 -> 793 bytes
 src/site/site.xml                               |  18 +-
 src/site/xdoc/architecture.xml                  | 205 ++++++++++---------
 src/site/xdoc/building.xml                      |  65 ++----
 src/site/xdoc/contributing.xml                  |  19 +-
 src/site/xdoc/docs/index.xml                    |  74 ++++++-
 src/site/xdoc/downloads.xml                     | 112 ++--------
 src/site/xdoc/features.xml                      |  81 --------
 src/site/xdoc/iam-scenario.xml                  |  94 +++++++++
 src/site/xdoc/index.xml                         |  36 +++-
 src/site/xdoc/mailing-lists.xml                 |   5 -
 src/site/xdoc/professional-services.xml         |  11 +-
 src/site/xdoc/security.xml                      |   2 +-
 18 files changed, 426 insertions(+), 371 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/ce7cad4e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 529536d..4a05c77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1731,6 +1731,7 @@ under the License.
                   <version>2.10.3</version>
                   <configuration>
                     <destDir>apidocs/2.0</destDir>
+                    <isOffline>false</isOffline>
                     <detectLinks>true</detectLinks>
                     <detectJavaApiLink>true</detectJavaApiLink>
                     <links>
@@ -1739,7 +1740,7 @@ under the License.
                       <link>http://connid.tirasa.net/apidocs/1.4/</link>
                       <link>http://camel.apache.org/maven/current/camel-core/apidocs/</link>
                       <link>http://camel.apache.org/maven/current/camel-spring/apidocs/</link>
-                      <link>http://ci.apache.org/projects/wicket/apidocs/7.x/</link>
+                      <link>https://ci.apache.org/projects/wicket/apidocs/7.x/</link>
                       <link>http://docs.spring.io/spring/docs/4.2.x/javadoc-api/</link>
                       <link>http://docs.spring.io/spring-security/site/docs/4.0.x/apidocs/</link>
                       <link>http://activiti.org/javadocs/</link>
@@ -1758,6 +1759,20 @@ under the License.
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>
               <execution>
+                <id>fix-FacebookLike-width</id>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <phase>post-site</phase>
+                <configuration>
+                  <target>
+                    <replace dir="${rootpom.basedir}/target/site" token="48px" value="70px">
+                      <include name="**/*.html"/>
+                    </replace>
+                  </target>
+                </configuration>
+              </execution>
+              <execution>
                 <id>copy-docs-to-site</id>
                 <goals>
                   <goal>run</goal>

http://git-wip-us.apache.org/repos/asf/syncope/blob/ce7cad4e/src/main/asciidoc/images/iam-scenario.png
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/images/iam-scenario.png b/src/main/asciidoc/images/iam-scenario.png
new file mode 100644
index 0000000..a059c76
Binary files /dev/null and b/src/main/asciidoc/images/iam-scenario.png differ

http://git-wip-us.apache.org/repos/asf/syncope/blob/ce7cad4e/src/main/asciidoc/introduction.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/introduction.adoc b/src/main/asciidoc/introduction.adoc
index bb9d044..19eb534 100644
--- a/src/main/asciidoc/introduction.adoc
+++ b/src/main/asciidoc/introduction.adoc
@@ -57,9 +57,52 @@ defined so that any objects data can be managed through Syncope: workstations, p
 and so on. This positions Apache Syncope at the forefront for bringing Identity Management in the IoT world.
 ****
 
+=== Identity and Access Management - Reference Scenario
+
+[.text-center]
+image::iam-scenario.png[title="IAM Scenario",alt="IAM Scenario"]
+
+The picture above shows the tecnologies involved in a complete IAM solution:
+
+* *_Identity Store_* (as RDBMS, LDAP, Active Directory, meta- and virtual-directories) - the repository for account data
+* *_Provisioning Engine_* - synchronizes account data across identity stores and a broad range of data formats, models, 
+meanings and purposes
+* *_Access Manager_* - access mediator to all applications, focused on application front-end, taking care of
+authentication (https://en.wikipedia.org/wiki/Single_sign-on[Single Sign-On^]), authorization
+(http://oauth.net/[OAuth^], https://en.wikipedia.org/wiki/XACML[XACML^]) and federation
+(https://en.wikipedia.org/wiki/Security_Assertion_Markup_Language[SAML^], http://openid.net/connect/[OpenID Connect^]).
+
+[NOTE]
+====
+As you can notice, *Apache Syncope is primarily a provisioning engine*.
+====
+
+==== Aren't Identity Stores enough?
+
+One might suppose that a single identity store can solve all the identity needs inside an organization, but few
+drawbacks are just around the corner:
+
+. Heterogeneity of systems
+. Lack of a single source of information (HR for corporate id, Groupware for mail address, ...)
+. Often applications require a local user database
+. Inconsistent policies across the infrastructure
+. Lack of workflow management
+. Hidden infrastructure management cost, growing with organization
+
 === A bird's eye view on the Architecture of Apache Syncope
 
- * *_Core_* is the central component, providing all services offered by Apache Syncope. +
+[.text-center]
+image::architecture.png[title="Architecture",alt="Architecture"]
+
+*_Admin UI_* is the web-based console for configuring and administering running deployments, with full support
+for delegated administration.
+
+*_End-user UI_* is the web-based application for self-registration, self-service and password reset.
+
+*_CLI_* is the command-line application for interacting with Apache Syncope from scripts, particularly useful for 
+system administrators.
+
+*_Core_* is the central component, providing all services offered by Apache Syncope. +
 It exposes a fully-compliant https://en.wikipedia.org/wiki/Java_API_for_RESTful_Web_Services[JAX-RS 2.0^] 
 https://en.wikipedia.org/wiki/Representational_state_transfer[RESTful^] interface which enables third-party applications,
 written in any programming language, to consume IdM services.
@@ -78,24 +121,13 @@ http://www.bpmn.org/[BPMN 2.0^] implementation - or define new, custom ones.
  * *_Persistence_* manages all data (users, groups, attributes, resources, ...) at a high level 
 using a standard https://en.wikipedia.org/wiki/Java_Persistence_API[JPA 2.0^] approach. The data is persisted to an underlying 
 database, referred to as *_Internal Storage_*. Consistency is ensured via the comprehensive
-http://docs.spring.io/spring/docs/4.1.x/spring-framework-reference/html/transaction.html[transaction management^] 
+http://docs.spring.io/spring/docs/4.2.x/spring-framework-reference/html/transaction.html[transaction management^] 
 provided by the Spring Framework. +
 Globally, this offers the ability to easily scale up to a million entities and at the same time allows great portability with no code 
 changes: MySQL, MariaDB, PostgreSQL, Oracle and MS SQL Server are fully supported deployment options.
  * *_Security_* defines a fine-grained set of entitlements which can be granted to administrators, thus enabling the 
 implementation of delegated administration scenarios.
 
-[.text-center]
-image::architecture.png[title="Architecture",alt="Architecture"]
-
-*_Admin UI_* is the web-based console for configuring and administering running deployments, with full support
-for delegated administration.
-
-*_End-user UI_* is the web-based application for self-registration, self-service and password reset.
-
-*_CLI_* is the command-line application for interacting with Apache Syncope from scripts, particularly useful for 
-system administrators.
-
 Third-party applications are provided full access to IdM services by leveraging the REST interface, either via the 
 Java _SyncopeClient_ library (the basis of Admin UI, End-user UI and CLI) or plain HTTP calls.
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/ce7cad4e/src/site/resources/images/apache-syncope-architecture.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/apache-syncope-architecture.png b/src/site/resources/images/apache-syncope-architecture.png
deleted file mode 100644
index df48a1b..0000000
Binary files a/src/site/resources/images/apache-syncope-architecture.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/syncope/blob/ce7cad4e/src/site/resources/images/application-pdf.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/application-pdf.png b/src/site/resources/images/application-pdf.png
new file mode 100644
index 0000000..61abcf9
Binary files /dev/null and b/src/site/resources/images/application-pdf.png differ

http://git-wip-us.apache.org/repos/asf/syncope/blob/ce7cad4e/src/site/resources/images/text-html.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/text-html.png b/src/site/resources/images/text-html.png
new file mode 100644
index 0000000..60fe5d9
Binary files /dev/null and b/src/site/resources/images/text-html.png differ

http://git-wip-us.apache.org/repos/asf/syncope/blob/ce7cad4e/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index b7c5527..039014b 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -18,10 +18,10 @@ specific language governing permissions and limitations
 under the License.
 
 -->
-<project xmlns="http://maven.apache.org/DECORATION/1.1.0" 
+<project xmlns="http://maven.apache.org/DECORATION/1.6.0" 
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 
-                             http://maven.apache.org/xsd/decoration-1.1.0.xsd" 
+         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 
+                             http://maven.apache.org/xsd/decoration-1.6.0.xsd" 
          name="Apache Syncope">
 
   <publishDate position="none"/>
@@ -38,7 +38,7 @@ under the License.
       <sideBarEnabled>true</sideBarEnabled>
       <leftColumnClass>span2</leftColumnClass>
       <bodyColumnClass>span10</bodyColumnClass>
-      <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+      <sourceLineNumbersEnabled>false</sourceLineNumbersEnabled>
       <skipGenerationDate>true</skipGenerationDate>
       <twitter>
         <user>syncopeidm</user>
@@ -60,18 +60,12 @@ under the License.
       <item name="Apache Syncope" href="http://syncope.apache.org/"/>
     </breadcrumbs>
         
-    <menu name="Overview">
-      <item name="Features" href="features.html"/>
+    <menu name="Apache Syncope™" inherit="top">
+      <item name="IAM Scenario" href="iam-scenario.html"/>
       <item name="Architecture" href="architecture.html"/>
       <item name="Downloads" href="downloads.html"/>
       <item name="Security Advisories" href="security.html"/>
       <item name="Documentation" href="docs/index.html"/>
-      <item name="References">
-        <item name="REST 2.0" href="rest/2.0/index.html"/>
-        <item name="REST 1.2" href="rest/1.2/index.html"/>
-        <item name="Javadocs 2.0" href="apidocs/2.0/index.html"/>
-        <item name="Javadocs 1.2" href="apidocs/1.2/index.html"/>
-      </item>
       <item name="Mailing Lists" href="mailing-lists.html"/>
       <item name="Project Team" href="team-list.html"/>
       <item name="License" href="license.html"/>

http://git-wip-us.apache.org/repos/asf/syncope/blob/ce7cad4e/src/site/xdoc/architecture.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/architecture.xml b/src/site/xdoc/architecture.xml
index d072563..48bf196 100644
--- a/src/site/xdoc/architecture.xml
+++ b/src/site/xdoc/architecture.xml
@@ -27,119 +27,124 @@ under the License.
   </properties>
 
   <body>
-
-    <div class="toc_container">
-      <macro name="toc">
-        <param name="class" value="toc"/>
-      </macro>
-    </div>
+    <section name="Architecture">      
+      
+      <p style="text-align:center;">
+        <img src="docs/images/architecture.png" alt="Syncope architecture" width="600"/>
+      </p>
       
-    <section name="Introduction">
       <p>
-        From a high-level point of view, the component architecture of Apache Syncope can be summarized by the following
-        figure:
-        <div style="width:100%; text-align:center; margin:20px;">
-          <img src="images/apache-syncope-architecture.png" alt="Apache Syncope Architecture" width="600px"/>
-        </div>
-        Apache Syncope is composed by two main subsystems: 
-        <a href="#The_core">core</a> and 
-        <a href="#The_console">console</a>.
+        <strong>
+          <em>Admin UI</em>
+        </strong> is the web-based console for configuring and administering running deployments, with full support
+        for delegated administration.
       </p>
-    </section>
 
-    <section name="The core">
       <p>
-        The web application that implements IdM features. It offers a RESTful interface for caller applications, 
-        implements the provisioning core by mean of its workflow engine and its propagation layer, and manages data 
-        persistence.
+        <strong>
+          <em>End-user UI</em>
+        </strong> is the web-based application for self-registration, self-service and password reset
       </p>
-      
-      <subsection name="Apache Syncope core logic">
-        <p>
-          This central component orchestrates the whole data flow throughout the system.
-          Handles RESTful calls, processes data alongside the defined workflow and propagates to and synchronizes from 
-          configured external resources (if needed).
-        </p>
-      </subsection>
 
-      <subsection name="RESTful controllers">
-        <p>
-          RESTful controllers take care of communication with outside world.
-          Implemented by leveraging Spring's REST and MVC features, these controllers exchange data in both XML and JSON
-          formats.
-        </p>
-      </subsection>
+      <p>
+        <strong>
+          <em>CLI</em>
+        </strong> is the command-line application for interacting with Apache Syncope from scripts, particularly 
+        useful for system administrators.
+      </p>
 
-      <subsection name="Workflow engine">
-        <p>
-          The Workflow engine is a pluggable aspect of Apache Syncope: this lets every deployment choose among one of 
-          provided engine implementations or define new, custom ones.
-        </p>
+      <p>
+        <strong>
+          <em>Core</em>
+        </strong> is the central component, providing all services offered by Apache Syncope.<br/>
+        It exposes a fully-compliant 
+        <a target="_blank" href="https://en.wikipedia.org/wiki/Java_API_for_RESTful_Web_Services">JAX-RS 2.0</a>
+        <a target="_blank" href="https://en.wikipedia.org/wiki/Representational_state_transfer">RESTful</a> 
+        interface which enables third-party applications, written in any programming language, to consume IdM 
+        services.
+      </p>
 
-        <p>
-          The default implementation is based on 
-          <a href="http://www.activiti.org" target="_blank">Activiti BPM</a>, the reference Open Source implementation 
-          that supports the definition of an XML descriptor in which the user lifecycle is defined.
-          This aspect makes the whole system very flexible to adapt to different situations.
-          <br/>
-          The default implementation also provides notification, approval, and end-user request management.
+      <ul>
+        <li>
+          <p>
+            <strong>
+              <em>Logic</em>
+            </strong> implements the overall business logic that can be triggered via REST services, and controls some 
+            additional features (notifications, reports and audit over all)
+          </p>
+        </li>
+        <li>
+          <p>
+            <strong>
+              <em>Provisioning</em>
+            </strong> is involved with managing the internal (via workflow) and external (via specific connectors)
+            representation of users, groups and any objects.<br/>
+            This component often needs to be tailored to meet the requirements of a specific deployment, as it is the 
+            crucial decision point for defining and enforcing the consistency and transformations between internal and 
+            external data. The default all-Java implementation can be extended for this purpose.
+            In addition, an <a target="_blank" href="http://camel.apache.org/">Apache Camel</a>-based
+            implementation is also available as an extension, which brings all the power of runtime changes and 
+            adaptation.
+          </p>
+        </li>
+        <li>
+          <p>
+            <strong>
+              <em>Workflow</em>
+            </strong> is one of the pluggable aspects of Apache Syncope: this lets every deployment choose the preferred 
+            engine from a provided list - including the one based on 
+            <a target="_blank" href="http://www.activiti.org/">Activiti BPM</a>, the reference open source
+            <a target="_blank" href="http://www.bpmn.org/">BPMN 2.0</a> implementation - or define new, custom ones.
+          </p>
+        </li>
+        <li>
+          <p>
+            <strong>
+              <em>Persistence</em>
+            </strong> manages all data (users, groups, attributes, resources, …&#8203;) at a high level
+            using a standard <a target="_blank" href="https://en.wikipedia.org/wiki/Java_Persistence_API">JPA 2.0</a> 
+            approach. The data is persisted to an underlying database, referred to as <strong>
+              <em>Internal Storage</em>
+            </strong>. Consistency is ensured via the comprehensive
+            <a target="_blank" href="http://docs.spring.io/spring/docs/4.2.x/spring-framework-reference/html/transaction.html">transaction management</a>
+            provided by the Spring Framework.<br/>
+            Globally, this offers the ability to easily scale up to a million entities and at the same time allows great 
+            portability with no code changes: MySQL, MariaDB, PostgreSQL, Oracle and MS SQL Server are fully supported 
+            deployment options.
+          </p>
+        </li>
+        <li>
+          <p>
+            <strong>
+              <em>Security</em>
+            </strong> defines a fine-grained set of entitlements which can be granted to administrators, thus enabling 
+            the implementation of delegated administration scenarios
+          </p>
+        </li>
+      </ul>
+      
+      <p>
+        Third-party applications are provided full access to IdM services by leveraging the REST interface, either 
+        via the Java <em>SyncopeClient</em> library (the basis of Admin UI, End-user UI and CLI) or plain HTTP calls.
+      </p>
+      
+      <subsection name="ConnId">
+        <p>The <strong>
+            <em>Provisioning</em>
+          </strong> layer relies on <a href="http://connid.tirasa.net" target="_blank">ConnId</a>; ConnId is designed 
+          to separate the implementation of an application from the dependencies of the system that the application is 
+          attempting to connect to.
         </p>
-      </subsection>
 
-      <subsection name="JPA persistence layer">
-        <p>
-          All data in Apache Syncope (users, groups, attributes, resources, ...) is managed at a high level using a 
-          standard JPA 2.0 approach and persisted to an underlying database.
-        </p>
-        <p>
-          <a href="http://openjpa.apache.org">Apache OpenJPA</a>, the chosen JPA implementation, allows Apache Syncope 
-          to be successfully deployable to most DBMSs without any modification of the source code; for more information,
-          see these 
-          <a href="http://openjpa.apache.org/builds/2.3.0/apache-openjpa/docs/ref_guide_dbsetup_dbsupport.html">available options</a>.
-          <br/>
-          Currently, Apache Syncope officially supports MySQL, PostgreSQL, Oracle DB and MS SQL Server.
-        </p>
-      </subsection>
+        <p>ConnId is the continuation of The Identity Connectors Framework (Sun ICF), a project that used to be part of
+          market leader Sun IdM and has since been released by Sun Microsystems as an Open Source project.
+          This makes the connectors layer particularly reliable because most connectors have already been implemented 
+          in the framework and widely tested.</p>
 
-      <subsection name="Connectors layer">
-        <p>
-          The Connector layer is implemented with 
-          <a href="http://connid.tirasa.net" target="_blank">ConnId</a>; ConnId is designed to separate the 
-          implementation of an application from the dependencies of the system that the application is attempting to 
-          connect to.
-        </p>
-        <p>
-          Connid is the continuation of Identity connectors, a project that used to be part of market leader Sun IdM 
-          and has since been released by Sun as an Open Source project.
-          This makes the connectors layer particularly reliable since most connectors have already been implemented in 
-          the framework and widely tested. 
-          The new ConnId project provides all that is required nowadays for a modern Open Source project, including an 
-          Apache Maven driven build, artifacts and mailing lists.
-          Additional connectors – such as for SOAP, CSV and Active Directory – are also provided.
-        </p>
-        <p>
-          Apache Syncope supports either
-          <ul>
-            <li>
-              <em>propagation</em> towards external resources (when user data is copied from Syncope to external 
-              resources)
-            </li>
-            <li>
-              <em>synchronization</em> from external resources (when user data is pulled from external resources into 
-              Syncope)
-            </li>
-          </ul>
-        
-          Propagation and synchronization operations – a.k.a tasks – are saved for reporting and later re-execution.
-        </p>
+        <p>The new ConnId project, featuring contributors from several companies, provides all that is required 
+          nowadays for a modern Open Source project, including an Apache Maven driven build, artifacts and mailing 
+          lists. Additional connectors – such as for SOAP, CSV, PowerShell and Active Directory – are also provided.</p>
       </subsection>
     </section>
-
-    <section name="The console">
-      <p>The web management interface for configuring and administering Syncope core, implemented with 
-        <a href="http://wicket.apache,org">Apache Wicket</a>
-      </p>
-      <p>As with other external applications, the console communicates with the core using REST calls.</p>
-    </section>
   </body>
 </document>

http://git-wip-us.apache.org/repos/asf/syncope/blob/ce7cad4e/src/site/xdoc/building.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/building.xml b/src/site/xdoc/building.xml
index e1a90ae..c73e70c 100644
--- a/src/site/xdoc/building.xml
+++ b/src/site/xdoc/building.xml
@@ -35,7 +35,7 @@ under the License.
     <section name="Prerequisites">
       <p>
         <ul>
-          <li>Java 1.6.23 or higher</li>
+          <li>JDK 7 or higher</li>
           <li>
             <a href="http://maven.apache.org/download.html">Apache Maven</a> 3.0.3 or higher</li>
           <li>
@@ -64,7 +64,7 @@ under the License.
         <b>Important</b>: For subsequent builds (e.g., after code changes are made), 
         run <code>mvn clean</code> first to build from scratch, before using one of the <code>mvn install</code>
         commands above.
-        (You may also wish to run <code>svn update</code> after running <code>mvn clean</code> but before running 
+        (You may also wish to run <code>git pull</code> after running <code>mvn clean</code> but before running 
         <code>mvn install</code>.)
       </p>
     </section>
@@ -77,7 +77,7 @@ under the License.
         Such profiles are limited to a specific module, hence Maven needs to be invoked from the corresponding 
         subdirectory, not from top-level.
       </p>
-      <subsection name="core">
+      <subsection name="fit/core-reference">
         <h4>application/xml</h4>
         By default, integration tests are run using <code>application/json</code> for both <code>Accept</code> and
         <code>Content-Type</code> HTTP headers; it is possible, however, to use <code>application/xml</code>.
@@ -85,50 +85,41 @@ under the License.
         
         <h4>Debug</h4>
         Starts the full environment used by integration tests (with same components available when running new project
-        in <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Run+Syncope+in+embedded+mode#RunSyncopeinembeddedmode-Componentsavailable">embedded mode</a>
+        in <a href="docs/getting-started.html#paths-and-components">embedded mode</a>
         but console) and enables remote JPDA debugging on port 8000 in the running Java EE container (Tomcat).
-        <source>$ mvn -Pdebug</source>
-
-        <h4>Dev</h4>              
-        Run all / some / single integration tests (but no unit tests) by empowering 
-        <a href="http://maven.apache.org/surefire/maven-failsafe-plugin/examples/single-test.html">Maven Failsafe plugin</a>'s
-        selection features:
-        <source>$ mvn -Pdev
-$ mvn -Pdev -Dit.test=UserTestITCase
-$ mvn -Pdev -Dit.test=UserTestITCase#create</source>
+        <source>$ mvn -Pdebug,all</source>
 
-        <h4>NoOpWorkflow</h4>
-        Run the whole test suite by selecting the <em>NoOp</em> workflow adapter implementation;
-        by default, <a href="http://www.activiti.org">Activiti</a> is configured instead.
-        <source>$ mvn -Pnoopworkflow</source>
+        <h4>JRebel</h4>
+        As with Debug, but with <a href="http://zeroturnaround.com/software/jrebel/">JRebel</a> features enabled.
+        <source>$ export REBEL_HOME=/opt/jrebel
+$ mvn -Pjrebel</source>
 
         <h4>DBMSes</h4>
 
         <h5>PostgreSQL</h5>
-        After providing connection information in <code>src/test/resources/postgres/persistence.properties</code>,
+        After providing connection information in <code>src/main/resources/postgres/domains/Master.properties</code>,
         perform the full test suite against a real <a href="http://www.postgresql.org/">PostgreSQL</a> database via
         <source>$ mvn -Ppostgres-it</source>
 
         <h5>MySQL</h5>
-        After providing connection information in <code>src/test/resources/mysql/persistence.properties</code>,
-        perform the full test suite against a real <a href="http://www.mysql.com/">MySQL</a> or 
-        <a href="https://mariadb.org/">MariaDB</a> database via
+        After providing connection information in <code>src/main/resources/mysql/domains/Master.properties</code>,
+        perform the full test suite against a real <a href="http://www.mysql.com/">MySQL</a> database via
         <source>$ mvn -Pmysql-it</source>
 
         <h5>MariaDB</h5>
-        After providing connection information in <code>src/test/resources/mariadb/persistence.properties</code>,
+        After providing connection information in <code>src/main/resources/mariadb/domains/Master.properties</code>,
         perform the full test suite against a <a href="https://mariadb.org/">MariaDB</a> database via
         <source>$ mvn -Pmariadb-it</source>
 
         <h5>Oracle database</h5>
-        After providing connection information in <code>src/test/resources/oracle/persistence.properties</code>
+        After providing connection information in <code>src/main/resources/oracle/domains/Master.properties</code>
         and having <a href="http://www.mkyong.com/maven/how-to-add-oracle-jdbc-driver-in-your-maven-local-repository/">
           set up the appropriate JDBC driver in your local Maven repository</a>, perform the full test suite
         against a real <a href="http://www.oracle.com/products/database/">Oracle</a> database via
         <source>$ mvn -Poracle-it</source>
 
         <h5>MS SQL Server</h5>
-        After providing connection information in <code>src/test/resources/sqlserver/persistence.properties</code>
+        After providing connection information in <code>src/main/resources/sqlserver/domains/Master.properties</code>
         and having <a href="http://claude.betancourt.us/add-microsoft-sql-jdbc-driver-to-maven/">
           set up the appropriate JDBC driver in your local Maven repository</a>, perform the full test suite
         against a real <a href="http://www.microsoft.com/sqlserver/en/us/default.aspx">MS SQL Server</a> database via
@@ -141,37 +132,23 @@ $ mvn -Pdev -Dit.test=UserTestITCase#create</source>
         <a href="https://glassfish.java.net/">Glassfish</a> via
         <source>$ mvn -Pglassfish-it</source>
 
-        <h5>JBoss AS</h5>
+        <h5>Wildfly</h5>
         Perform the full test suite by deploying Syncope core in 
-        <a href="http://www.jboss.org/jbossas">JBoss AS</a> via
+        <a href="http://www.wildfly.org">Wildfly</a> via
         <source>$ mvn -Pjboss-it</source>
-
-        <h5>Oracle WebLogic</h5>
-        Either put local WebLogic installation under <code>/opt/weblogic-12.1.1</code> or 
-        pass <code>-Dweblogic.home=...</code>, then perform the full test suite by deploying Syncope core in
-        <a href="http://www.oracle.com/technetwork/middleware/weblogic/overview/index.html">Oracle WebLogic</a> via
-        <source>$ mvn -Pweblogic-it</source>
       </subsection>
       
-      <subsection name="console">
+      <subsection name="fit/console-reference">
         <h4>Debug</h4>
         Starts the full environment used by core's integration tests (with same components available when running new project
-        in <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Run+Syncope+in+embedded+mode#RunSyncopeinembeddedmode-Componentsavailable">embedded mode</a>,
+        in <a href="docs/getting-started.html#paths-and-components">embedded mode</a>,
         including console) and enables remote JPDA debugging on port 8000 in the running Java EE container (Tomcat).
         <source>$ mvn -Pdebug</source>
 
         <h4>JRebel</h4>
-        Starts the full environment used by core's integration tests (with same components available when running new project
-        in <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Run+Syncope+in+embedded+mode#RunSyncopeinembeddedmode-Componentsavailable">embedded mode</a>,
-        including console) and enables <a href="http://zeroturnaround.com/software/jrebel/">JRebel</a>.
-        <source>export REBEL_HOME=/opt/jrebel
+        As with Debug, but with <a href="http://zeroturnaround.com/software/jrebel/">JRebel</a> features enabled.
+        <source>$ export REBEL_HOME=/opt/jrebel
 $ mvn -Pjrebel</source>
-
-        <h4>Selenium</h4>
-        Perform the integration test suite based on <a href="http://www.seleniumhq.org/">Selenium</a>; also supports
-        test selection.
-        <source>$ mvn -Pselenium
-$ mvn -Pselenium -Dit.test=UserTestITCase</source>
       </subsection>
     </section>
   </body>

http://git-wip-us.apache.org/repos/asf/syncope/blob/ce7cad4e/src/site/xdoc/contributing.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/contributing.xml b/src/site/xdoc/contributing.xml
index ca95ea4..3ce476a 100644
--- a/src/site/xdoc/contributing.xml
+++ b/src/site/xdoc/contributing.xml
@@ -44,20 +44,27 @@ under the License.
             whether someone had already encountered the same issue.
           </li>
           <li>If this issue was never encountered before, create a new 
-            <a href="http://issues.apache.org/jira/browse/SYNCOPE">JIRA</a> issue.
+            <a href="https://issues.apache.org/jira/browse/SYNCOPE">JIRA</a> issue.
           </li>
           <li>Develop / describe a test case to demonstrate the issue.</li>
           <li>Attach the new test to the JIRA issue.</li>
-          <li>If you have also developed a fix for the raised issue, attach a patch to it. Here are some useful 
-            <a href="https://commons.apache.org/patches.html">guidelines</a> about how to correctly generate a patch.
+          <li>If you have also developed a fix for the raised issue, either
+            <ul>
+              <li>attach a patch to it; here are some useful 
+                <a href="https://commons.apache.org/patches.html">guidelines</a> about how to correctly generate a patch.
+              </li>
+              <li>open a <a href="https://github.com/apache/syncope/pulls">pull request</a> - don't forget to
+                mention the JIRA issue id (e.g. SYNCOPE-XXX) opened above in the commit log message</li>
+            </ul>
           </li>
         </ul>
       </subsection>
 
       <subsection name="Documentation">
         <p>The website is managed via the 
-          <a href="http://maven.apache.org/plugins/maven-site-plugin/">maven-site-plugin</a>, hence contributing site 
-          content is similar to contributing source code: Create a new issue on JIRA and attach a GIT patch to it.
+          <a href="http://maven.apache.org/plugins/maven-site-plugin/">maven-site-plugin</a> and the guides are being
+          maintained with <a href="http://asciidoctor.org/">Asciidoctor</a>, hence contributing site content or
+          guides is similar to contributing source code: create a new issue on JIRA and attach a GIT patch to it.
         </p>
         <p>The project 
           <a href="http://cwiki.apache.org/confluence/display/SYNCOPE">Wiki</a> is also available to gather any other 
@@ -98,7 +105,7 @@ under the License.
         <a href="http://www.apache.org/licenses/#clas">Corporate Contributors License Agreement (CCLA)</a>).
       </p>
       <p>If you're interested in committing to the project, you need to establish a history over time of successful 
-         contributions to the project. After that, you may be invited to become a committer.
+        contributions to the project. After that, you may be invited to become a committer.
       </p>
       <ul>
         <li>

http://git-wip-us.apache.org/repos/asf/syncope/blob/ce7cad4e/src/site/xdoc/docs/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/docs/index.xml b/src/site/xdoc/docs/index.xml
index aae4193..592009a 100644
--- a/src/site/xdoc/docs/index.xml
+++ b/src/site/xdoc/docs/index.xml
@@ -27,36 +27,94 @@ under the License.
   </properties>
 
   <body>
-    <section>
+    <section name="Documentation">
+      <p>
+        Finding the right documentation to read or the right people to ask is probably one of the hardest tasks for
+        anyone approaching an Open Source project.<br/>
+        Besides the links below, please do not forget to visit the Syncope
+        <a href="https://cwiki.apache.org/confluence/display/SYNCOPE">Wiki</a>.
+      </p>
+      <p>
+        If you find errors or omissions in the documentation, please don’t hesitate to 
+        <a href="issue-tracking.html">submit an issue</a> or 
+        <a href="contributing.html#Documentation">contribute</a>.
+        We also encourage you to ask questions and discuss any aspects of the project on the 
+        <a href="mailing-lists.html">mailing lists or IRC</a>. New contributors are always welcome!
+      </p>
+      
       <subsection name="Guides">
         <table>
           <thead>
             <tr>
               <th>Name</th>
-              <th>Formats</th>
+              <th width="100">Formats</th>
             </tr>
           </thead>
           <tbody>
             <tr>
               <td>Getting Started</td>
               <td>
-                <a href="getting-started.html">HTML</a> 
-                <a href="getting-started.pdf">PDF</a> 
+                <a href="getting-started.html">
+                  <img src="../images/text-html.png"/>
+                </a>
+                &nbsp;
+                <a href="getting-started.pdf">
+                  <img src="../images/application-pdf.png"/>
+                </a> 
               </td>
             </tr>
             <tr>
               <td>Reference Guide</td>
               <td>
-                <a href="reference-guide.html">HTML</a> 
-                <a href="reference-guide.pdf">PDF</a> 
+                <a href="reference-guide.html">
+                  <img src="../images/text-html.png"/>
+                </a>
+                &nbsp;
+                <a href="reference-guide.pdf">
+                  <img src="../images/application-pdf.png"/>
+                </a> 
               </td>
             </tr>
           </tbody>
         </table>
       </subsection>
             
-      <subsection name="Wiki">
-        <a href="https://cwiki.apache.org/confluence/display/SYNCOPE">Wiki</a>
+      <subsection name="References">
+        <p>
+          Each release of Syncope comes with sources, including JavaDocs.
+          When using Maven for dependency management, IDE will automatically download the source JARs and, when 
+          going hover on a Syncope class or method, show the corresponding documentation.
+        </p>
+        <p>
+          For reference, the API and REST documentation are published online allowing easy link from emails or websites.
+        </p>
+        
+        <table>
+          <thead>
+            <tr>
+              <th>Name</th>
+              <th width="100">Versions</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>REST</td>
+              <td>
+                <a href="../rest/2.0/index.html">2.0</a>
+                &nbsp;&nbsp;
+                <a href="../rest/1.2/index.html">1.2</a> 
+              </td>
+            </tr>
+            <tr>
+              <td>Javadocs</td>
+              <td>
+                <a href="../apidocs/2.0/index.html">2.0</a>
+                &nbsp;&nbsp;
+                <a href="../apidocs/1.2/index.html">1.2</a> 
+              </td>
+            </tr>
+          </tbody>
+        </table>
       </subsection>
     </section>
   </body>

http://git-wip-us.apache.org/repos/asf/syncope/blob/ce7cad4e/src/site/xdoc/downloads.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/downloads.xml b/src/site/xdoc/downloads.xml
index 30b4ecd..165ebc9 100644
--- a/src/site/xdoc/downloads.xml
+++ b/src/site/xdoc/downloads.xml
@@ -26,13 +26,7 @@ under the License.
   </properties>
 
   <body>
-    <div class="toc_container">
-      <macro name="toc">
-        <param name="class" value="toc"/>
-      </macro>
-    </div>
-    
-    <section name="Introduction">
+    <section name="Downloads">
       <p>Apache Syncope artifacts are distributed in source and binary form under the terms of the 
         <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
         See the <tt>LICENSE</tt> and <tt>NOTICE</tt> files included in each artifact for additional license 
@@ -41,25 +35,26 @@ under the License.
       <p>Use the links below to download a distribution of Apache Syncope.
         It is good practice to <a href="#Verifying_Releases">verify the integrity</a> of the distribution files.
       </p>
-      <subsection name="Which distribution to download?">
+      <p>
+        <b>Don't know which downloads best suit your needs?</b>
+        <br/>
+        Take a look at the quick summary from the <a href="docs/index.html#Guides">Getting Started guide</a>:
         <ul>
-          <li>Evaluating? <a class="externalLink" href="https://cwiki.apache.org/confluence/display/SYNCOPE/Run+Syncope+standalone+distribution">Standalone distribution</a></li>
-          <li>Building your own IdM solution?
-            <ul>
-              <li>GUI lover?
-                <a class="externalLink" href="https://cwiki.apache.org/confluence/display/SYNCOPE/Install+Syncope+from+installer">Use the installer</a>
-              </li>                
-              <li>Prefer CLI?
-                <a class="externalLink" href="https://cwiki.apache.org/confluence/display/SYNCOPE/Create+a+new+Syncope+project">Generate a Maven project</a>
-              </li>
-            </ul>
+          <li>
+            <a href="docs/getting-started.html#standalone">Standalone</a>
+          </li>
+          <li>
+            <a href="docs/getting-started.html#debian-packages">Debian Packages</a>
+          </li>
+          <li>
+            <a href="docs/getting-started.html#gui-installer">GUI Installer</a>
+          </li>
+          <li>
+            <a href="docs/getting-started.html#maven-project">Maven Project</a>
           </li>
-          <li>Deploying on Debian GNU / Linux - Ubuntu? <a class="externalLink" href="https://cwiki.apache.org/confluence/display/SYNCOPE/Install+Syncope+from+.deb+packages">.deb packages</a></li>
         </ul>
-      </subsection>
-    </section>
+      </p>
 
-    <section name="Current Releases">
       <subsection name="2.0.0-M1 Jazz">
         <p>Release date: December ??, 2015</p>
         <p>
@@ -69,7 +64,7 @@ under the License.
           <thead>
             <tr>
               <th>Artifact</th>
-              <th>Signatures</th>
+              <th width="150">Signatures</th>
             </tr>
           </thead>
           <tbody>
@@ -155,7 +150,7 @@ under the License.
           <thead>
             <tr>
               <th>Artifact</th>
-              <th>Signatures</th>
+              <th width="150">Signatures</th>
             </tr>
           </thead>
           <tbody>
@@ -214,75 +209,6 @@ under the License.
       </subsection>
     </section>
 
-    <section name="Older Releases">
-      <subsection name="1.2.5 Intermezzo">
-        <p>Release date: July 28th, 2015</p>
-        <p>
-          <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Intermezzo">Release notes</a>
-        </p>
-        <table>
-          <thead>
-            <tr>
-              <th>Artifact</th>
-              <th>Signatures</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/syncope-1.2.5-source-release.zip">syncope-1.2.5-source-release.zip</a>
-              </td>
-              <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/syncope-1.2.5-source-release.zip.asc">asc</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/syncope-1.2.5-source-release.zip.md5">md5</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/syncope-1.2.5-source-release.zip.sha1">sha1</a>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/syncope-standalone-1.2.5-distribution.zip">syncope-standalone-1.2.5-distribution.zip</a>
-              </td>
-              <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/syncope-standalone-1.2.5-distribution.zip.asc">asc</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/syncope-standalone-1.2.5-distribution.zip.md5">md5</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/syncope-standalone-1.2.5-distribution.zip.sha1">sha1</a>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/syncope-installer-1.2.5-uber.jar">syncope-installer-1.2.5.jar</a>
-              </td>
-              <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/syncope-installer-1.2.5-uber.jar.asc">asc</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/syncope-installer-1.2.5-uber.jar.md5">md5</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/syncope-installer-1.2.5-uber.jar.sha1">sha1</a>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/apache-syncope-1.2.5.deb">apache-syncope-1.2.5.deb</a>
-              </td>
-              <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/apache-syncope-1.2.5.deb.asc">asc</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/apache-syncope-1.2.5.deb.md5">md5</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/apache-syncope-1.2.5.deb.sha1">sha1</a>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/apache-syncope-console-1.2.5.deb">apache-syncope-console-1.2.5.deb</a>
-              </td>
-              <td>
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/apache-syncope-console-1.2.5.deb.asc">asc</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/apache-syncope-console-1.2.5.deb.md5">md5</a> 
-                <a href="http://archive.apache.org/dist/syncope/1.2.5/apache-syncope-console-1.2.5.deb.sha1">sha1</a>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </subsection>
-    </section>
-
     <section name="Archives">
       <p>All past releases can be fetched from ASF <a href="http://archive.apache.org/dist/syncope/">archives</a>.</p>
     </section>

http://git-wip-us.apache.org/repos/asf/syncope/blob/ce7cad4e/src/site/xdoc/features.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/features.xml b/src/site/xdoc/features.xml
deleted file mode 100644
index c503ab5..0000000
--- a/src/site/xdoc/features.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
-
--->
-<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
-
-  <properties>
-    <title>Features</title>
-    <author email="dev@syncope.apache.org">Apache Syncope Documentation Team</author>
-  </properties>
-
-  <body>    
-    <section name="Account and Group Administration">
-      <ul>
-        <li>Password management and Self-Service Operations</li>
-        <li>Configurable Password encryption</li>
-        <li>Attribute validators (Reg-Exp based and custom)</li>
-        <li>Account Policy management</li>
-        <li>Password Policy management</li>
-        <li>User group-based provisioning</li>
-        <li>Group provisioning</li>
-        <li>Account status information on external resources</li>
-      </ul>
-    </section>
-      
-    <section name="Approval and Request Management">
-      <ul>
-        <li>End-User Request Management</li>
-        <li>Approval workflow</li>
-        <li>Workflow event notification</li>
-      </ul>
-    </section>
-      
-    <section name="Domain Integration">
-      <ul>
-        <li>Highly configurable communication with external resources powered by            
-          <a href="http://connid.tirasa.net" target="_blank">ConnId</a>
-        </li>
-        <li>Identity propagation towards external resources</li>
-        <li>Reconciliation / Bulk load from external resources</li>
-        <li>Identity synchronization from external resources (ActiveSync)</li>
-        <li>Synchronization Policy Management</li>
-      </ul>
-    </section>
-      
-    <section name="Business Intelligence">
-      <ul>
-        <li>Comprehensive Auditing features</li>
-        <li>Highly customizable and configurable Report generation</li>
-      </ul>
-    </section>
-      
-    <section name="System Administration">
-      <ul>
-        <li>RESTFul interface</li>
-        <li>Web-based multilingual AJAX administration console</li>
-        <li>Group-based administration</li>
-        <li>Attribute schema, Derived attribute schema and Virtual Attribute schema management</li>
-        <li>Group tree management</li>
-        <li>Schedulable Task execution</li>
-      </ul>
-    </section>
-  </body>
-</document>

http://git-wip-us.apache.org/repos/asf/syncope/blob/ce7cad4e/src/site/xdoc/iam-scenario.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/iam-scenario.xml b/src/site/xdoc/iam-scenario.xml
new file mode 100644
index 0000000..5643e76
--- /dev/null
+++ b/src/site/xdoc/iam-scenario.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+
+-->
+<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+
+  <properties>
+    <title>IAM Scenario</title>
+    <author email="dev@syncope.apache.org">Apache Syncope Documentation Team</author>
+  </properties>
+
+  <body>    
+    <section name="Identity and Access Management - Reference Scenario">
+      
+      <p style="text-align:center;">
+        <img src="docs/images/iam-scenario.png" alt="IAM Scenario" width="700"/>
+      </p>
+      
+      <p>
+        The picture above shows the tecnologies involved in a complete IAM solution:
+        <ul>
+          <li>
+            <strong>
+              <em>Identity Store</em>
+            </strong>
+            <br/>
+            (as RDBMS, LDAP, Active Directory, meta- and virtual-directories), the repository for account data
+          </li>
+          <li>
+            <strong>
+              <em>Provisioning Engine</em>
+            </strong>
+            <br/>
+            synchronizes account data across identity stores and a broad range of data formats, models, meanings and 
+            purposes
+          </li>
+          <li>
+            <strong>
+              <em>Access Manager</em>
+            </strong>
+            <br/>
+            access mediator to all applications, focused on application front-end, taking care
+            of <u>authentication</u>
+            (<a href="https://en.wikipedia.org/wiki/Single_sign-on" target="_blank">Single Sign-On</a>),
+            <u>authorization</u>
+            (<a href="http://oauth.net/" target="_blank">OAuth</a>, 
+            <a href="https://en.wikipedia.org/wiki/XACML">XACML</a>) and <u>federation</u>
+            (<a href="https://en.wikipedia.org/wiki/Security_Assertion_Markup_Language" target="_blank">SAML</a>, 
+            <a href="http://openid.net/connect/" target="_blank">OpenID Connect</a>).
+          </li>
+        </ul>
+      </p>
+
+      <hr/>
+      <p style="text-align:center;">
+        As you can notice,<b>
+          <u>Apache Syncope is primarily a provisioning engine</u>
+        </b>.
+      </p>
+      <hr/>
+      
+      <subsection name="Aren't Identity Stores enough?">
+        One might suppose that a single identity store can solve all the identity needs inside an organization, but few
+        drawbacks are just around the corner:
+        
+        <ol>
+          <li>Heterogeneity of systems</li>
+          <li>Lack of a single source of information (HR for corporate id, Groupware for mail address, ...)</li>
+          <li>Often applications require a local user database</li>
+          <li>Inconsistent policies across the infrastructure</li>
+          <li>Lack of workflow management</li>
+          <li>Hidden infrastructure management cost, growing with organization</li>
+        </ol>
+      </subsection>
+    </section>
+  </body>
+</document>

http://git-wip-us.apache.org/repos/asf/syncope/blob/ce7cad4e/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 6fd210c..7f9d460 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -37,14 +37,44 @@ under the License.
       </p>
 
       <p>
-        <span style="font-weight: bold">Identity management</span> (or IdM) represents the joint result of business process and IT to manage user data on systems
-        and applications. IdM involves considering user attributes, groups, resources and entitlements in trying to give a 
-        decent answer to the question bumping up every time in an IT administrator's mind:
+        <span style="font-weight: bold">Identity management</span> (or IdM) means to manage user data on systems and 
+        applications, using the combination of business processes and IT. IdM involves considering user attributes, 
+        roles, resources and entitlements in trying to answer the following thorny question:
       </p>
 
       <p style="text-align:center;">
         <i>Who has access to What, When, How, and Why?</i>
       </p>
     </div>
+
+    <h4>What is Identity Management, anyway?</h4>
+    <dl>
+      <dt>Account</dt>
+      <dd>
+        <p>Computers work with records of data about people. Such records contain technical information needed by 
+          the system for which the account is created and managed.</p>
+      </dd>
+      <dt>(Digital) Identity</dt>
+      <dd>
+        <p>A representation of a set of claims made by one digital subject about itself.
+          <strong>It’s you!</strong>
+        </p>
+      </dd>
+    </dl>
+      
+    <p>Have you ever been hired by a company, entered an organization or just created a new Google account?
+      Companies, organizations and cloud entities work with applications that need your data to function properly:
+      username, password, e-mail, first name, surname, and more.</p>
+        
+    <p>Where is this information going to come from? And what happens when you need to be enabled for more 
+      applications? And what if you get promoted and acquire more rights on the applications you already had access 
+      to? Most important, what happens when you quit or they gently let you go?</p>
+        
+    <p>In brief, Identity Management takes care of managing identity data throughout what is called the 
+      <strong>Identity Lifecycle</strong>.</p>
+        
+    <p style="text-align:center;">
+      <img src="docs/images/identityLifecycle.png" alt="Identity lifecycle" width="500"/>
+    </p>
   </body>
 </document>

http://git-wip-us.apache.org/repos/asf/syncope/blob/ce7cad4e/src/site/xdoc/mailing-lists.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/mailing-lists.xml b/src/site/xdoc/mailing-lists.xml
index 85ff927..f493d7a 100644
--- a/src/site/xdoc/mailing-lists.xml
+++ b/src/site/xdoc/mailing-lists.xml
@@ -27,11 +27,6 @@ under the License.
   </properties>
 
   <body>
-    
-    <p>
-      Feel free to participate in Apache Syncope mailing lists and IRC channel.
-    </p>
-    
     <section name="Mailing Lists">
       <table border="0" class="table table-striped">
         <tbody>

http://git-wip-us.apache.org/repos/asf/syncope/blob/ce7cad4e/src/site/xdoc/professional-services.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/professional-services.xml b/src/site/xdoc/professional-services.xml
index 441b633..d1432ee 100644
--- a/src/site/xdoc/professional-services.xml
+++ b/src/site/xdoc/professional-services.xml
@@ -28,10 +28,13 @@ under the License.
 
   <body>    
     <section name="Professional Services">
-      The following companies provide professional services around Apache Syncope (in alphabetical order):
-      <ul>
-        <li><a href="http://syncope.tirasa.net">Tirasa</a></li>
-      </ul>
+      
+      <p>The companies below provide enterprise support and professional services around Apache Syncope.</p>
+      
+      <a href="http://www.tirasa.net/businessproposition/apache-syncope.html" target="_blank">
+        <img src="http://www.tirasa.net/images/logo.png" width="300"/>
+      </a>
+      
     </section>
   </body>
 </document>

http://git-wip-us.apache.org/repos/asf/syncope/blob/ce7cad4e/src/site/xdoc/security.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/security.xml b/src/site/xdoc/security.xml
index 8232c6a..f5b9be3 100644
--- a/src/site/xdoc/security.xml
+++ b/src/site/xdoc/security.xml
@@ -30,7 +30,7 @@ under the License.
 
     <section name="Security Advisories">
       <p>This page lists all security vulnerabilities fixed in released versions of Apache Syncope.</p>
-      <p>Please note that binary patches are never provided. If you need to apply a source code patch, use the <a href="building.html">building instructions</a> or <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Create+a+new+Syncope+project">re-generate your Maven project</a> from published archetype.</p>
+      <p>Please note that binary patches are never provided. If you need to apply a source code patch, use the <a href="building.html">building instructions</a> or <a href="docs/getting-started.html#create-project">re-generate your Maven project</a> from published archetype.</p>
 
       <p>If you want to report a vulnerability, please follow <a href="http://www.apache.org/security/">the procedure</a>.</p>