Addressed various unicode related issues.

Note this is using recent changes from text_filter library.
Updated roc tools, and associated scripts.
2015-10-20 18:49:40 +02:00 · 2015-10-20 11:29:16 +02:00 · 2015-10-19 23:33:17 +02:00 · 2015-10-19 22:50:48 +02:00 · 2015-10-19 20:50:47 +02:00 · 2015-10-19 11:24:22 +02:00
74 changed files with 2192 additions and 423 deletions
--- a/cms-safe.ecf
+++ b/cms-safe.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="cms" uuid="8CC0D052-57D1-4CAA-AFF1-448FA290734B" library_target="cms">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="cms" uuid="8CC0D052-57D1-4CAA-AFF1-448FA290734B" library_target="cms">
 	<target name="cms">
 		<root all_classes="true"/>
 		<file_rule>
@@ -14,14 +14,16 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension-safe.ecf"/>
 		<library name="cms_app_env" location=".\library\app_env\app_env-safe.ecf"/>
-		<library name="cms_model" location=".\library\model\cms_model-safe.ecf" readonly="false"/>
 		<library name="cms_config" location=".\library\configuration\config-safe.ecf"/>
+		<library name="cms_model" location=".\library\model\cms_model-safe.ecf" readonly="false"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf"/>
 		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf" readonly="false"/>
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error-safe.ecf"/>
 		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
 		<library name="i18n" location="$ISE_LIBRARY\library\i18n\i18n-safe.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
+		<library name="kmp_matcher" location="$ISE_LIBRARY\library\text\regexp\kmp_matcher\kmp_matcher-safe.ecf"/>
+		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf"/>
 		<library name="notification_mailer" location="$ISE_LIBRARY\contrib\library\runtime\process\notification_email\notification_email-safe.ecf"/>
 		<library name="smarty" location="$ISE_LIBRARY\contrib\library\text\template\smarty\smarty-safe.ecf" readonly="false"/>
 		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter-safe.ecf"/>
@@ -30,7 +32,6 @@
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
 		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension-safe.ecf" readonly="false"/>
 		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html-safe.ecf" readonly="false"/>
-		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
--- a/cms.ecf
+++ b/cms.ecf
@@ -15,14 +15,16 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension.ecf"/>
 		<library name="cms_app_env" location=".\library\app_env\app_env.ecf"/>
-		<library name="cms_model" location=".\library\model\cms_model.ecf" readonly="false"/>
 		<library name="cms_config" location=".\library\configuration\config.ecf"/>
+		<library name="cms_model" location=".\library\model\cms_model.ecf" readonly="false"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto.ecf"/>
 		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf" readonly="false"/>
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
 		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
 		<library name="i18n" location="$ISE_LIBRARY\library\i18n\i18n.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
+		<library name="kmp_matcher" location="$ISE_LIBRARY\library\text\regexp\kmp_matcher\kmp_matcher.ecf"/>
+		<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
 		<library name="notification_mailer" location="$ISE_LIBRARY\contrib\library\runtime\process\notification_email\notification_email.ecf"/>
 		<library name="smarty" location="$ISE_LIBRARY\contrib\library\text\template\smarty\smarty.ecf" readonly="false"/>
 		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter.ecf"/>
@@ -31,7 +33,6 @@
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
 		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension.ecf" readonly="false"/>
 		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html.ecf" readonly="false"/>
-		<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
--- a/examples/demo/demo-safe.ecf
+++ b/examples/demo/demo-safe.ecf
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="demo" uuid="3643E657-BCBE-46AA-931B-71EAEA877A18" library_target="demo">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="demo" uuid="3643E657-BCBE-46AA-931B-71EAEA877A18" library_target="demo">
 	<description>Example/demo for Eiffel ROC CMS library</description>
 	<target name="common" abstract="true">
+		<root class="DEMO_CMS_SERVER" feature="make_and_launch"/>
 		<file_rule>
 			<exclude>/EIFGENs$</exclude>
 			<exclude>/CVS$</exclude>
@@ -12,7 +13,12 @@
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="cms" location="..\..\cms-safe.ecf" readonly="false"/>
+		<library name="cms" location="..\..\cms-safe.ecf" readonly="false">
+			<option>
+				<assertions precondition="true" postcondition="true" supplier_precondition="true"/>
+			</option>
+		</library>
+		<library name="cms_admin_module" location="..\..\modules\admin\admin-safe.ecf" readonly="false"/>
 		<library name="cms_app_env" location="..\..\library\app_env\app_env-safe.ecf" readonly="false"/>
 		<library name="cms_auth_module" location="..\..\modules\auth\auth-safe.ecf" readonly="false"/>
 		<library name="cms_basic_auth_module" location="..\..\modules\basic_auth\basic_auth-safe.ecf" readonly="false"/>
@@ -24,34 +30,31 @@
 		<library name="cms_node_module" location="..\..\modules\node\node-safe.ecf" readonly="false"/>
 		<library name="cms_oauth_20_module" location="..\..\modules\oauth20\oauth20-safe.ecf" readonly="false"/>
 		<library name="cms_openid_module" location="..\..\modules\openid\openid-safe.ecf" readonly="false"/>
-		<library name="cms_admin_module" location="..\..\modules\admin\admin-safe.ecf" readonly="false"/>
 		<library name="cms_recent_changes_module" location="..\..\modules\recent_changes\recent_changes-safe.ecf" readonly="false"/>
-		<library name="persistence_store_odbc" location="..\..\library\persistence\store_odbc\store_odbc-safe.ecf" readonly="false"/>
+		<library name="persistence_sqlite3" location="..\..\library\persistence\sqlite3\sqlite3-safe.ecf" readonly="false">
+			<option>
+				<assertions/>
+			</option>
+		</library>
+		<library name="persistence_store_odbc" location="..\..\library\persistence\store_odbc\store_odbc-safe.ecf" />
 		<!--
-		<library name="persistence_store_mysql" location="..\..\library\persistence\store_mysql\store_mysql-safe.ecf" readonly="false"/>
+		<library name="persistence_store_mysql" location="..\..\library\persistence\store_mysql\store_mysql-safe.ecf" />
 		-->
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
 		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension-safe.ecf" readonly="false"/>
 	</target>
 	<target name="demo_any" extends="common">
-		<root class="EWF_ROC_SERVER" feature="make_and_launch"/>
 		<setting name="concurrency" value="thread"/>
-		<library name="cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\cgi-safe.ecf"/>
-		<library name="libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\libfcgi-safe.ecf"/>
-		<library name="nino" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\nino-safe.ecf"/>
-		<library name="standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\standalone-safe.ecf"/>
-		<cluster name="launcher" location=".\launcher\any\" recursive="true"/>
+		<library name="any_launcher" location="..\..\launcher\any-safe.ecf" readonly="false"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 	<target name="demo_standalone" extends="common">
-		<root class="EWF_ROC_SERVER" feature="make_and_launch"/>
 		<option debug="true">
 			<debug name="dbglog" enabled="true"/>
 		</option>
-		<setting name="concurrency" value="thread"/>
+		<setting name="concurrency" value="scoop"/>
 		<variable name="httpd_ssl_disabled" value="true"/>
-		<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone-safe.ecf"/>
-		<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
+		<library name="standalone_launcher" location="..\..\launcher\standalone-safe.ecf" readonly="false"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 	<target name="demo_standalone_none" extends="demo_standalone">
@@ -63,25 +66,14 @@
 	<target name="demo_standalone_scoop" extends="demo_standalone">
 		<setting name="concurrency" value="scoop"/>
 	</target>
-	<target name="demo_nino" extends="common">
-		<root class="EWF_ROC_SERVER" feature="make_and_launch"/>
-		<setting name="concurrency" value="none"/>
-		<library name="default_nino" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\nino-safe.ecf"/>
-		<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
-		<cluster name="src" location=".\src\" recursive="true"/>
-	</target>
 	<target name="demo_cgi" extends="common">
-		<root class="EWF_ROC_SERVER" feature="make_and_launch"/>
 		<setting name="concurrency" value="none"/>
-		<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
-		<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
+		<library name="cgi_launcher" location="..\..\launcher\cgi-safe.ecf" readonly="false"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 	<target name="demo_libfcgi" extends="common">
-		<root class="EWF_ROC_SERVER" feature="make_and_launch"/>
 		<setting name="concurrency" value="none"/>
-		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
-		<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
+		<library name="libfcgi_launcher" location="..\..\launcher\libfcgi-safe.ecf" readonly="false"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 	<target name="demo" extends="demo_standalone">
--- a/examples/demo/site/config/blocks.ini
+++ b/examples/demo/site/config/blocks.ini
@@ -0,0 +1,38 @@
+### Blocks settings
+
+#navigation.region=sidebar_first
+#navigation.condition=is_front
+management.conditions[]=path:admin*
+management.conditions[]=is_front
+
+#Feeds
+feed.news.weight=3
+feed.news.region=feed_news
+feed.news.region=content
+feed.news.condition=<none>
+feed.forum.weight=2
+feed.forum.region=feed_forum
+feed.forum.region=<none>
+feed.forum.condition=<none>
+feed.forum.options[size]=15
+
+#Updates
+recent_changes.region=content
+recent_changes.condition=is_front
+recent_changes.title=Updates
+recent_changes.options[size]=3
+
+#Aliases
+&aliases[foo]=management
+&aliases[bar]=feed.forum
+
+foo.region=content
+foo.condition=is_front
+foo.weight=-10
+
+bar.region=content
+bar.condition=is_front
+bar.title=Bar
+
+
+
--- a/examples/demo/site/config/cms.ini
+++ b/examples/demo/site/config/cms.ini
@@ -9,9 +9,9 @@ email=your@email.com
 theme=bootstrap

 [mailer]
-smtp=localhost:25
+#smtp=localhost:25
 #sendmail=/usr/bin/sendmail
-#output=@stderr
+output=@stderr

 [modules]
 # Module status
@@ -21,30 +21,10 @@ smtp=localhost:25
 # for each module, this can be overwritten with
 #  module_name= on or off
 *=all
-admin=on
-auth=on
-basic_auth=on
-blog=on
-debug=on
-demo=on
-node=on
-oauth20=on
-openid=on

 [blocks]
-#navigation.region=sidebar_first
-feed.eiffel.region=feed_eiffel
-feed.eiffel.condition=is_front
-
-feed.forum.region=feed_forum
-feed.forum.condition=is_front
-
-feed.stackoverflow.region=feed_stackoverflow
-feed.stackoverflow.condition=is_front
-
-#management.condition=is_front
-#navigation.condition=is_front
+@include=blocks.ini

 [admin]
 # CMS Installation, are accessible by "all", "none" or uppon "permission". (default is none)
-installation_access=permission
+installation_access=all
--- a/examples/demo/site/config/demo.json
+++ b/examples/demo/site/config/demo.json
@@ -1,10 +1,15 @@
 {
 	"database": {
 		"datasource": {
-			"driver": "odbc",
-			"environment": "odbc-sqlite"
+			"driver": "sqlite3",
+			"environment": "sqlite3",
+			"-driver": "odbc",
+			"-environment": "odbc-sqlite"
 		},
 		"environments": {
+			"sqlite3": {
+				"connection_string":"Database=./site/database.sqlite3;"
+			},
 			"odbc-sqlite": {
 				"connection_string":"Driver=SQLite3 ODBC Driver;Database=./site/database.sqlite;LongNames=0;Timeout=1000;NoTXN=0;SyncPragma=NORMAL;StepAPI=0;"
 			},
--- a/examples/demo/site/config/modules/feed_aggregator/feeds.json
+++ b/examples/demo/site/config/modules/feed_aggregator/feeds.json
@@ -1,28 +0,0 @@
-{
-	"ids": ["eiffel", "forum"],
-	"feeds": { 
-			"eiffel": {
-				"title": "Eiffel related posts.", 
-				"expiration": "21600",
-				"size": 10,
-				"locations": [
-						"https://bertrandmeyer.com/feed/",
-						"https://room.eiffel.com/blog/feed",
-						"https://room.eiffel.com/article/feed",
-						"https://room.eiffel.com/library/feed"
-						]
-				, "categories": ["Eiffel"]
-				,"option_description": "enabled"
-				},
-			"forum": {
-				"title": "Eiffel Forum",
-				"expiration": "21600",
-				"size": 10,
-				"locations": [
-						"https://groups.google.com/forum/feed/eiffel-users/msgs/atom.xml?num=15".
-						"http://stackoverflow.com/feeds/tag?tagnames=eiffel&sort=newest"
-					]
-				,"option_description": "enabled"
-			}
-	}
-}
--- a/examples/demo/site/modules/feed_aggregator/config/feeds.json
+++ b/examples/demo/site/modules/feed_aggregator/config/feeds.json
@@ -0,0 +1,28 @@
+{
+	"ids": ["news", "forum"],
+	"feeds": { 
+		"news": {
+			"title": "Eiffel related posts", 
+			"expiration": "21600",
+			"size": 5,
+			"locations": [
+					"https://bertrandmeyer.com/feed/",
+					"https://room.eiffel.com/blog/feed",
+					"https://room.eiffel.com/article/feed",
+					"https://room.eiffel.com/library/feed"
+					]
+			, "categories": ["Eiffel"]
+			,"option_description": "enabled"
+			},
+		"forum": {
+			"title": "Eiffel Forum",
+			"expiration": "21600",
+			"size": 5,
+			"locations": [
+					"https://groups.google.com/forum/feed/eiffel-users/msgs/atom.xml?num=15",
+					"http://stackoverflow.com/feeds/tag?tagnames=eiffel&sort=newest"
+				]
+			,"option_description": "enabled"
+		}
+	}
+}
--- a/examples/demo/site/themes/bootstrap/page.tpl
+++ b/examples/demo/site/themes/bootstrap/page.tpl
@@ -63,8 +63,8 @@
 		  {unless isempty="$page_title"}<h1 class="page-title">{$page_title/}</h1>{/unless}
          {$page.region_content/}   
 		  {if condition="$page.is_front"}
-			  {if isset="$page.region_feed_eiffel"}
-				<div class="column" style="width: 45%; float: left">{$page.region_feed_eiffel/}</div>
+			  {if isset="$page.region_feed_news"}
+				<div class="column" style="width: 45%; float: left">{$page.region_feed_news/}</div>
 			  {/if}
 			  {if isset="$page.region_feed_forum"}
 				<div class="column" style="width: 45%; float: left">{$page.region_feed_forum/}</div>
--- a/examples/demo/src/ewf_roc_server_execution.e
+++ b/examples/demo/src/ewf_roc_server_execution.e
@@ -1,31 +1,21 @@
 note
-	description: "Summary description for {EWF_ROC_SERVER_EXECUTION}."
+	description: "[
+			CMS Execution for the demo server.
+		]"
 	date: "$Date$"
 	revision: "$Revision$"

 class
-	EWF_ROC_SERVER_EXECUTION
+	DEMO_CMS_EXECUTION

 inherit
 	CMS_EXECUTION
-		redefine
-			initialize
-		end
-
-	REFACTORING_HELPER
-
-	SHARED_LOGGER

 create
 	make

 feature {NONE} -- Initialization

-	initialize
-		do
-			Precursor
-		end
-
 	initial_cms_setup: CMS_DEFAULT_SETUP
 			-- CMS setup.
 		local
@@ -39,17 +29,17 @@ feature {NONE} -- Initialization
 			create Result.make (l_env)
 		end

-feature -- CMS setup
+feature -- CMS storage

 	setup_storage (a_setup: CMS_SETUP)
 		do
-			debug ("refactor_fixme")
-				to_implement ("To implement custom storage")
-			end
+			a_setup.storage_drivers.force (create {CMS_STORAGE_SQLITE3_BUILDER}.make, "sqlite3")
 --			a_setup.storage_drivers.force (create {CMS_STORAGE_STORE_MYSQL_BUILDER}.make, "mysql")
 			a_setup.storage_drivers.force (create {CMS_STORAGE_STORE_ODBC_BUILDER}.make, "odbc")
 		end

+feature -- CMS modules
+
 	setup_modules (a_setup: CMS_SETUP)
 			-- Setup additional modules.
 		local
--- a/examples/demo/src/demo_cms_server.e
+++ b/examples/demo/src/demo_cms_server.e
@@ -0,0 +1,18 @@
+note
+	description: "[
+				DEMO application server.
+			]"
+	date: "$Date: 2015-02-09 22:29:56 +0100 (lun., 09 févr. 2015) $"
+	revision: "$Revision: 96596 $"
+
+class
+	DEMO_CMS_SERVER
+
+inherit
+	ROC_CMS_LAUNCHER [DEMO_CMS_EXECUTION]
+
+create
+	make_and_launch
+
+end
+
--- a/launcher/README.txt
+++ b/launcher/README.txt
@@ -0,0 +1,10 @@
+Collection of ROC CMS launcher ready to use.
+
+- Include any-safe.ecf to use any of cgi, libfcgi or standalone connector.
+- Include standalone-safe.ecf to use standalone connector.
+- Include libfcgi-safe.ecf to use libfcgi connector.
+- Include cgi-safe.ecf to use cgi connector.
+
+In application, the root class need to inherit from ROC_CMS_LAUNCHER with adapted CMS_EXECUTION
+descendant.
+
--- a/launcher/any-safe.ecf
+++ b/launcher/any-safe.ecf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="launcher" uuid="6FDCA393-AFC3-436B-A58A-870923967C86" library_target="launcher">
+	<target name="common" abstract="true">
+		<root all_classes="true"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="cms" location="..\cms-safe.ecf"/>
+		<library name="cms_app_env" location="..\library\app_env\app_env-safe.ecf" readonly="false"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
+	</target>
+	<target name="launcher" extends="common">
+		<library name="cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\cgi-safe.ecf"/>
+		<library name="libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\libfcgi-safe.ecf"/>
+		<library name="nino" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\nino-safe.ecf"/>
+		<library name="standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\standalone-safe.ecf"/>
+		<cluster name="src" location=".\" recursive="false"/>
+		<cluster name="launcher" location=".\any\" recursive="true"/>
+	</target>
+</system>
--- a/launcher/any.ecf
+++ b/launcher/any.ecf
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="launcher" uuid="6FDCA393-AFC3-436B-A58A-870923967C86" library_target="launcher">
+	<target name="common" abstract="true">
+		<root all_classes="true"/>
+		<option void_safety="none" />
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="cms" location="..\cms.ecf"/>
+		<library name="cms_app_env" location="..\library\app_env\app_env.ecf" readonly="false"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
+	</target>
+	<target name="launcher" extends="common">
+		<library name="cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\cgi.ecf"/>
+		<library name="libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\libfcgi.ecf"/>
+		<library name="nino" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\nino.ecf"/>
+		<library name="standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\standalone.ecf"/>
+		<cluster name="src" location=".\" recursive="false"/>
+		<cluster name="launcher" location=".\any\" recursive="true"/>
+	</target>
+</system>
--- a/launcher/any/application_launcher.e
+++ b/launcher/any/application_launcher.e
@@ -0,0 +1,19 @@
+note
+	description: "[
+				Effective class for APPLICATION_LAUNCHER_I
+
+				You can put modification in this class
+			]"
+	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
+	revision: "$Revision: 36 $"
+
+class
+	APPLICATION_LAUNCHER [G -> WSF_EXECUTION create make end]
+
+inherit
+	APPLICATION_LAUNCHER_I [G]
+
+feature -- Custom
+
+end
+
--- a/launcher/any/application_launcher_i.e
+++ b/launcher/any/application_launcher_i.e
@@ -0,0 +1,127 @@
+note
+	description: "[
+			Specific application launcher
+
+			DO NOT EDIT THIS CLASS
+
+			you can customize APPLICATION_LAUNCHER
+		]"
+	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
+	revision: "$Revision: 36 $"
+
+deferred class
+	APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]
+
+inherit
+	SHARED_EXECUTION_ENVIRONMENT
+
+feature -- Execution
+
+	launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+		local
+			nature: like launcher_nature
+		do
+			nature := launcher_nature
+			if nature = Void then
+				launch_standalone (opts)
+			elseif nature = nature_standalone then
+				launch_standalone (opts)
+			elseif nature = nature_nino then
+				launch_nino (opts)
+			elseif nature = nature_cgi then
+				launch_cgi (opts)
+			elseif nature = nature_libfcgi then
+				launch_libfcgi (opts)
+			else
+				-- bye bye
+				(create {EXCEPTIONS}).die (-1)
+			end
+		end
+
+feature {NONE} -- Access
+
+	launcher_nature: detachable READABLE_STRING_8
+			-- Initialize the launcher nature
+			-- either cgi, libfcgi, or nino.
+			--| We could extend with more connector if needed.
+			--| and we could use WSF_DEFAULT_SERVICE_LAUNCHER to configure this at compilation time.
+		local
+			p: PATH
+			ext: detachable READABLE_STRING_32
+		do
+			create p.make_from_string (execution_environment.arguments.command_name)
+			if attached p.entry as l_entry then
+				ext := l_entry.extension
+			end
+			if ext /= Void then
+				if ext.same_string (nature_standalone) then
+					Result := nature_standalone
+				end
+				if ext.same_string (nature_nino) then
+					Result := nature_nino
+				end
+				if ext.same_string (nature_cgi) then
+					Result := nature_cgi
+				end
+				if ext.same_string (nature_libfcgi) or else ext.same_string ("fcgi") then
+					Result := nature_libfcgi
+				end
+			end
+			Result := default_nature
+		end
+
+feature {NONE} -- standalone		
+
+	nature_standalone: STRING = "standalone"
+
+	launch_standalone (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+		local
+			launcher: WSF_STANDALONE_SERVICE_LAUNCHER [G]
+		do
+			create launcher.make_and_launch (opts)
+		end
+
+feature {NONE} -- nino		
+
+	nature_nino: STRING = "nino"
+
+	launch_nino (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+		local
+			launcher: WSF_NINO_SERVICE_LAUNCHER [G]
+		do
+			create launcher.make_and_launch (opts)
+		end
+
+feature {NONE} -- cgi
+
+	nature_cgi: STRING = "cgi"
+
+	launch_cgi (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+		local
+			launcher: WSF_CGI_SERVICE_LAUNCHER [G]
+		do
+			create launcher.make_and_launch (opts)
+		end
+
+feature {NONE} -- libfcgi
+
+	nature_libfcgi: STRING = "libfcgi"
+
+	launch_libfcgi (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+		local
+			launcher: WSF_LIBFCGI_SERVICE_LAUNCHER [G]
+		do
+			create launcher.make_and_launch (opts)
+		end
+
+feature -- Default
+
+	default_nature: STRING
+		do
+			Result := nature_standalone
+		end
+
+
+end
+
+
--- a/launcher/cgi-safe.ecf
+++ b/launcher/cgi-safe.ecf
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="cgi_launcher" uuid="0FE4F1D0-BB70-4C7F-A66E-B27F1D718109" library_target="cgi_launcher">
+	<target name="common" abstract="true">
+		<root all_classes="true"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="cms" location="..\cms-safe.ecf"/>
+		<library name="cms_app_env" location="..\library\app_env\app_env-safe.ecf" readonly="false"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
+	</target>
+	<target name="cgi_launcher" extends="common">
+		<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
+		<cluster name="src" location=".\" recursive="false"/>
+		<cluster name="launcher" location=".\default\" recursive="true"/>
+	</target>
+</system>
--- a/launcher/default/application_launcher.e
+++ b/launcher/default/application_launcher.e
@@ -0,0 +1,19 @@
+note
+	description: "[
+				Effective class for APPLICATION_LAUNCHER_I
+
+				You can put modification in this class
+			]"
+	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
+	revision: "$Revision: 36 $"
+
+class
+	APPLICATION_LAUNCHER [G -> WSF_EXECUTION create make end]
+
+inherit
+	APPLICATION_LAUNCHER_I [G]
+
+feature -- Custom
+
+end
+
--- a/launcher/default/application_launcher_i.e
+++ b/launcher/default/application_launcher_i.e
@@ -0,0 +1,26 @@
+note
+	description: "[
+			Specific application launcher
+
+			DO NOT EDIT THIS CLASS
+
+			you can customize APPLICATION_LAUNCHER
+		]"
+	date: "$Date: 2015-02-09 22:29:56 +0100 (lun., 09 févr. 2015) $"
+	revision: "$Revision: 96596 $"
+
+deferred class
+	APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]
+
+feature -- Execution
+
+	launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+		local
+			launcher: WSF_DEFAULT_SERVICE_LAUNCHER [G]
+		do
+			create launcher.make_and_launch (opts)
+		end
+
+end
+
+
--- a/launcher/libfcgi-safe.ecf
+++ b/launcher/libfcgi-safe.ecf
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="libfcgi_launcher" uuid="04D7D1EA-059B-4024-B0DE-BBB57AB2D00C" library_target="libfcgi_launcher">
+	<target name="common" abstract="true">
+		<root all_classes="true"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="cms" location="..\cms-safe.ecf"/>
+		<library name="cms_app_env" location="..\library\app_env\app_env-safe.ecf" readonly="false"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
+	</target>
+	<target name="libfcgi_launcher" extends="common">
+		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
+		<cluster name="src" location=".\" recursive="false"/>
+		<cluster name="launcher" location=".\default\" recursive="true"/>
+	</target>
+</system>
--- a/launcher/libfcgi.ecf
+++ b/launcher/libfcgi.ecf
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="libfcgi_launcher" uuid="04D7D1EA-059B-4024-B0DE-BBB57AB2D00C" library_target="libfcgi_launcher">
+	<target name="common" abstract="true">
+		<root all_classes="true"/>
+		<option void_safety="none" />
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="cms" location="..\cms.ecf"/>
+		<library name="cms_app_env" location="..\library\app_env\app_env.ecf" readonly="false"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
+	</target>
+	<target name="libfcgi_launcher" extends="common">
+		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi.ecf"/>
+		<cluster name="src" location=".\" recursive="false"/>
+		<cluster name="launcher" location=".\default\" recursive="true"/>
+	</target>
+</system>
--- a/examples/demo/src/ewf_roc_server.e
+++ b/examples/demo/src/ewf_roc_server.e
@@ -1,12 +1,12 @@
 note
 	description: "[
-				application service
+				Reusable ROC CMS launcher.
 			]"
 	date: "$Date: 2015-02-09 22:29:56 +0100 (lun., 09 févr. 2015) $"
 	revision: "$Revision: 96596 $"

 class
-	EWF_ROC_SERVER
+	ROC_CMS_LAUNCHER [G -> CMS_EXECUTION create make end]

 inherit
 	WSF_LAUNCHABLE_SERVICE
@@ -37,16 +37,27 @@ feature {NONE} -- Initialization
 			-- Initialize current service.
 		local
 			env: CMS_ENVIRONMENT
+			l_app_name: detachable READABLE_STRING_32
 		do
 			Precursor
-			create {WSF_SERVICE_LAUNCHER_OPTIONS_FROM_INI} service_options.make_from_file ("demo.ini")
 			create env.make_default
+			l_app_name := optional_application_name
+			if l_app_name = Void then
+				l_app_name := env.name
+			end
+			create {WSF_SERVICE_LAUNCHER_OPTIONS_FROM_INI} service_options.make_from_file (l_app_name + ".ini")
 			initialize_logger (env)
 		end

+	optional_application_name: detachable READABLE_STRING_32
+			-- Optional application name.
+			--| Redefine if needed.
+		do
+		end
+
 feature {NONE} -- Launch operation

-	launcher: APPLICATION_LAUNCHER [EWF_ROC_SERVER_EXECUTION]
+	launcher: APPLICATION_LAUNCHER [G]

 	launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
 		local
@@ -70,7 +81,7 @@ feature {NONE} -- Launch operation
 						l_message.append ("%N%N")
 					end
 				else
-					l_message.append ("The application crash without available information")
+					l_message.append ("The application crashed without information.")
 					l_message.append ("%N%N")
 				end
 				-- send email shutdown
--- a/launcher/standalone-safe.ecf
+++ b/launcher/standalone-safe.ecf
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="standalone_launcher" uuid="F42660A9-26C2-466B-A63C-C7823C808BE7" library_target="standalone_launcher">
+	<target name="common" abstract="true">
+		<root all_classes="true"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="cms" location="..\cms-safe.ecf"/>
+		<library name="cms_app_env" location="..\library\app_env\app_env-safe.ecf" readonly="false"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
+	</target>
+	<target name="standalone_launcher" extends="common">
+		<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone-safe.ecf"/>
+		<library name="standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\standalone-safe.ecf"/>
+		<cluster name="src" location=".\" recursive="false"/>
+		<cluster name="launcher" location=".\default\" recursive="true"/>
+	</target>
+</system>
--- a/launcher/standalone.ecf
+++ b/launcher/standalone.ecf
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="standalone_launcher" uuid="F42660A9-26C2-466B-A63C-C7823C808BE7" library_target="standalone_launcher">
+	<target name="common" abstract="true">
+		<root all_classes="true"/>
+		<option void_safety="none" />
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="cms" location="..\cms.ecf"/>
+		<library name="cms_app_env" location="..\library\app_env\app_env.ecf" readonly="false"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
+	</target>
+	<target name="standalone_launcher" extends="common">
+		<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone.ecf"/>
+		<library name="standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\standalone.ecf"/>
+		<cluster name="src" location=".\" recursive="false"/>
+		<cluster name="launcher" location=".\default\" recursive="true"/>
+	</target>
+</system>
--- a/library/persistence/implementation/store/cms_storage_store_sql.e
+++ b/library/persistence/implementation/store/cms_storage_store_sql.e
@@ -86,8 +86,23 @@ feature -- Query
 			sql_post_execution
 		end

-	sql_change (a_sql_statement: STRING; a_params: detachable STRING_TABLE [detachable ANY])
-			-- Execute an sql query change `a_sql_statement' with the params `a_params'.
+	sql_finalize
+			-- <Precursor>
+		do
+			-- N/A
+		end
+
+	sql_insert (a_sql_statement: STRING; a_params: detachable STRING_TABLE [detachable ANY])
+			-- <Precursor>
+		do
+			check_sql_query_validity (a_sql_statement, a_params)
+			db_handler.set_query (create {DATABASE_QUERY}.data_reader (a_sql_statement, a_params))
+			db_handler.execute_change
+			sql_post_execution
+		end
+
+	sql_modify (a_sql_statement: STRING; a_params: detachable STRING_TABLE [detachable ANY])
+			-- <Precursor>
 		do
 			check_sql_query_validity (a_sql_statement, a_params)
 			db_handler.set_query (create {DATABASE_QUERY}.data_reader (a_sql_statement, a_params))
@@ -133,4 +148,32 @@ feature -- Query
 			end
 		end

+	sql_read_integer_32 (a_index: INTEGER): INTEGER_32
+			-- Retrieved value at `a_index' position in `item'.
+		local
+			l_item: like sql_item
+		do
+			l_item := sql_item (a_index)
+			if attached {INTEGER_32} l_item as i then
+				Result := i
+			elseif attached {INTEGER_32_REF} l_item as l_value then
+				Result := l_value.item
+			else
+				check is_integer_32: False end
+			end
+		end
+
+	sql_read_date_time (a_index: INTEGER): detachable DATE_TIME
+			-- Retrieved value at `a_index' position in `item'.
+		local
+			l_item: like sql_item
+		do
+			l_item := sql_item (a_index)
+			if attached {DATE_TIME} l_item as dt then
+				Result := dt
+			else
+				check is_date_time_or_null: l_item = Void end
+			end
+		end
+
 end
--- a/library/persistence/sqlite3/sqlite3-safe.ecf
+++ b/library/persistence/sqlite3/sqlite3-safe.ecf
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="persistence_sqlite3" uuid="4E536C92-A09F-4305-8230-2EC5ABC51416" library_target="persistence_sqlite3">
+	<target name="persistence_sqlite3">
+		<root all_classes="true"/>
+		<option warning="true" void_safety="all">
+			<assertions precondition="true" supplier_precondition="true"/>
+		</option>
+		<setting name="console_application" value="true"/>
+		<library name="app_env" location="..\..\app_env\app_env-safe.ecf"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="cms" location="..\..\..\cms-safe.ecf"/>
+		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf"/>
+		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf"/>
+		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error-safe.ecf"/>
+		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
+		<library name="logging" location="$ISE_LIBRARY\library\runtime\logging\logging-safe.ecf"/>
+		<library name="model" location="..\..\model\cms_model-safe.ecf"/>
+		<library name="sqlite3" location="$ISE_LIBRARY\unstable\library\persistency\database\sqlite3\sqlite-safe.ecf" readonly="false">
+			<option msil_application_optimize="false">
+				<assertions precondition="true" supplier_precondition="true"/>
+			</option>
+		</library>
+		<library name="thread" location="$ISE_LIBRARY\library\thread\thread-safe.ecf"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
+		<cluster name="persistence_sqlite" location=".\src\" recursive="true">
+			<file_rule>
+				<exclude>/old$</exclude>
+				<exclude>/EIFGENs$</exclude>
+				<exclude>/CVS$</exclude>
+				<exclude>/.svn$</exclude>
+			</file_rule>
+		</cluster>
+	</target>
+</system>
--- a/library/persistence/sqlite3/src/cms_storage_sqlite3.e
+++ b/library/persistence/sqlite3/src/cms_storage_sqlite3.e
@@ -0,0 +1,450 @@
+note
+	description: "Summary description for {CMS_STORAGE_MYSQL}."
+	date: "$Date: 2015-02-09 22:29:56 +0100 (lun., 09 févr. 2015) $"
+	revision: "$Revision: 96596 $"
+
+class
+	CMS_STORAGE_SQLITE3
+
+inherit
+	CMS_STORAGE_SQL
+		redefine
+			sql_read_date_time, sql_read_integer_32,
+			sql_read_string_32
+		end
+
+	CMS_CORE_STORAGE_SQL_I
+		redefine
+			sql_read_date_time, sql_read_integer_32,
+			sql_read_string_32
+		end
+
+	CMS_USER_STORAGE_SQL_I
+		redefine
+			sql_read_date_time, sql_read_integer_32,
+			sql_read_string_32
+		end
+
+	SQLITE_BIND_ARG_MARSHALLER
+
+	REFACTORING_HELPER
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make (db: SQLITE_DATABASE)
+		do
+			sqlite := db
+			create error_handler.make
+		end
+
+	sqlite: SQLITE_DATABASE
+			-- Associated SQLite database.
+
+feature -- Status report
+
+	is_initialized: BOOLEAN
+			-- Is storage initialized?
+		do
+			Result := has_user
+		end
+
+feature -- Status report
+
+	is_available: BOOLEAN
+			-- Is storage available?
+		do
+			Result := sqlite.is_interface_usable
+		end
+
+feature -- Basic operation
+
+	close
+			-- Close/disconnect current storage.
+		do
+			sqlite.close
+		end
+
+feature -- Execution
+
+	transaction_depth: INTEGER
+
+	sql_begin_transaction
+			-- Start a database transtaction.
+		do
+			if transaction_depth = 0 then
+				sqlite.begin_transaction (False)
+			end
+			transaction_depth := transaction_depth + 1
+			debug ("roc_storage")
+				print ("# sql_begin_transaction (depth="+ transaction_depth.out +").%N")
+			end
+		end
+
+	sql_rollback_transaction
+			-- Rollback updates in the database.
+		do
+			if sqlite.is_in_transaction then
+				sqlite.rollback
+			end
+			transaction_depth := transaction_depth - 1
+			debug ("roc_storage")
+				print ("# sql_rollback_transaction (depth="+ transaction_depth.out +").%N")
+			end
+		end
+
+	sql_commit_transaction
+			-- Commit updates in the database.
+		do
+			if sqlite.is_in_transaction then
+				sqlite.commit
+			end
+			transaction_depth := transaction_depth - 1
+			debug ("roc_storage")
+				print ("# sql_commit_transaction (depth="+ transaction_depth.out +").%N")
+			end
+		end
+
+	sql_post_execution
+			-- Post database execution.
+			-- note: execute after each `sql_query' and `sql_change'.
+		do
+			debug ("roc_storage")
+				print ("# sql_post_execution.%N")
+			end
+			-- FIXME
+			if sqlite.has_error then
+				write_critical_log (generator + ".post_execution Error occurred!")
+			end
+		end
+
+feature -- Operation
+
+	last_statement: detachable SQLITE_STATEMENT
+
+	last_sqlite_result_cursor: detachable SQLITE_STATEMENT_ITERATION_CURSOR
+
+	sql_query (a_sql_statement: STRING; a_params: detachable STRING_TABLE [detachable ANY])
+			-- <Precursor>
+		local
+			st: SQLITE_QUERY_STATEMENT
+		do
+			debug ("roc_storage")
+				print ("> sql_query (" +a_sql_statement + ").%N")
+			end
+			last_sqlite_result_cursor := Void
+			create st.make (a_sql_statement, sqlite)
+			last_statement := st
+			if st.is_compiled then
+				if a_params /= Void then
+					check st.has_arguments end
+					last_sqlite_result_cursor := st.execute_new_with_arguments (sqlite_arguments (a_params))
+				else
+					last_sqlite_result_cursor := st.execute_new
+				end
+			else
+				error_handler.add_custom_error (1, "invalid query", "query compilation failed!")
+			end
+			debug ("roc_storage")
+				print ("< sql_query (" +a_sql_statement + ").%N")
+			end
+		end
+
+	sql_finalize
+			-- Finalize sql query (i.e destroy previous query statement.
+		do
+			debug ("roc_storage")
+				print ("> sql_finalize.%N")
+			end
+			if attached last_statement as st then
+				st.cleanup
+			end
+			if attached last_sqlite_result_cursor as cur then
+				if cur.statement /= last_statement then
+					check should_not_occurs: False end
+					cur.statement.cleanup
+				end
+				last_sqlite_result_cursor := Void
+			end
+			last_statement := Void
+			debug ("roc_storage")
+				print ("< sql_finalize.%N")
+			end
+		end
+
+	sql_insert (a_sql_statement: STRING; a_params: detachable STRING_TABLE [detachable ANY])
+			-- <Precursor>
+		local
+			st: SQLITE_INSERT_STATEMENT
+		do
+			debug ("roc_storage")
+				print ("> sql_insert (" +a_sql_statement + ").%N")
+			end
+			last_sqlite_result_cursor := Void
+			create st.make (a_sql_statement, sqlite)
+			last_statement := st
+			if st.is_compiled then
+				if a_params /= Void then
+					check st.has_arguments end
+					last_sqlite_result_cursor := st.execute_new_with_arguments (sqlite_arguments (a_params))
+				else
+					last_sqlite_result_cursor := st.execute_new
+				end
+			else
+				error_handler.add_custom_error (1, "invalid query", "query compilation failed!")
+			end
+			debug ("roc_storage")
+				print ("< sql_insert (" +a_sql_statement + ").%N")
+			end
+		end
+
+	sql_modify (a_sql_statement: STRING; a_params: detachable STRING_TABLE [detachable ANY])
+			-- <Precursor>
+		local
+			st: SQLITE_MODIFY_STATEMENT
+		do
+			debug ("roc_storage")
+				print ("> sql_modify (" +a_sql_statement + ").%N")
+			end
+			last_sqlite_result_cursor := Void
+			create st.make (a_sql_statement, sqlite)
+			last_statement := st
+			if st.is_compiled then
+				if a_params /= Void then
+					check st.has_arguments end
+					last_sqlite_result_cursor := st.execute_new_with_arguments (sqlite_arguments (a_params))
+				else
+					last_sqlite_result_cursor := st.execute_new
+				end
+			else
+				error_handler.add_custom_error (1, "invalid query", "query compilation failed!")
+			end
+			debug ("roc_storage")
+				print ("< sql_modify (" +a_sql_statement + ").%N")
+			end
+		end
+
+	sqlite_arguments (a_params: STRING_TABLE [detachable ANY]): ARRAYED_LIST [SQLITE_BIND_ARG [ANY]]
+		local
+			k: READABLE_STRING_GENERAL
+			k8: STRING
+			utf: UTF_CONVERTER
+		do
+			create Result.make (a_params.count)
+			across
+				a_params as ic
+			loop
+				k := ic.key
+				if k.is_valid_as_string_8 then
+					k8 := k.as_string_8
+				else
+					k8 := utf.utf_32_string_to_utf_8_string_8 (k)
+				end
+				if attached {DATE_TIME} ic.item as dt then
+					Result.force (new_binding_argument (date_time_to_string (dt), ":" + k8))
+				elseif attached {READABLE_STRING_32} ic.item as s32 then
+					Result.force (new_binding_argument (utf.utf_32_string_to_utf_8_string_8 (s32), ":" + k8))
+				else
+					Result.force (new_binding_argument (ic.item, ":" + k8))
+				end
+			end
+		end
+
+	date_time_to_string (dt: DATE_TIME): STRING
+		do
+			create Result.make (16)
+			Result.append_integer (dt.year)
+			Result.append_character ('-')
+			if dt.month <= 9 then
+				Result.append_character ('0')
+			end
+			Result.append_integer (dt.month)
+			Result.append_character ('-')
+			if dt.day <= 9 then
+				Result.append_character ('0')
+			end
+			Result.append_integer (dt.day)
+			Result.append_character (' ')
+			if dt.hour <= 9 then
+				Result.append_character ('0')
+			end
+			Result.append_integer (dt.hour)
+			Result.append_character (':')
+			if dt.minute <= 9 then
+				Result.append_character ('0')
+			end
+			Result.append_integer (dt.minute)
+			Result.append_character (':')
+			if dt.second <= 9 then
+				Result.append_character ('0')
+			end
+			Result.append_integer (dt.second)
+		end
+
+	string_to_date_time (a_string: READABLE_STRING_GENERAL): DATE_TIME
+		local
+			y,m,d: INTEGER
+			h,min,sec: INTEGER
+			s: detachable READABLE_STRING_GENERAL
+			i,j: INTEGER
+		do
+			i := 1
+				-- YYYY
+			j := a_string.index_of ('-', i)
+			s := a_string.substring (i, j - 1)
+			y := s.to_integer
+			i := j + 1
+				-- /MM
+			j := a_string.index_of ('-', i)
+			s := a_string.substring (i, j - 1)
+			m := s.to_integer
+			i := j + 1
+				-- /DD
+			j := a_string.index_of (' ', i)
+			s := a_string.substring (i, j - 1)
+			d := s.to_integer
+			i := j + 1
+				-- %THour
+			j := a_string.index_of (':', i)
+			s := a_string.substring (i, j - 1)
+			h := s.to_integer
+			i := j + 1
+				-- :Min
+			j := a_string.index_of (':', i)
+			s := a_string.substring (i, j - 1)
+			min := s.to_integer
+			i := j + 1
+				-- :Sec
+			j := a_string.count + 1
+			s := a_string.substring (i, j - 1)
+			sec := s.to_integer
+
+			create Result.make (y,m,d,h,min,sec)
+		end
+
+feature -- Access		
+
+	sql_start
+			-- <Precursor>.
+		do
+			-- sqlite cursor `last_sqlite_result_cursor', already at first position if any.
+		end
+
+	sql_after: BOOLEAN
+			-- <Precursor>.
+		do
+			if attached last_sqlite_result_cursor as l_cursor then
+				Result := l_cursor.after
+			end
+		end
+
+	sql_forth
+			-- <Precursor>.
+		do
+			if attached last_sqlite_result_cursor as l_cursor then
+				l_cursor.forth
+			end
+		end
+
+	sql_valid_item_index (a_index: INTEGER): BOOLEAN
+		local
+			l_row: SQLITE_RESULT_ROW
+		do
+			if attached last_sqlite_result_cursor as l_cursor then
+				l_row := l_cursor.item
+				Result := a_index > 0 and a_index.to_natural_32 <= l_row.count
+			end
+		end
+
+	sql_item (a_index: INTEGER): detachable ANY
+		local
+			l_row: SQLITE_RESULT_ROW
+		do
+			if attached last_sqlite_result_cursor as l_cursor then
+				l_row := l_cursor.item
+				Result := l_row.value (a_index.to_natural_32)
+			end
+		end
+
+	sql_read_string_32 (a_index: INTEGER): detachable STRING_32
+			-- <Precursor>
+		local
+			utf: UTF_CONVERTER
+		do
+			Result := Precursor (a_index)
+			if Result = Void then
+				if attached sql_read_string (a_index) as s8 then
+					Result := utf.utf_8_string_8_to_string_32 (s8)
+				end
+			end
+		end
+
+	sql_read_integer_32 (a_index: INTEGER): INTEGER_32
+			-- Retrieved value at `a_index' position in `item'.
+		local
+			l_item: like sql_item
+			i64: INTEGER_64
+		do
+			l_item := sql_item (a_index)
+			if attached {INTEGER_32} l_item as i then
+				Result := i
+			elseif attached {INTEGER_32_REF} l_item as l_value then
+				Result := l_value.item
+			else
+				if attached {INTEGER_64} l_item as i then
+					i64 := i
+				elseif attached {INTEGER_64_REF} l_item as l_value then
+					i64 := l_value.item
+				else
+					check is_integer_32: False end
+				end
+				if i64 <= {INTEGER_32}.max_value then
+					Result := i64.to_integer_32
+				else
+					check is_integer_32: False end
+				end
+			end
+		end
+
+	sql_read_date_time (a_index: INTEGER): detachable DATE_TIME
+			-- Retrieved value at `a_index' position in `item'.
+		local
+			l_item: like sql_item
+		do
+			l_item := sql_item (a_index)
+			if attached {DATE_TIME} l_item as dt then
+				Result := dt
+			elseif attached {READABLE_STRING_GENERAL} l_item as s then
+				Result := string_to_date_time (s)
+			else
+				check is_date_time_nor_null: l_item = Void end
+			end
+		end
+
+feature -- Conversion
+
+	sql_statement (a_statement: STRING): STRING
+			-- <Precursor>.
+		local
+			i: INTEGER
+		do
+			Result := a_statement
+			from
+				i := 1
+			until
+				i = 0
+			loop
+				i := a_statement.substring_index ("AUTO_INCREMENT", i)
+				if i > 0 then
+					if Result = a_statement then
+						create Result.make_from_string (a_statement)
+					end
+					Result.remove (i + 4)
+					i := i + 14
+				end
+			end
+		end
+
+end
--- a/library/persistence/sqlite3/src/cms_storage_sqlite3_builder.e
+++ b/library/persistence/sqlite3/src/cms_storage_sqlite3_builder.e
@@ -0,0 +1,90 @@
+note
+	description: "[
+			Objects that ...
+		]"
+	author: "$Author: jfiat $"
+	date: "$Date: 2015-02-13 13:08:13 +0100 (ven., 13 févr. 2015) $"
+	revision: "$Revision: 96616 $"
+
+class
+	CMS_STORAGE_SQLITE3_BUILDER
+
+inherit
+	CMS_STORAGE_SQL_BUILDER
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make
+			-- Initialize `Current'.
+		do
+		end
+
+feature -- Factory
+
+	storage (a_setup: CMS_SETUP; a_error_handler: ERROR_HANDLER): detachable CMS_STORAGE_SQLITE3
+		local
+			s: detachable READABLE_STRING_32
+			p: PATH
+			db: detachable SQLITE_DATABASE
+			l_source: SQLITE_FILE_SOURCE
+			i,j: INTEGER
+		do
+			if
+				attached (create {APPLICATION_JSON_CONFIGURATION_HELPER}).new_database_configuration (a_setup.environment.application_config_path) as l_database_config
+			then
+				if l_database_config.driver.is_case_insensitive_equal ("sqlite3") then
+					s := l_database_config.database_string
+					i := s.substring_index ("Database=", 1)
+					if i > 0 then
+						i := s.index_of ('=', i) + 1
+						j := s.index_of (';', i)
+						if j = 0 then
+							j := s.count + 1
+						end
+						create p.make_from_string (s.substring (i, j - 1))
+					else
+						create p.make_from_string (s)
+					end
+
+					if attached reuseable_connection.item as d then
+						if p.same_as (d.path) then
+							db := d.database
+						end
+					end
+					if db = Void or else db.is_closed then
+						create l_source.make (p.name)
+						create db.make (l_source)
+						if l_source.exists then
+							db.open_read_write
+						else
+							db.open_create_read_write
+						end
+					end
+					if not db.is_closed then
+						db.set_busy_timeout (1_000) -- FIXME
+						create Result.make (db)
+--						set_map_zero_null_value (False)	--| This way we map 0 to 0, instead of Null as default.
+						if Result.is_available then
+							if not Result.is_initialized then
+								initialize (a_setup, Result)
+							end
+						end
+					else
+						a_error_handler.add_custom_error (0, "Could not connect to the ODBC storage", Void)
+					end
+				else
+					-- Wrong mapping between storage name and storage builder!
+				end
+			end
+		end
+
+	reuseable_connection: CELL [detachable TUPLE [path: PATH; database: SQLITE_DATABASE]]
+		once
+			create Result.put (Void)
+		end
+
+
+end
--- a/library/persistence/store_mysql/src/cms_storage_store_mysql_builder.e
+++ b/library/persistence/store_mysql/src/cms_storage_store_mysql_builder.e
@@ -35,6 +35,7 @@ feature -- Factory
 				if conn.is_connected then
 					create Result.make (conn)
 					set_map_zero_null_value (False)	--| This way we map 0 to 0, instead of Null as default.
+					set_use_extended_types (True) --| Use extended types: STRING_32 etc.
 					if Result.is_available then
 						if not Result.is_initialized then
 							initialize (a_setup, Result)
--- a/library/persistence/store_odbc/src/cms_storage_store_odbc_builder.e
+++ b/library/persistence/store_odbc/src/cms_storage_store_odbc_builder.e
@@ -48,6 +48,7 @@ feature -- Factory
 					if conn.is_connected then
 						create Result.make_with_driver (conn, l_database_config.item ("Driver"))
 						set_map_zero_null_value (False)	--| This way we map 0 to 0, instead of Null as default.
+						set_use_extended_types (True) --| Use extended types: STRING_32 etc.
 						if Result.is_available then
 							if not Result.is_initialized then
 								initialize (a_setup, Result)
--- a/modules/admin/cms_admin_module.e
+++ b/modules/admin/cms_admin_module.e
@@ -53,6 +53,8 @@ feature -- Access: router
 			l_user_handler: CMS_USER_HANDLER
 			l_role_handler:	CMS_ROLE_HANDLER

+			l_admin_cache_handler: CMS_ADMIN_CACHE_HANDLER
+
 			l_uri_mapping: WSF_URI_MAPPING
 		do
 			create l_admin_handler.make (a_api)
@@ -67,6 +69,10 @@ feature -- Access: router
 			create l_uri_mapping.make_trailing_slash_ignored ("/admin/roles", l_roles_handler)
 			a_router.map (l_uri_mapping, a_router.methods_get_post)

+			create l_admin_cache_handler.make (a_api)
+			create l_uri_mapping.make_trailing_slash_ignored ("/admin/cache", l_admin_cache_handler)
+			a_router.map (l_uri_mapping, a_router.methods_get_post)
+
 			create l_user_handler.make (a_api)
 			a_router.handle ("/admin/add/user", l_user_handler, a_router.methods_get_post)
 			a_router.handle ("/admin/user/{id}", l_user_handler, a_router.methods_get)
@@ -78,6 +84,8 @@ feature -- Access: router
 			a_router.handle ("/admin/role/{id}", l_role_handler, a_router.methods_get)
 			a_router.handle ("/admin/role/{id}/edit", l_role_handler, a_router.methods_get_post)
 			a_router.handle ("/admin/role/{id}/delete", l_role_handler, a_router.methods_get_post)
+
+
 		end

 feature -- Security
@@ -120,6 +128,13 @@ feature -- Hooks
 				lnk.set_permission_arguments (<<"manage " + {CMS_ADMIN_MODULE}.name>>)
 				a_menu_system.management_menu.extend (lnk)
 			end
+			if
+				a_response.has_permission ("admin cache") -- Note: admin user has all permissions enabled by default.
+			then
+				create lnk.make ("Cache", "admin/cache")
+				lnk.set_permission_arguments (<<"admin cache">>)
+				a_menu_system.management_menu.extend (lnk)
+			end
 		end

 note
--- a/modules/admin/handler/cms_admin_cache_handler.e
+++ b/modules/admin/handler/cms_admin_cache_handler.e
@@ -0,0 +1,101 @@
+note
+	description: "[
+			Administrate cache functionality.
+		]"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_ADMIN_CACHE_HANDLER
+
+inherit
+	CMS_HANDLER
+
+	WSF_URI_HANDLER
+		rename
+			new_mapping as new_uri_mapping
+		end
+
+	WSF_RESOURCE_HANDLER_HELPER
+		redefine
+			do_get,
+			do_post
+		end
+
+	REFACTORING_HELPER
+
+create
+	make
+
+feature -- Execution
+
+	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- Execute request handler
+		do
+			execute_methods (req, res)
+		end
+
+	do_get (req: WSF_REQUEST; res: WSF_RESPONSE)
+		local
+			l_response: CMS_RESPONSE
+			s: STRING
+			f: CMS_FORM
+		do
+			create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
+			if l_response.has_permission ("admin cache") then
+				f := clear_cache_web_form (l_response)
+				create s.make_empty
+				f.append_to_html (create {CMS_TO_WSF_THEME}.make (l_response, l_response.theme), s)
+				l_response.set_main_content (s)
+			else
+				create {FORBIDDEN_ERROR_CMS_RESPONSE} l_response.make (req, res, api)
+			end
+			l_response.execute
+		end
+
+	do_post (req: WSF_REQUEST; res: WSF_RESPONSE)
+		local
+			l_response: CMS_RESPONSE
+			s: STRING
+			f: CMS_FORM
+		do
+			create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
+			if l_response.has_permission ("admin cache") then
+				f := clear_cache_web_form (l_response)
+				f.process (l_response)
+				if
+					attached f.last_data as fd and then
+					fd.is_valid
+				then
+					if attached fd.string_item ("op") as l_op and then l_op.same_string (text_clear_all_caches) then
+						l_response.hooks.invoke_clear_cache (Void, l_response)
+						l_response.add_notice_message ("Cache cleared!")
+					else
+						fd.report_error ("Invalid form data!")
+					end
+				end
+				create s.make_empty
+				f.append_to_html (create {CMS_TO_WSF_THEME}.make (l_response, l_response.theme), s)
+				l_response.set_main_content (s)
+			else
+				create {FORBIDDEN_ERROR_CMS_RESPONSE} l_response.make (req, res, api)
+			end
+			l_response.execute
+		end
+
+feature -- Widget
+
+	clear_cache_web_form (a_response: CMS_RESPONSE): CMS_FORM
+		local
+			but: WSF_FORM_SUBMIT_INPUT
+		do
+			create Result.make (a_response.url (a_response.location, Void), "form_clear_cache")
+			create but.make_with_text ("op", text_clear_all_caches)
+			Result.extend (but)
+		end
+
+feature -- Interface text.		
+
+	text_clear_all_caches: STRING_32 = "Clear all caches"
+
+end
--- a/modules/admin/handler/role/cms_admin_roles_handler.e
+++ b/modules/admin/handler/role/cms_admin_roles_handler.e
@@ -93,7 +93,7 @@ feature -- HTTP Methods
 					s.append ("<a href=%"")
 					s.append (req.absolute_script_url ("/admin/role/" + u.id.out))
 					s.append ("%">")
-					s.append (u.name)
+					s.append (html_encoded (u.name))
 					s.append ("</a>")
 					s.append ("</li>%N")
 				end
--- a/modules/admin/handler/user/cms_admin_users_handler.e
+++ b/modules/admin/handler/user/cms_admin_users_handler.e
@@ -106,7 +106,7 @@ feature -- HTTP Methods
 						s.append ("<a href=%"")
 						s.append (req.absolute_script_url ("/admin/user/"+u.id.out))
 						s.append ("%">")
-						s.append (u.name)
+						s.append (html_encoded (u.name))
 						s.append ("</a>")
 						s.append ("</li>%N")
 					end
--- a/modules/blog/cms_blog.e
+++ b/modules/blog/cms_blog.e
@@ -50,10 +50,10 @@ feature -- Access

 feature -- Access: node

-	summary: detachable READABLE_STRING_8
+	summary: detachable READABLE_STRING_32
 			-- A short summary of the node.

-	content: detachable READABLE_STRING_8
+	content: detachable READABLE_STRING_32
 			-- Content of the node.

 	format: detachable READABLE_STRING_8
--- a/modules/blog/cms_node_storage_sql_blog_extension.e
+++ b/modules/blog/cms_node_storage_sql_blog_extension.e
@@ -83,17 +83,18 @@ feature -- Persistence

 				if l_update then
 					if l_has_modif then
-						sql_change (sql_update_node_data, l_parameters)
+						sql_modify (sql_update_node_data, l_parameters)
 					end
 				else
 					if l_has_modif then
-						sql_change (sql_insert_node_data, l_parameters)
+						sql_insert (sql_insert_node_data, l_parameters)
 					else
 						-- no page data, means everything is empty.
 						-- FOR NOW: always record row
 --						sql_change (sql_insert_node_data, l_parameters)
 					end
 				end
+				sql_finalize
 			end
 		end

@@ -116,7 +117,8 @@ feature -- Persistence
 			if a_node.has_id then
 				create l_parameters.make (1)
 				l_parameters.put (a_node.id, "nid")
-				sql_change (sql_delete_node_data, l_parameters)
+				sql_modify (sql_delete_node_data, l_parameters)
+				sql_finalize
 			end
 		end

@@ -136,18 +138,21 @@ feature {NONE} -- Implementation
 			l_parameters.put (a_node.revision, "revision")
 			sql_query (sql_select_node_data, l_parameters)
 			if not has_error then
-				n := sql_rows_count
-				if n = 1 then
+				if not sql_after then
 						-- nid, revision, tags
 					l_rev := sql_read_integer_64 (2)
 					l_tags := sql_read_string_32 (3)
 					if l_tags /= Void then
 						Result := [l_rev, l_tags]
 					end
-				else
-					check unique_data: n = 0 end
+					sql_forth
+					if not sql_after then
+						check unique_data: n = 0 end
+						Result := Void
+					end
 				end
 			end
+			sql_finalize
 		ensure
 			accepted_revision: Result /= Void implies Result.revision <= a_node.revision
 		end
--- a/modules/blog/handler/blog_user_handler.e
+++ b/modules/blog/handler/blog_user_handler.e
@@ -123,7 +123,7 @@ feature -- HTML Output
 		do
 			a_output.append ("<h2>Posts from ")
 			if attached user as l_user then
-				a_output.append (l_user.name)
+				a_output.append (html_encoded (l_user.name))
 			else
 				a_output.append ("unknown user")
 			end
--- a/modules/blog/persistence/cms_blog_storage_sql.e
+++ b/modules/blog/persistence/cms_blog_storage_sql.e
@@ -23,9 +23,10 @@ feature -- Access
 			error_handler.reset
 			write_information_log (generator + ".blogs_count")
 			sql_query (sql_select_blog_count, Void)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := sql_read_integer_64 (1)
 			end
+			sql_finalize
 		end

 	blogs_count_from_user (a_user: CMS_USER) : INTEGER_64
@@ -38,9 +39,10 @@ feature -- Access
 			create l_parameters.make (2)
 			l_parameters.put (a_user.id, "user")
 			sql_query (sql_select_blog_count_from_user, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := sql_read_integer_64 (1)
 			end
+			sql_finalize
 		end

 	blogs: LIST [CMS_NODE]
@@ -62,6 +64,7 @@ feature -- Access
 				end
 				sql_forth
 			end
+			sql_finalize
 		end

 	blogs_limited (a_limit: NATURAL_32; a_offset: NATURAL_32): LIST [CMS_NODE]
@@ -88,6 +91,7 @@ feature -- Access
 				end
 				sql_forth
 			end
+			sql_finalize
 		end

 	blogs_from_user_limited (a_user: CMS_USER; a_limit: NATURAL_32; a_offset: NATURAL_32): LIST [CMS_NODE]
@@ -115,6 +119,7 @@ feature -- Access
 				end
 				sql_forth
 			end
+			sql_finalize
 		end

 feature {NONE} -- Queries
--- a/modules/feed_aggregator/feed_aggregation.e
+++ b/modules/feed_aggregator/feed_aggregation.e
@@ -45,6 +45,15 @@ feature -- Access
 	description_enabled: BOOLEAN
 			-- Display description?

+feature -- Status report
+
+	has_category_filter: BOOLEAN
+			-- Is there any category filtering?
+			-- i.e via `included_categories'
+		do
+			Result := attached included_categories as cats and then not cats.is_empty
+		end
+
 feature -- Element change

 	set_description (a_desc: detachable READABLE_STRING_GENERAL)
@@ -99,6 +108,10 @@ feature -- Element change
 feature -- Status report

 	is_included (e: FEED_ITEM): BOOLEAN
+			-- Is `e' included in final aggregation?
+			-- i.e: related to `included_categories'
+			-- note that if `e' has no category, it is included by default,
+			-- even if `included_categories' is defined.
 		do
 			Result := True
 			if attached e.categories as e_cats then
--- a/modules/feed_aggregator/feed_aggregator_api.e
+++ b/modules/feed_aggregator/feed_aggregator_api.e
@@ -20,7 +20,7 @@ feature -- Access
 			agg: FEED_AGGREGATION
 			l_feed_id: READABLE_STRING_32
 			l_title: detachable READABLE_STRING_GENERAL
-			l_location_list: detachable LIST [READABLE_STRING_32]
+			l_locations: detachable STRING_TABLE [READABLE_STRING_8]
 			utf: UTF_CONVERTER
 			l_table: like internal_aggregations
 		do
@@ -36,16 +36,28 @@ feature -- Access
 							l_ids as ic
 						loop
 							l_feed_id := ic.item
-							l_location_list := cfg.text_list_item ({STRING_32} "feeds." + l_feed_id + ".locations")
+							create l_locations.make (1)
+
+							if attached cfg.text_list_item ({STRING_32} "feeds." + l_feed_id + ".locations") as l_location_list then
+								across
+									l_location_list as loc_ic
+								loop
+									l_locations.force (utf.utf_32_string_to_utf_8_string_8 (loc_ic.item), loc_ic.item)
+								end
+							end
+							if attached cfg.text_table_item ({STRING_32} "feeds." + l_feed_id + ".locations") as l_location_table then
+								across
+									l_location_table as loc_tb_ic
+								loop
+									l_locations.force (utf.utf_32_string_to_utf_8_string_8 (loc_tb_ic.item), loc_tb_ic.key)
+								end
+							end
 							if
 								attached cfg.text_item ({STRING_32} "feeds." + l_feed_id + ".location") as l_location
 							then
-								if l_location_list = Void then
-									create {ARRAYED_LIST [READABLE_STRING_32]} l_location_list.make (1)
-								end
-								l_location_list.force (l_location)
+								l_locations.force (utf.utf_32_string_to_utf_8_string_8 (l_location), l_location)
 							end
-							if l_location_list /= Void and then not l_location_list.is_empty then
+							if l_locations /= Void and then not l_locations.is_empty then
 								l_title := cfg.text_item ({STRING_32} "feeds." + l_feed_id + ".title")
 								if l_title = Void then
 									l_title := l_feed_id
@@ -62,10 +74,10 @@ feature -- Access
 									end
 								end
 								if attached cfg.text_item ({STRING_32} "feeds." + l_feed_id + ".option_description") as l_description_opt then
-										agg.set_description_enabled (not l_description_opt.is_case_insensitive_equal_general ("disabled"))
+									agg.set_description_enabled (not l_description_opt.is_case_insensitive_equal_general ("disabled"))
 								end
 								across
-									l_location_list as loc_ic
+									l_locations as loc_ic
 								loop
 									agg.locations.force (utf.utf_32_string_to_utf_8_string_8 (loc_ic.item))
 								end
@@ -113,16 +125,11 @@ feature -- Operation

 	aggregation_feed (agg: FEED_AGGREGATION): detachable FEED
 			-- Feed from aggregation `agg'.
-		local
-			fac: FEED_DEFAULT_PARSERS
-			f: detachable FEED
 		do
-			create fac
 			across
 				agg.locations as ic
 			loop
-				if attached new_http_client_session (ic.item).get ("", Void).body as res then
-					f := fac.feed_from_string (res)
+				if attached feed (ic.item) as f then
 					if Result /= Void then
 						if f /= Void then
 							Result := Result + f
--- a/modules/feed_aggregator/feed_aggregator_module.e
+++ b/modules/feed_aggregator/feed_aggregator_module.e
@@ -1,7 +1,7 @@
 note
 	description: "CMS module bringing support for feed aggregation."
-	date: "$Date: 2015-02-13 13:08:13 +0100 (ven., 13 févr. 2015) $"
-	revision: "$Revision: 96616 $"
+	date: "$Date$"
+	revision: "$Revision$"

 class
 	FEED_AGGREGATOR_MODULE
@@ -23,6 +23,8 @@ inherit

 	CMS_HOOK_MENU_SYSTEM_ALTER

+	CMS_HOOK_CACHE
+
 create
 	make

@@ -181,10 +183,27 @@ feature -- Hooks configuration
 			a_response.hooks.subscribe_to_block_hook (Current)
 			a_response.hooks.subscribe_to_response_alter_hook (Current)
 			a_response.hooks.subscribe_to_menu_system_alter_hook (Current)
+			a_response.hooks.subscribe_to_cache_hook (Current)
 		end

 feature -- Hook

+	clear_cache (a_cache_id_list: detachable ITERABLE [READABLE_STRING_GENERAL]; a_response: CMS_RESPONSE)
+			-- <Precursor>.
+		local
+			p: PATH
+			dir: DIRECTORY
+		do
+			if a_cache_id_list = Void then
+					-- Clear all cache.
+				p := a_response.api.files_location.extended (".cache").extended (name)
+				create dir.make_with_path (p)
+				if dir.exists then
+					dir.recursive_delete
+				end
+			end
+		end
+
 	block_list: ITERABLE [like {CMS_BLOCK}.name]
 			-- List of block names, managed by current object.
 		local
@@ -211,6 +230,7 @@ feature -- Hook
 			s: READABLE_STRING_8
 			b: CMS_CONTENT_BLOCK
 			pref: STRING
+			nb: INTEGER
 		do
 			if attached feed_aggregator_api as l_feed_api then
 				pref := "feed."
@@ -219,7 +239,15 @@ feature -- Hook
 				else
 					s := a_block_id
 				end
-				if attached feed_to_html (s, 0, True, a_response) as l_content then
+				nb := 0
+				if
+					attached a_response.block_options (a_block_id) as l_options and then
+					attached {READABLE_STRING_GENERAL} l_options.item ("size") as l_size and then
+					l_size.is_integer
+				then
+					nb := l_size.to_integer
+				end
+				if attached feed_to_html (s, nb, True, a_response) as l_content then
 					create b.make (a_block_id, Void, l_content, Void)
 					b.set_is_raw (True)
 					a_response.add_block (b, "feed_" + s)
@@ -280,6 +308,19 @@ feature -- Hook
 						vis.set_footer (s)

 						if attached l_feed_api.aggregation_feed (l_agg) as l_feed then
+							if l_agg.has_category_filter and attached l_feed.items as lst then
+								from
+									lst.start
+								until
+									lst.after
+								loop
+									if not l_agg.is_included (lst.item_for_iteration) then
+										lst.remove
+									else
+										lst.forth
+									end
+								end
+							end
 							l_feed.accept (vis)
 						end
 						l_cache.put (Result)
--- a/modules/feed_aggregator/site/config/feeds.json.example
+++ b/modules/feed_aggregator/site/config/feeds.json.example
@@ -0,0 +1,28 @@
+{
+	"ids": ["news", "forum"],
+	"feeds": { 
+		"news": {
+			"title": "Eiffel related posts", 
+			"expiration": "21600",
+			"size": 5,
+			"locations": [
+					"https://bertrandmeyer.com/feed/",
+					"https://room.eiffel.com/blog/feed",
+					"https://room.eiffel.com/article/feed",
+					"https://room.eiffel.com/library/feed"
+					]
+			, "categories": ["Eiffel"]
+			,"option_description": "enabled"
+			},
+		"forum": {
+			"title": "Eiffel Forum",
+			"expiration": "21600",
+			"size": 5,
+			"locations": [
+					"https://groups.google.com/forum/feed/eiffel-users/msgs/atom.xml?num=15",
+					"http://stackoverflow.com/feeds/tag?tagnames=eiffel&sort=newest"
+				]
+			,"option_description": "enabled"
+		}
+	}
+}
--- a/modules/node/content/cms_node.e
+++ b/modules/node/content/cms_node.e
@@ -103,12 +103,12 @@ feature -- Access
 			-- Full title of the node.
 			-- Required!

-	summary: detachable READABLE_STRING_8
+	summary: detachable READABLE_STRING_32
 			-- A short summary of the node.
 		deferred
 		end

-	content: detachable READABLE_STRING_8
+	content: detachable READABLE_STRING_32
 			-- Content of the node.
 		deferred
 		end
--- a/modules/node/content/cms_partial_node.e
+++ b/modules/node/content/cms_partial_node.e
@@ -33,10 +33,10 @@ feature -- Access: code

 feature -- Access: content			

-	summary: detachable READABLE_STRING_8
+	summary: detachable READABLE_STRING_32
 			-- A short summary of the node.

-	content: detachable READABLE_STRING_8
+	content: detachable READABLE_STRING_32
 			-- Content of the node.

 	format: detachable READABLE_STRING_8
--- a/modules/node/content_type/cms_page.e
+++ b/modules/node/content_type/cms_page.e
@@ -44,10 +44,10 @@ feature -- Access

 feature -- Access: content

-	summary: detachable READABLE_STRING_8
+	summary: detachable READABLE_STRING_32
 			-- A short summary of the node.

-	content: detachable READABLE_STRING_8
+	content: detachable READABLE_STRING_32
 			-- Content of the node.

 	format: detachable READABLE_STRING_8
--- a/modules/node/handler/cms_node_type_webform_manager.e
+++ b/modules/node/handler/cms_node_type_webform_manager.e
@@ -100,6 +100,7 @@ feature -- Forms ...
 		local
 			ti: WSF_FORM_TEXT_INPUT
 			l_uri: detachable READABLE_STRING_8
+			l_iri: detachable READABLE_STRING_32
 		do
 				-- Path alias		
 			create ti.make ("path_alias")
@@ -111,7 +112,8 @@ feature -- Forms ...
 				if attached a_node.link as lnk then
 					l_uri := lnk.location
 				else
-					l_uri := percent_encoder.percent_decoded_string (response.api.location_alias (response.node_api.node_path (a_node)))
+					l_iri := percent_encoder.percent_decoded_string (response.api.location_alias (response.node_api.node_path (a_node)))
+					l_uri := l_iri.to_string_8
 				end
 				ti.set_text_value (l_uri)
 				ti.set_description ("Optionally specify an alternative URL path by which this content can be accessed. For example, type 'about' when writing an about page. Use a relative path or the URL alias won't work.")
@@ -151,10 +153,9 @@ feature -- Forms ...
 			end
 		end

-
 	update_node	(response: NODE_RESPONSE; fd: WSF_FORM_DATA; a_node: CMS_NODE)
 		local
-			b,s: detachable READABLE_STRING_8
+			b,s: detachable READABLE_STRING_32
 			f: detachable CONTENT_FORMAT
 		do
 			if attached fd.integer_item ("id") as l_id and then l_id > 0 then
@@ -193,7 +194,7 @@ feature -- Forms ...
 	new_node (response: NODE_RESPONSE; fd: WSF_FORM_DATA; a_node: detachable CMS_NODE): G
 			-- <Precursor>
 		local
-			b,s: detachable READABLE_STRING_8
+			b,s: detachable READABLE_STRING_32
 			f: detachable CONTENT_FORMAT
 			l_node: detachable like new_node
 		do
@@ -304,7 +305,7 @@ feature -- Output
 			s.append ("<div class=%"info%"> ")
 			if attached a_node.author as l_author then
 				s.append (" by ")
-				s.append (l_author.name)
+				s.append (a_response.html_encoded (l_author.name))
 			end
 			if attached a_node.modification_date as l_modified then
 				s.append (" (modified: ")
@@ -321,9 +322,9 @@ feature -- Output
 --			if attached a_node.summary as l_summary then
 --				s.append ("<p class=%"summary%">")
 --				if attached node_api.cms_api.format (a_node.format) as f then
--					s.append (f.formatted_output (l_summary))
+--					append_formatted_output (l_content, f, s)
 --				else
--					s.append (a_response.formats.default_format.formatted_output (l_summary))
+--					append_formatted_output (l_content, a_response.formats.default_format, s)
 --				end

 --				s.append ("</p>")
@@ -333,9 +334,9 @@ feature -- Output
 			if attached a_node.content as l_content then
 				s.append ("<p class=%"content%">")
 				if attached node_api.cms_api.format (a_node.format) as f then
-					s.append (f.formatted_output (l_content))
+					append_formatted_output (l_content, f, s)
 				else
-					s.append (a_response.formats.default_format.formatted_output (l_content))
+					append_formatted_output (l_content, a_response.formats.default_format, s)
 				end

 				s.append ("</p>")
@@ -346,5 +347,15 @@ feature -- Output
 			a_response.set_main_content (s)
 		end

+	append_formatted_output (a_content: READABLE_STRING_GENERAL; a_format: CONTENT_FORMAT; a_output: STRING_8)
+			-- Format `a_content' with format `a_format'.
+		do
+			if a_content.is_valid_as_string_8 then
+				a_output.append (a_format.formatted_output (a_content.to_string_8))
+			else
+				a_format.append_formatted_to (a_content, a_output)
+			end
+		end
+
 end

--- a/modules/node/persistence/cms_node_storage_sql.e
+++ b/modules/node/persistence/cms_node_storage_sql.e
@@ -28,12 +28,12 @@ feature -- Access
 			error_handler.reset
 			write_information_log (generator + ".nodes_count")
 			sql_query (sql_select_nodes_count, Void)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := sql_read_natural_64 (1)
 			end
+			sql_finalize
 		end

-
 	nodes: LIST [CMS_NODE]
 			-- List of nodes.
 		do
@@ -53,6 +53,7 @@ feature -- Access
 				end
 				sql_forth
 			end
+			sql_finalize
 		end

 	node_revisions (a_node: CMS_NODE): LIST [CMS_NODE]
@@ -80,6 +81,7 @@ feature -- Access
 				end
 				sql_forth
 			end
+			sql_finalize
 		end

 	trashed_nodes (a_user: detachable CMS_USER): LIST [CMS_NODE]
@@ -109,6 +111,7 @@ feature -- Access
 				end
 				sql_forth
 			end
+			sql_finalize
 		end

 	recent_nodes (a_lower: INTEGER; a_count: INTEGER): LIST [CMS_NODE]
@@ -135,6 +138,7 @@ feature -- Access
 				end
 				sql_forth
 			end
+			sql_finalize
 		end

 	recent_node_changes_before (a_lower: INTEGER; a_count: INTEGER; a_date: DATE_TIME): LIST [CMS_NODE]
@@ -163,6 +167,7 @@ feature -- Access
 				end
 				sql_forth
 			end
+			sql_finalize
 		end

 	node_by_id (a_id: INTEGER_64): detachable CMS_NODE
@@ -175,9 +180,10 @@ feature -- Access
 			create l_parameters.make (1)
 			l_parameters.put (a_id, "nid")
 			sql_query (sql_select_node_by_id, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_node
 			end
+			sql_finalize
 		end

 	node_by_id_and_revision (a_node_id, a_revision: INTEGER_64): detachable CMS_NODE
@@ -191,9 +197,10 @@ feature -- Access
 			l_parameters.put (a_node_id, "nid")
 			l_parameters.put (a_revision, "revision")
 			sql_query (sql_select_node_by_id_and_revision, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_node
 			end
+			sql_finalize
 		end

 	node_author (a_node: CMS_NODE): detachable CMS_USER
@@ -207,9 +214,10 @@ feature -- Access
 			l_parameters.put (a_node.id, "nid")
 			l_parameters.put (a_node.revision, "revision")
 			sql_query (Select_user_author, l_parameters)
-			if sql_rows_count >= 1 then
+			if not has_error and not sql_after then
 				Result := fetch_author
 			end
+			sql_finalize
 		end

 	last_inserted_node_id: INTEGER_64
@@ -218,9 +226,10 @@ feature -- Access
 			error_handler.reset
 			write_information_log (generator + ".last_inserted_node_id")
 			sql_query (Sql_last_insert_node_id, Void)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := sql_read_integer_64 (1)
 			end
+			sql_finalize
 		end

 	last_inserted_node_revision (a_node: detachable CMS_NODE): INTEGER_64
@@ -234,15 +243,20 @@ feature -- Access
 				create l_parameters.make (1)
 				l_parameters.force (a_node.id, "nid")
 				sql_query (Sql_last_insert_node_revision_for_nid, l_parameters)
-				if sql_rows_count = 1 then
+				if not has_error and not sql_after then
 					if sql_item (1) /= Void then
 						Result := sql_read_integer_64 (1)
 					end
+					sql_forth
+					if not sql_after then
+						check no_more_than_one: False end
+					end
 				end
+				sql_finalize
 			end
 --			if Result = 0 and not has_error then --| include the case a_node = Void
 --				sql_query (Sql_last_insert_node_revision, Void)
--				if sql_rows_count = 1 then
+--				if not has_error and not sql_after then
 --					if sql_item (1) /= Void then
 --						Result := sql_read_integer_64 (1)
 --					end
@@ -275,6 +289,7 @@ feature -- Access: outline
 				end
 				sql_forth
 			end
+			sql_finalize
 		end

 	available_parents_for_node (a_node: CMS_NODE): LIST [CMS_NODE]
@@ -300,6 +315,7 @@ feature -- Access: outline
 				end
 				sql_forth
 			end
+			sql_finalize
 		end

 feature -- Change: Node
@@ -328,7 +344,8 @@ feature -- Change: Node
 			l_parameters.put (create {DATE_TIME}.make_now_utc, "changed")
 			l_parameters.put ({CMS_NODE_API}.trashed, "status")
 			l_parameters.put (a_id, "nid")
-			sql_change (sql_trash_node, l_parameters)
+			sql_modify (sql_trash_node, l_parameters)
+			sql_finalize
 		end

 	 delete_node_base (a_node: CMS_NODE)
@@ -343,11 +360,13 @@ feature -- Change: Node
 			error_handler.reset
 			create l_parameters.make (1)
 			l_parameters.put (a_node.id, "nid")
-			sql_change (sql_delete_node, l_parameters)
+			sql_modify (sql_delete_node, l_parameters)
+			sql_finalize

 				-- we remove node_revisions and pages.
 				-- Check: maybe we need a transaction.
-			sql_change (sql_delete_node_revisions, l_parameters)
+			sql_modify (sql_delete_node_revisions, l_parameters)
+			sql_finalize

 			if not error_handler.has_error then
 				extended_delete (a_node)
@@ -368,7 +387,8 @@ feature -- Change: Node
 			l_parameters.put (l_time, "changed")
 			l_parameters.put ({CMS_NODE_API}.not_published, "status")
 			l_parameters.put (a_id, "nid")
-			sql_change (sql_restore_node, l_parameters)
+			sql_modify (sql_restore_node, l_parameters)
+			sql_finalize
 		end


@@ -412,7 +432,9 @@ feature {NONE} -- Implementation
 				create l_copy_parameters.make (2)
 				l_copy_parameters.force (a_node.id, "nid")
 --				l_copy_parameters.force (l_rev - 1, "revision")
-				sql_change (sql_copy_node_to_revision, l_copy_parameters)
+				sql_insert (sql_copy_node_to_revision, l_copy_parameters)
+				sql_finalize
+

 				if not has_error then
 					a_node.set_revision (l_rev)
@@ -420,7 +442,8 @@ feature {NONE} -- Implementation
 						-- Update
 					l_parameters.put (a_node.id, "nid")
 					l_parameters.put (a_node.revision, "revision")
-					sql_change (sql_update_node, l_parameters)
+					sql_modify (sql_update_node, l_parameters)
+					sql_finalize

 					if not error_handler.has_error then
 						a_node.set_modification_date (now)
@@ -431,7 +454,9 @@ feature {NONE} -- Implementation
 				l_parameters.put (a_node.creation_date, "created")
 				l_parameters.put (l_rev, "revision")

-				sql_change (sql_insert_node, l_parameters)
+				sql_insert (sql_insert_node, l_parameters)
+				sql_finalize
+
 				if not error_handler.has_error then
 					a_node.set_modification_date (now)
 					a_node.set_id (last_inserted_node_id)
@@ -550,7 +575,7 @@ feature {NONE} -- Implementation
 				if attached sql_read_string_32 (5) as l_summary then
 					Result.set_summary (l_summary)
 				end
-				if attached sql_read_string (6) as l_content then
+				if attached sql_read_string_32 (6) as l_content then
 					Result.set_content (l_content)
 				end
 				if attached sql_read_string (7) as l_format then
--- a/modules/node/persistence/cms_node_storage_sql_page_extension.e
+++ b/modules/node/persistence/cms_node_storage_sql_page_extension.e
@@ -73,17 +73,18 @@ feature -- Persistence

 				if l_update then
 					if l_has_modif then
-						sql_change (sql_update_node_data, l_parameters)
+						sql_modify (sql_update_node_data, l_parameters)
 					end
 				else
 					if l_has_modif then
-						sql_change (sql_insert_node_data, l_parameters)
+						sql_insert (sql_insert_node_data, l_parameters)
 					else
 						-- no page data, means everything is empty.
 						-- FOR NOW: always record row
-						sql_change (sql_insert_node_data, l_parameters)
+						sql_insert (sql_insert_node_data, l_parameters)
 					end
 				end
+				sql_finalize
 			end
 		end

@@ -121,7 +122,8 @@ feature -- Persistence
 			if a_node.has_id then
 				create l_parameters.make (1)
 				l_parameters.put (a_node.id, "nid")
-				sql_change (sql_delete_node_data, l_parameters)
+				sql_modify (sql_delete_node_data, l_parameters)
+				sql_finalize
 			end
 		end

@@ -139,14 +141,19 @@ feature {NONE} -- Implementation
 			l_parameters.put (a_node.revision, "revision")
 			sql_query (sql_select_node_data, l_parameters)
 			if not has_error then
-				n := sql_rows_count
-				if n = 1 then
+				if not sql_after then
 						-- nid, revision, parent
 					Result := [sql_read_integer_64 (2), sql_read_integer_64 (3)]
+					sql_forth
+					if not sql_after then
+						check unique_data: n = 0 end
+						Result := Void
+					end
 				else
 					check unique_data: n = 0 end
 				end
 			end
+			sql_finalize
 		ensure
 			accepted_revision: Result /= Void implies Result.revision <= a_node.revision
 		end
--- a/modules/oauth20/cms_oauth_20_module.e
+++ b/modules/oauth20/cms_oauth_20_module.e
@@ -121,6 +121,7 @@ feature {CMS_API} -- Module management
 						end
 						l_sql_storage.sql_forth
 					end
+					l_sql_storage.sql_finalize
 					across l_consumers as ic  loop
 						if not l_sql_storage.sql_table_exists (ic.item) then
 							if attached l_sql_storage.sql_script_content (api.module_resource_location (Current, (create {PATH}.make_from_string ("scripts")).extended ("oauth2_table.sql.tpl"))) as sql then
@@ -131,6 +132,7 @@ feature {CMS_API} -- Module management
 						end
 					end
 				end
+				l_sql_storage.sql_finalize
 				Precursor {CMS_MODULE}(api)
 			end
 		end
--- a/modules/oauth20/persistence/cms_oauth_20_storage_sql.e
+++ b/modules/oauth20/persistence/cms_oauth_20_storage_sql.e
@@ -53,11 +53,15 @@ feature -- Access User Outh
 			create l_string.make_from_string (select_user_oauth2_template_by_id)
 			l_string.replace_substring_all ("$table_name", oauth2_sql_table_name (a_consumer))
 			sql_query (l_string, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_user
-			else
-				check no_more_than_one: sql_rows_count = 0 end
+				sql_forth
+				if not sql_after then
+					check no_more_than_one: False end
+					Result := Void
+				end
 			end
+			sql_finalize
 		end

 	user_oauth2_by_email (a_email: like {CMS_USER}.email; a_consumer: READABLE_STRING_GENERAL): detachable CMS_USER
@@ -73,11 +77,15 @@ feature -- Access User Outh
 			create l_string.make_from_string (select_user_oauth2_template_by_email)
 			l_string.replace_substring_all ("$table_name", oauth2_sql_table_name (a_consumer))
 			sql_query (l_string, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_user
-			else
-				check no_more_than_one: sql_rows_count = 0 end
+				sql_forth
+				if not sql_after then
+					check no_more_than_one: False end
+					Result := Void
+				end
 			end
+			sql_finalize
 		end

 	user_oauth2_by_token (a_token: READABLE_STRING_GENERAL; a_consumer: READABLE_STRING_GENERAL): detachable CMS_USER
@@ -93,11 +101,15 @@ feature -- Access User Outh
 			create l_string.make_from_string (select_user_by_oauth2_template_token)
 			l_string.replace_substring_all ("$table_name", oauth2_sql_table_name (a_consumer))
 			sql_query (l_string, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_user
-			else
-				check no_more_than_one: sql_rows_count = 0 end
+				sql_forth
+				if not sql_after then
+					check no_more_than_one: False end
+					Result := Void
+				end
 			end
+			sql_finalize
 		end


@@ -122,6 +134,7 @@ feature --Access: Consumers
 					sql_forth
 				end
 			end
+			sql_finalize
 		end

 	oauth_consumer_by_name (a_name: READABLE_STRING_8): detachable CMS_OAUTH_20_CONSUMER
@@ -134,11 +147,15 @@ feature --Access: Consumers
 			create l_parameters.make (1)
 			l_parameters.put (a_name, "name")
 			sql_query (sql_oauth_consumer_name, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_consumer
-			else
-				check no_more_than_one: sql_rows_count = 0 end
+				sql_forth
+				if not sql_after then
+					check no_more_than_one: False end
+					Result := Void
+				end
 			end
+			sql_finalize
 		end

 	oauth_consumer_by_callback  (a_callback: READABLE_STRING_8): detachable CMS_OAUTH_20_CONSUMER
@@ -151,11 +168,15 @@ feature --Access: Consumers
 			create l_parameters.make (1)
 			l_parameters.put (a_callback, "name")
 			sql_query (sql_oauth_consumer_callback, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_consumer
-			else
-				check no_more_than_one: sql_rows_count = 0 end
+				sql_forth
+				if not sql_after then
+					check no_more_than_one: False end
+					Result := Void
+				end
 			end
+			sql_finalize
 		end

 feature -- Change: User OAuth
@@ -181,8 +202,9 @@ feature -- Change: User OAuth

 			create l_string.make_from_string (sql_insert_oauth2_template)
 			l_string.replace_substring_all ("$table_name", oauth2_sql_table_name (a_consumer))
-			sql_change (l_string, l_parameters)
+			sql_insert (l_string, l_parameters)
 			sql_commit_transaction
+			sql_finalize
 		end

 	update_user_oauth2 (a_token: READABLE_STRING_GENERAL; a_user_profile: READABLE_STRING_32; a_user: CMS_USER; a_consumer: READABLE_STRING_GENERAL )
@@ -202,8 +224,9 @@ feature -- Change: User OAuth

 			create l_string.make_from_string (sql_update_oauth2_template)
 			l_string.replace_substring_all ("$table_name", oauth2_sql_table_name (a_consumer))
-			sql_change (l_string, l_parameters)
+			sql_modify (l_string, l_parameters)
 			sql_commit_transaction
+			sql_finalize
 		end

 	remove_user_oauth2 (a_user: CMS_USER; a_consumer: READABLE_STRING_GENERAL)
@@ -221,8 +244,9 @@ feature -- Change: User OAuth

 			create l_string.make_from_string (sql_remove_oauth2_template)
 			l_string.replace_substring_all ("$table_name", oauth2_sql_table_name (a_consumer))
-			sql_change (l_string, l_parameters)
+			sql_modify (l_string, l_parameters)
 			sql_commit_transaction
+			sql_finalize
 		end

 feature {NONE} -- Implementation OAuth Consumer
@@ -342,7 +366,7 @@ feature {NONE} -- User OAuth2

 	Sql_remove_oauth2_template: STRING = "DELETE FROM $table_name WHERE uid =:uid;"

-	Sql_oauth_consumers: STRING = "SELECT name FROM oauth2_consumers";
+	Sql_oauth_consumers: STRING = "SELECT name FROM oauth2_consumers;"

 	Sql_oauth2_table_prefix: STRING = "oauth2_"

--- a/modules/openid/persitence/cms_openid_storage_sql.e
+++ b/modules/openid/persitence/cms_openid_storage_sql.e
@@ -33,11 +33,15 @@ feature -- Access User Outh
 			l_parameters.put (a_uid, "uid")
 			l_parameters.put (a_identity, "identity")
 			sql_query (Select_user_openid_by_id, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_user
-			else
-				check no_more_than_one: sql_rows_count = 0 end
+				sql_forth
+				if not sql_after then
+					check no_more_than_one: False end
+					Result := Void
+				end
 			end
+			sql_finalize
 		end

 	user_openid_by_identity (a_identity: READABLE_STRING_GENERAL): detachable CMS_USER
@@ -50,14 +54,19 @@ feature -- Access User Outh
 			create l_parameters.make (1)
 			l_parameters.put (a_identity, "identity")
 			sql_query (Select_user_by_openid_identity, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_user
+				sql_forth
+				if not sql_after then
+					check no_more_than_one: False end
+					Result := Void
+				end
 			else
-				check no_more_than_one: sql_rows_count = 0 end
+				check no_more_than_one: False end
 			end
+			sql_finalize
 		end

-
 feature --Access: Consumers	

 	openid_consumers: LIST [STRING]
@@ -79,6 +88,7 @@ feature --Access: Consumers
 					sql_forth
 				end
 			end
+			sql_finalize
 		end

 	openid_consumer_by_name (a_name: READABLE_STRING_8): detachable CMS_OPENID_CONSUMER
@@ -91,11 +101,14 @@ feature --Access: Consumers
 			create l_parameters.make (1)
 			l_parameters.put (a_name, "name")
 			sql_query (sql_openid_consumer_name, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_consumer
-			else
-				check no_more_than_one: sql_rows_count = 0 end
+				sql_forth
+				if not sql_after then
+					check no_more_than_one: False end
+				end
 			end
+			sql_finalize
 		end

 feature -- Change: User OAuth
@@ -114,8 +127,9 @@ feature -- Change: User OAuth
 			l_parameters.put (a_user.id, "uid")
 			l_parameters.put (a_identity, "identity")
 			l_parameters.put (create {DATE_TIME}.make_now_utc, "utc_date")
-			sql_change (Sql_insert_openid, l_parameters)
+			sql_insert (Sql_insert_openid, l_parameters)
 			sql_commit_transaction
+			sql_finalize
 		end

 feature {NONE} -- Implementation OAuth Consumer
--- a/modules/recent_changes/cms_recent_changes_module.e
+++ b/modules/recent_changes/cms_recent_changes_module.e
@@ -70,6 +70,7 @@ feature -- Hook
 			b: CMS_CONTENT_BLOCK
 			s, l_content: STRING
 			gen: FEED_TO_XHTML_VISITOR
+			nb: NATURAL_32
 		do
 			if a_block_id.same_string_general ("recent_changes") then
 				create l_content.make (1024)
@@ -81,7 +82,16 @@ feature -- Hook
 				s.append_string ("</li>")
 				gen.set_footer (s)

-				recent_changes_feed (a_response, 10, Void).accept (gen)
+				nb := 10
+				if
+					attached a_response.block_options (a_block_id) as l_options and then
+					attached {READABLE_STRING_GENERAL} l_options.item ("size") as l_size and then
+					l_size.is_integer
+				then
+					nb := l_size.to_natural_32
+				end
+
+				recent_changes_feed (a_response, nb, Void).accept (gen)

 				create b.make (a_block_id, Void, l_content, Void)
 				a_response.put_block (b, Void, False)
--- a/modules/recent_changes/recent_changes.ecf
+++ b/modules/recent_changes/recent_changes.ecf
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="recent_changes" uuid="1C3893A3-46FC-4E60-86AE-37CB7939BC7F" library_target="recent_changes">
+	<target name="recent_changes">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option warning="true" void_safety="none" syntax="transitional">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension.ecf"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
+		<library name="cms" location="..\..\cms.ecf"/>
+		<library name="cms_model" location="..\..\library\model\cms_model.ecf" readonly="false"/>
+		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
+		<library name="feed" location="$ISE_LIBRARY\contrib\library\text\parser\feed\feed.ecf"/>
+		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
+		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension.ecf" readonly="false"/>
+		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html.ecf" readonly="false"/>
+		<cluster name="src" location=".\" recursive="true"/>
+	</target>
+</system>
--- a/src/hooks/cms_hook_cache.e
+++ b/src/hooks/cms_hook_cache.e
@@ -0,0 +1,31 @@
+note
+	description: "[
+				Hook providing cache related management facilities.
+		]"
+	date: "$Date: 2014-11-19 20:00:19 +0100 (mer., 19 nov. 2014) $"
+	revision: "$Revision: 96123 $"
+
+deferred class
+	CMS_HOOK_CACHE
+
+inherit
+	CMS_HOOK
+
+feature -- Hook
+
+	clear_cache (a_cache_id_list: detachable ITERABLE [READABLE_STRING_GENERAL]; a_response: CMS_RESPONSE)
+			-- Clear caches identified by `a_cache_id_list',
+			-- or clear all caches if `a_cache_id_list' is Void.
+		deferred
+		end
+
+	cache_identifiers: detachable ITERABLE [like {CMS_BLOCK}.name]
+			-- Optional list of cache id, if any.
+		do
+				-- To redefine if needed.
+		end
+
+note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end
--- a/src/hooks/cms_hook_core_manager.e
+++ b/src/hooks/cms_hook_core_manager.e
@@ -104,7 +104,6 @@ feature -- Hook: menu_alter
 			end
 		end

-
 feature -- Hook: form_alter

 	subscribe_to_form_alter_hook (h: CMS_HOOK_FORM_ALTER)
@@ -139,12 +138,15 @@ feature -- Hook: block
 	invoke_block (a_response: CMS_RESPONSE)
 			-- Invoke block hook for response `a_response' in order to get block from modules.
 		local
-			bl: READABLE_STRING_8
+			bl, l_alias: READABLE_STRING_8
 			bl_optional: BOOLEAN
-			l_ok: BOOLEAN
 			l_block_cache: detachable TUPLE [block: CMS_CACHE_BLOCK; region: READABLE_STRING_8; expired: BOOLEAN]
+			l_alias_table: detachable STRING_TABLE [LIST [READABLE_STRING_8]] --| block_id => [alias_ids..]
+			l_origin_block: detachable CMS_BLOCK
 		do
 			if attached subscribers ({CMS_HOOK_BLOCK}) as lst then
+				l_alias_table := a_response.block_alias_table
+
 				across
 					lst as c
 				loop
@@ -152,18 +154,13 @@ feature -- Hook: block
 						across
 							h.block_list as blst
 						loop
-							l_ok := False
 							bl := blst.item
 							bl_optional := bl.count > 0 and bl[1] = '?'
 							if bl_optional then
 								bl := bl.substring (2, bl.count)
-								if a_response.is_block_included (bl, False) then
-									l_ok := True
-								end
-							else
-								l_ok := True
 							end
-							if l_ok then
+
+							if a_response.is_block_included (bl, not bl_optional) then
 								l_block_cache := a_response.block_cache (bl)
 								if l_block_cache /= Void and then not l_block_cache.expired then
 									a_response.add_block (l_block_cache.block, l_block_cache.region)
@@ -171,12 +168,61 @@ feature -- Hook: block
 									h.get_block_view (bl, a_response)
 								end
 							end
+							if
+								l_alias_table /= Void and then
+								attached l_alias_table.item (bl) as l_aliases
+							then
+								across
+									l_aliases as aliases_ic
+								loop
+									l_alias := aliases_ic.item
+									l_origin_block := a_response.blocks.item (bl)
+									if l_origin_block = Void then
+										h.get_block_view (bl, a_response)
+										l_origin_block := a_response.blocks.item (bl)
+										if l_origin_block /= Void then
+												-- Previously, it was not included.
+												-- Computed only to include alias
+												-- then remove `l_origin_block'.
+											a_response.remove_block (l_origin_block)
+										end
+									end
+									if l_origin_block /= Void then
+										a_response.add_block (create {CMS_ALIAS_BLOCK}.make_with_block (l_alias, l_origin_block), Void)
+									end
+								end
+							end
 						end
 					end
 				end
 			end
 		end

+feature -- Hook: cache
+
+	subscribe_to_cache_hook (h: CMS_HOOK_CACHE)
+			-- Add `h' as subscriber of cache hooks CMS_HOOK_CACHE,
+			-- and response `a_response'.
+		do
+			subscribe_to_hook (h, {CMS_HOOK_CACHE})
+		end
+
+	invoke_clear_cache (a_cache_id_list: detachable ITERABLE [READABLE_STRING_GENERAL]; a_response: CMS_RESPONSE)
+			-- Invoke cache hook for identifiers `a_cache_id_list'.
+		do
+			if attached subscribers ({CMS_HOOK_CACHE}) as lst then
+				across
+					lst as c
+				loop
+					if attached {CMS_HOOK_CACHE} c.item as h then
+						h.clear_cache (a_cache_id_list, a_response)
+					end
+				end
+
+				a_response.clear_block_caches (a_cache_id_list)
+			end
+		end
+
 note
 	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
--- a/src/kernel/content/block/condition/cms_block_expression_condition.e
+++ b/src/kernel/content/block/condition/cms_block_expression_condition.e
@@ -41,6 +41,8 @@ feature -- Evaluation
 	satisfied_for_response (res: CMS_RESPONSE): BOOLEAN
 		local
 			exp: like expression
+			l_path: READABLE_STRING_8
+			kmp: KMP_WILD
 		do
 			exp := expression
 			if exp.same_string ("is_front") then
@@ -50,7 +52,17 @@ feature -- Evaluation
 			elseif exp.same_string ("<none>") then
 				Result := False
 			elseif exp.starts_with ("path:") then
-				Result := res.location.same_string (exp.substring (6, exp.count))
+				l_path := exp.substring (6, exp.count)
+				if l_path.has ('*') then
+					if l_path.index_of ('*', 1) = l_path.count then
+						Result := res.location.starts_with_general (l_path.substring (1, l_path.count - 1))
+					else
+						create kmp.make (l_path, res.location)
+						Result := kmp.pattern_matches
+					end
+				else
+					Result := res.location.same_string (l_path)
+				end
 			end
 		end

--- a/src/kernel/content/block/condition/cms_block_location_condition.e
+++ b/src/kernel/content/block/condition/cms_block_location_condition.e
@@ -28,15 +28,13 @@ feature -- Access
 			Result.append_character ('%"')
 		end

-	location: STRING
+	location: READABLE_STRING_8

 feature -- Evaluation

 	satisfied_for_response (res: CMS_RESPONSE): BOOLEAN
-		local
-			loc: like location
 		do
-			Result := res.location.same_string (loc)
+			Result := res.location.same_string (location)
 		end

 note
--- a/src/kernel/content/cms_alias_block.e
+++ b/src/kernel/content/cms_alias_block.e
@@ -0,0 +1,59 @@
+note
+	description: "[
+				Block being an alias of other block.
+				
+				Mainly to avoid multiple region for a block content.
+		]"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_ALIAS_BLOCK
+
+inherit
+	CMS_BLOCK
+
+create
+	make_with_block
+
+feature {NONE} -- Initialization
+
+	make_with_block	(a_name: READABLE_STRING_8; a_block: CMS_BLOCK)
+		do
+			name := a_name
+			origin := a_block
+			title := a_block.title
+		end
+
+feature -- Access
+
+	origin: CMS_BLOCK
+
+	name: READABLE_STRING_8
+
+feature -- Status report	
+
+	is_empty: BOOLEAN
+			-- <Precursor>
+		do
+			Result := origin.is_empty
+		end
+
+	is_raw: BOOLEAN
+			-- <Precursor>
+		do
+			Result := origin.is_raw
+		end
+
+feature -- Conversion
+
+	to_html (a_theme: CMS_THEME): STRING_8
+			-- HTML representation of Current block.
+		do
+			Result := origin.to_html (a_theme)
+		end
+
+;note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end
--- a/src/kernel/content/cms_block.e
+++ b/src/kernel/content/cms_block.e
@@ -6,7 +6,17 @@ deferred class
 	CMS_BLOCK

 inherit
+	CMS_BLOCK_SETUP
+		undefine
+			is_equal
+		end
+
+	COMPARABLE
+
 	DEBUG_OUTPUT
+		undefine
+			is_equal
+		end

 feature -- Access

@@ -15,11 +25,6 @@ feature -- Access
 		deferred
 		end

-	title: detachable READABLE_STRING_32
-			-- Optional title.
-		deferred
-		end
-
 	html_options: detachable CMS_HTML_OPTIONS
 			-- Optional addition html options.

@@ -39,8 +44,13 @@ feature -- Status report
 		deferred
 		end

-	conditions: detachable LIST [CMS_BLOCK_CONDITION]
-			-- Optional block condition to be enabled.
+feature -- Comparison
+
+	is_less alias "<" (other: like Current): BOOLEAN
+			-- <Precursor>.
+		do
+			Result := weight < other.weight
+		end

 feature -- Element change

@@ -70,19 +80,6 @@ feature -- Element change
 			opts.remove_css_class (a_class)
 		end

-	add_condition (a_condition: CMS_BLOCK_CONDITION)
-			-- Add condition `a_condition'.
-		local
-			l_conditions: like conditions
-		do
-			l_conditions := conditions
-			if l_conditions = Void then
-				create {ARRAYED_LIST [CMS_BLOCK_CONDITION]} l_conditions.make (1)
-				conditions := l_conditions
-			end
-			l_conditions.force (a_condition)
-		end
-
 feature -- Conversion

 	to_html (a_theme: CMS_THEME): STRING_8
--- a/src/kernel/content/cms_block_region.e
+++ b/src/kernel/content/cms_block_region.e
@@ -41,6 +41,16 @@ feature -- Element change
 			blocks.prune_all (b)
 		end

+feature -- Sort
+
+	sort
+		local
+			cmp: QUICK_SORTER [CMS_BLOCK]
+		do
+			create cmp.make (create {COMPARABLE_COMPARATOR [CMS_BLOCK]})
+			cmp.sort (blocks)
+		end
+
 note
 	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
--- a/src/kernel/content/cms_block_setup.e
+++ b/src/kernel/content/cms_block_setup.e
@@ -0,0 +1,55 @@
+note
+	description: "Settings for CMS_BLOCK, that could be set and overwritten via CMS configuration."
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_BLOCK_SETUP
+
+feature -- Access
+
+	title: detachable READABLE_STRING_32
+			-- Optional title.
+
+	weight: INTEGER
+			-- Weight used to order blocks.
+			-- Default: 0.
+
+	conditions: detachable LIST [CMS_BLOCK_CONDITION]
+			-- Optional block condition to be enabled.			
+
+feature -- Element change	
+
+	set_title (a_title: detachable READABLE_STRING_GENERAL)
+			-- Set `title' with `a_title'.
+		do
+			if a_title = Void then
+				title := Void
+			else
+				title := a_title.as_string_32
+			end
+		end
+
+	set_weight (w: like weight)
+			-- Set `weight' to `w'.
+		do
+			weight := w
+		end
+
+	add_condition (a_condition: CMS_BLOCK_CONDITION)
+			-- Add condition `a_condition'.
+		local
+			l_conditions: like conditions
+		do
+			l_conditions := conditions
+			if l_conditions = Void then
+				create {ARRAYED_LIST [CMS_BLOCK_CONDITION]} l_conditions.make (1)
+				conditions := l_conditions
+			end
+			l_conditions.force (a_condition)
+		end
+
+;note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end
--- a/src/kernel/content/cms_cache_block.e
+++ b/src/kernel/content/cms_cache_block.e
@@ -32,9 +32,6 @@ feature -- Access
 	name: READABLE_STRING_8
 			-- <Precursor>

-	title: detachable READABLE_STRING_32
-			-- <Precursor>
-
 	cache: CMS_CACHE [READABLE_STRING_8]
 			-- Cache content.

@@ -65,12 +62,6 @@ feature -- Element change
 			name := n
 		end

-	set_title (a_title: like title)
-			-- Set `title' to `a_title'.
-		do
-			title := a_title
-		end
-
 feature -- Conversion

 	to_html (a_theme: CMS_THEME): STRING_8
--- a/src/kernel/content/cms_content_block.e
+++ b/src/kernel/content/cms_content_block.e
@@ -39,9 +39,6 @@ feature -- Access
 	name: READABLE_STRING_8
 			-- <Precursor>

-	title: detachable READABLE_STRING_32
-			-- <Precursor>
-
 	content: READABLE_STRING_8

 	format: detachable CONTENT_FORMAT
@@ -74,12 +71,6 @@ feature -- Element change
 			name := n
 		end

-	set_title (a_title: like title)
-			-- Set `title' to `a_title'.
-		do
-			title := a_title
-		end
-
 feature -- Conversion

 	to_html (a_theme: CMS_THEME): STRING_8
--- a/src/kernel/content/cms_file_block.e
+++ b/src/kernel/content/cms_file_block.e
@@ -48,9 +48,6 @@ feature -- Access
 	name: READABLE_STRING_8
 			-- <Precursor>

-	title: detachable READABLE_STRING_32
-			-- <Precursor>
-
 	location: PATH
 			-- Location of file.

@@ -105,12 +102,6 @@ feature -- Element change
 			name := n
 		end

-	set_title (a_title: like title)
-			-- Set `title' to `a_title'.
-		do
-			title := a_title
-		end
-
 feature -- Conversion

 	to_html (a_theme: CMS_THEME): STRING_8
--- a/src/kernel/content/cms_menu_block.e
+++ b/src/kernel/content/cms_menu_block.e
@@ -27,8 +27,6 @@ feature -- Access

 	name: READABLE_STRING_8

-	title: detachable READABLE_STRING_32
-
 feature -- Status report

 	is_empty: BOOLEAN
@@ -53,12 +51,6 @@ feature -- Element change
 			name := n
 		end

-	set_title (a_title: like title)
-			-- Set `title' to `a_title'.
-		do
-			title := a_title
-		end
-
 	set_is_horizontal (b: BOOLEAN)
 			-- Set `is_horizontal' to `b'.
 		do
--- a/src/kernel/content/cms_smarty_template_block.e
+++ b/src/kernel/content/cms_smarty_template_block.e
@@ -15,9 +15,12 @@ inherit
 		select
 			out
 		end
+
 	SHARED_TEMPLATE_CONTEXT
 		rename
 			out as tpl_out
+		undefine
+			is_equal
 		end

 create
@@ -55,9 +58,6 @@ feature -- Access
 	name: READABLE_STRING_8
 			-- <Precursor>

-	title: detachable READABLE_STRING_32
-			-- <Precursor>
-
 	location: PATH
 			-- Location of template file.

@@ -91,12 +91,6 @@ feature -- Element change
 			name := n
 		end

-	set_title (a_title: like title)
-			-- Set `title' to `a_title'.
-		do
-			title := a_title
-		end
-
 	set_value (v: detachable ANY; k: READABLE_STRING_GENERAL)
 			-- Associate value `v' with key `k'.
 		do
--- a/src/persistence/core/cms_core_storage_sql_i.e
+++ b/src/persistence/core/cms_core_storage_sql_i.e
@@ -37,7 +37,8 @@ feature -- URL aliases
 					error_handler.add_custom_error (0, "alias exists", "Path alias %"" + a_alias + "%" already exists!")
 				end
 			else
-				sql_change (sql_insert_path_alias, l_parameters)
+				sql_insert (sql_insert_path_alias, l_parameters)
+				sql_finalize
 			end
 		end

@@ -63,7 +64,8 @@ feature -- URL aliases
 				l_parameters.put (l_previous_alias, "old")
 				l_parameters.put (a_alias, "alias")

-				sql_change (sql_update_path_alias, l_parameters)
+				sql_modify (sql_update_path_alias, l_parameters)
+				sql_finalize
 			end
 		end

@@ -79,7 +81,8 @@ feature -- URL aliases
 						-- Found
 					create l_parameters.make (1)
 					l_parameters.put (a_alias, "alias")
-					sql_change (sql_delete_path_alias, l_parameters)
+					sql_modify (sql_delete_path_alias, l_parameters)
+					sql_finalize
 				else
 					error_handler.add_custom_error (0, "alias mismatch", "Path alias %"" + a_alias + "%" is not related to source %"" + a_source + "%"!")
 				end
@@ -97,11 +100,12 @@ feature -- URL aliases
 			create l_parameters.make (1)
 			l_parameters.put (a_source, "source")
 			sql_query (sql_select_path_source, l_parameters)
-			if not has_error then
-				if sql_rows_count = 1 then
-					Result := sql_read_string (1)
-				end
+			if not has_error and not sql_after then
+				Result := sql_read_string (1)
+				sql_forth
+				check one_row: sql_after end
 			end
+			sql_finalize
 		end

 	source_of_path_alias (a_alias: READABLE_STRING_8): detachable READABLE_STRING_8
@@ -114,10 +118,13 @@ feature -- URL aliases
 			l_parameters.put (a_alias, "alias")
 			sql_query (sql_select_path_alias, l_parameters)
 			if not has_error then
-				if sql_rows_count = 1 then
+				if not has_error and not sql_after then
 					Result := sql_read_string (1)
+					sql_forth
+					check one_row: sql_after end
 				end
 			end
+			sql_finalize
 		end

 	sql_select_path_alias: STRING = "SELECT source FROM path_aliases WHERE alias=:alias ;"
@@ -166,7 +173,8 @@ feature -- Logs
 				l_parameters.put (Void, "link")
 			end
 			l_parameters.put (now, "date")
-			sql_change (sql_insert_log, l_parameters)
+			sql_insert (sql_insert_log, l_parameters)
+			sql_finalize
 		end

 	sql_insert_log: STRING = "INSERT INTO logs (category, level, uid, message, info, link, date) VALUES (:category, :level, :uid, :message, :info, :link, :date);"
@@ -193,10 +201,12 @@ feature -- Misc
 				if a_value.same_string (l_value) then
 						-- already up to date
 				else
-					sql_change (sql_update_custom_value, l_parameters)
+					sql_modify (sql_update_custom_value, l_parameters)
+					sql_finalize
 				end
 			else
-				sql_change (sql_insert_custom_value, l_parameters)
+				sql_insert (sql_insert_custom_value, l_parameters)
+				sql_finalize
 			end
 		end

@@ -214,7 +224,8 @@ feature -- Misc
 				l_parameters.put (a_type, "default")
 			end
 			l_parameters.put (a_name, "name")
-			sql_change (sql_delete_custom_value, l_parameters)
+			sql_modify (sql_delete_custom_value, l_parameters)
+			sql_finalize
 		end

 	custom_value (a_name: READABLE_STRING_GENERAL; a_type: detachable READABLE_STRING_8): detachable READABLE_STRING_32
@@ -232,11 +243,12 @@ feature -- Misc
 			end
 			l_parameters.put (a_name, "name")
 			sql_query (sql_select_custom_value, l_parameters)
-			if not has_error then
-				if sql_rows_count = 1 then
-					Result := sql_read_string_32 (1)
-				end
+			if not has_error and not sql_after then
+				Result := sql_read_string_32 (1)
+				sql_forth
+				check one_row: sql_after end
 			end
+			sql_finalize
 		end

 	sql_select_custom_value: STRING = "SELECT value FROM custom_values WHERE type=:type AND name=:name;"
@@ -252,4 +264,7 @@ feature -- Misc
 				-- SQL delete custom value;


+note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end
--- a/src/persistence/sql/cms_proxy_storage_sql.e
+++ b/src/persistence/sql/cms_proxy_storage_sql.e
@@ -68,19 +68,24 @@ feature -- Operation
 			sql_storage.sql_query (a_sql_statement, a_params)
 		end

-	sql_change (a_sql_statement: STRING; a_params: detachable STRING_TABLE [detachable ANY])
+	sql_finalize
+			-- Finalize sql query (i.e destroy previous query statement.
 		do
-			sql_storage.sql_change (a_sql_statement, a_params)
+			sql_storage.sql_finalize
+		end
+
+	sql_insert (a_sql_statement: STRING; a_params: detachable STRING_TABLE [detachable ANY])
+		do
+			sql_storage.sql_insert (a_sql_statement, a_params)
+		end
+
+	sql_modify (a_sql_statement: STRING; a_params: detachable STRING_TABLE [detachable ANY])
+		do
+			sql_storage.sql_modify (a_sql_statement, a_params)
 		end

 feature -- Access		

-	sql_rows_count: INTEGER
-			-- Number of rows for last sql execution.	
-		do
-			Result := sql_storage.sql_rows_count
-		end
-
 	sql_start
 			-- Set the cursor on first element.
 		do
@@ -109,6 +114,16 @@ feature -- Access
 			Result:= sql_storage.sql_item (a_index)
 		end

+	sql_read_integer_32 (a_index: INTEGER_32): INTEGER_32
+		do
+			Result := sql_storage.sql_read_integer_32 (a_index)
+		end
+
+	sql_read_date_time (a_index: INTEGER_32): detachable DATE_TIME
+		do
+			Result := sql_storage.sql_read_date_time (a_index)
+		end
+
 feature -- Conversion

 	sql_statement (a_statement: STRING): STRING
@@ -117,4 +132,7 @@ feature -- Conversion
 			Result := sql_storage.sql_statement (a_statement)
 		end

+note
+	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end
--- a/src/persistence/sql/cms_storage_sql_i.e
+++ b/src/persistence/sql/cms_storage_sql_i.e
@@ -119,12 +119,22 @@ feature -- Operation
 		end

 	sql_query (a_sql_statement: STRING; a_params: detachable STRING_TABLE [detachable ANY])
-			-- <Precursor>
+			-- Execute sql query `a_sql_statement' with optional parameters `a_params'.
 		deferred
 		end

-	sql_change (a_sql_statement: STRING; a_params: detachable STRING_TABLE [detachable ANY])
-			-- <Precursor>
+	sql_finalize
+			-- Finalize sql query (i.e destroy previous query statement.
+		deferred
+		end
+
+	sql_insert (a_sql_statement: STRING; a_params: detachable STRING_TABLE [detachable ANY])
+			-- Execute sql insert `a_sql_statement' with optional parameters `a_params'.
+		deferred
+		end
+
+	sql_modify (a_sql_statement: STRING; a_params: detachable STRING_TABLE [detachable ANY])
+			-- Execute sql modify `a_sql_statement' with optional parameters `a_params'.
 		deferred
 		end

@@ -179,7 +189,11 @@ feature -- Helper
 			loop
 				if attached next_sql_statement (a_sql_script, i, cl) as s then
 					if not s.is_whitespace then
-						sql_change (sql_statement (s), a_params)
+						if s.starts_with ("INSERT") then
+							sql_insert (sql_statement (s), a_params)
+						else
+							sql_modify (sql_statement (s), a_params)
+						end
 						err := err or has_error
 						reset_error
 					end
@@ -193,6 +207,7 @@ feature -- Helper
 			else
 				sql_commit_transaction
 			end
+			sql_finalize
 		end

 	sql_table_exists (a_table_name: READABLE_STRING_8): BOOLEAN
@@ -202,6 +217,7 @@ feature -- Helper
 			sql_query ("SELECT count(*) FROM " + a_table_name + " ;", Void)
 			Result := not has_error
 				-- FIXME: find better solution
+			sql_finalize
 			reset_error
 		end

@@ -213,15 +229,11 @@ feature -- Helper
 			if not has_error then
 				Result := sql_read_integer_64 (1)
 			end
+			sql_finalize
 		end

 feature -- Access		

-	sql_rows_count: INTEGER
-			-- Number of rows for last sql execution.	
-		deferred
-		end
-
 	sql_start
 			-- Set the cursor on first element.
 		deferred
@@ -279,17 +291,7 @@ feature -- Access

 	sql_read_integer_32 (a_index: INTEGER): INTEGER_32
 			-- Retrieved value at `a_index' position in `item'.
-		local
-			l_item: like sql_item
-		do
-			l_item := sql_item (a_index)
-			if attached {INTEGER_32} l_item as i then
-				Result := i
-			elseif attached {INTEGER_32_REF} l_item as l_value then
-				Result := l_value.item
-			else
-				check is_integer_32: False end
-			end
+		deferred
 		end

 	sql_read_string (a_index: INTEGER): detachable STRING
@@ -313,11 +315,14 @@ feature -- Access
 			-- Retrieved value at `a_index' position in `item'.
 		local
 			l_item: like sql_item
+			utf: UTF_CONVERTER
 		do
 			-- FIXME: handle string_32 !
 			l_item := sql_item (a_index)
 			if attached {READABLE_STRING_32} l_item as l_string then
 				Result := l_string
+			elseif attached {READABLE_STRING_8} l_item as l_string_8 then
+				Result := utf.utf_8_string_8_to_string_32 (l_string_8)
 			else
 				if attached sql_read_string (a_index) as s8 then
 					Result := s8.to_string_32 -- FIXME: any escape?
@@ -329,15 +334,7 @@ feature -- Access

 	sql_read_date_time (a_index: INTEGER): detachable DATE_TIME
 			-- Retrieved value at `a_index' position in `item'.
-		local
-			l_item: like sql_item
-		do
-			l_item := sql_item (a_index)
-			if attached {DATE_TIME} l_item as dt then
-				Result := dt
-			else
-				check is_date_time_nor_null: l_item = Void end
-			end
+		deferred
 		end

 	sql_read_boolean (a_index: INTEGER): detachable BOOLEAN
--- a/src/persistence/user/cms_user_storage_sql_i.e
+++ b/src/persistence/user/cms_user_storage_sql_i.e
@@ -30,10 +30,12 @@ feature -- Access: user
 			write_information_log (generator + ".user_count")

 			sql_query (select_users_count, Void)
-			if sql_rows_count = 1 then
-				Result := sql_read_integer_32 (1)
+			if not has_error and then not sql_after then
+				Result := sql_read_integer_64 (1).to_integer_32
+				sql_forth
+				check one_row: sql_after end
 			end
-			error_handler.reset
+			sql_finalize
 		end

 	users: LIST [CMS_USER]
@@ -47,13 +49,14 @@ feature -- Access: user
 				sql_query (select_users, Void)
 				sql_start
 			until
-				sql_after
+				sql_after or has_error
 			loop
 				if attached fetch_user as l_user then
 					Result.force (l_user)
 				end
 				sql_forth
 			end
+			sql_finalize
 		end

 	user_by_id (a_id: like {CMS_USER}.id): detachable CMS_USER
@@ -66,11 +69,12 @@ feature -- Access: user
 			create l_parameters.make (1)
 			l_parameters.put (a_id, "uid")
 			sql_query (select_user_by_id, l_parameters)
-			if sql_rows_count = 1 then
+			if not has_error and not sql_after then
 				Result := fetch_user
-			else
-				check no_more_than_one: sql_rows_count = 0 end
+				sql_forth
+				check one_row: sql_after end
 			end
+			sql_finalize
 		end

 	user_by_name (a_name: like {CMS_USER}.name): detachable CMS_USER
@@ -83,11 +87,12 @@ feature -- Access: user
 			create l_parameters.make (1)
 			l_parameters.put (a_name, "name")
 			sql_query (select_user_by_name, l_parameters)
-			if sql_rows_count = 1 then
+			if not sql_after then
 				Result := fetch_user
-			else
-				check no_more_than_one: sql_rows_count = 0 end
+				sql_forth
+				check one_row: sql_after end
 			end
+			sql_finalize
 		end

 	user_by_email (a_email: like {CMS_USER}.email): detachable CMS_USER
@@ -100,11 +105,12 @@ feature -- Access: user
 			create l_parameters.make (1)
 			l_parameters.put (a_email, "email")
 			sql_query (select_user_by_email, l_parameters)
-			if sql_rows_count = 1 then
+			if not sql_after then
 				Result := fetch_user
-			else
-				check no_more_than_one: sql_rows_count = 0 end
+				sql_forth
+				check one_row: sql_after end
 			end
+			sql_finalize
 		end

 	user_by_activation_token (a_token: READABLE_STRING_32): detachable CMS_USER
@@ -117,11 +123,12 @@ feature -- Access: user
 			create l_parameters.make (1)
 			l_parameters.put (a_token, "token")
 			sql_query (select_user_by_activation_token, l_parameters)
-			if sql_rows_count = 1 then
+			if not sql_after then
 				Result := fetch_user
-			else
-				check no_more_than_one: sql_rows_count = 0 end
+				sql_forth
+				check one_row: sql_after end
 			end
+			sql_finalize
 		end

 	user_by_password_token (a_token: READABLE_STRING_32): detachable CMS_USER
@@ -134,11 +141,12 @@ feature -- Access: user
 			create l_parameters.make (1)
 			l_parameters.put (a_token, "token")
 			sql_query (select_user_by_password_token, l_parameters)
-			if sql_rows_count = 1 then
+			if not sql_after then
 				Result := fetch_user
-			else
-				check no_more_than_one: sql_rows_count = 0 end
+				sql_forth
+				check one_row: sql_after end
 			end
+			sql_finalize
 		end

 	is_valid_credential (l_auth_login, l_auth_password: READABLE_STRING_32): BOOLEAN
@@ -160,7 +168,6 @@ feature -- Access: user
 					write_information_log (generator + ".is_valid_credential User:" + l_auth_login + "does not exist" )
 				end
 			end
-
 		end

 	recent_users (a_lower: INTEGER; a_count: INTEGER): LIST [CMS_USER]
@@ -187,6 +194,7 @@ feature -- Access: user
 				end
 				sql_forth
 			end
+			sql_finalize
 		end
 feature -- Change: user

@@ -216,7 +224,7 @@ feature -- Change: user
 				l_parameters.put (create {DATE_TIME}.make_now_utc, "created")
 				l_parameters.put (a_user.status, "status")

-				sql_change (sql_insert_user, l_parameters)
+				sql_insert (sql_insert_user, l_parameters)
 				if not error_handler.has_error then
 					a_user.set_id (last_inserted_user_id)
 					update_user_roles (a_user)
@@ -226,6 +234,7 @@ feature -- Change: user
 				else
 					sql_rollback_transaction
 				end
+				sql_finalize
 			else
 				-- set error
 				error_handler.add_custom_error (-1, "bad request" , "Missing password or email")
@@ -265,7 +274,8 @@ feature -- Change: user
 				l_parameters.put (l_email, "email")
 				l_parameters.put (a_user.status, "status")

-				sql_change (sql_update_user, l_parameters)
+				sql_modify (sql_update_user, l_parameters)
+				sql_finalize
 				if not error_handler.has_error then
 					update_user_roles (a_user)
 				end
@@ -274,6 +284,7 @@ feature -- Change: user
 				else
 					sql_rollback_transaction
 				end
+				sql_finalize
 			else
 					-- set error
 				error_handler.add_custom_error (-1, "bad request" , "Missing password or email")
@@ -290,8 +301,9 @@ feature -- Change: user
 			write_information_log (generator + ".delete_user")
 			create l_parameters.make (1)
 			l_parameters.put (a_user.id, "uid")
-			sql_change (sql_delete_user, l_parameters)
+			sql_modify (sql_delete_user, l_parameters)
 			sql_commit_transaction
+			sql_finalize
 		end

 	update_user_roles (a_user: CMS_USER)
@@ -347,6 +359,7 @@ feature -- Change: user
 			else
 				sql_rollback_transaction
 			end
+			sql_finalize
 		end

 	assign_role_to_user (a_role: CMS_USER_ROLE; a_user: CMS_USER)
@@ -356,7 +369,8 @@ feature -- Change: user
 			create l_parameters.make (2)
 			l_parameters.put (a_user.id, "uid")
 			l_parameters.put (a_role.id, "rid")
-			sql_change (sql_insert_role_to_user, l_parameters)
+			sql_insert (sql_insert_role_to_user, l_parameters)
+			sql_finalize
 		end

 	unassign_role_from_user (a_role: CMS_USER_ROLE; a_user: CMS_USER)
@@ -366,7 +380,8 @@ feature -- Change: user
 			create l_parameters.make (2)
 			l_parameters.put (a_user.id, "uid")
 			l_parameters.put (a_role.id, "rid")
-			sql_change (sql_delete_role_from_user, l_parameters)
+			sql_modify (sql_delete_role_from_user, l_parameters)
+			sql_finalize
 		end

 feature -- Access: roles and permissions
@@ -380,14 +395,16 @@ feature -- Access: roles and permissions
 			create l_parameters.make (1)
 			l_parameters.put (a_id, "rid")
 			sql_query (select_user_role_by_id, l_parameters)
-			if sql_rows_count = 1 then
+			if not sql_after then
 				Result := fetch_user_role
+				sql_forth
+				check one_row: sql_after end
+				sql_finalize
 				if Result /= Void and not has_error then
 					fill_user_role (Result)
 				end
-			else
-				check no_more_than_one: sql_rows_count = 0 end
 			end
+			sql_finalize
 		end

 	user_role_by_name (a_name: READABLE_STRING_GENERAL): detachable CMS_USER_ROLE
@@ -400,14 +417,16 @@ feature -- Access: roles and permissions
 			create l_parameters.make (1)
 			l_parameters.put (a_name, "name")
 			sql_query (select_user_role_by_name, l_parameters)
-			if sql_rows_count = 1 then
+			if not sql_after then
 				Result := fetch_user_role
+				sql_forth
+				check one_row: sql_after end
+				sql_finalize
 				if Result /= Void and not has_error then
 					fill_user_role (Result)
 				end
-			else
-				check no_more_than_one: sql_rows_count = 0 end
 			end
+			sql_finalize
 		end

 	user_roles_for (a_user: CMS_USER): LIST [CMS_USER_ROLE]
@@ -431,6 +450,7 @@ feature -- Access: roles and permissions
 				end
 				sql_forth
 			end
+			sql_finalize
 			if not has_error then
 				across Result as ic loop
 					fill_user_role (ic.item)
@@ -458,6 +478,7 @@ feature -- Access: roles and permissions
 				end
 				sql_forth
 			end
+			sql_finalize
 			if not has_error then
 				across Result as ic loop
 					fill_user_role (ic.item)
@@ -501,6 +522,7 @@ feature -- Access: roles and permissions
 --				end
 				sql_forth
 			end
+			sql_finalize
 		end

 	role_permissions: LIST [READABLE_STRING_8]
@@ -522,6 +544,7 @@ feature -- Access: roles and permissions
 				end
 				sql_forth
 			end
+			sql_finalize
 		end

 feature -- Change: roles and permissions		
@@ -550,7 +573,8 @@ feature -- Change: roles and permissions
 					create l_parameters.make (2)
 					l_parameters.put (a_user_role.id, "rid")
 					l_parameters.put (a_user_role.name, "name")
-					sql_change (sql_update_user_role, l_parameters)
+					sql_modify (sql_update_user_role, l_parameters)
+					sql_finalize
 				end
 				if not a_user_role.permissions.is_empty then
 					-- FIXME: check if this is non set permissions,or none ...
@@ -596,7 +620,8 @@ feature -- Change: roles and permissions
 			else
 				create l_parameters.make (1)
 				l_parameters.put (a_user_role.name, "name")
-				sql_change (sql_insert_user_role, l_parameters)
+				sql_insert (sql_insert_user_role, l_parameters)
+				sql_finalize
 				if not error_handler.has_error then
 					a_user_role.set_id (last_inserted_user_role_id)
 					across
@@ -619,7 +644,8 @@ feature -- Change: roles and permissions
 			l_parameters.put (a_role_id, "rid")
 			l_parameters.put (a_permission, "permission")
 			l_parameters.put (Void, "module") -- FIXME: unsupported for now!
-			sql_change (sql_insert_user_role_permission, l_parameters)
+			sql_insert (sql_insert_user_role_permission, l_parameters)
+			sql_finalize
 		end

 	unset_permission_for_role_id (a_permission: READABLE_STRING_8; a_role_id: INTEGER)
@@ -633,7 +659,8 @@ feature -- Change: roles and permissions
 			create l_parameters.make (2)
 			l_parameters.put (a_role_id, "rid")
 			l_parameters.put (a_permission, "permission")
-			sql_change (sql_delete_user_role_permission, l_parameters)
+			sql_modify (sql_delete_user_role_permission, l_parameters)
+			sql_finalize
 		end

 	last_inserted_user_role_id: INTEGER_32
@@ -642,9 +669,12 @@ feature -- Change: roles and permissions
 			error_handler.reset
 			write_information_log (generator + ".last_inserted_user_role_id")
 			sql_query (Sql_last_insert_user_role_id, Void)
-			if sql_rows_count = 1 then
-				Result := sql_read_integer_32 (1)
+			if not sql_after then
+				Result := sql_read_integer_64 (1).to_integer_32
+				sql_forth
+				check one_row: sql_after end
 			end
+			sql_finalize
 		end


@@ -658,9 +688,11 @@ feature -- Change: roles and permissions
 			write_information_log (generator + ".delete_role")
 			create l_parameters.make (1)
 			l_parameters.put (a_role.id, "rid")
-			sql_change (sql_delete_role_permissions_by_role_id, l_parameters)
-			sql_change (sql_delete_role_by_id, l_parameters)
+			sql_modify (sql_delete_role_permissions_by_role_id, l_parameters)
+			sql_finalize
+			sql_modify (sql_delete_role_by_id, l_parameters)
 			sql_commit_transaction
+			sql_finalize
 		end


@@ -676,9 +708,12 @@ feature -- Access: User activation
 			create l_parameters.make (1)
 			l_parameters.put (a_token, "token")
 			sql_query (sql_select_activation_expiration, l_parameters)
-			if sql_rows_count = 1 then
+			if not sql_after then
 				Result := sql_read_integer_32 (1)
+				sql_forth
+				check one_row: sql_after end
 			end
+			sql_finalize
 		end

 	user_id_by_activation (a_token: READABLE_STRING_32): INTEGER_64
@@ -691,9 +726,12 @@ feature -- Access: User activation
 			create l_parameters.make (1)
 			l_parameters.put (a_token, "token")
 			sql_query (sql_select_userid_activation, l_parameters)
-			if sql_rows_count = 1 then
+			if not sql_after then
 				Result := sql_read_integer_32 (1)
+				sql_forth
+				check one_row: sql_after end
 			end
+			sql_finalize
 		end

 feature -- Change: User activation
@@ -712,8 +750,9 @@ feature -- Change: User activation
 			l_parameters.put (a_token, "token")
 			l_parameters.put (a_id, "uid")
 			l_parameters.put (l_utc_date, "utc_date")
-			sql_change (sql_insert_activation, l_parameters)
+			sql_insert (sql_insert_activation, l_parameters)
 			sql_commit_transaction
+			sql_finalize
 		end

 	remove_activation (a_token: READABLE_STRING_32)
@@ -726,8 +765,9 @@ feature -- Change: User activation
 			write_information_log (generator + ".remove_activation")
 			create l_parameters.make (1)
 			l_parameters.put (a_token, "token")
-			sql_change (sql_remove_activation, l_parameters)
+			sql_modify (sql_remove_activation, l_parameters)
 			sql_commit_transaction
+			sql_finalize
 		end

 feature -- Change: User password recovery
@@ -746,8 +786,9 @@ feature -- Change: User password recovery
 			l_parameters.put (a_token, "token")
 			l_parameters.put (a_id, "uid")
 			l_parameters.put (l_utc_date, "utc_date")
-			sql_change (sql_insert_password, l_parameters)
+			sql_insert (sql_insert_password, l_parameters)
 			sql_commit_transaction
+			sql_finalize
 		end

 	remove_password (a_token: READABLE_STRING_32)
@@ -760,8 +801,9 @@ feature -- Change: User password recovery
 			write_information_log (generator + ".remove_password")
 			create l_parameters.make (1)
 			l_parameters.put (a_token, "token")
-			sql_change (sql_remove_password, l_parameters)
+			sql_modify (sql_remove_password, l_parameters)
 			sql_commit_transaction
+			sql_finalize
 		end

 feature {NONE} -- Implementation: User
@@ -776,11 +818,14 @@ feature {NONE} -- Implementation: User
 			create l_parameters.make (1)
 			l_parameters.put (a_username, "name")
 			sql_query (select_salt_by_username, l_parameters)
-			if sql_rows_count  = 1 then
+			if not sql_after then
 				if attached sql_read_string (1) as l_salt then
 					Result := l_salt
 				end
+				sql_forth
+				check one_row: sql_after end
 			end
+			sql_finalize
 		end

 	fetch_user: detachable CMS_USER
@@ -826,9 +871,12 @@ feature {NONE} -- Implementation: User
 			error_handler.reset
 			write_information_log (generator + ".last_inserted_user_id")
 			sql_query (Sql_last_insert_user_id, Void)
-			if sql_rows_count = 1 then
+			if not sql_after then
 				Result := sql_read_integer_64 (1)
+				sql_forth
+				check one_row: sql_after end
 			end
+			sql_finalize
 		end

 feature {NONE} -- Implementation: User role		
--- a/src/service/cms_module_collection.e
+++ b/src/service/cms_module_collection.e
@@ -1,5 +1,7 @@
 note
-	description: "Collection of CMS modules."
+	description: "[
+				Collection of CMS modules.
+		]"
 	date: "$Date: 2015-02-09 22:29:56 +0100 (lun., 09 févr. 2015) $"
 	revision: "$Revision: 96596 $"

@@ -38,7 +40,8 @@ feature -- Access
 						-- Found
 				elseif
 						-- Hack: use conformance of type, and reverse conformance of type of type.
-					attached a_type.attempt (Result) and then attached l_type.generating_type.attempt (a_type)
+					attached a_type.attempted (Result) and then
+					attached l_type.generating_type.attempted (a_type)
 				then
 						-- Found
 				else
--- a/src/service/response/cms_response.e
+++ b/src/service/response/cms_response.e
@@ -401,6 +401,7 @@ feature -- Blocks initialization
 				fixme ("let the user choose ...")
 			end
 			create regions.make_caseless (5)
+			create blocks.make (10)

 			create l_table.make_caseless (10)
 			l_table["top"] := block_region_preference ("top", "top")
@@ -423,8 +424,30 @@ feature -- Blocks initialization
 			Result := setup.text_item_or_default ("blocks." + a_block_id + ".region", a_default_region)
 		end

+feature -- Block management
+
+	update_block (a_block: CMS_BLOCK)
+			-- Update parameters for block `a_block' according to configuration.
+		do
+			if
+				attached setup.text_item ("blocks." + a_block.name + ".weight") as w and then
+				w.is_integer
+			then
+				a_block.set_weight (w.to_integer)
+			end
+			if
+				attached setup.text_item ("blocks." + a_block.name + ".title") as l_title
+			then
+				if l_title.same_string ("<none>") then
+					a_block.set_title (Void)
+				else
+					a_block.set_title (l_title)
+				end
+			end
+		end
+
 	block_conditions (a_block_id: READABLE_STRING_8): detachable ARRAYED_LIST [CMS_BLOCK_EXPRESSION_CONDITION]
-				-- Condition associated with `a_block_id' in configuration, if any.
+			-- Condition associated with `a_block_id' in configuration, if any.
 		do
 			if attached setup.text_item ("blocks." + a_block_id + ".condition") as s then
 				create Result.make (1)
@@ -433,12 +456,20 @@ feature -- Blocks initialization
 			if attached setup.text_list_item ("blocks." + a_block_id + ".conditions") as lst then
 				if Result = Void then
 					create Result.make (lst.count)
-					across
-						lst as ic
-					loop
-						Result.force (create {CMS_BLOCK_EXPRESSION_CONDITION}.make (ic.item))
-					end
 				end
+				across
+					lst as ic
+				loop
+					Result.force (create {CMS_BLOCK_EXPRESSION_CONDITION}.make (ic.item))
+				end
+			end
+		end
+
+	block_options (a_block_id: READABLE_STRING_8): detachable STRING_TABLE [READABLE_STRING_32]
+			-- Options associated with `a_block_id' in configuration, if any.
+		do
+			if attached setup.text_table_item ("blocks." + a_block_id + ".options") as tb then
+				Result := tb
 			end
 		end

@@ -476,11 +507,88 @@ feature -- Blocks initialization
 			end
 		end

+	clear_block_caches (a_block_id_list: detachable ITERABLE [READABLE_STRING_GENERAL])
+			-- Clear cache for block `a_block_id_list' if set,
+			-- otherwise clear all block caches if `a_block_id_list' is Void.
+		local
+			p,pb: PATH
+			dir: DIRECTORY
+			l_cache: CMS_FILE_STRING_8_CACHE
+		do
+			p := api.files_location.extended (".cache").extended ("blocks")
+			if a_block_id_list /= Void then
+				across
+					a_block_id_list as ic
+				loop
+						-- FIXME: find a smarter way to avoid conflict between block id, and other cache id.
+						-- however, this is only about "Cache" so not that critical if deleted by mistake.
+					pb := p.extended (ic.item).appended_with_extension ("html")
+					create l_cache.make (pb)
+					if l_cache.exists then
+						l_cache.delete
+					end
+				end
+			else
+					-- Clear all block caches.
+				create dir.make_with_path (p)
+				dir.recursive_delete
+			end
+		end
+
+feature {CMS_HOOK_CORE_MANAGER} -- Block management: internal
+
+	internal_block_alias_table: like block_alias_table
+			-- Internal memory cache for `block_alias_table'.
+
+	block_alias_table: detachable STRING_TABLE [LIST [READABLE_STRING_8]]
+			-- Table of included block aliases, if any.
+			-- note: { block_id => [ alias-names ..] }
+		local
+			k,v: READABLE_STRING_GENERAL
+			l_block_id, l_alias_id: READABLE_STRING_8
+			lst: detachable LIST [READABLE_STRING_8]
+		do
+			Result := internal_block_alias_table
+			if
+				Result = Void and then
+				attached setup.text_table_item ("blocks.&aliases") as tb
+			then
+				create Result.make (tb.count)
+				across
+					tb as ic
+				loop
+					k := ic.key
+					v := ic.item
+					if v.is_valid_as_string_8 then
+						l_block_id := v.to_string_8
+						if k.is_valid_as_string_8 then
+							l_alias_id := k.to_string_8
+							if is_block_included (l_alias_id, False) then
+								lst := Result.item (l_block_id)
+								if lst = Void then
+									create {ARRAYED_LIST [READABLE_STRING_8]} lst.make (1)
+								end
+								lst.force (l_alias_id)
+								Result.force (lst, l_block_id)
+							end
+						else
+							check valid_alias_id: False end
+						end
+					else
+						check valid_block_id: False end
+					end
+				end
+			end
+		end
+
 feature -- Blocks regions

 	regions: STRING_TABLE [CMS_BLOCK_REGION]
 			-- Layout regions, that contains blocks.

+	blocks: STRING_TABLE [CMS_BLOCK]
+			-- Blocks indexed by their block id.
+
 	block_region_settings: STRING_TABLE [STRING]

 	block_region (b: CMS_BLOCK; a_default_region: detachable READABLE_STRING_8): CMS_BLOCK_REGION
@@ -510,6 +618,34 @@ feature -- Blocks regions
 			end
 		end

+feature {NONE} -- Blocks
+
+	put_core_block (b: CMS_BLOCK; a_default_region: detachable READABLE_STRING_8; is_block_included_by_default: BOOLEAN; a_alias_table: like block_alias_table)
+			-- Add block `b' to associated region or `a_default_region' if provided
+			-- and check optional associated condition.
+			-- If no condition then use `is_block_included_by_default' to
+			-- decide if block is included or not.
+		local
+			l_region: detachable like block_region
+		do
+			if is_block_included (b.name, is_block_included_by_default) then
+				l_region := block_region (b, a_default_region)
+				l_region.extend (b)
+				blocks.force (b, b.name)
+			end
+				-- Included alias block ids.
+			if
+				a_alias_table /= Void and then
+				attached a_alias_table.item (b.name) as l_aliases
+			then
+				across
+					l_aliases as ic
+				loop
+					add_block (create {CMS_ALIAS_BLOCK}.make_with_block (ic.item, b), a_default_region)
+				end
+			end
+		end
+
 feature -- Blocks

 	put_block (b: CMS_BLOCK; a_default_region: detachable READABLE_STRING_8; is_block_included_by_default: BOOLEAN)
@@ -523,6 +659,7 @@ feature -- Blocks
 			if is_block_included (b.name, is_block_included_by_default) then
 				l_region := block_region (b, a_default_region)
 				l_region.extend (b)
+				blocks.force (b, b.name)
 			end
 		end

@@ -534,37 +671,91 @@ feature -- Blocks
 		do
 			l_region := block_region (b, a_default_region)
 			l_region.extend (b)
+			blocks.force (b, b.name)
+		end
+
+	remove_block (b: CMS_BLOCK)
+			-- Remove block `b' from associated region.
+		local
+			l_region: detachable like block_region
+			l_found: BOOLEAN
+		do
+			across
+				regions as reg_ic
+			until
+				l_found
+			loop
+				l_region := reg_ic.item
+				l_found := l_region.blocks.has (b)
+				if l_found then
+					l_region.remove (b)
+				end
+			end
+			blocks.remove (b.name)
 		end

 	get_blocks
+			-- Get block from CMS core, and from modules.
+		local
+			l_region: CMS_BLOCK_REGION
+			b: CMS_BLOCK
 		do
-			debug ("refactor_fixme")
-				fixme ("find a way to have this in configuration or database, and allow different order")
+			get_core_blocks
+			get_module_blocks
+
+			across
+				regions as reg_ic
+			loop
+				l_region := reg_ic.item
+				across
+					l_region.blocks as ic
+				loop
+					update_block (ic.item)
+				end
+				l_region.sort
 			end
-			put_block (top_header_block, "top", True)
-			put_block (header_block, "header", True)
+
+			debug ("cms")
+				create {CMS_CONTENT_BLOCK} b.make ("made_with", Void, "Made with <a href=%"https://www.eiffel.org/%">EWF</a>", Void)
+				b.set_weight (99)
+				put_block (b, "footer", True)
+			end
+		end
+
+	get_core_blocks
+			-- Get blocks provided by the CMS core.
+		local
+			l_alias_table: like block_alias_table
+		do
+				-- Get included aliased blocks.
+			l_alias_table := block_alias_table
+
+			put_core_block (top_header_block, "top", True, l_alias_table)
+			put_core_block (header_block, "header", True, l_alias_table)
 			if attached message_block as m then
-				put_block (m, "content", True)
+				put_core_block (m, "content", True, l_alias_table)
 			end
 			if attached primary_tabs_block as m then
-				put_block (m, "content", True)
+				put_core_block (m, "content", True, l_alias_table)
 			end
 			add_block (content_block, "content") -- Can not be disabled!

 			if attached management_menu_block as l_block then
-				put_block (l_block, "sidebar_first", True)
+				put_core_block (l_block, "sidebar_first", True, l_alias_table)
 			end
 			if attached navigation_menu_block as l_block then
-				put_block (l_block, "sidebar_first", True)
+				put_core_block (l_block, "sidebar_first", True, l_alias_table)
 			end
 			if attached user_menu_block as l_block then
-				put_block (l_block, "sidebar_second", True)
+				put_core_block (l_block, "sidebar_second", True, l_alias_table)
 			end
+		end

+	get_module_blocks
+			-- Get blocks provided by modules.
+		do
+				-- Get block from modules, and related alias.
 			hooks.invoke_block (Current)
-			debug ("cms")
-				put_block (create {CMS_CONTENT_BLOCK}.make ("made_with", Void, "Made with <a href=%"https://www.eiffel.org/%">EWF</a>", Void), "footer", True)
-			end
 		end

 	primary_menu_block: detachable CMS_MENU_BLOCK
@@ -595,22 +786,13 @@ feature -- Blocks
 			end
 		end

-	primary_tabs_block: detachable CMS_MENU_BLOCK
-		do
-			if attached primary_tabs as m and then not m.is_empty then
-				create Result.make (m)
-				Result.is_horizontal := True
-				Result.set_is_raw (True)
-				Result.add_css_class ("tabs")
-			end
-		end
-
 	top_header_block: CMS_CONTENT_BLOCK
 		local
 			s: STRING
 		do
 			create s.make_empty
 			create Result.make ("page_top", Void, s, Void)
+			Result.set_weight (-5)
 			Result.set_is_raw (True)
 		end

@@ -622,6 +804,7 @@ feature -- Blocks
 			create s.make_from_string (theme.menu_html (primary_menu, True, Void))
 			create l_hb.make_empty
 			create Result.make ("header", Void, l_hb, Void)
+			Result.set_weight (-4)
 			Result.set_is_raw (True)
 		end

@@ -653,6 +836,18 @@ feature -- Blocks
 			if attached message as m and then not m.is_empty then
 				create Result.make ("message", Void, "<div id=%"message%">" + m + "</div>", Void)
 				Result.set_is_raw (True)
+				Result.set_weight (-3)
+			end
+		end
+
+	primary_tabs_block: detachable CMS_MENU_BLOCK
+		do
+			if attached primary_tabs as m and then not m.is_empty then
+				create Result.make (m)
+				Result.is_horizontal := True
+				Result.set_is_raw (True)
+				Result.set_weight (-2)
+				Result.add_css_class ("tabs")
 			end
 		end

@@ -669,6 +864,7 @@ feature -- Blocks
 				end
 			end
 			create Result.make ("content", Void, s, Void)
+			Result.set_weight (-1)
 			Result.set_is_raw (True)
 		end

@@ -892,8 +1088,10 @@ feature -- Generation
 			across
 				regions as reg_ic
 			loop
+				l_region := reg_ic.item
+					-- region blocks Already sorted.
 				across
-					reg_ic.item.blocks as ic
+					l_region.blocks as ic
 				loop
 					if attached {CMS_SMARTY_TEMPLATE_BLOCK} ic.item as l_tpl_block then
 							-- Apply page variables to smarty block.
--- a/tools/install.bat
+++ b/tools/install.bat
@@ -4,6 +4,7 @@ set TMP_EXCLUDE=%~dp0.install_ROC-copydir-exclude
 set COPYCMD= xcopy /EXCLUDE:%TMP_EXCLUDE% /I /E /Y 
 set TMP_DIR=%~dp0..
 set SAFE_RMDIR=rd /q/s
+set SAFE_RM=del

 echo EIFGENs > %TMP_EXCLUDE%
 echo .git >> %TMP_EXCLUDE%
@@ -61,6 +62,10 @@ echo Install ROC as CMS ewf
 %COPYCMD% %TMP_DIR%\modules	%TMP_UNSTABLE_DIR%\library\web\cms\modules
 %COPYCMD% %TMP_DIR%\examples	%TMP_UNSTABLE_DIR%\library\web\cms\examples

+%COPYCMD% %TMP_DIR%\tools	%TMP_UNSTABLE_DIR%\library\web\cms\tools
+%SAFE_RM% %TMP_UNSTABLE_DIR%\library\web\cms\tools\install.bat
+%SAFE_RM% %TMP_UNSTABLE_DIR%\library\web\cms\tools\safe_md.bat
+
 copy %TMP_DIR%\cms.ecf %TMP_UNSTABLE_DIR%\library\web\cms\cms.ecf
 copy %TMP_DIR%\cms-safe.ecf %TMP_UNSTABLE_DIR%\library\web\cms\cms-safe.ecf
 copy %TMP_DIR%\README.md %TMP_UNSTABLE_DIR%\library\web\cms\README.md
--- a/tools/roc/roc_install_command.e
+++ b/tools/roc/roc_install_command.e
@@ -170,6 +170,8 @@ feature -- Execution
 						print ("%NCheck the module elements at ")
 						print (l_dest_dir.path.name)
 						print (".%N")
+						print ("Copied " + directories_count.out + " directories.%N")
+						print ("Copied " + files_count.out + " files.%N")
 					else
 						print ({STRING_32} "The CMS Application located at " + l_cms_path.name + "does not have the site or modules folders.%N")
 					end
@@ -202,9 +204,17 @@ feature -- Execution
 			if not l_dest_dir.exists then
 				l_dest_dir.create_dir
 			end
+			files_count := 0
+			directories_count := -1
 			copy_directory (l_src_dir, l_dest_dir, True)
 		end

+	files_count: INTEGER
+			-- Number of copied files during installation.
+
+	directories_count: INTEGER
+			-- Number of copied directories during installation.
+
 feature {NONE} -- System/copy files

 	copy_directory (a_src: DIRECTORY; a_dest: DIRECTORY; is_recursive: BOOLEAN)
@@ -217,6 +227,7 @@ feature {NONE} -- System/copy files
 			l_file: FILE
 			ut: FILE_UTILITIES
 		do
+			directories_count := directories_count + 1
 			across
 				a_src.entries as ic
 			loop
@@ -259,6 +270,7 @@ feature {NONE} -- System/copy files
 						a_file.copy_to (l_dest)
 						a_file.close
 						l_dest.close
+						files_count := files_count + 1
 					end
 				end
 			end
Author	SHA1	Message	Date
Jocelyn Fiat	a84f86d7a2	Addressed various unicode related issues. Note this is using recent changes from text_filter library.	2015-10-20 18:49:40 +02:00
Jocelyn Fiat	3f4e70b98c	Updated roc tools, and associated scripts. Also include Eiffel Store ODBC persistence.	2015-10-20 11:29:16 +02:00
Jocelyn Fiat	782e9397a3	Added missing sql_finalize which is used to cleanup as early as possible the last statement when it is not needed anymore.	2015-10-19 23:33:17 +02:00
Jocelyn Fiat	f51ddc9796	Extracted launcher code into cms/launcher/... libraries. (mostly to help new project based on ROC CMS). Renamed and simplified the roc cms server launcher, and the related cms execution. Updated cms.ini and extract blocks related management into blocks.ini. Added debug clauses for cms sqlite3 storage.	2015-10-19 22:50:48 +02:00
Jocelyn Fiat	a260bbc2c5	Removed obsolete usage of {TYPE}.attempt from CMS_MODULE_COLLECTION.	2015-10-19 20:50:47 +02:00
Jocelyn Fiat	eb5ae32e46	Added persistence support for Eiffel sqlite3 wrapper. Updated existing persistency solution to be more generic to any db solution.	2015-10-19 11:24:22 +02:00
Jocelyn Fiat	7fcacad5eb	Use extended type support from EiffelStore to handle STRING_32, and other extended types.	2015-10-19 11:20:04 +02:00
Jocelyn Fiat	7c99f2dc83	Added recent_changes.ecf	2015-10-18 20:47:33 +02:00
Jocelyn Fiat	57430193e3	Fixed compilation of CMS_FILE_BLOCK.	2015-10-18 19:24:43 +02:00
Jocelyn Fiat	62bf58ce6d	Added support for block options for the feed aggregator blocks. Updated weight for primary_tabs block.	2015-10-17 00:17:59 +02:00
Jocelyn Fiat	23c395513b	Fixed handling of block and optional block. - All blocks behavior can be specified and overwritten via the configuaration. - And optional block are not displayed by default.	2015-10-16 23:46:18 +02:00
Jocelyn Fiat	d2d86ecdf2	Added notion of block options, declared in cms.ini as [blocks] {block_id}.options[name]=value {block_id}.options[size]=123	2015-10-16 23:11:44 +02:00
Jocelyn Fiat	e90f82387f	Added notion of alias block, to provide a way to include a block content in mutiple regions.	2015-10-16 23:02:47 +02:00
Jocelyn Fiat	05472abdd7	Improved block condition "path:..." by allowing wildchar. Added weight data to CMS_BLOCK to be able to sort the block lists, and thus order the display of blocks. Set negative weight for various core block, so that they appear first as expected. The weight can be set and overwritten in cms.ini , by pref blocks.{block_id}.weight=integer_weight.	2015-10-16 17:22:22 +02:00
Jocelyn Fiat	788cf3738d	Fixed compilation of CMS_BLOCK_LOCATION_CONDITION (not used for now).	2015-10-14 14:20:55 +02:00
Jocelyn Fiat	f6185612b2	Fixed compilation issue.	2015-10-12 19:42:09 +02:00
Jocelyn Fiat	d37f45d958	Include block caches clearing during "clear_cache" hook invocation.	2015-10-12 19:39:41 +02:00
Jocelyn Fiat	872f2a177d	For now, only clear feed aggregation cache if clear all cache is requested.	2015-10-12 19:22:37 +02:00
Jocelyn Fiat	3ed2f410d9	Added feeds.json example in feed_aggregator module folder.	2015-10-12 19:15:09 +02:00
Jocelyn Fiat	1b451ef142	Moved the feeds.json example in associated module files.	2015-10-12 19:12:42 +02:00
Jocelyn Fiat	50146985de	Added CMS_HOOK_CACHE, and admin cache. Prepared evolution of feed module, by allowing json object to list feeds locations. The associated key will be used to identify the location, and have category filter by location.	2015-10-12 19:03:12 +02:00
Jocelyn Fiat	8cdf9ba973	Updated demo feed info.	2015-10-12 19:00:46 +02:00
Jocelyn Fiat	8044f7d52b	Implemented feed aggregation filtering based on categories.	2015-10-12 15:53:50 +02:00