Provided a CMS_EMAIL, and CMS_API.process_email (CMS_EMAIL)

Added CMS_SETUP.mailer
Updated implementation of email_service to use notification_email library

.gitignore

@@ -2,4 +2,6 @@ EIFGENs
 *.swp
 *.log*
 *.rc
-*.bak
+*.bak
+*.sqlite
+Thumbs.db

cms-safe.ecf

@@ -19,13 +19,17 @@
 		<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="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"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
+		<library name="uri_template" location="$ISE_LIBRARY\contrib\library\text\parser\uri_template\uri_template-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"/>
 		<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>

cms.ecf

@@ -1,5 +1,6 @@
 <?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">
+	<description>ROC CMS library</description>
 	<target name="cms">
 		<root all_classes="true"/>
 		<file_rule>
@@ -12,20 +13,24 @@
 		</option>
 		<mapping old_name="CMS_LAYOUT" new_name="CMS_ENVIRONMENT"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.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="config" location=".\library\configuration\config.ecf"/>
 		<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="cms_app_env" location=".\library\app_env\app_env.ecf"/>
-		<library name="cms_model" location=".\library\model\cms_model.ecf" readonly="false"/>
+		<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"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
+		<library name="uri_template" location="$ISE_LIBRARY\contrib\library\text\parser\uri_template\uri_template.ecf"/>
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
-		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html.ecf" readonly="false"/>
 		<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>

examples/demo/demo-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="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">
 		<file_rule>
@@ -7,33 +7,57 @@
 			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="all" syntax="transitional">
-			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		<option debug="true" warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="all" syntax="transitional">
+			<debug name="dbglog" enabled="true"/>
 		</option>
-		<setting name="concurrency" value="none"/>
+		<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_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_oauth_20_module" location="..\..\modules\oauth20\oauth20-safe.ecf" readonly="false"/>
 		<library name="cms_basic_auth_module" location="..\..\modules\basic_auth\basic_auth-safe.ecf" readonly="false"/>
 		<library name="cms_blog_module" location="modules\blog\cms_blog_module-safe.ecf" readonly="false"/>
 		<library name="cms_demo_module" location="modules\demo\cms_demo_module-safe.ecf" readonly="false"/>
 		<library name="cms_model" location="..\..\library\model\cms_model-safe.ecf" readonly="false"/>
 		<library name="cms_node_module" location="..\..\modules\node\node-safe.ecf" readonly="false"/>
 		<!--
-		<library name="persistence_mysql" location="..\..\library\persistence\mysql\persistence_mysql-safe.ecf" readonly="false"/>
+		<library name="persistence_store_mysql" location="..\..\library\persistence\store_mysql\store_mysql-safe.ecf" readonly="false"/>
 		-->
-		<library name="persistence_sqlite" location="..\..\library\persistence\sqlite\persistence_sqlite-safe.ecf" readonly="false"/>
+		<library name="persistence_store_odbc" location="..\..\library\persistence\store_odbc\store_odbc-safe.ecf" readonly="false"/>
 		<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"/>
 		<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"/>
+		<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"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
+	</target>
+	<target name="demo_standalone_none" extends="demo_standalone">
+		<setting name="concurrency" value="none"/>
+	</target>
+	<target name="demo_standalone_mt" extends="demo_standalone">
+		<setting name="concurrency" value="thread"/>
+	</target>
+	<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"/>
@@ -43,16 +67,18 @@
 	</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"/>
 		<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"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
-	<target name="demo" extends="demo_nino">
+	<target name="demo" extends="demo_standalone">
 	</target>
 </system>

examples/demo/launcher/any/application_launcher.e

@@ -8,10 +8,10 @@ note
 	revision: "$Revision: 36 $"
 
 class
-	APPLICATION_LAUNCHER
+	APPLICATION_LAUNCHER [G -> WSF_EXECUTION create make end]
 
 inherit
-	APPLICATION_LAUNCHER_I
+	APPLICATION_LAUNCHER_I [G]
 
 feature -- Custom
 

examples/demo/launcher/any/application_launcher_i.e

@@ -10,24 +10,28 @@ note
 	revision: "$Revision: 36 $"
 
 deferred class
-	APPLICATION_LAUNCHER_I
+	APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]
 
 inherit
 	SHARED_EXECUTION_ENVIRONMENT
 
 feature -- Execution
 
-	launch (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+	launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
 		local
 			nature: like launcher_nature
 		do
 			nature := launcher_nature
-			if nature = Void or else nature = nature_nino then
-				launch_nino (a_service, opts)
+			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 (a_service, opts)
+				launch_cgi (opts)
 			elseif nature = nature_libfcgi then
-				launch_libfcgi (a_service, opts)
+				launch_libfcgi (opts)
 			else
 				-- bye bye
 				(create {EXCEPTIONS}).die (-1)
@@ -43,14 +47,16 @@ feature {NONE} -- Access
 			--| and we could use WSF_DEFAULT_SERVICE_LAUNCHER to configure this at compilation time.
 		local
 			p: PATH
-			l_entry_name: READABLE_STRING_32
 			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 
+				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
@@ -61,39 +67,58 @@ feature {NONE} -- Access
 					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 (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+	launch_nino (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
 		local
-			launcher: WSF_NINO_SERVICE_LAUNCHER
+			launcher: WSF_NINO_SERVICE_LAUNCHER [G]
 		do
-			create launcher.make_and_launch (a_service, opts)
+			create launcher.make_and_launch (opts)
 		end
 
 feature {NONE} -- cgi
 
 	nature_cgi: STRING = "cgi"
 
-	launch_cgi (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+	launch_cgi (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
 		local
-			launcher: WSF_CGI_SERVICE_LAUNCHER
+			launcher: WSF_CGI_SERVICE_LAUNCHER [G]
 		do
-			create launcher.make_and_launch (a_service, opts)
+			create launcher.make_and_launch (opts)
 		end
 
 feature {NONE} -- libfcgi
 
 	nature_libfcgi: STRING = "libfcgi"
 
-	launch_libfcgi (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+	launch_libfcgi (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
 		local
-			launcher: WSF_LIBFCGI_SERVICE_LAUNCHER
+			launcher: WSF_LIBFCGI_SERVICE_LAUNCHER [G]
 		do
-			create launcher.make_and_launch (a_service, opts)
+			create launcher.make_and_launch (opts)
+		end
+
+feature -- Default
+
+	default_nature: STRING
+		do
+			Result := nature_standalone
 		end
 
 

examples/demo/launcher/default/application_launcher.e

@@ -8,10 +8,10 @@ note
 	revision: "$Revision: 36 $"
 
 class
-	APPLICATION_LAUNCHER
+	APPLICATION_LAUNCHER [G -> WSF_EXECUTION create make end]
 
 inherit
-	APPLICATION_LAUNCHER_I
+	APPLICATION_LAUNCHER_I [G]
 
 feature -- Custom
 

examples/demo/launcher/default/application_launcher_i.e

@@ -10,15 +10,15 @@ note
 	revision: "$Revision: 96596 $"
 
 deferred class
-	APPLICATION_LAUNCHER_I
+	APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]
 
 feature -- Execution
 
-	launch (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+	launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
 		local
-			launcher: WSF_DEFAULT_SERVICE_LAUNCHER
+			launcher: WSF_DEFAULT_SERVICE_LAUNCHER [G]
 		do
-			create {WSF_DEFAULT_SERVICE_LAUNCHER} launcher.make_and_launch (a_service, opts)
+			create launcher.make_and_launch (opts)
 		end
 
 end

examples/demo/modules/blog/cms_blog.e

@@ -31,7 +31,13 @@ feature -- Conversion
 		do
 			Precursor (a_node)
 			if attached {CMS_BLOG} a_node as l_blog then
---				l_blog
+				if attached l_blog.tags as l_tags then
+					across
+						l_tags as ic
+					loop
+						add_tag (ic.item)
+					end
+				end
 			end
 		end
 
@@ -42,7 +48,7 @@ feature -- Access
 			Result := {CMS_BLOG_NODE_TYPE}.name
 		end
 
-feature -- Access: content
+feature -- Access: node
 
 	summary: detachable READABLE_STRING_8
 			-- A short summary of the node.
@@ -54,10 +60,12 @@ feature -- Access: content
 			-- Format associated with `content' and `summary'.
 			-- For example: text, mediawiki, html, etc
 
+feature -- Access: blog
+
 	tags: detachable ARRAYED_LIST [READABLE_STRING_32]
 			-- Optional tags
 
-feature -- Element change
+feature -- Element change: node
 
 	set_content (a_content: like content; a_summary: like summary; a_format: like format)
 		do
@@ -66,6 +74,8 @@ feature -- Element change
 			format := a_format
 		end
 
+feature -- Element change: blog		
+
 	add_tag (a_tag: READABLE_STRING_32)
 			-- Set `parent' to `a_page'
 		require

examples/demo/modules/blog/cms_blog_api.e

@@ -0,0 +1,118 @@
+note
+	description: "API to handle nodes of type blog. Extends the node API."
+	author: "Dario B<>sch <daboesch@student.ethz.ch"
+	date: "$Date: 2015-05-21 14:46:00 +0100$"
+	revision: "$Revision: 96616 $"
+
+class
+	CMS_BLOG_API
+
+inherit
+	CMS_MODULE_API
+		rename
+			make as make_with_cms_api
+		redefine
+			initialize
+		end
+
+	REFACTORING_HELPER
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make (a_api: CMS_API; a_node_api: CMS_NODE_API)
+			-- (from CMS_MODULE_API)
+			-- (export status {NONE})
+		do
+			node_api := a_node_api
+			make_with_cms_api (a_api)
+		end
+
+	initialize
+			-- <Precursor>
+		do
+			Precursor
+
+				-- Create the node storage for type blog
+			if attached {CMS_STORAGE_SQL_I} storage as l_storage_sql then
+				create {CMS_BLOG_STORAGE_SQL} blog_storage.make (l_storage_sql)
+			else
+				create {CMS_BLOG_STORAGE_NULL} blog_storage.make
+			end
+--			initialize_node_types
+		end
+
+feature {CMS_API_ACCESS, CMS_MODULE, CMS_API} -- Restricted access		
+
+	node_api: CMS_NODE_API
+
+feature {CMS_MODULE} -- Access nodes storage.
+
+	blog_storage: CMS_BLOG_STORAGE_I
+
+feature -- Configuration of blog handlers
+
+	entries_per_page : NATURAL_32 = 2
+			-- The numbers of posts that are shown on one page. If there are more post a pagination is generated
+			--| For test reasons this is 2, so we don't have to create a lot of blog entries.
+			--| TODO: Set to bigger constant.
+
+feature -- Access node
+
+	blogs_count: INTEGER_64
+			-- Number of nodes of type blog.
+		do
+			Result := blog_storage.blogs_count
+		end
+
+	blogs_count_from_user (a_user: CMS_USER): INTEGER_64
+			-- Number of nodes of type blog from user with `a_user_id'.
+		require
+			has_id: a_user.has_id
+		do
+			Result := blog_storage.blogs_count_from_user (a_user)
+		end
+
+	blogs_order_created_desc: LIST [CMS_BLOG]
+			-- List of nodes ordered by creation date (descending)
+		do
+			Result := nodes_to_blogs (blog_storage.blogs)
+		end
+
+	blogs_order_created_desc_limited (a_limit: NATURAL_32; a_offset: NATURAL_32): LIST [CMS_BLOG]
+			-- List of nodes ordered by creation date and limited by limit and offset
+		do
+				-- load all posts and add the authors to each post
+			Result := nodes_to_blogs (blog_storage.blogs_limited (a_limit, a_offset))
+		end
+
+	blogs_from_user_order_created_desc_limited (a_user: CMS_USER; a_limit: NATURAL_32; a_offset: NATURAL_32) : LIST [CMS_BLOG]
+			-- List of nodes ordered by creation date and limited by limit and offset
+		require
+			has_id: a_user.has_id
+		do
+				-- load all posts and add the authors to each post
+			Result := nodes_to_blogs (blog_storage.blogs_from_user_limited (a_user, a_limit, a_offset))
+		end
+
+feature {NONE} -- Helpers
+
+	nodes_to_blogs (a_nodes: LIST [CMS_NODE]): ARRAYED_LIST [CMS_BLOG]
+			-- Convert list of nodes into a list of blog when possible.
+		do
+			create {ARRAYED_LIST [CMS_BLOG]} Result.make (a_nodes.count)
+
+			if attached node_api as l_node_api then
+				across
+					a_nodes as ic
+				loop
+					if attached {CMS_BLOG} l_node_api.full_node (ic.item) as l_blog then
+						Result.force (l_blog)
+					end
+				end
+			end
+		end
+
+end

examples/demo/modules/blog/cms_blog_module-safe.ecf

@@ -20,6 +20,7 @@
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
 		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html-safe.ecf"/>
+		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension-safe.ecf" readonly="false"/>
 		<library name="wsf_encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf"/>
 		<cluster name="src" location=".\" recursive="true"/>
 	</target>

examples/demo/modules/blog/cms_blog_module.e

@@ -1,18 +1,21 @@
 note
-	description: "Summary description for {CMS_BLOG_MODULE}."
-	date: "$Date: 2015-02-13 13:08:13 +0100 (ven., 13 févr. 2015) $"
-	revision: "$Revision: 96616 $"
+	description: "Displays all posts (pages with type blog). It's possible to list posts by user."
+	author: "Dario B<>sch <daboesch@student.ethz.ch>"
+	date: "$Date: 2015-05-22 15:13:00 +0100 (lun., 18 mai 2015) $"
+	revision: "$Revision 96616$"
 
 class
 	CMS_BLOG_MODULE
 
 inherit
 	CMS_MODULE
+		rename
+			module_api as blog_api
 		redefine
 			register_hooks,
 			initialize,
-			is_installed,
-			install
+			install,
+			blog_api
 		end
 
 	CMS_HOOK_MENU_SYSTEM_ALTER
@@ -24,12 +27,15 @@ feature {NONE} -- Initialization
 
 	make
 		do
-			name := "Blog demo module"
 			version := "1.0"
 			description := "Service to demonstrate new node for blog"
 			package := "demo"
 		end
 
+feature -- Access
+
+	name: STRING = "blog"
+
 feature {CMS_API} -- Module Initialization			
 
 	initialize (api: CMS_API)
@@ -40,6 +46,10 @@ feature {CMS_API} -- Module Initialization
 			Precursor (api)
 
 			if attached {CMS_NODE_API} api.module_api ({NODE_MODULE}) as l_node_api then
+				create blog_api.make (api, l_node_api)
+
+				node_api := l_node_api
+					-- Depends on {NODE_MODULE}
 				create ct
 				l_node_api.add_content_type (ct)
 				l_node_api.add_content_type_webform_manager (create {CMS_BLOG_NODE_TYPE_WEBFORM_MANAGER}.make (ct))
@@ -53,12 +63,6 @@ feature {CMS_API} -- Module Initialization
 
 feature {CMS_API} -- Module management
 
-	is_installed (api: CMS_API): BOOLEAN
-			-- Is Current module installed?
-		do
-			Result := attached api.storage.custom_value ("is_initialized", "module-" + name) as v and then v.is_case_insensitive_equal_general ("yes")
-		end
-
 	install (api: CMS_API)
 		local
 			sql: STRING
@@ -67,28 +71,68 @@ feature {CMS_API} -- Module management
 			if attached {CMS_STORAGE_SQL_I} api.storage as l_sql_storage then
 				if not l_sql_storage.sql_table_exists ("blog_post_nodes") then
 					sql := "[
-CREATE TABLE "blog_post_nodes"(
-  "nid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("nid">=0),
-  "revision" INTEGER,
-  "tags" VARCHAR(255)
+CREATE TABLE blog_post_nodes(
+  `nid` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL CHECK("nid">=0),
+  `revision` INTEGER,
+  `tags` VARCHAR(255)
 );
 					]"
-					l_sql_storage.sql_execute_script (sql)
+					l_sql_storage.sql_execute_script (sql, Void)
 					if l_sql_storage.has_error then
 						api.logger.put_error ("Could not initialize database for blog module", generating_type)
 					end
 				end
-				api.storage.set_custom_value ("is_initialized", "module-" + name, "yes")
+				Precursor (api)
 			end
 		end
 
+feature {CMS_API} -- Access: API
+
+	blog_api: detachable CMS_BLOG_API
+			-- <Precursor>
+
+	node_api: detachable CMS_NODE_API
+
 feature -- Access: router
 
-	router (a_api: CMS_API): WSF_ROUTER
-			-- Node router.
+	setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
+			-- <Precursor>
 		do
-			create Result.make (1)
-			Result.handle_with_request_methods ("/blogs/", create {WSF_URI_AGENT_HANDLER}.make (agent handle_blogs (?,?, a_api)), Result.methods_get)
+			if attached blog_api as l_blog_api then
+				configure_web (a_api, l_blog_api, a_router)
+			else
+					-- Issue with api/dependencies,
+					-- thus Current module should not be used!
+					-- thus no url mapping
+			end
+		end
+
+	configure_web (a_api: CMS_API; a_blog_api: CMS_BLOG_API; a_router: WSF_ROUTER)
+			-- Configure router mapping for web interface.
+		local
+			l_blog_handler: BLOG_HANDLER
+			l_blog_user_handler: BLOG_USER_HANDLER
+			l_uri_mapping: WSF_URI_MAPPING
+		do
+				-- TODO: for now, focused only on web interface, add REST api later. [2015-May-18]
+			create l_blog_handler.make (a_api, a_blog_api)
+			create l_blog_user_handler.make (a_api, a_blog_api)
+
+				-- Let the class BLOG_HANDLER handle the requests on "/blogs"
+			create l_uri_mapping.make_trailing_slash_ignored ("/blogs", l_blog_handler)
+			a_router.map (l_uri_mapping, a_router.methods_get)
+
+				-- We can add a page number after /blogs/ to get older posts
+			a_router.handle ("/blogs/page/{page}", l_blog_handler, a_router.methods_get)
+
+				-- If a user id is given route with blog user handler
+				--| FIXME: maybe /user/{user}/blogs/  would be better.
+			a_router.handle ("/blogs/user/{user}", l_blog_user_handler, a_router.methods_get)
+
+				-- If a user id is given we also want to allow different pages
+				--| FIXME: what about /user/{user}/blogs/?page={page} ?
+			a_router.handle ("/blogs/user/{user}/page/{page}", l_blog_user_handler, a_router.methods_get)
+
 		end
 
 feature -- Hooks
@@ -102,19 +146,8 @@ feature -- Hooks
 		local
 			lnk: CMS_LOCAL_LINK
 		do
-			create lnk.make ("Blogs", "/blogs/")
+				-- Add the link to the blog to the main menu
+			create lnk.make ("Blogs", "blogs/")
 			a_menu_system.primary_menu.extend (lnk)
 		end
-
-feature -- Handler
-
-	handle_blogs (req: WSF_REQUEST; res: WSF_RESPONSE; a_api: CMS_API)
-		local
-			r: NOT_IMPLEMENTED_ERROR_CMS_RESPONSE
-		do
-			create r.make (req, res, a_api)
-			r.set_main_content ("Blog module is in development ...")
-			r.execute
-		end
-
 end

examples/demo/modules/blog/cms_blog_node_type.e

@@ -17,10 +17,11 @@ feature {NONE} -- Initialization
 	default_create
 		do
 			Precursor
-			create {ARRAYED_LIST [like available_formats.item]} available_formats.make (3)
+			create {ARRAYED_LIST [like available_formats.item]} available_formats.make (4)
 			available_formats.extend (create {PLAIN_TEXT_CONTENT_FORMAT})
 			available_formats.extend (create {FILTERED_HTML_CONTENT_FORMAT})
 			available_formats.extend (create {FULL_HTML_CONTENT_FORMAT})
+			available_formats.extend (create {CMS_EDITOR_CONTENT_FORMAT})
 		end
 
 feature -- Access

examples/demo/modules/blog/handler/blog_handler.e

@@ -0,0 +1,279 @@
+note
+	description: "Request handler related to /blogs and /blogs/{page}. Displays all posts in the blog."
+	author: "Dario B<>sch <daboesch@student.ethz.ch>"
+	date: "$Date: 2015-05-18 13:49:00 +0100 (lun., 18 mai 2015) $"
+	revision: "$9661667$"
+
+class
+	BLOG_HANDLER
+
+inherit
+	CMS_BLOG_HANDLER
+
+	WSF_URI_HANDLER
+		rename
+			execute as uri_execute,
+			new_mapping as new_uri_mapping
+		end
+
+	WSF_URI_TEMPLATE_HANDLER
+		rename
+			execute as uri_template_execute,
+			new_mapping as new_uri_template_mapping
+		select
+			new_uri_template_mapping
+		end
+
+	WSF_RESOURCE_HANDLER_HELPER
+		redefine
+			do_get
+		end
+
+	REFACTORING_HELPER
+
+	CMS_API_ACCESS
+
+create
+	make
+
+feature -- execute
+
+	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- Execute request handler for any kind of mapping.
+		do
+			execute_methods (req, res)
+		end
+
+	uri_execute (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- Execute request handler for URI mapping.
+		do
+			execute (req, res)
+		end
+
+	uri_template_execute (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- Execute request handler for URI-template mapping.
+		do
+			execute (req, res)
+		end
+
+feature -- Global Variables
+
+	page_number: NATURAL_32
+			-- Current page number.
+
+feature -- HTTP Methods	
+
+	do_get (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- <Precursor>
+		local
+			l_page: CMS_RESPONSE
+		do
+				-- Read page number from path parameter.
+			page_number := page_number_path_parameter (req)
+
+				-- Responding with `main_content_html (l_page)'.
+			create {GENERIC_VIEW_CMS_RESPONSE} l_page.make (req, res, api)
+			l_page.set_main_content (main_content_html (l_page))
+			l_page.execute
+		end
+
+feature -- Query
+
+	posts: LIST [CMS_NODE]
+			-- Blog posts to display on given page ordered by date (descending).
+		do
+			Result := blog_api.blogs_order_created_desc_limited (
+						entries_per_page,
+						entries_per_page * (page_number - 1)
+					)
+		end
+
+	multiple_pages_needed : BOOLEAN
+			-- Return if more that one page is needed to display posts.
+		do
+			Result := entries_per_page < total_entries
+		end
+
+	pages_count: NATURAL_32
+			-- Number of pages needed to display all posts.
+		require
+			entries_per_page > 0
+		local
+			tmp: REAL_32
+		do
+			tmp := total_entries.to_real_32 / entries_per_page.to_real_32;
+			Result := tmp.ceiling.to_natural_32
+		end
+
+	page_number_path_parameter (req: WSF_REQUEST): NATURAL_32
+			-- Page number from path /blogs/{page}.
+			-- Unsigned integer since negative pages are not allowed.
+		local
+			s: STRING
+		do
+			Result := 1 -- default if not get variable is set
+			if attached {WSF_STRING} req.path_parameter ("page") as p_page then
+				s := p_page.value
+				if s.is_natural_32 then
+					if s.to_natural_32 > 1 then
+						Result := s.to_natural_32
+					end
+				end
+			end
+		end
+
+	total_entries: NATURAL_32
+			-- Total number of entries/posts.
+		do
+			Result := blog_api.blogs_count.to_natural_32
+		end
+
+feature -- HTML Output
+
+	frozen main_content_html (page: CMS_RESPONSE): STRING
+			-- Content of the page as a html string.
+		do
+			create Result.make_empty
+			append_main_content_html_to (page, Result)
+		end
+
+	append_main_content_html_to (page: CMS_RESPONSE; a_output: STRING)
+			-- Append to `a_output, the content of the page as a html string.
+		local
+			n: CMS_NODE
+			lnk: CMS_LOCAL_LINK
+		do
+				-- Output the title. If more than one page, also output the current page number
+			append_page_title_html_to (a_output)
+
+				-- Get the posts from the current page (given by page number and entries per page)
+				-- Start list of posts
+			a_output.append ("<ul class=%"cms_blog_nodes%">%N")
+			across
+				posts as ic
+			loop
+				n := ic.item
+				lnk := blog_api.node_api.node_link (n)
+				a_output.append ("<li class=%"cms_type_"+ n.content_type +"%">")
+
+					-- Output the creation date
+				append_creation_date_html_to (n, a_output)
+
+					-- Output the author of the post
+				append_author_html_to (n, a_output)
+
+					-- Output the title of the post as a link (to the detail page)
+				append_title_html_to (n, page, a_output)
+
+					-- Output the summary of the post and a more link to the detail page
+				append_summary_html_to (n, page, a_output)
+
+				a_output.append ("</li>%N")
+			end
+
+				-- End of post list
+			a_output.append ("</ul>%N")
+
+				-- Pagination (older and newer links)
+			append_pagination_html_to (a_output)
+		end
+
+	append_page_title_html_to (a_output: STRING)
+			-- Append the title of the page as a html string to `a_output'.
+			-- It shows the current page number.
+		do
+			a_output.append ("<h2>Blog")
+			if multiple_pages_needed then
+				a_output.append (" (Page " + page_number.out + " of " + pages_count.out + ")")
+			end
+			a_output.append ("</h2>")
+		end
+
+	append_creation_date_html_to (n: CMS_NODE; a_output: STRING)
+			-- Append the creation date as a html string to `a_output'.
+		local
+			hdate: HTTP_DATE
+		do
+			if attached n.creation_date as l_modified then
+				create hdate.make_from_date_time (l_modified)
+				hdate.append_to_yyyy_mmm_dd_string (a_output)
+				a_output.append (" ")
+			end
+		end
+
+	append_author_html_to (n: CMS_NODE; a_output: STRING)
+			-- Append to `a_output', the author of node `n' as html link to author's posts.
+		do
+			if attached n.author as l_author then
+				a_output.append ("by ")
+				a_output.append ("<a class=%"blog_user_link%" href=%"/blogs/user/" + l_author.id.out + "%">" + l_author.name + "</a>")
+			end
+		end
+
+	append_title_html_to (n: CMS_NODE; page: CMS_RESPONSE; a_output: STRING)
+			-- Append to `a_output', the title of node `n' as html link to detail page.
+		local
+			lnk: CMS_LOCAL_LINK
+		do
+			lnk := blog_api.node_api.node_link (n)
+			a_output.append ("<span class=%"blog_title%">")
+			a_output.append (page.link (lnk.title, lnk.location, Void))
+			a_output.append ("</span>")
+		end
+
+	append_summary_html_to (n: CMS_NODE; page: CMS_RESPONSE; a_output: STRING)
+			-- returns a html string with the summary of the node and a link to the detail page
+		local
+			lnk: CMS_LOCAL_LINK
+		do
+			if attached n.summary as l_summary then
+				lnk := blog_api.node_api.node_link (n)
+				a_output.append ("<p class=%"blog_list_summary%">")
+				if attached api.format (n.format) as f then
+					a_output.append (f.formatted_output (l_summary))
+				else
+					a_output.append (page.formats.default_format.formatted_output (l_summary))
+				end
+				a_output.append ("<br />")
+				a_output.append (page.link ("See more...", lnk.location, Void))
+				a_output.append ("</p>")
+			end
+		end
+
+	append_pagination_html_to (a_output: STRING)
+			-- Append to `a_output' with the pagination links (if necessary).
+		local
+			tmp: NATURAL_32
+		do
+			if multiple_pages_needed then
+				a_output.append ("<div class=%"pagination%">")
+
+					-- If exist older posts show link to next page
+				if page_number < pages_count then
+					tmp := page_number + 1
+					a_output.append (" <a class=%"blog_older_posts%" href=%"" + base_path + "/page/" + tmp.out + "%"><< Older Posts</a> ")
+				end
+
+				-- Delimiter
+				if page_number < pages_count AND page_number > 1 then
+					a_output.append (" | ")
+				end
+
+				-- If exist newer posts show link to previous page
+				if page_number > 1 then
+					tmp := page_number -1
+					a_output.append (" <a class=%"blog_newer_posts%" href=%"" + base_path + "/page/" + tmp.out + "%">Newer Posts >></a> ")
+				end
+
+				a_output.append ("</div>")
+			end
+
+		end
+
+	base_path : STRING
+			-- the path to the page that lists all blogs
+		do
+			Result := "/blogs"
+		end
+
+end

examples/demo/modules/blog/handler/blog_user_handler.e

@@ -0,0 +1,148 @@
+note
+	description: "[
+			Request handler related to 
+				/blogs/user/{id}/ 
+				or /blogs/user/{id}/page/{page}. 
+				
+			Displays all posts of the given user
+		]"
+	author: "Dario B<>sch <daboesch@student.ethz.ch>"
+	date: "$Date: 2015-05-22 15:13:00 +0100 (lun., 18 mai 2015) $"
+	revision: "$Revision 96616$"
+
+class
+	BLOG_USER_HANDLER
+
+inherit
+	BLOG_HANDLER
+		redefine
+			do_get,
+			posts,
+			total_entries,
+			append_page_title_html_to,
+			base_path
+		end
+
+create
+	make
+
+feature -- Global Variables
+
+	user : detachable CMS_USER
+
+feature -- HTTP Methods
+
+	do_get (req: WSF_REQUEST; res: WSF_RESPONSE)
+			-- <Precursor>
+		local
+			l_error: NOT_FOUND_ERROR_CMS_RESPONSE
+		do
+			user := Void
+			if attached user_from_request (req) as l_user then
+				user := l_user
+					-- Output the results, similar as in the blog hanlder (but with other queries)
+				Precursor (req, res)
+			else
+					-- Throw a bad request error because the user is not valid
+				create l_error.make (req, res, api)
+				l_error.set_main_content ("<h1>Error</h1>User with id " + user_id_path_parameter (req).out + " doesn't exist!")
+				l_error.execute
+			end
+		end
+
+feature -- Query
+
+	user_valid (req: WSF_REQUEST) : BOOLEAN
+			-- Returns true if a valid user id is given and a user with this id exists,
+			-- otherwise returns false.
+		local
+			user_id: INTEGER_32
+		do
+			user_id := user_id_path_parameter (req)
+
+			if user_id <= 0 then
+					-- Given user id is not valid
+				Result := False
+			else
+					--Check if user with user_id exists
+				Result := api.user_api.user_by_id (user_id) /= Void
+			end
+		end
+
+	user_from_request (req: WSF_REQUEST): detachable CMS_USER
+			-- Eventual user with given id in the path of request `req'.
+		local
+			uid: like user_id_path_parameter
+		do
+			uid := user_id_path_parameter (req)
+			if uid > 0 then
+				Result := api.user_api.user_by_id (uid)
+			else
+					-- Missing or invalid user id.
+			end
+		end
+
+	user_id_path_parameter (req: WSF_REQUEST): INTEGER_32
+			-- User id from path /blogs/{user}.
+			-- Unsigned integer since negative ids are not allowed.
+			-- If no valid id can be read it returns -1
+		do
+			Result := -1
+			if attached {WSF_STRING} req.path_parameter ("user") as l_user_id then
+				if l_user_id.is_integer then
+					Result := l_user_id.integer_value
+				end
+			end
+		end
+
+	posts: LIST [CMS_BLOG]
+			-- Blog posts to display on given page.
+			-- Filters out the posts of the current user.
+		do
+			if attached user as l_user then
+				Result := blog_api.blogs_from_user_order_created_desc_limited (l_user, entries_per_page, entries_per_page * (page_number - 1))
+			else
+				create {ARRAYED_LIST [CMS_BLOG]} Result.make (0)
+			end
+		end
+
+	total_entries : NATURAL_32
+			-- Returns the number of total entries/posts of the current user
+		do
+			if attached user as l_user then
+				Result := blog_api.blogs_count_from_user (l_user).to_natural_32
+			else
+				Result := Precursor
+			end
+		end
+
+feature -- HTML Output
+
+	append_page_title_html_to (a_output: STRING)
+			-- Returns the title of the page as a html string. It shows the current page number and the name of the current user
+		do
+			a_output.append ("<h2>Posts from ")
+			if attached user as l_user then
+				a_output.append (l_user.name)
+			else
+				a_output.append ("unknown user")
+			end
+			if multiple_pages_needed then
+				a_output.append (" (Page " + page_number.out + " of " + pages_count.out + ")")
+					-- Get the posts from the current page (limited by entries per page)
+			end
+			a_output.append ("</h2>")
+		end
+
+	base_path : STRING
+			-- Path to page listing all blogs.
+			-- If user is logged in, include user id
+		do
+			if attached user as l_user then
+				Result := "/blogs/user/" + l_user.id.out
+			else
+				Result := precursor
+			end
+		end
+
+end

examples/demo/modules/blog/handler/cms_blog_handler.e

@@ -0,0 +1,23 @@
+note
+	description: "Deferred request handler related to /blogs/... Has an own blog api."
+	author: "Dario B<>sch <daboesch@student.ethz.ch>"
+	date: "$Date: 2015-05-18 13:49:00 +0100 (lun., 18 mai 2015) $"
+	revision: "$9661667$"
+
+deferred class
+	CMS_BLOG_HANDLER
+
+inherit
+	CMS_MODULE_HANDLER [CMS_BLOG_API]
+		rename
+			module_api as blog_api
+		end
+
+feature -- Access
+
+	entries_per_page: NATURAL_32
+		do
+			Result := blog_api.entries_per_page
+		end
+
+end

examples/demo/modules/blog/persistence/cms_blog_storage_i.e

@@ -0,0 +1,43 @@
+note
+	description: "Interface for accessing blog contents from the database."
+	date: "$Date: 2015-01-27 19:15:02 +0100 (mar., 27 janv. 2015) $"
+	revision: "$Revision: 96542 $"
+
+deferred class
+	CMS_BLOG_STORAGE_I
+
+inherit
+	CMS_NODE_STORAGE_I
+
+feature -- Access
+
+	blogs_count: INTEGER_64
+			-- Count of blog nodes
+		deferred
+		end
+
+	blogs_count_from_user (a_user: CMS_USER) : INTEGER_64
+			-- Number of nodes of type blog from `a_user'.
+		require
+			has_id: a_user.has_id
+		deferred
+		end
+
+	blogs: LIST [CMS_NODE]
+			-- List of nodes ordered by creation date (descending).
+		deferred
+		end
+
+	blogs_limited (limit: NATURAL_32; offset: NATURAL_32): LIST [CMS_NODE]
+			-- List of posts ordered by creation date from offset to offset + limit.
+		deferred
+		end
+
+	blogs_from_user_limited (a_user: CMS_USER; limit: NATURAL_32; offset: NATURAL_32): LIST [CMS_NODE]
+			-- List of posts from `a_user' ordered by creation date from offset to offset + limit.
+		require
+			has_id: a_user.has_id
+		deferred
+		end
+
+end

examples/demo/modules/blog/persistence/cms_blog_storage_null.e

@@ -0,0 +1,47 @@
+note
+	description: "Summary description for {CMS_BLOG_STORAGE_NULL}."
+	author: ""
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	CMS_BLOG_STORAGE_NULL
+
+inherit
+	CMS_NODE_STORAGE_NULL
+
+	CMS_BLOG_STORAGE_I
+
+create
+	make
+
+feature -- Access
+
+	blogs_count: INTEGER_64
+			-- Count of nodes.
+		do
+		end
+
+	blogs_count_from_user (a_user: CMS_USER) : INTEGER_64
+			-- <Precursor>
+		do
+		end
+
+	blogs: LIST [CMS_NODE]
+			-- <Precursor>
+		do
+			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
+		end
+
+	blogs_limited (limit: NATURAL_32; offset: NATURAL_32) : LIST [CMS_NODE]
+			-- <Precursor>
+		do
+			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
+		end
+
+	blogs_from_user_limited (a_user: CMS_USER; limit: NATURAL_32; offset: NATURAL_32): LIST [CMS_NODE]
+			-- <Precursor>
+		do
+			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
+		end
+end

examples/demo/modules/blog/persistence/cms_blog_storage_sql.e

@@ -0,0 +1,140 @@
+note
+	description: "Access to the sql database for the blog module"
+	author: "Dario B<>sch <daboesch@student.ethz.ch>"
+	date: "$Date: 2015-05-21 14:46:00 +0100$"
+	revision: "$Revision: 96616 $"
+
+class
+	CMS_BLOG_STORAGE_SQL
+
+inherit
+	CMS_NODE_STORAGE_SQL
+
+	CMS_BLOG_STORAGE_I
+
+create
+	make
+
+feature -- Access
+
+	blogs_count: INTEGER_64
+			-- <Precursor>
+		do
+			error_handler.reset
+			write_information_log (generator + ".blogs_count")
+			sql_query (sql_select_blog_count, Void)
+			if sql_rows_count = 1 then
+				Result := sql_read_integer_64 (1)
+			end
+		end
+
+	blogs_count_from_user (a_user: CMS_USER) : INTEGER_64
+			-- <Precursor>
+		local
+			l_parameters: STRING_TABLE [detachable ANY]
+		do
+			error_handler.reset
+			write_information_log (generator + ".blogs_count_from_user")
+			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
+				Result := sql_read_integer_64 (1)
+			end
+		end
+
+	blogs: LIST [CMS_NODE]
+			-- <Precursor>
+		do
+			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
+
+			error_handler.reset
+			write_information_log (generator + ".blogs")
+
+			from
+				sql_query (sql_select_blogs_order_created_desc, Void)
+				sql_start
+			until
+				sql_after
+			loop
+				if attached fetch_node as l_node then
+					Result.force (l_node)
+				end
+				sql_forth
+			end
+		end
+
+	blogs_limited (a_limit: NATURAL_32; a_offset: NATURAL_32): LIST [CMS_NODE]
+			-- <Precursor>
+		local
+			l_parameters: STRING_TABLE [detachable ANY]
+		do
+			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
+
+			error_handler.reset
+			write_information_log (generator + ".blogs_limited")
+
+			from
+				create l_parameters.make (2)
+				l_parameters.put (a_limit, "limit")
+				l_parameters.put (a_offset, "offset")
+				sql_query (sql_blogs_limited, l_parameters)
+				sql_start
+			until
+				sql_after
+			loop
+				if attached fetch_node as l_node then
+					Result.force (l_node)
+				end
+				sql_forth
+			end
+		end
+
+	blogs_from_user_limited (a_user: CMS_USER; a_limit: NATURAL_32; a_offset: NATURAL_32): LIST [CMS_NODE]
+			-- <Precursor>
+		local
+			l_parameters: STRING_TABLE [detachable ANY]
+		do
+			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
+
+			error_handler.reset
+			write_information_log (generator + ".blogs_from_user_limited")
+
+			from
+				create l_parameters.make (2)
+				l_parameters.put (a_limit, "limit")
+				l_parameters.put (a_offset, "offset")
+				l_parameters.put (a_user.id, "user")
+				sql_query (sql_blogs_from_user_limited, l_parameters)
+				sql_start
+			until
+				sql_after
+			loop
+				if attached fetch_node as l_node then
+					Result.force (l_node)
+				end
+				sql_forth
+			end
+		end
+
+feature {NONE} -- Queries
+
+	sql_select_blog_count: STRING = "SELECT count(*) FROM Nodes WHERE status != -1 AND type = %"blog%";"
+			-- Nodes count (Published and not Published)
+			--| note: {CMS_NODE_API}.trashed = -1
+
+	sql_select_blog_count_from_user: STRING = "SELECT count(*) FROM Nodes WHERE status != -1 AND type = %"blog%" AND author = :user ;"
+			-- Nodes count (Published and not Published)
+			--| note: {CMS_NODE_API}.trashed = -1
+
+	sql_select_blogs_order_created_desc: STRING = "SELECT * FROM Nodes WHERE status != -1 AND type = %"blog%" ORDER BY created DESC;"
+			-- SQL Query to retrieve all nodes that are from the type "blog" ordered by descending creation date.
+
+	sql_blogs_limited: STRING = "SELECT * FROM Nodes WHERE status != -1 AND type = %"blog%" ORDER BY created DESC LIMIT :limit OFFSET :offset ;"
+			--- SQL Query to retrieve all node of type "blog" limited by limit and starting at offset
+
+	sql_blogs_from_user_limited: STRING = "SELECT * FROM Nodes WHERE status != -1 AND type = %"blog%" AND author = :user ORDER BY created DESC LIMIT :limit OFFSET :offset ;"
+			--- SQL Query to retrieve all node of type "blog" from author with id limited by limit + offset
+
+
+end

examples/demo/modules/demo/cms_demo_module.e

@@ -27,12 +27,15 @@ feature {NONE} -- Initialization
 
 	make
 		do
-			name := "Demo module"
 			version := "1.0"
 			description := "Service to demonstrate and test cms system"
 			package := "demo"
 		end
 
+feature -- Access
+
+	name: STRING = "demo"
+
 feature {CMS_API} -- Module Initialization			
 
 	initialize (api: CMS_API)
@@ -63,13 +66,13 @@ feature {CMS_API} -- Module management
 			if attached {CMS_STORAGE_SQL_I} api.storage as l_sql_storage then
 				if not l_sql_storage.sql_table_exists ("tb_demo") then
 					sql := "[
-CREATE TABLE "tb_demo"(
-  "demo_id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("demo_id">=0),
-  "name" VARCHAR(100) NOT NULL,
-  "value" TEXT
+CREATE TABLE tb_demo(
+  `demo_id` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL CHECK("demo_id">=0),
+  `name` VARCHAR(100) NOT NULL,
+  `value` TEXT
 );
 					]"
-					l_sql_storage.sql_execute_script (sql)
+					l_sql_storage.sql_execute_script (sql, Void)
 					if l_sql_storage.has_error then
 						api.logger.put_error ("Could not initialize database for demo module", generating_type)
 					end
@@ -80,12 +83,11 @@ CREATE TABLE "tb_demo"(
 
 feature -- Access: router
 
-	router (a_api: CMS_API): WSF_ROUTER
-			-- Node router.
+	setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
+			-- <Precursor>
 		do
-			create Result.make (2)
-			map_uri_template_agent (Result, "/demo/", agent handle_demo (?,?,a_api))
-			map_uri_template_agent (Result, "/demo/{id}", agent handle_demo_entry (?,?,a_api))
+			map_uri_template_agent (a_router, "/demo/", agent handle_demo (?,?,a_api), Void)
+			map_uri_template_agent (a_router, "/demo/{id}", agent handle_demo_entry (?,?,a_api), Void)
 		end
 
 feature -- Hooks
@@ -111,9 +113,9 @@ feature -- Hooks
 			if a_block_id.is_case_insensitive_equal_general ("demo-info") then
 				if a_response.request.request_uri.starts_with ("/demo/") then
 					create m.make_with_title (a_block_id, "Demo", 2)
-					create lnk.make ("/demo/abc", a_response.url ("/demo/abc", Void))
+					create lnk.make ("demo: abc", "demo/abc")
 					m.extend (lnk)
-					create lnk.make ("/demo/123", a_response.url ("/demo/123", Void))
+					create lnk.make ("demo: 123", "demo/123")
 					m.extend (lnk)
 					create mb.make (m)
 					a_response.add_block (mb, "sidebar_second")
@@ -126,7 +128,7 @@ feature -- Hooks
 			lnk: CMS_LOCAL_LINK
 --			perms: detachable ARRAYED_LIST [READABLE_STRING_8]
 		do
-			create lnk.make ("Demo", "/demo/")
+			create lnk.make ("Demo", "demo/")
 			a_menu_system.primary_menu.extend (lnk)
 		end
 
@@ -138,49 +140,31 @@ feature -- Handler
 			r: NOT_IMPLEMENTED_ERROR_CMS_RESPONSE
 		do
 			create r.make (req, res, a_api)
-			r.set_main_content ("NODE module does not yet implement %"" + req.path_info + "%" ...")
-			r.add_error_message ("NODE Module: not yet implemented")
+			r.set_main_content ("DEMO module does not yet implement %"" + req.path_info + "%" ...")
+			r.add_error_message ("DEMO Module: not yet implemented")
 			r.execute
 		end
 
 feature -- Mapping helper: uri template
 
-	map_uri_template (a_router: WSF_ROUTER; a_tpl: STRING; h: WSF_URI_TEMPLATE_HANDLER)
-			-- Map `h' as handler for `a_tpl'
-		require
-			a_tpl_attached: a_tpl /= Void
-			h_attached: h /= Void
-		do
-			map_uri_template_with_request_methods (a_router, a_tpl, h, Void)
-		end
-
-	map_uri_template_with_request_methods (a_router: WSF_ROUTER; a_tpl: READABLE_STRING_8; h: WSF_URI_TEMPLATE_HANDLER; rqst_methods: detachable WSF_REQUEST_METHODS)
+	map_uri_template (a_router: WSF_ROUTER; a_tpl: READABLE_STRING_8; h: WSF_URI_TEMPLATE_HANDLER; rqst_methods: detachable WSF_REQUEST_METHODS)
 			-- Map `h' as handler for `a_tpl' for request methods `rqst_methods'.
 		require
 			a_tpl_attached: a_tpl /= Void
 			h_attached: h /= Void
 		do
-			a_router.map_with_request_methods (create {WSF_URI_TEMPLATE_MAPPING}.make (a_tpl, h), rqst_methods)
+			a_router.map (create {WSF_URI_TEMPLATE_MAPPING}.make (a_tpl, h), rqst_methods)
 		end
 
 feature -- Mapping helper: uri template agent
 
-	map_uri_template_agent (a_router: WSF_ROUTER; a_tpl: READABLE_STRING_8; proc: PROCEDURE [ANY, TUPLE [req: WSF_REQUEST; res: WSF_RESPONSE]])
-			-- Map `proc' as handler for `a_tpl'
-		require
-			a_tpl_attached: a_tpl /= Void
-			proc_attached: proc /= Void
-		do
-			map_uri_template_agent_with_request_methods (a_router, a_tpl, proc, Void)
-		end
-
-	map_uri_template_agent_with_request_methods (a_router: WSF_ROUTER; a_tpl: READABLE_STRING_8; proc: PROCEDURE [ANY, TUPLE [req: WSF_REQUEST; res: WSF_RESPONSE]]; rqst_methods: detachable WSF_REQUEST_METHODS)
+	map_uri_template_agent (a_router: WSF_ROUTER; a_tpl: READABLE_STRING_8; proc: PROCEDURE [ANY, TUPLE [req: WSF_REQUEST; res: WSF_RESPONSE]]; rqst_methods: detachable WSF_REQUEST_METHODS)
 			-- Map `proc' as handler for `a_tpl' for request methods `rqst_methods'.
 		require
 			a_tpl_attached: a_tpl /= Void
 			proc_attached: proc /= Void
 		do
-			map_uri_template_with_request_methods (a_router, a_tpl, create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (proc), rqst_methods)
+			map_uri_template (a_router, a_tpl, create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (proc), rqst_methods)
 		end
 
 end

examples/demo/site/config/cms.ini

@@ -1,11 +1,14 @@
 [layout]
 root-dir=site/www
-themes-dir=site/themes
+#themes-dir=site/themes
+#modules-dir=site/modules
 
 [site]
 name=Eiffel CMS
 email=your@email.com
 theme=bootstrap
 
-[misc]
-smtp=localhost
+[mailer]
+smtp=localhost:25
+#sendmail=/usr/bin/sendmail
+#output=@stderr

examples/demo/site/config/demo.json

@@ -1,15 +1,18 @@
 {
 	"database": {
 		"datasource": {
-			"driver": "sqlite",
-			"environment": "sqlite"
+			"driver": "odbc",
+			"environment": "odbc-sqlite"
 		},
 		"environments": {
-			"sqlite": {
+			"odbc-sqlite": {
 				"connection_string":"Driver=SQLite3 ODBC Driver;Database=./site/database.sqlite;LongNames=0;Timeout=1000;NoTXN=0;SyncPragma=NORMAL;StepAPI=0;"
 			},
-			"test": {
-                "connection_string":"Server=localhost;Port=3306;Database=cms_dev;Uid=root;Pwd=;"
+			"odbc-mysql": {
+				"connection_string":"Driver=mysql ODBC Driver;Server=localhost;Port=3306;Database=roc;Uid=roc;Pwd=roc;"
+			},
+			"mysql": {
+				"connection_string":"Driver=mysql;Server=localhost;Port=3306;Database=roc;Uid=roc;Pwd=roc;"
 			},
 			"development": {
 				"connection_string":"Server=localhost;Port=3306;Database=cms_dev;Uid=root;Pwd=;"
@@ -23,7 +26,8 @@
 		"server": "localhost"
 		},
 	"logger": { 
-			"level":"debug",
+			"level":"error",
+			"type":"stderr",
 			"backup_count":"4"
 		},
 	"server": { 

examples/demo/site/modules/auth/auth.json

@@ -0,0 +1,8 @@
+{
+	"email": "webmaster@example.com",
+	"subjet_register": "Thank you for regitering with us, activate account",
+	"subjet_activate": "New account ativation token",
+	"subjet_password": "Password Recovery!!!",
+	"subjet_oauth": "Welcome",
+	"smtp": "127.0.0.1"
+}

examples/demo/site/modules/auth/mail_templates/account_activation.html

@@ -0,0 +1,18 @@
+<!doctype html>
+<html lang="en">
+	<head>
+	  <meta charset="utf-8">
+	  <title>Activation</title>
+	  <meta name="description" content="Activation">
+	  <meta name="author" content="ROC CMS">
+	</head>
+
+	<body>
+		<p>Thank you for registering at <a href="$host">ROC CMS</a></p>
+
+		<p>To complete your registration, please click on this link to activate your account:<p>
+
+		<p><a href="$link">$link</a></p>
+		<p>Thank you for joining us.</p>
+	</body>
+</html>

examples/demo/site/modules/auth/mail_templates/account_new_password.html

@@ -0,0 +1,17 @@
+<!doctype html>
+<html lang="en">
+	<head>
+	  <meta charset="utf-8">
+	  <title>New Password</title>
+	  <meta name="description" content="New Password">
+	  <meta name="author" content="ROC CMS">
+	</head>
+
+	<body>
+		<p>You have required a new password at <a href="...">ROC CMS</a></p>
+
+		<p>To complete your request, please click on this link to genereate a new password:<p>
+
+		<p><a href="$link">$link</a></p>
+	</body>
+</html>

examples/demo/site/modules/auth/mail_templates/account_re_activation.html

@@ -0,0 +1,18 @@
+<!doctype html>
+<html lang="en">
+	<head>
+	  <meta charset="utf-8">
+	  <title>New Activation</title>
+	  <meta name="description" content="New Activation token">
+	  <meta name="author" content="ROC CMS">
+	</head>
+
+	<body>
+		<p>You have request a new activation token at<a href="...">ROC CMS</a></p>
+
+		<p>To complete your registration, please click on this link to activate your account:<p>
+
+		<p><a href="$link">$link</a></p>
+		<p>Thank you for joining us.</p>
+	</body>
+</html>

examples/demo/site/modules/auth/mail_templates/account_welcome.html

@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+	<head>
+	  <meta charset="utf-8">
+	  <title>Welcome</title>
+	  <meta name="description" content="Welcome">
+	  <meta name="author" content="ROC CMS">
+	</head>
+	<body>
+		<p>Welcome to<a href="...">ROC CMS</a></p>
+		<p>Thank you for joining us.</p>
+	</body>
+</html>

examples/demo/site/modules/auth/oauth2_gmail.json

@@ -0,0 +1,7 @@
+{
+	"api_secret":"ADD_YOUR_SECRET_KEY",
+	"api_key":"ADD_YOUR_PUBLIC_KEY",
+	"scope": "email",
+	"api_revoke":"https://accounts.google.com/o/oauth2/revoke?token=$ACCESS_TOKEN",	
+	"protected_resource_url":"https://www.googleapis.com/plus/v1/people/me"
+}

examples/demo/site/modules/auth/templates/block_login.tpl

@@ -0,0 +1,34 @@
+ 	<div class="primary-tabs">
+ 		{unless isset="$user"}
+			<h3>Login or <a href="{$site_url/}account/roc-register">Register</a></h3>
+		<div>
+			<div>	
+			    <form action method="POST">
+					<div>
+						<input type="text" name="username" required>
+						<label>Username</label>
+					</div>
+										
+					<div>
+						<input  type="password" name="password" required>
+						<label>Password</label>
+					</div>
+        
+					<button type="button" onclick="ROC_AUTH.login();">Login</button>
+				</form>
+			</div>
+    	</div>
+		<div>
+			<div>
+				<p>
+					<a href="{$site_url/}account/new-password">Forgot password?</a>
+				</p>
+			</div>
+		</div>	
+		<div>
+			{foreach item="item" from="$oauth_consumers"}
+				<a href="{$site_url/}account/login-with-oauth/{$item/}">Login with {$item/}</a><br>
+			{/foreach}	
+		</div>    	
+		{/unless}
+	</div>

examples/demo/site/modules/auth/templates/block_new_password.tpl

@@ -0,0 +1,16 @@
+ <div>
+    <form action="/account/new-password" method="post">
+        <fieldset>
+            <legend>Require new password</legend>
+            <div>
+                <input type="email" id="email" name="email"  value="{$email/}"  required/>
+                <label for="email">Email</label>
+                {if isset="$error_email"}
+                    <span><i>{$error_email/}</i></span> <br>
+                {/if}
+                <br>
+            </div>
+            <button type="submit">Send</button>
+        </fieldset>    
+    </form>
+</div>

examples/demo/site/modules/auth/templates/block_post_password.tpl

@@ -0,0 +1,3 @@
+<div>
+    <p>We have send you a new token code, check your email to generate a new password</p>
+</div>

examples/demo/site/modules/auth/templates/block_post_reactivate.tpl

@@ -0,0 +1,3 @@
+<div>
+    <p>We have send you a new activation code, check your email to activate your account.</p>
+</div>

examples/demo/site/modules/auth/templates/block_post_register.tpl

@@ -0,0 +1,3 @@
+<div>
+    <p>Thanks for register, check your email to activate your account.</p>
+</div>

examples/demo/site/modules/auth/templates/block_post_reset.tpl

@@ -0,0 +1,3 @@
+<div>
+    <p>You new password has been saved!</p>
+</div>

examples/demo/site/modules/auth/templates/block_reactivate.tpl

@@ -0,0 +1,19 @@
+ <div>
+    <form action="/account/reactivate" method="post">
+        <fieldset>
+            <legend>Reactivate Form</legend>
+            <div>
+                <input type="email" id="email" name="email"  value="{$email/}"  required/>
+                <label for="email">Email</label>
+                {if isset="$error_email"}
+                    <span><i>{$error_email/}</i></span> <br>
+                {/if}
+                <br>
+                {if isset="$is_active"}
+                    <span><i>{$is_active/}</i></span> <br>
+                {/if}
+            </div>
+            <button type="submit">Reactivate</button>
+        </fieldset>    
+    </form>
+</div>

examples/demo/site/modules/auth/templates/block_register.tpl

@@ -0,0 +1,28 @@
+ <div>
+    <form action="/account/roc-register" method="post">
+        <fieldset>
+            <legend>Register Form</legend>
+            <div>
+                <input type="text" id="name" name="name"  value="{$name/}" required  autofocus />
+                <label for="name">Name</label>
+                {if isset="$error_name"}
+                    <span><i>{$error_name/}</i></span> <br>
+                {/if}
+            </div>
+            <div>
+                <input type="password" id="password" name="password" value="" required/>
+                <label for="password">Password</label>
+            </div>
+            <div>
+                <input type="email" id="email" name="email"  value="{$email/}"  required/>
+                <label for="email">Email</label>
+                {if isset="$error_email"}
+                    <span><i>{$error_email/}</i></span> <br>
+                {/if}
+            </div>
+            
+            
+            <button type="submit">Register</button>
+        </fieldset>    
+    </form>
+</div>

examples/demo/site/modules/auth/templates/block_reset_password.tpl

@@ -0,0 +1,28 @@
+ <div>
+    <form action="/account/reset-password" method="post">
+        <fieldset>
+            <legend>Generate New Password Form</legend>
+            <div>
+                <input type="text" id="token" name="token"  value="{$token/}" required />
+                <label for="token">Token</label>
+                {if isset="$error_token"}
+                    <span><i>{$error_token/}</i></span> <br>
+                {/if}
+            </div>
+            <div>
+                <input type="password" id="password" name="password" value="" required/>
+                <label for="password">Password</label>
+            </div>
+            <div>
+                <input type="password" id="confirm_password" name="confirm_password" value="" required/>
+                <label for="password">Confirm Password</label>
+            </div>
+            
+            <button type="submit">Confirm</button>
+            {if isset="$error_password"}
+              <span><i>{$error_password/}</i></span> <br>
+            {/if}
+ 
+        </fieldset>    
+    </form>
+</div>

examples/demo/site/modules/node/scripts/node.sql

@@ -0,0 +1,22 @@
+
+CREATE TABLE nodes (
+	`nid`	INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT UNIQUE,
+	`revision`	INTEGER,
+	`type`	TEXT NOT NULL,
+	`title`	VARCHAR(255) NOT NULL,
+	`summary`	TEXT,
+	`content`	TEXT,
+	`format`	VARCHAR(128),
+	`author`	INTEGER,
+	`publish`	DATETIME,
+	`created`	DATETIME NOT NULL,
+	`changed`	DATETIME NOT NULL,
+	`status`	INTEGER
+);
+
+CREATE TABLE page_nodes(
+  `nid` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `revision` INTEGER,
+  `parent` INTEGER
+);
+

examples/demo/site/modules/oauth20/scripts/oauth2_consumers.sql

@@ -0,0 +1,18 @@
+
+CREATE TABLE oauth2_consumers(
+   `cid` INTEGER PRIMARY KEY NOT NULL CHECK(`cid`>=0),
+   `name` VARCHAR(255) NOT NULL,
+   `api_secret` TEXT  NOT NULL,
+   `api_key` TEXT NOT NULL,
+   `scope` VARCHAR (100) NOT NULL,
+   `protected_resource_url` VARCHAR (255) NOT NULL,
+   `callback_name` VARCHAR(255) NOT NULL,
+   `extractor` VARCHAR(50) NOT NULL,
+   `authorize_url` VARCHAR (255) NOT NULL,
+   `endpoint`  VARCHAR (255) NOT NULL,
+   CONSTRAINT `cid`
+    UNIQUE(`cid`),
+   CONSTRAINT `name`
+    UNIQUE(`name`)
+   );
+

examples/demo/site/modules/oauth20/scripts/oauth2_consumers_initialize.sql

@@ -0,0 +1,7 @@
+	-- Change the values TO_COMPLETE based on your API.
+	-- API SECTET KEY AND API PUBLIC KEY 
+INSERT INTO oauth2_consumers (name, api_secret, api_key, scope, protected_resource_url, callback_name, extractor, authorize_url, endpoint) 
+VALUES ('google', 'TO-COMPLETE', 'TO-COMPLETE', 'email', 'https://www.googleapis.com/plus/v1/people/me', 'callback_google', 'json','https://accounts.google.com/o/oauth2/auth?response_type=code&client_id=$CLIENT_ID&redirect_uri=$REDIRECT_URI','https://accounts.google.com/o/oauth2/token');
+
+INSERT INTO oauth2_consumers (name, api_secret, api_key, scope, protected_resource_url, callback_name, extractor, authorize_url, endpoint ) 
+VALUES ('facebook', 'TO-COMPLETE', 'TO-COMPLETE', 'email', 'https://graph.facebook.com/me', 'callback_facebook','text','https://www.facebook.com/dialog/oauth?response_type=code&client_id=$CLIENT_ID&redirect_uri=$REDIRECT_URI','https://graph.facebook.com/oauth/access_token');

examples/demo/site/modules/oauth20/scripts/oauth2_table.sql.tpl

@@ -0,0 +1,10 @@
+
+CREATE TABLE $table_name (
+   `uid` INTEGER PRIMARY KEY NOT NULL CHECK(`uid`>=0),
+   `access_token` TEXT  NOT NULL,
+   `created` DATETIME NOT NULL,
+   `details` TEXT NOT NULL,
+   CONSTRAINT `uid`
+    UNIQUE(`uid`)
+   );
+

examples/demo/site/modules/oauth20/templates/block_login.tpl

@@ -0,0 +1,7 @@
+ 	<div class="primary-tabs">
+ 		<div>
+			{foreach item="item" from="$oauth_consumers"}
+				<a href="{$site_url/}account/login-with-oauth/{$item/}">Login with {$item/}</a><br>
+			{/foreach}	
+		</div>    	
+	</div>

examples/demo/site/scripts/core.sql

@@ -1,51 +1,23 @@
-BEGIN;
-
-CREATE TABLE "users"(
-  "uid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("uid">=0),
-  "name" VARCHAR(100) NOT NULL,
-  "password" VARCHAR(100) NOT NULL,
-  "salt" VARCHAR(100) NOT NULL,
-  "email" VARCHAR(250) NOT NULL,
-  "status" INTEGER,
-  "created" DATETIME NOT NULL,
-  "signed" DATETIME,
-  CONSTRAINT "name"
-    UNIQUE("name")
+CREATE TABLE `logs`(
+  `id` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `category` VARCHAR(255) NOT NULL,
+  `level` INTEGER NOT NULL,
+  `uid` INTEGER,
+  `message` TEXT NOT NULL,
+  `info` TEXT,
+  `link` TEXT,
+  `date` DATETIME NOT NULL
 );
 
-CREATE TABLE "roles"(
-  "rid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("rid">=0),
-  "name" VARCHAR(100) NOT NULL,
-  CONSTRAINT "name"
-    UNIQUE("name")
+CREATE TABLE `custom_values`(
+  `type` VARCHAR(255) NOT NULL,
+  `name` VARCHAR(255) NOT NULL,
+  `value` TEXT
 );
 
-CREATE TABLE "users_roles"(
-  "uid" INTEGER NOT NULL CHECK("uid">=0),
-  "rid" INTEGER NOT NULL CHECK("rid">=0)
+CREATE TABLE `path_aliases`(
+  `pid` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `source` VARCHAR(255) NOT NULL,
+  `alias` VARCHAR(255) NOT NULL,
+  `lang` VARCHAR(12)
 );
-
-CREATE TABLE "role_permissions"(
-  "rid" INTEGER NOT NULL CHECK("rid">=0),
-  "permission" VARCHAR(255) NOT NULL,
-  "module" VARCHAR(255)
-);
-
-CREATE TABLE "logs"(
-  "id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("id">=0),
-  "category" VARCHAR(255) NOT NULL,
-  "level" INTEGER NOT NULL CHECK("level">=1),
-  "uid" INTEGER,
-  "message" TEXT NOT NULL,
-  "info" TEXT,
-  "link" TEXT,
-  "date" DATETIME NOT NULL
-);
-
-CREATE TABLE "custom_values"(
-  "type" VARCHAR(255) NOT NULL,
-  "name" VARCHAR(255) NOT NULL,
-  "value" VARCHAR(255) NOT NULL
-);
-
-COMMIT;

examples/demo/site/scripts/node.sql

@@ -1,23 +0,0 @@
-BEGIN;
-
-CREATE TABLE "nodes"(
-  "nid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("nid">=0),
-  "revision" INTEGER,
-  "type" TEXT NOT NULL,
-  "title" VARCHAR(255) NOT NULL,
-  "summary" TEXT,
-  "content" MEDIUMTEXT NOT NULL,
-  "format" VARCHAR(255),
-  "author" INTEGER,
-  "publish" DATETIME,
-  "created" DATETIME NOT NULL,
-  "changed" DATETIME NOT NULL
-);
-
-CREATE TABLE page_nodes(
-  "nid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("nid">=0),
-  "revision" INTEGER,
-  "parent" INTEGER
-);
-
-COMMIT;

examples/demo/site/scripts/user.sql

@@ -0,0 +1,48 @@
+
+CREATE TABLE `users`(
+  `uid` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `name` VARCHAR(100) NOT NULL,
+  `password` VARCHAR(100) NOT NULL,
+  `salt` VARCHAR(100) NOT NULL,
+  `email` VARCHAR(250) NOT NULL,
+  `status` INTEGER,
+  `created` DATETIME NOT NULL,
+  `signed` DATETIME,
+  CONSTRAINT `name`
+    UNIQUE(`name`)
+);
+
+CREATE TABLE `roles`(
+  `rid` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `name` VARCHAR(100) NOT NULL,
+  CONSTRAINT `name`
+    UNIQUE(`name`)
+);
+
+CREATE TABLE `users_roles`(
+  `uid` INTEGER NOT NULL CHECK(`uid`>=0),
+  `rid` INTEGER NOT NULL CHECK(`rid`>=0)
+);
+
+CREATE TABLE `role_permissions`(
+  `rid` INTEGER NOT NULL,
+  `permission` VARCHAR(255) NOT NULL,
+  `module` VARCHAR(255)
+);
+
+CREATE TABLE `users_activations` (
+  `aid` INTEGER  PRIMARY KEY AUTO_INCREMENT NOT NULL CHECK (`aid` >= 0),
+  `token` VARCHAR(255) NOT NULL,
+  `uid` INTEGER NOT NULL CHECK (`uid` >= 0),
+  `created` DATETIME NOT NULL,
+  CONSTRAINT `token` UNIQUE  (`token`)
+);
+
+CREATE TABLE `users_password_recovery` (
+  `aid` INTEGER  PRIMARY KEY AUTO_INCREMENT NOT NULL CHECK (`aid` >= 0),
+  `token` VARCHAR(255) NOT NULL,
+  `uid` INTEGER NOT NULL CHECK (`uid` >= 0),
+  `created` DATETIME NOT NULL,
+  CONSTRAINT `token` UNIQUE  (`token`)
+);
+

examples/demo/site/themes/bootstrap/assets/css/blog.css

@@ -0,0 +1,25 @@
+ul.cms_blog_nodes {
+  padding: 0;
+  margin: 0;
+}
+ul.cms_blog_nodes li.cms_type_blog {
+  list-style: none;
+  display: block;
+  margin-top: 20px;
+  padding-bottom: 20px;
+  border-bottom: 1px dotted black;
+}
+ul.cms_blog_nodes li.cms_type_blog .blog_title a {
+  color: black;
+  font-size: 18px;
+  text-decoration: none;
+  display: block;
+  margin: 6px 0;
+}
+ul.cms_blog_nodes li.cms_type_blog .blog_title a:hover {
+  color: #999;
+}
+ul.cms_blog_nodes li.cms_type_blog .blog_list_summary a {
+  margin-top: 20px;
+  display: block;
+}

examples/demo/site/themes/bootstrap/assets/css/node.css

@@ -3,13 +3,15 @@ ul.cms-nodes {
   padding: 3px 3px 3px 3px;
   border: solid 1px #ccc;
 }
-
-li.cms_type_page {
+ul.cms-nodes li {
   border-top: dotted 1px #ccc;
 }
-li.cms_type_page a::before {
-  content: "[page] ";
-}
-li.cms_type_page:first-child {
+ul.cms-nodes li:first-child {
   border-top: none;
 }
+ul.cms-nodes li.cms_type_page a::before {
+  content: "[page] ";
+}
+ul.cms-nodes li.cms_type_blog a::before {
+  content: "[blog] ";
+}

examples/demo/site/themes/bootstrap/assets/js/roc_auth.js

@@ -1,7 +1,8 @@
 var ROC_AUTH = ROC_AUTH || { };
 
-var loginURL = "/login";
-var logoutURL = "/logoff";
+var loginURL = "/basic_auth_login";
+var logoutURL = "/basic_auth_logoff";
+
 var userAgent = navigator.userAgent.toLowerCase();
 var firstLogIn = true;
  
@@ -305,3 +306,16 @@ ROC_AUTH.create_form = function() {
 };
 
 
+var password = document.getElementById("password")
+  , confirm_password = document.getElementById("confirm_password");
+
+ROC_AUTH.validatePassword =function(){
+  if(password.value != confirm_password.value) {
+    confirm_password.setCustomValidity("Passwords Don't Match");
+  } else {
+    confirm_password.setCustomValidity('');
+  }
+}
+
+password.onchange = ROC_AUTH.validatePassword();
+confirm_password.onkeyup = ROC_AUTH.validatePassword;

examples/demo/site/themes/bootstrap/assets/scss/blog.scss

@@ -0,0 +1,30 @@
+ul.cms_blog_nodes{
+
+	padding:0;
+	margin:0;
+
+	li.cms_type_blog{
+		list-style: none;
+		display: block;
+		margin-top:20px;
+		padding-bottom:20px;
+		border-bottom:1px dotted black;
+
+		.blog_title a{
+			color:black;
+			font-size:18px;
+			text-decoration: none;
+			display:block;
+			margin:6px 0;
+
+			&:hover{
+				color:#999;
+			}
+		}
+
+		.blog_list_summary a{
+			margin-top:20px;
+			display:block;
+		}
+	}
+}

examples/demo/site/themes/bootstrap/assets/scss/node.scss

@@ -1,14 +1,24 @@
 ul.cms-nodes {
+	
 	list-style-type: none;
 	padding: 3px 3px 3px 3px;
 	border: solid 1px #ccc;
-}
-li.cms_type_page {
-	a::before {
+
+	li{
+		border-top: dotted 1px #ccc;
+		&:first-child {
+			border-top: none;
+		}
+	}
+
+	li.cms_type_page a::before {
 		content: "[page] ";
 	}
-	border-top: dotted 1px #ccc;
-	&:first-child {
-		border-top: none;
+
+	li.cms_type_blog a::before {
+		content: "[blog] ";
 	}
+
+
 }
+

examples/demo/site/themes/bootstrap/page.tpl

@@ -4,10 +4,14 @@
   <meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<!-- EWF CMS -->
-	<link rel="stylesheet" href="{$site_url/}/theme/css/style.css">
-	<link rel="stylesheet" href="{$site_url/}/theme/css/node.css">
-  <script src="{$site_url/}/theme/js/jquery-1.10.2.min.js"></script>
-  <script src="{$site_url/}/theme/js/roc_auth.js"></script>
+	<link rel="stylesheet" href="{$site_url/}theme/css/style.css">
+	<link rel="stylesheet" href="{$site_url/}theme/css/node.css">
+
+	<!-- CMS Blog Module -->
+	<link rel="stylesheet" href="{$site_url/}theme/css/blog.css">
+
+	<script src="{$site_url/}theme/js/jquery-1.10.2.min.js"></script>
+	<script src="{$site_url/}theme/js/roc_auth.js"></script>
 
 	<!-- bootstrap framework -->
 	<!-- Latest compiled and minified CSS -->
@@ -57,7 +61,7 @@
           <!-- Main Content Section -->
 		  {unless isempty="$page_title"}<h1 class="page-title">{$page_title/}</h1>{/unless}
           {$page.region_content/}   
-        </div>
+          </div>
 
 
       </div>

examples/demo/src/ewf_roc_server.e

@@ -16,11 +16,6 @@ inherit
 			initialize
 		end
 
-	WSF_SERVICE
-		redefine
-			execute
-		end
-
 	REFACTORING_HELPER
 
 	SHARED_EXECUTION_ENVIRONMENT
@@ -40,37 +35,26 @@ feature {NONE} -- Initialization
 
 	initialize
 			-- Initialize current service.
+		local
+			env: CMS_ENVIRONMENT
 		do
-				-- Launcher
 			Precursor
 			create {WSF_SERVICE_LAUNCHER_OPTIONS_FROM_INI} service_options.make_from_file ("demo.ini")
-
-				-- CMS
-			initialize_cms
-		end
-
-feature -- Service
-
-	cms_service: CMS_SERVICE
-			-- cms service.
-
-	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
-		do
-			cms_service.execute (req, res)
+			create env.make_default
+			initialize_logger (env)
 		end
 
 feature {NONE} -- Launch operation
 
-	launcher: APPLICATION_LAUNCHER
+	launcher: APPLICATION_LAUNCHER [EWF_ROC_SERVER_EXECUTION]
 
-	launch (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+	launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
 		local
 			l_retry: BOOLEAN
 			l_message: STRING
 		do
 			if not l_retry then
-				write_debug_log (generator + ".launch")
-				launcher.launch (a_service, opts)
+				launcher.launch (opts)
 			else
 					-- error hanling.
 				create l_message.make (1024)
@@ -89,77 +73,12 @@ feature {NONE} -- Launch operation
 					l_message.append ("The application crash without available information")
 					l_message.append ("%N%N")
 				end
-					-- notify shutdown
-				write_debug_log (generator + ".launch shutdown")
+				-- send email shutdown
 			end
 		rescue
 			l_retry :=  True
 			retry
 		end
 
-feature -- CMS Initialization
-
-	initialize_cms
-		local
-			l_setup: CMS_DEFAULT_SETUP
-			utf: UTF_CONVERTER
-			cms_env: CMS_ENVIRONMENT
-		do
-				-- Application Environment initialization
-			if attached execution_environment.arguments.separate_character_option_value ('d') as l_dir then
-				create cms_env.make_with_directory_name (l_dir)
-			else
-				create cms_env.make_default
-			end
-			initialize_logger (cms_env)
-
-				-- CMS Setup
-			write_debug_log (generator + ".initialize_cms / SETUP based directory=%"" + utf.escaped_utf_32_string_to_utf_8_string_8 (cms_env.path.name) + "%"")
-			create l_setup.make (cms_env)
-
-				-- CMS
-			write_debug_log (generator + ".initialize_cms / CMS")
-			setup_storage (l_setup)
-			setup_modules (l_setup)
-			create cms_service.make (l_setup)
-		end
-
-feature -- CMS setup
-
-	setup_modules (a_setup: CMS_SETUP)
-			-- Setup additional modules.
-		local
-			m: CMS_MODULE
-		do
-			create {NODE_MODULE} m.make (a_setup)
-			m.enable
-			a_setup.register_module (m)
-
-			create {BASIC_AUTH_MODULE} m.make
-			if not a_setup.module_with_same_type_registered (m) then
-				m.enable
-				a_setup.register_module (m)
-			end
-
-			create {CMS_DEBUG_MODULE} m.make
-			m.enable
-			a_setup.register_module (m)
-
-			create {CMS_DEMO_MODULE} m.make
-			m.enable
-			a_setup.register_module (m)
-
-			create {CMS_BLOG_MODULE} m.make
-			m.enable
-			a_setup.register_module (m)
-		end
-
-	setup_storage (a_setup: CMS_SETUP)
-			-- Setup storage by declaring storage builder.
-		do
---			a_setup.storage_drivers.force (create {CMS_STORAGE_MYSQL_BUILDER}.make, "mysql")
-			a_setup.storage_drivers.force (create {CMS_STORAGE_SQLITE_BUILDER}.make, "sqlite")
-		end
-
 end
 

examples/demo/src/ewf_roc_server_execution.e

@@ -0,0 +1,89 @@
+note
+	description: "Summary description for {EWF_ROC_SERVER_EXECUTION}."
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	EWF_ROC_SERVER_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
+			l_env: CMS_ENVIRONMENT
+		do
+			if attached execution_environment.arguments.separate_character_option_value ('d') as l_dir then
+				create l_env.make_with_directory_name (l_dir)
+			else
+				create l_env.make_default
+			end
+			create Result.make (l_env)
+		end
+
+feature -- CMS setup
+
+	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_STORE_MYSQL_BUILDER}.make, "mysql")
+			a_setup.storage_drivers.force (create {CMS_STORAGE_STORE_ODBC_BUILDER}.make, "odbc")
+		end
+
+	setup_modules (a_setup: CMS_SETUP)
+			-- Setup additional modules.
+		local
+			m: CMS_MODULE
+		do
+			create {NODE_MODULE} m.make (a_setup)
+			m.enable
+			a_setup.register_module (m)
+
+			create {CMS_AUTHENTICATION_MODULE} m.make
+			m.enable
+			a_setup.register_module (m)
+
+			create {BASIC_AUTH_MODULE} m.make
+			if not a_setup.module_with_same_type_registered (m) then
+				m.enable
+				a_setup.register_module (m)
+			end
+
+			create {CMS_OAUTH_20_MODULE} m.make
+			m.enable
+			a_setup.register_module (m)
+
+			create {CMS_DEBUG_MODULE} m.make
+			m.enable
+			a_setup.register_module (m)
+
+			create {CMS_DEMO_MODULE} m.make
+			m.enable
+			a_setup.register_module (m)
+
+			create {CMS_BLOG_MODULE} m.make
+			m.enable
+			a_setup.register_module (m)
+		end
+
+end

library/app_env/src/application_environment.e

@@ -109,7 +109,7 @@ feature -- Access: internal
 		do
 			p := internal_application_config_path
 			if p = Void then
-				p := config_path.extended ("application_configuration.json")
+				p := config_path.extended (name + ".json")
 				internal_application_config_path := p
 			end
 			Result := p

library/app_env/src/configuration/logger_configuration.e

@@ -30,6 +30,7 @@ feature -- Initialization
 			backup_count := 4
 			level := Log_debug
 			location := Void
+			type := {STRING_32} "null"
 		ensure then
 			backup_count_set: backup_count = 4
 			level_set: level = Log_debug
@@ -48,6 +49,9 @@ feature -- Access
 	level: INTEGER
 			-- Logger level.
 
+	type: IMMUTABLE_STRING_32
+			-- Type of logging.
+
 feature -- Element Change
 
 	set_location (a_location: detachable PATH)
@@ -65,6 +69,15 @@ feature -- Element Change
 			set_location (create {PATH}.make_from_string (a_location))
 		end
 
+	set_type_with_string (a_type: detachable READABLE_STRING_GENERAL)
+		do
+			if a_type /= Void and then not a_type.is_whitespace then
+				create type.make_from_string_general (a_type)
+			else
+				create type.make_from_string_general ("null")
+			end
+		end
+
 	set_backup_count (a_backup: NATURAL)
 			-- Set backup_count to `a_backup'.
 		do

library/app_env/src/logger/logger.e

@@ -32,7 +32,7 @@ feature {NONE} -- Initialization
 			create log.make
 		end
 
-	make_with_environment (app: APPLICATION_ENVIRONMENT)
+	make_with_environment (app: separate APPLICATION_ENVIRONMENT)
 			-- Initialize a logger object with an application environment `app'.
 		do
 			make
@@ -49,7 +49,7 @@ feature {NONE} -- Initialization
 
 feature -- Change
 
-	apply_environment (app: APPLICATION_ENVIRONMENT)
+	apply_environment (app: separate APPLICATION_ENVIRONMENT)
 		do
 			initialize_logger (app, log)
 		end
@@ -58,75 +58,107 @@ feature {NONE} -- Internal
 
 	log: LOGGING_FACILITY
 
+feature -- Settings
+
+	level: INTEGER
+
 feature -- Logging
 
+	put_debug (a_message: separate READABLE_STRING_8)
+			-- Put message `a_message' to the log at debug level.
+		do
+			if level >= log_debug then
+				log.write_debug (create {STRING}.make_from_separate (a_message))
+			end
+		end
+
 	put_information (a_message: separate READABLE_STRING_8)
 			-- Put message `a_message' to the log at information level.
 		do
-			log.write_information (create {STRING}.make_from_separate (a_message))
-		end
-
-	put_error (a_message: separate READABLE_STRING_8)
-			-- Put message `a_message' to the log at error level.
-		do
-			log.write_error (create {STRING}.make_from_separate (a_message))
+			if level >= log_information  then
+				log.write_information (create {STRING}.make_from_separate (a_message))
+			end
 		end
 
 	put_warning (a_message: separate READABLE_STRING_8)
 			-- Put message `a_message' to the log at warning level.
 		do
-			log.write_warning (create {STRING}.make_from_separate (a_message))
+			if level >= log_warning then
+				log.write_warning (create {STRING}.make_from_separate (a_message))
+			end
+		end
+
+	put_error (a_message: separate READABLE_STRING_8)
+			-- Put message `a_message' to the log at error level.
+		do
+			if level >= log_error then
+				log.write_error (create {STRING}.make_from_separate (a_message))
+			end
 		end
 
 	put_critical (a_message: separate READABLE_STRING_8)
 			-- Put message `a_message' to the log at critical level.
 		do
-			log.write_critical (create {STRING}.make_from_separate (a_message))
+			if level >= log_critical then
+				log.write_critical (create {STRING}.make_from_separate (a_message))
+			end
 		end
 
 	put_alert (a_message: separate READABLE_STRING_8)
 			-- Put message `a_message' to the log at alert level.
 		do
-			log.write_alert (create {STRING}.make_from_separate (a_message))
-		end
-
-	put_debug (a_message: separate READABLE_STRING_8)
-			-- Put message `a_message' to the log at debug level.
-		do
-			log.write_debug (create {STRING}.make_from_separate (a_message))
+			if level >= log_alert then
+				log.write_alert (create {STRING}.make_from_separate (a_message))
+			end
 		end
 
 feature {NONE} -- Implementation
 
-	initialize_logger (app: APPLICATION_ENVIRONMENT; a_log: like log)
+	initialize_logger (app: separate APPLICATION_ENVIRONMENT; a_log: like log)
 		local
 			l_log_writer_file: LOG_ROLLING_WRITER_FILE
-			l_log_writer: LOG_WRITER
+			l_log_writer: detachable LOG_WRITER
 			l_logs_path: detachable PATH
 			l_logger_config: LOGGER_CONFIGURATION
 			ut: FILE_UTILITIES
+			p: PATH
+			l_name: IMMUTABLE_STRING_32
 		do
-			l_logger_config := new_logger_level_configuration (app.application_config_path)
-			l_logs_path := l_logger_config.location
-			if l_logs_path = Void then
-				l_logs_path := app.logs_path
+			create l_name.make_from_separate (app.name)
+			create p.make_from_separate (app.application_config_path)
+--			l_name := app.name
+--			p := app.application_config_path
+
+			l_logger_config := new_logger_level_configuration (p)
+			if l_logger_config.type.is_case_insensitive_equal_general ("file") then
+				l_logs_path := l_logger_config.location
+				if l_logs_path = Void then
+					create  l_logs_path.make_from_separate (app.logs_path)
+				end
+				if ut.directory_path_exists (l_logs_path) then
+					create l_log_writer_file.make_at_location (l_logs_path.extended (l_name).appended_with_extension ("log"))
+					l_log_writer_file.set_max_file_size ({NATURAL_64} 1024 * 1204)
+					l_log_writer_file.set_max_backup_count (l_logger_config.backup_count)
+					l_log_writer := l_log_writer_file
+				else
+						-- Should we create the directory anyway ?
+				end
+			elseif l_logger_config.type.is_case_insensitive_equal_general ("stderr") then
+				create {LOG_WRITER_STDERR} l_log_writer
 			end
-			if ut.directory_path_exists (l_logs_path) then
-				create l_log_writer_file.make_at_location (l_logs_path.extended (app.name).appended_with_extension ("log"))
-				l_log_writer_file.set_max_file_size ({NATURAL_64} 1024 * 1204)
-				l_log_writer_file.set_max_backup_count (l_logger_config.backup_count)
-				l_log_writer := l_log_writer_file
-			else
-					-- Should we create the directory anyway ?
+			if l_log_writer = Void then
 				create {LOG_WRITER_NULL} l_log_writer
+				set_logger_level (l_log_writer, log_notice)
+			else
+				set_logger_level (l_log_writer, 0) -- None
 			end
-			set_logger_level (l_log_writer, l_logger_config.level)
 			a_log.register_log_writer (l_log_writer)
 		end
 
 	set_logger_level (a_log_writer: LOG_WRITER; a_priority: INTEGER)
 			-- Setup the logger level based on `a_priority'
 		do
+			level := a_priority
 			if a_priority = log_debug then
 				a_log_writer.enable_debug_log_level
 			elseif a_priority = Log_emergency then
@@ -167,6 +199,9 @@ feature {NONE} -- Implementation
 					attached l_parser.parsed_json_object as jv and then
 					attached {JSON_OBJECT} jv.item ("logger") as l_logger
 				then
+					if attached {JSON_STRING} l_logger.item ("type") as l_type then
+						Result.set_type_with_string (l_type.item)
+					end
 					if attached {JSON_STRING} l_logger.item ("location") as l_location then
 						Result.set_location_with_string (l_location.item)
 					end

library/app_env/src/logger/shared_logger.e

@@ -35,72 +35,113 @@ feature -- Logging
 
 	write_debug_log (m: READABLE_STRING_8)
 		do
-			write_debug_log_to (m, logger)
+--			write_debug_log_to (m, logger)
 		end
 
 	write_information_log (m: READABLE_STRING_8)
 		do
-			write_information_log_to (m, logger)
+--			write_information_log_to (m, logger)
 		end
 
 	write_warning_log (m: READABLE_STRING_8)
 		do
-			write_warning_log_to (m, logger)
+--			write_warning_log_to (m, logger)
 		end
 
 	write_error_log (m: READABLE_STRING_8)
 		do
-			write_error_log_to (m, logger)
+--			write_error_log_to (m, logger)
 		end
 
 	write_critical_log (m: READABLE_STRING_8)
 		do
-			write_critical_log_to (m, logger)
+--			write_critical_log_to (m, logger)
 		end
 
 	write_alert_log (m: READABLE_STRING_8)
 		do
-			write_alert_log_to (m, logger)
+--			write_alert_log_to (m, logger)
 		end
 
 feature {NONE} -- Logger: separate implementation			
 
 	write_debug_log_to (m: READABLE_STRING_8; a_log: like logger)
+		local
+			retried: BOOLEAN
 		do
-			a_log.put_debug (m)
+			if not retried then
+				a_log.put_debug (m)
+			end
+		rescue
+			retried := True
+			retry
 		end
 
 	write_information_log_to (m: READABLE_STRING_8; a_log: like logger)
+		local
+			retried: BOOLEAN
 		do
-			a_log.put_information (m)
+			if not retried then
+				a_log.put_information (m)
+			end
+		rescue
+			retried := True
+			retry
 		end
 
 	write_warning_log_to (m: READABLE_STRING_8; a_log: like logger)
+		local
+			retried: BOOLEAN
 		do
-			a_log.put_warning (m)
+			if not retried then
+				a_log.put_warning (m)
+			end
+		rescue
+			retried := True
+			retry
 		end
 
 	write_error_log_to (m: READABLE_STRING_8; a_log: like logger)
+		local
+			retried: BOOLEAN
 		do
-			a_log.put_error (m)
+			if not retried then
+				a_log.put_error (m)
+			end
+		rescue
+			retried := True
+			retry
 		end
 
 	write_critical_log_to (m: READABLE_STRING_8; a_log: like logger)
+		local
+			retried: BOOLEAN
 		do
-			a_log.put_critical (m)
+			if not retried then
+				a_log.put_critical (m)
+			end
+		rescue
+			retried := True
+			retry
 		end
 
 	write_alert_log_to (m: READABLE_STRING_8; a_log: like logger)
+		local
+			retried: BOOLEAN
 		do
-			a_log.put_alert (m)
+			if not retried then
+				a_log.put_alert (m)
+			end
+		rescue
+			retried := True
+			retry
 		end
 
-
 feature {NONE} -- Implementation
 
 	initialize_logger (app: APPLICATION_ENVIRONMENT)
 		local
-			l_logger: LOGGER
+			l_logger: separate LOGGER
 		do
 			create l_logger.make_with_environment (app)
 			set_logger_to (l_logger, logger_cell)

library/email/email-safe.ecf

@@ -0,0 +1,18 @@
+<?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="email_service" uuid="261DC9D5-C3A0-498D-A063-0BB6C80423CC" library_target="email_service">
+	<target name="email_service">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/.git$</exclude>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
+		</option>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="cms_app_env" location="..\app_env\app_env-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"/>
+		<cluster name="src" location=".\" recursive="true"/>
+	</target>
+</system>

library/email/email_service.e

@@ -0,0 +1,96 @@
+note
+	description: "Basic Email Service"
+	date: "$Date: 2015-04-30 05:45:25 -0300 (ju. 30 de abr. de 2015) $"
+	revision: "$Revision: 97218 $"
+
+class
+	EMAIL_SERVICE
+
+inherit
+	SHARED_ERROR
+
+	SHARED_LOGGER
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make (a_params: like parameters)
+			-- Create instance of {EMAIL_SERVICE} with smtp_server `a_params.smtp_server'.
+			-- Using `a_params.admin_email' as admin email.
+		do
+			parameters := a_params
+			initialize
+		end
+
+	initialize
+			-- Initialize service.
+		local
+			l_address_factory: INET_ADDRESS_FACTORY
+		do
+			admin_email := parameters.admin_email
+
+			create {NOTIFICATION_SMTP_MAILER} mailer.make (parameters.smtp_server)
+			set_successful
+		end
+
+	parameters: EMAIL_SERVICE_PARAMETERS
+			-- Associated parameters.
+
+	admin_email: IMMUTABLE_STRING_8
+			-- Site admin's email.
+
+	mailer: NOTIFICATION_MAILER
+			-- SMTP protocol.
+
+feature -- Basic Operations
+
+	send_internal_email (a_content: READABLE_STRING_GENERAL)
+		do
+			send_message (admin_email, admin_email, "Notification Contact", a_content)
+		end
+
+	send_email_internal_server_error (a_content: READABLE_STRING_GENERAL)
+		do
+			send_message (admin_email, admin_email, "Internal Server Error", a_content)
+		end
+
+	send_message (a_from_address, a_to_address: READABLE_STRING_8; a_subjet: READABLE_STRING_GENERAL; a_content: READABLE_STRING_GENERAL)
+		local
+			l_email: NOTIFICATION_EMAIL
+			utf: UTF_CONVERTER
+		do
+			write_debug_log (generator + ".send_message: [from:" + a_from_address + ", to:" + a_to_address + ", subject:" + a_subjet + ", content:" + a_content)
+			create l_email.make (a_from_address, a_to_address, utf.escaped_utf_32_string_to_utf_8_string_8 (a_subjet) , utf.escaped_utf_32_string_to_utf_8_string_8 (a_content))
+			l_email.add_header_line ("MIME-Version:1.0")
+			l_email.add_header_line ("Content-Type: text/html; charset=utf-8")
+			send_email (l_email)
+		end
+
+feature {NONE} -- Implementation
+
+	send_email (a_email: NOTIFICATION_EMAIL)
+			-- Send the email represented by `a_email'.
+		local
+			l_retried: BOOLEAN
+		do
+			if not l_retried then
+				write_information_log (generator + ".send_email Process send email.")
+				mailer.process_email (a_email)
+				write_information_log (generator + ".send_email Email sent.")
+				if mailer.has_error then
+					set_last_error ("smtp_protocol reported an error", generator + ".send_email")
+				else
+					set_successful
+				end
+			else
+				write_error_log (generator + ".send_email Email not send " + last_error_message)
+			end
+		rescue
+			set_last_error_from_exception (generator + ".send_email")
+			l_retried := True
+			retry
+		end
+
+end

library/email/email_service_parameters.e

@@ -0,0 +1,20 @@
+note
+	description: "Basic Email Service customized for cms site"
+	author: ""
+	date: "$Date: 2015-01-16 07:17:14 -0300 (vi. 16 de ene. de 2015) $"
+	revision: "$Revision: 96467 $"
+
+deferred class
+	EMAIL_SERVICE_PARAMETERS
+
+feature	-- Access
+
+	smtp_server: IMMUTABLE_STRING_8
+		deferred
+		end
+
+	admin_email: IMMUTABLE_STRING_8
+		deferred
+		end
+
+end

library/model/src/link/cms_local_link.e

@@ -25,15 +25,13 @@ create
 
 feature {NONE} -- Initialization
 
-	make (a_title: detachable like title; a_location: like location)
+	make (a_title: detachable READABLE_STRING_GENERAL; a_location: like location)
 			-- Create current local link with optional title `a_title' and location `a_location'.
+		require
+			is_valid_local_location_argument: not a_location.starts_with_general ("/")
 		do
-			if a_title /= Void then
-				title := a_title
-			else
-				title := a_location
-			end
 			location := a_location
+			set_title (a_title)
 		end
 
 feature -- Access
@@ -75,6 +73,16 @@ feature -- Status report
 
 feature -- Element change
 
+	set_title (a_title: detachable READABLE_STRING_GENERAL)
+			-- Set `title' to `a_title' or `location'.
+		do
+			if a_title /= Void then
+				title := a_title.as_string_32
+			else
+				title := location.as_string_32
+			end
+		end
+
 	add_link (lnk: CMS_LINK)
 			-- <Precursor>
 		local

library/model/src/user/cms_user.e

@@ -27,6 +27,7 @@ feature {NONE} -- Initialization
 			initialize
 		ensure
 			name_set: name = a_name
+			status_not_active: status = not_active
 		end
 
 	make_with_id (a_id: INTEGER_64)
@@ -38,11 +39,13 @@ feature {NONE} -- Initialization
 			initialize
 		ensure
 			id_set: id = a_id
+			status_not_active: status = not_active
 		end
 
 	initialize
 		do
 			create creation_date.make_now_utc
+			mark_not_active
 		end
 
 feature -- Access
@@ -71,6 +74,13 @@ feature -- Access
 	last_login_date: detachable DATE_TIME
 			-- User last login.
 
+	status: INTEGER
+			-- Associated status for the current user.
+			-- default:	not_active
+			--			active
+			--			trashed
+
+
 feature -- Roles
 
 	roles: detachable LIST [CMS_USER_ROLE]
@@ -118,6 +128,12 @@ feature -- Status report
 			Result := other /= Void and then id = other.id
 		end
 
+	is_active: BOOLEAN
+			-- is the current user active?
+		do
+			Result := status = {CMS_USER}.active
+		end
+
 feature -- Change element
 
 	set_id (a_id: like id)
@@ -225,6 +241,52 @@ feature -- Change element: data
 			end
 		end
 
+feature -- Status change		
+
+	mark_not_active
+			-- Set status to not_active
+		do
+			set_status (not_active)
+		ensure
+			status_not_active: status = not_active
+		end
+
+	mark_active
+			-- Set status to active.
+		do
+			set_status (active)
+		ensure
+			status_active: status = active
+		end
+
+	mark_trashed
+			-- Set status to trashed.
+		do
+			set_status (trashed)
+		ensure
+			status_trash: status = trashed
+		end
+
+	set_status (a_status: like status)
+			-- Assign `status' with `a_status'.
+		do
+			status := a_status
+		ensure
+			status_set:  status = a_status
+		end
+
+
+feature -- User status
+
+	not_active: INTEGER = 0
+			-- The user is not active.
+
+	active: INTEGER = 1
+			-- The user is active
+
+	Trashed: INTEGER = -1
+			-- The user is trashed (soft delete), ready to be deleted/destroyed from storage.
+
 invariant
 
 	id_or_name_set: id > 0 or else not name.is_whitespace

library/persistence/implementation/store/cms_storage_store_sql.e

@@ -1,6 +1,5 @@
 note
-	description: "Summary description for {CMS_STORAGE_STORE_SQL}."
-	author: ""
+	description: "Storage based on Eiffel Store component."
 	date: "$Date: 2015-02-13 13:08:13 +0100 (ven., 13 févr. 2015) $"
 	revision: "$Revision: 96616 $"
 
@@ -8,9 +7,7 @@ deferred class
 	CMS_STORAGE_STORE_SQL
 
 inherit
-	CMS_STORAGE
-
-	CMS_STORAGE_SQL_I
+	CMS_STORAGE_SQL
 
 feature {NONE} -- Initialization
 
@@ -25,7 +22,6 @@ feature {NONE} -- Initialization
 			create {DATABASE_HANDLER_IMPL} db_handler.make (a_connection)
 
 			create error_handler.make
---			error_handler.add_synchronization (db_handler.database_error_handler)
 		end
 
 feature -- Status report
@@ -36,6 +32,15 @@ feature -- Status report
 			Result := connection.is_connected
 		end
 
+feature -- Basic operation
+
+	close
+			-- <Precursor>
+			-- Disconnect from SQL database.
+		do
+			connection.disconnect
+		end
+
 feature {NONE} -- Implementation	
 
 	db_handler: DATABASE_HANDLER

library/persistence/implementation/store/cms_storage_store_sql_builder.e

@@ -0,0 +1,16 @@
+note
+	description: "[
+			Common ancestor for builders responsible to instantiate storage based
+			on Eiffel Store storage.
+		]"
+	author: "$Author: jfiat $"
+	date: "$Date: 2015-02-13 13:08:13 +0100 (ven., 13 févr. 2015) $"
+	revision: "$Revision: 96616 $"
+
+deferred class
+	CMS_STORAGE_STORE_SQL_BUILDER
+
+inherit
+	CMS_STORAGE_SQL_BUILDER
+
+end

library/persistence/implementation/store/database/database_config.e

@@ -8,16 +8,16 @@ deferred class
 
 feature -- Database access
 
-	hostname: STRING = ""
+	default_hostname: STRING = ""
 			-- Database hostname.
 
-	username: STRING = ""
+	default_username: STRING = ""
 			-- Database username.
 
-	password: STRING = ""
+	default_password: STRING = ""
 			-- Database password.
 
-	database_name: STRING = "EiffelDB"
+	default_database_name: STRING = "EiffelDB"
 			-- Database name.
 
 	is_keep_connection: BOOLEAN

library/persistence/implementation/store/database/database_connection.e

@@ -12,27 +12,7 @@ inherit
 
 feature {NONE} -- Initialization
 
-	make_common
-			-- Create a database handler with common settings.
-		deferred
-		ensure
-			db_application_not_void: db_application /= Void
-			db_control_not_void: db_control /= Void
-		end
-
-	make_basic ( a_database_name: STRING)
-			-- Create a database handler with common settings and
- 			-- set database_name with `a_database_name'.
-		require
-			database_name_not_void: a_database_name /= Void
-			database_name_not_empty: not a_database_name.is_empty
-		deferred
-		ensure
-			db_application_not_void: db_application /= Void
-			db_control_not_void: db_control /= Void
-		end
-
-	make (a_username: STRING; a_password: STRING; a_hostname: STRING; a_database_name: STRING; connection: BOOLEAN)
+	login (a_username: STRING; a_password: STRING; a_hostname: STRING; a_database_name: STRING; connection: BOOLEAN)
 
 			-- Create a database handler with user `a_username', password `a_password',
 			-- host `a_hostname', database_name `a_database_name', and keep_connection `connection'.
@@ -59,6 +39,26 @@ feature {NONE} -- Initialization
 			db_control_not_void: db_control /= Void
 		end
 
+	login_with_default
+			-- Create a database handler with common settings.
+		deferred
+		ensure
+			db_application_not_void: db_application /= Void
+			db_control_not_void: db_control /= Void
+		end
+
+	login_with_database_name ( a_database_name: STRING)
+			-- Create a database handler with common settings and
+ 			-- set database_name with `a_database_name'.
+		require
+			database_name_not_void: a_database_name /= Void
+			database_name_not_empty: not a_database_name.is_empty
+		deferred
+		ensure
+			db_application_not_void: db_application /= Void
+			db_control_not_void: db_control /= Void
+		end
+
 feature -- Database Setup
 
 	db_application: DATABASE_APPL [DATABASE]
@@ -168,7 +168,7 @@ feature -- Error Handling
 
 	database_error_handler: DATABASE_ERROR_HANDLER
 			-- Error handler.
-	
+
 feature -- Status Report
 
 	has_error: BOOLEAN
@@ -179,11 +179,11 @@ feature -- Status Report
 
 feature -- Helper
 
-	exception_as_error (a_e: like {EXCEPTION_MANAGER}.last_exception)
-			-- Record exception as an error.
+	exception_as_error (a_exception: like {EXCEPTION_MANAGER}.last_exception)
+			-- Record exception `a_exception' as an error.
 		do
-			if attached a_e as l_e and then attached l_e.trace as l_trace then
-				database_error_handler.add_error_details (l_e.code, once "Exception", l_trace.as_string_32)
+			if a_exception /= Void and then attached a_exception.trace as l_trace then
+				database_error_handler.add_error_details (a_exception.code, once "Exception", l_trace)
 			end
 		end
 

library/persistence/implementation/store/database/database_connection_null.e

@@ -15,33 +15,33 @@ inherit
 		end
 
 create
-	make, make_common, make_basic
+	login, login_with_default, login_with_database_name
 
 feature -- Initialization
 
-	make_common
+	login_with_default
 			-- Create a database handler for ODBC with common settings.
 		do
 			create database_error_handler.make
-			create db_application.login (username, password)
-			db_application.set_hostname (hostname)
-			db_application.set_data_source (database_name)
+			create db_application.login (default_username, default_password)
+			db_application.set_hostname (default_username)
+			db_application.set_data_source (default_database_name)
 			db_application.set_base
 			create db_control.make
 		end
 
-	make (a_username: STRING; a_password: STRING; a_hostname: STRING; a_database_name: STRING; connection: BOOLEAN)
+	login (a_username: STRING; a_password: STRING; a_hostname: STRING; a_database_name: STRING; connection: BOOLEAN)
 
 			-- Create a database handler for ODBC.
 		do
-			make_common
+			login_with_default
 		end
 
-	make_basic (a_database_name: STRING)
+	login_with_database_name (a_database_name: STRING)
 
 			-- Create a database handler for ODBC.
 		do
-			make_common
+			login_with_default
 		end
 
 
@@ -49,7 +49,7 @@ feature -- Initialization
 			-- Login with `a_connection_string'
 			-- and immediately connect to database.
 		do
-			make_common
+			login_with_default
 		end
 
 

library/persistence/implementation/store/database/database_connection_odbc.e

@@ -7,117 +7,97 @@ class
 	DATABASE_CONNECTION_ODBC
 
 inherit
-
 	DATABASE_CONNECTION
 		redefine
 			db_application
 		end
 
-	SHARED_LOGGER
-
 create
-	make, make_common, make_basic, login_with_connection_string
+	login, login_with_default, login_with_database_name, login_with_connection_string
 
 feature -- Initialization
 
-	make_common
-			-- Create a database handler for ODBC with common settings.
-		local
-			l_retried: BOOLEAN
-		do
-			create db_application.login (username, password)
-			create database_error_handler.make
-			if not l_retried then
-				db_application.set_hostname (hostname)
-				db_application.set_data_source (database_name)
-				db_application.set_base
-				create db_control.make
-				keep_connection := is_keep_connection
-				if keep_connection then
-					connect
-				end
-			else
-				create db_control.make
-			end
-		rescue
-			create db_control.make
---			set_last_error_from_exception ("Connection execution")
---			write_critical_log (generator + ".make_common:" + last_error_message)
-			if is_connected then
-				disconnect
-			end
-			l_retried := True
-			retry
-		end
-
-	make_basic (a_database_name: STRING)
-			-- Create a database handler and
-			-- set database_name to `a_database_name'.
-		local
-			l_retried: BOOLEAN
-		do
-			create db_application.login (username, password)
-			create database_error_handler.make
-			if not l_retried then
-				db_application.set_hostname (hostname)
-				db_application.set_data_source (a_database_name)
-				db_application.set_base
-				create db_control.make
-				keep_connection := is_keep_connection
-				if keep_connection then
-					connect
-				end
-			else
-				create db_control.make
-			end
-		rescue
-			create db_control.make
---			set_last_error_from_exception ("Connection execution")
---			write_critical_log (generator + ".make_common:" + last_error_message)
-			if is_connected then
-				disconnect
-			end
-			l_retried := True
-			retry
-		end
-
-	make (a_username: STRING; a_password: STRING; a_hostname: STRING; a_database_name: STRING; connection: BOOLEAN)
+	login (a_username: STRING; a_password: STRING; a_hostname: STRING; a_database_name: STRING; a_keep_connection: BOOLEAN)
 
 			-- Create a database handler for ODBC and set `username' to `a_username',
 			-- `password' to `a_password'
 			-- `database_name' to `a_database_name'
-			-- `connection' to `a_connection'
+			-- `keep_connection' to `a_keep_connection'
+		local
+			retried: BOOLEAN
+			l_database_error_handler: detachable like database_error_handler
 		do
-			create database_error_handler.make
+			create l_database_error_handler.make
+			database_error_handler := l_database_error_handler
 			create db_application.login (a_username, a_password)
-			db_application.set_hostname (a_hostname)
-			db_application.set_data_source (a_database_name)
-			db_application.set_base
-			create db_control.make
-			keep_connection := connection
-			if keep_connection then
-				connect
+			if not retried then
+				db_application.set_hostname (a_hostname)
+				db_application.set_data_source (a_database_name)
+				db_application.set_base
+				create db_control.make
+				keep_connection := a_keep_connection
+				if keep_connection then
+					connect
+				end
+			else
+				create db_control.make
+				if is_connected then
+					disconnect
+				end
 			end
+		rescue
+			if l_database_error_handler = Void then
+				create l_database_error_handler.make
+			end
+			database_error_handler := l_database_error_handler
+			exception_as_error ((create {EXCEPTION_MANAGER}).last_exception)
+			retried := True
+			retry
+		end
+
+	login_with_default
+			-- Create a database handler for ODBC with common settings.
+		do
+			login_with_database_name (default_database_name)
+		end
+
+	login_with_database_name (a_database_name: STRING)
+			-- Create a database handler and
+			-- set database_name to `a_database_name'.
+		do
+			login (default_username, default_password, default_hostname, default_database_name, is_keep_connection)
 		end
 
 	login_with_connection_string (a_string: STRING)
 			-- Login with `a_connection_string'and immediately connect to database.
+		local
+			retried: BOOLEAN
+			l_database_error_handler: detachable like database_error_handler
 		do
-			write_debug_log (generator +".login_with_connection_string")
+			create l_database_error_handler.make
+			database_error_handler := l_database_error_handler
 			create db_application.login_with_connection_string (a_string)
-			create database_error_handler.make
-			db_application.set_base
-			create db_control.make
-			write_debug_log (generator +".login_with_connection_string, is_keep_connection? "+ is_keep_connection.out )
-			keep_connection := is_keep_connection
-			if keep_connection then
-				connect
-				if not db_control.is_ok then
-					write_critical_log (generator +".login_with_connection_string:"+ db_control.error_code.out )
-					write_critical_log (generator +".login_with_connection_string:"+ db_control.error_message_32 )
+			if not retried then
+				db_application.set_base
+				create db_control.make
+				keep_connection := is_keep_connection
+				if keep_connection then
+					connect
+				end
+			else
+				create db_control.make
+				if is_connected then
+					disconnect
 				end
-				write_debug_log (generator +".login_with_connection_string, After connect, is_connected? "+ is_connected.out)
 			end
+		rescue
+			if l_database_error_handler = Void then
+				create l_database_error_handler.make
+			end
+			database_error_handler := l_database_error_handler
+			exception_as_error ((create {EXCEPTION_MANAGER}).last_exception)
+			retried := True
+			retry
 		end
 
 feature -- Databse Connection

library/persistence/mysql/persistence_mysql.ecf

@@ -1,35 +0,0 @@
-<?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="persistence_mysql" uuid="DC757CBD-D8C4-44D6-A07F-C1148D8D233E" library_target="persistence_mysql">
-	<target name="persistence_mysql">
-		<root all_classes="true"/>
-		<option warning="true" void_safety="none">
-			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
-		</option>
-		<setting name="console_application" value="true"/>
-		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
-		<library name="cms" location="..\..\..\cms.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"/>
-		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
-		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
-		<library name="layout" location="..\..\layout\layout.ecf"/>
-		<library name="logging" location="$ISE_LIBRARY\library\runtime\logging\logging.ecf"/>
-		<library name="model" location="..\..\model\cms_model.ecf"/>
-		<library name="mysql" location="$ISE_LIBRARY\library\store\dbms\rdbms\mysql\mysql.ecf"/>
-		<library name="store" location="$ISE_LIBRARY\library\store\store.ecf" readonly="false"/>
-		<library name="thread" location="$ISE_LIBRARY\library\thread\thread.ecf"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
-		<cluster name="common" location="..\implementation\store\" recursive="true">
-			<file_rule>
-				<exclude>/database/database_connection_odbc.e</exclude>
-			</file_rule>
-		</cluster>
-		<cluster name="persistence_mysql" location=".\src\" recursive="true">
-			<file_rule>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/.svn$</exclude>
-			</file_rule>
-		</cluster>
-	</target>
-</system>

library/persistence/mysql/scripts/Readme.md

@@ -1,3 +0,0 @@
-To build the MySQL schema use the schema.sql script.
-The other script will be deleted soon.
-

library/persistence/mysql/scripts/Readme.txt

@@ -1 +0,0 @@
-Added Stored Procedures

library/persistence/mysql/scripts/core.sql

@@ -0,0 +1,30 @@
+BEGIN;
+
+CREATE TABLE `logs` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `category` VARCHAR(255) NOT NULL,
+  `level` int(11) NOT NULL,
+  `uid` int(11) DEFAULT NULL,
+  `message` text NOT NULL,
+  `info` text,
+  `link` text,
+  `date` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+);
+
+CREATE TABLE   `custom_values`  (
+    `type`   VARCHAR(255) NOT NULL,
+    `name`   VARCHAR(255) NOT NULL,
+    `value`   VARCHAR(255) NOT NULL
+);
+
+CREATE TABLE `path_aliases` (
+  `pid` int(11) NOT NULL AUTO_INCREMENT,
+  `source` varchar(255) NOT NULL,
+  `alias` varchar(255) NOT NULL,
+  `lang` varchar(12) DEFAULT NULL,
+  PRIMARY KEY (`pid`)
+);
+
+COMMIT;
+

library/persistence/mysql/scripts/create_database.sql

@@ -1,163 +0,0 @@
-SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
-SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
-SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES';
-
--- -----------------------------------------------------
--- Schema mydb
--- -----------------------------------------------------
--- -----------------------------------------------------
--- Schema cms_dev
--- -----------------------------------------------------
-CREATE SCHEMA IF NOT EXISTS `cms_dev` DEFAULT CHARACTER SET latin1 ;
-USE `cms_dev` ;
-
--- -----------------------------------------------------
--- Table `cms_dev`.`users`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `cms_dev`.`users` (
-  `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `username` VARCHAR(100) NOT NULL,
-  `password` VARCHAR(100) NOT NULL,
-  `salt` VARCHAR(100) NOT NULL,
-  `email` VARCHAR(250) NOT NULL,
-  `creation_date` DATETIME NULL DEFAULT NULL,
-  `last_login_date` DATETIME NULL DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `username` (`username` ASC))
-ENGINE = InnoDB
-AUTO_INCREMENT = 2
-DEFAULT CHARACTER SET = latin1;
-
-
--- -----------------------------------------------------
--- Table `cms_dev`.`nodes`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `cms_dev`.`nodes` (
-  `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `publication_date` DATE NOT NULL,
-  `creation_date` DATE NOT NULL,
-  `modification_date` DATE NOT NULL,
-  `title` VARCHAR(255) NOT NULL,
-  `summary` TEXT NOT NULL,
-  `content` MEDIUMTEXT NOT NULL,
-  `author_id` INT(10) UNSIGNED NULL DEFAULT NULL,
-  `version` INT(10) UNSIGNED ZEROFILL NULL DEFAULT NULL,
-  `editor_id` INT(10) UNSIGNED NULL DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  INDEX `fk_nodes_users1_idx` (`author_id` ASC),
-  INDEX `fk_nodes_users2_idx` (`editor_id` ASC),
-  CONSTRAINT `fk_nodes_users1`
-    FOREIGN KEY (`author_id`)
-    REFERENCES `cms_dev`.`users` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION,
-  CONSTRAINT `fk_nodes_users2`
-    FOREIGN KEY (`editor_id`)
-    REFERENCES `cms_dev`.`users` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION)
-ENGINE = InnoDB
-AUTO_INCREMENT = 11
-DEFAULT CHARACTER SET = latin1;
-
-
--- -----------------------------------------------------
--- Table `cms_dev`.`roles`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `cms_dev`.`roles` (
-  `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `role` VARCHAR(100) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `role` (`role` ASC))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = latin1;
-
-
--- -----------------------------------------------------
--- Table `cms_dev`.`permissions`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `cms_dev`.`permissions` (
-  `id` INT(11) NOT NULL AUTO_INCREMENT,
-  `name` VARCHAR(45) NOT NULL,
-  `roles_id` INT(10) UNSIGNED NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `name_UNIQUE` (`name` ASC),
-  INDEX `fk_permissions_roles1_idx` (`roles_id` ASC),
-  CONSTRAINT `fk_permissions_roles1`
-    FOREIGN KEY (`roles_id`)
-    REFERENCES `cms_dev`.`roles` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = latin1;
-
-
--- -----------------------------------------------------
--- Table `cms_dev`.`profiles`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `cms_dev`.`profiles` (
-  `id` INT(11) NOT NULL AUTO_INCREMENT,
-  `key` VARCHAR(45) NOT NULL,
-  `value` VARCHAR(100) NULL DEFAULT NULL,
-  `users_id` INT(10) UNSIGNED NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE INDEX `key_UNIQUE` (`key` ASC),
-  INDEX `fk_profiles_users1_idx` (`users_id` ASC),
-  CONSTRAINT `fk_profiles_users1`
-    FOREIGN KEY (`users_id`)
-    REFERENCES `cms_dev`.`users` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = latin1;
-
-
--- -----------------------------------------------------
--- Table `cms_dev`.`users_nodes`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `cms_dev`.`users_nodes` (
-  `users_id` INT(10) UNSIGNED NOT NULL,
-  `nodes_id` INT(10) UNSIGNED NOT NULL,
-  PRIMARY KEY (`users_id`, `nodes_id`),
-  INDEX `fk_users_has_nodes_nodes1_idx` (`nodes_id` ASC),
-  INDEX `fk_users_has_nodes_users_idx` (`users_id` ASC),
-  CONSTRAINT `fk_users_has_nodes_nodes1`
-    FOREIGN KEY (`nodes_id`)
-    REFERENCES `cms_dev`.`nodes` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION,
-  CONSTRAINT `fk_users_has_nodes_users`
-    FOREIGN KEY (`users_id`)
-    REFERENCES `cms_dev`.`users` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = latin1;
-
-
--- -----------------------------------------------------
--- Table `cms_dev`.`users_roles`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `cms_dev`.`users_roles` (
-  `users_id` INT(10) UNSIGNED NOT NULL,
-  `roles_id` INT(10) UNSIGNED NOT NULL,
-  PRIMARY KEY (`users_id`, `roles_id`),
-  INDEX `fk_users_has_roles_roles1_idx` (`roles_id` ASC),
-  INDEX `fk_users_has_roles_users1_idx` (`users_id` ASC),
-  CONSTRAINT `fk_users_has_roles_roles1`
-    FOREIGN KEY (`roles_id`)
-    REFERENCES `cms_dev`.`roles` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION,
-  CONSTRAINT `fk_users_has_roles_users1`
-    FOREIGN KEY (`users_id`)
-    REFERENCES `cms_dev`.`users` (`id`)
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION)
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = latin1;
-
-
-SET SQL_MODE=@OLD_SQL_MODE;
-SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
-SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;

library/persistence/mysql/scripts/node.sql

@@ -0,0 +1,24 @@
+BEGIN;
+
+CREATE TABLE  nodes (
+   nid  INTEGER PRIMARY KEY  AUTO_INCREMENT NOT NULL CHECK( nid >=0),
+   revision  INTEGER,
+   type  TEXT NOT NULL,
+   title  VARCHAR(255) NOT NULL,
+   summary  TEXT,
+   content  MEDIUMTEXT NOT NULL,
+   format  VARCHAR(255),
+   author  INTEGER,
+   publish  DATETIME,
+   created  DATETIME NOT NULL,
+   changed  DATETIME NOT NULL,
+   status   INTEGER
+);
+
+CREATE TABLE page_nodes(
+   nid  INTEGER PRIMARY KEY  AUTO_INCREMENT NOT NULL CHECK( nid >=0),
+   revision  INTEGER,
+   parent  INTEGER
+);
+
+COMMIT;

library/persistence/mysql/scripts/schema.sql

@@ -1,72 +0,0 @@
-SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
-SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
-SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES';
-
--- -----------------------------------------------------
--- Schema mydb
--- -----------------------------------------------------
--- -----------------------------------------------------
--- Schema roc_cms
--- -----------------------------------------------------
-DROP SCHEMA IF EXISTS `roc_cms` ;
-CREATE SCHEMA IF NOT EXISTS `roc_cms` DEFAULT CHARACTER SET latin1 ;
-USE `roc_cms` ;
-
--- -----------------------------------------------------
--- Table `roc_cms`.`nodes`
--- -----------------------------------------------------
-DROP TABLE IF EXISTS `roc_cms`.`nodes` ;
-
-CREATE TABLE IF NOT EXISTS `roc_cms`.`nodes` (
-  `nid` INT(11) NOT NULL AUTO_INCREMENT,
-  `version` INT(11) NULL DEFAULT NULL,
-  `type` INT(11) NULL DEFAULT NULL,
-  `title` VARCHAR(255) NOT NULL,
-  `summary` TEXT NOT NULL,
-  `content` MEDIUMTEXT NOT NULL,
-  `author` INT(11) NULL DEFAULT NULL,
-  `publish` DATETIME NULL DEFAULT NULL,
-  `created` DATETIME NOT NULL,
-  `changed` DATETIME NOT NULL,
-  PRIMARY KEY (`nid`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = latin1;
-
-
--- -----------------------------------------------------
--- Table `roc_cms`.`users`
--- -----------------------------------------------------
-DROP TABLE IF EXISTS `roc_cms`.`users` ;
-
-CREATE TABLE IF NOT EXISTS `roc_cms`.`users` (
-  `uid` INT(11) NOT NULL AUTO_INCREMENT,
-  `name` VARCHAR(100) NOT NULL,
-  `password` VARCHAR(100) NOT NULL,
-  `salt` VARCHAR(100) NOT NULL,
-  `email` VARCHAR(250) NOT NULL,
-  `status` INT(11) NULL DEFAULT NULL,
-  `created` DATETIME NOT NULL,
-  `signed` DATETIME NULL DEFAULT NULL,
-  PRIMARY KEY (`uid`),
-  UNIQUE INDEX `name` (`name` ASC))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = latin1;
-
-
--- -----------------------------------------------------
--- Table `roc_cms`.`users_roles`
--- -----------------------------------------------------
-DROP TABLE IF EXISTS `roc_cms`.`users_roles` ;
-
-CREATE TABLE IF NOT EXISTS `roc_cms`.`users_roles` (
-  `rid` INT(11) NOT NULL AUTO_INCREMENT,
-  `role` VARCHAR(100) NOT NULL,
-  PRIMARY KEY (`rid`),
-  UNIQUE INDEX `role` (`role` ASC))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = latin1;
-
-
-SET SQL_MODE=@OLD_SQL_MODE;
-SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
-SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;

library/persistence/mysql/scripts/tables.sql

@@ -1,14 +0,0 @@
-DROP TABLE IF EXISTS nodes;
-
-CREATE TABLE nodes
-(
-	id smallint unsigned NOT NULL auto_increment,
-	publication_date date NOT NULL,  #When the article was published
-	creation_date  date  NOT NULL, #When the article was created
-	modification_date  date  NOT NULL, #When the article was updated
-	title varchar(255) NOT NULL, #Full title of the article
-	summary text NOT NULL, #A short summary of the articule
-	content mediumtext NOT NULL,  #The HTML content of the article
-
-	PRIMARY KEY (ID)
-);

library/persistence/mysql/scripts/triggers.sql

@@ -1,8 +0,0 @@
-DELIMITER $$
-CREATE TRIGGER update_editor
-AFTER INSERT ON `users_nodes` FOR EACH ROW
-   UPDATE Nodes
-     SET editor_id = NEW.users_id
-   WHERE id = NEW.nodes_id;
-$$
-DELIMITER ;

library/persistence/mysql/scripts/user.sql

@@ -0,0 +1,66 @@
+BEGIN;
+
+CREATE TABLE `users` (
+  `uid` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  `password` varchar(100) NOT NULL,
+  `salt` varchar(100) NOT NULL,
+  `email` varchar(250) NOT NULL,
+  `status` int(11)  DEFAULT NULL,
+  `created` datetime NOT NULL,
+  `signed` datetime DEFAULT NULL,
+  CHECK (`uid` >= 0),
+  PRIMARY KEY (`uid`),
+  UNIQUE KEY `name` (`name`)
+);
+
+CREATE TABLE `roles` (
+  `rid` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL,
+  CHECK (`rid` >= 0),
+  PRIMARY KEY (`rid`),
+  UNIQUE KEY `name` (`name`)
+);
+
+
+CREATE TABLE `users_roles` (
+  `uid` int(11) NOT NULL,
+  `rid` int(11) NOT NULL,
+  CHECK (`uid` >= 0),
+  CHECK (`rid` >= 0)
+); 
+
+CREATE TABLE `role_permissions` (
+  `rid` int(11) NOT NULL,
+  `permission` varchar(255) NOT NULL,
+  `module` varchar(255) DEFAULT NULL,
+   CHECK (`rid` >= 0)
+);
+
+
+CREATE TABLE `users_activations` (
+  `aid` int(11) NOT NULL AUTO_INCREMENT,
+  `token` varchar(255) NOT NULL,
+  `uid` int(11) NOT NULL,
+  `created` datetime NOT NULL,
+   CHECK (`aid` >= 0),
+   CHECK (`uid` >= 0),
+   PRIMARY KEY (`aid`),
+   UNIQUE KEY `token` (`token`)
+);
+
+
+CREATE TABLE `users_password_recovery` (
+  `aid` int(11) NOT NULL AUTO_INCREMENT,
+  `token` varchar(255) NOT NULL,
+  `uid` int(11) NOT NULL,
+  `created` datetime NOT NULL,
+   CHECK (`aid` >= 0),
+   CHECK (`uid` >= 0),
+   PRIMARY KEY (`aid`),
+   UNIQUE KEY `token` (`token`)
+);
+
+
+
+COMMIT;

library/persistence/mysql/src/cms_storage_mysql.e

@@ -1,29 +0,0 @@
-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_MYSQL
-
-inherit
-	CMS_STORAGE_STORE_SQL
-
-	CMS_CORE_STORAGE_SQL_I
-
-	CMS_USER_STORAGE_SQL_I
-
-	REFACTORING_HELPER
-
-create
-	make
-
-feature -- Status report
-
-	is_initialized: BOOLEAN
-			-- Is storage initialized?
-		do
-			Result := has_user
-		end
-
-end

library/persistence/mysql/tests/roles/role_test_set.e-

@@ -1,100 +0,0 @@
-note
-	description: "Summary description for {ROLE_TEST_SET}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	ROLE_TEST_SET
-inherit
-	EQA_TEST_SET
-		redefine
-			on_prepare,
-			on_clean
-		select
-			default_create
-		end
-	ABSTRACT_DB_TEST
-		rename
-			default_create as default_db_test
-		end
-
-
-feature {NONE} -- Events
-
-	on_prepare
-			-- <Precursor>
-		do
-			(create {CLEAN_DB}).clean_db(connection)
-		end
-
-	on_clean
-			-- <Precursor>
-		do
-		end
-
-feature -- Test routines
-
-	test_roles_empty
-		do
-			assert ("Not elements",role_provider.roles.after)
-			assert ("Count = 0", role_provider.count = 0)
-		end
-
-	test_roles_by_id_not_exist
-		do
-			assert ("Void", role_provider.role (1) = Void)
-		end
-
-	test_roles_by_name_not_exist
-		do
-			assert ("Void", role_provider.role_by_name ("admin") = Void)
-		end
-
-	test_new_role
-		do
-			assert ("Count = 0", role_provider.count = 0)
-			role_provider.new_role ("admin")
-			assert ("Count = 1", role_provider.count = 1)
-			assert ("Expected role", attached role_provider.role (1) as l_role and then l_role.name ~ "admin")
-			assert ("Expected role", attached role_provider.role_by_name ("admin") as l_role and then l_role.id = 1)
-		end
-
-	test_permissions_empty_not_exist_role
-		do
-			assert ("Not elements",role_provider.permission_by_role (1).after)
-		end
-
-	test_permissions_empty_exist_role
-		do
-			assert ("Count = 0", role_provider.count = 0)
-			role_provider.new_role ("admin")
-			assert ("Count = 1", role_provider.count = 1)
-			assert ("Exist role",not role_provider.roles.after)
-			assert ("Not permission by role 1 elements",role_provider.permission_by_role (1).after)
-		end
-
-	test_new_role_with_permissions
-		do
-			assert ("Count = 0", role_provider.count = 0)
-			role_provider.new_role ("admin")
-			role_provider.save_role_permission (1, "Create Page")
-			role_provider.save_role_permission (1, "Edit Page")
-			role_provider.save_role_permission (1, "Delete Page")
-			assert ("Count = 1", role_provider.count = 1)
-			assert ("Exist role",not role_provider.roles.after)
-			assert ("Exist role permissions",not role_provider.permission_by_role (1).after)
-			assert ("Not Exist role permissions, for id 2",role_provider.permission_by_role (2).after)
-		end
-
-
-
-
-feature {NONE} -- Implementation
-
-	role_provider: ROLE_DATA_PROVIDER
-			-- role provider.
-		once
-			create Result.make (connection)
-		end
-end

library/persistence/sqlite/persistence_sqlite.ecf

@@ -1,31 +0,0 @@
-<?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="persistence_sqlite" uuid="8FD9D3B3-5FC1-495F-A05D-0205EC966841" library_target="persistence_sqlite">
-	<target name="persistence_sqlite">
-		<root all_classes="true"/>
-		<option warning="true" void_safety="none">
-			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
-		</option>
-		<setting name="console_application" value="true"/>
-		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
-		<library name="cms" location="..\..\..\cms.ecf"/>
-		<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"/>
-		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
-		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
-		<library name="layout" location="..\..\layout\layout.ecf"/>
-		<library name="logging" location="$ISE_LIBRARY\library\runtime\logging\logging.ecf"/>
-		<library name="model" location="..\..\model\cms_model.ecf"/>
-		<library name="odbc" location="$ISE_LIBRARY\library\store\dbms\rdbms\odbc\odbc.ecf"/>
-		<library name="store" location="$ISE_LIBRARY\library\store\store.ecf" readonly="false"/>
-		<library name="thread" location="$ISE_LIBRARY\library\thread\thread.ecf"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
-		<cluster name="common" location="..\implementation\store\" recursive="true"/>
-		<cluster name="persistence_sqlite" location=".\src\" recursive="true">
-			<file_rule>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/.svn$</exclude>
-			</file_rule>
-		</cluster>
-	</target>
-</system>

library/persistence/sqlite/scripts/Readme.txt

@@ -1 +0,0 @@
-Added Stored Procedures

library/persistence/sqlite/scripts/schema.sql

@@ -1,36 +0,0 @@
-PRAGMA foreign_keys = OFF;
-
-BEGIN;
-CREATE TABLE "users"(
-  "uid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("uid">=0),
-  "name" VARCHAR(100) NOT NULL,
-  "password" VARCHAR(100) NOT NULL,
-  "salt" VARCHAR(100) NOT NULL,
-  "email" VARCHAR(250) NOT NULL,
-  "status" INTEGER,
-  "created" DATETIME NOT NULL,
-  "signed" DATETIME,
-  CONSTRAINT "name"
-    UNIQUE("name")
-);
-
-CREATE TABLE "users_roles"(
-  "rid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("rid">=0),
-  "role" VARCHAR(100) NOT NULL,
-  CONSTRAINT "role"
-    UNIQUE("role")
-);
-
-CREATE TABLE "nodes"(
-  "nid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("nid">=0),
-  "version" INTEGER,
-  "type" INTEGER,
-  "title" VARCHAR(255) NOT NULL,
-  "summary" TEXT NOT NULL,
-  "content" MEDIUMTEXT NOT NULL,
-  "author" INTEGER,
-  "publish" DATETIME,
-  "created" DATETIME NOT NULL,
-  "changed" DATETIME NOT NULL
-);
-COMMIT;

library/persistence/sqlite/src/cms_storage_sqlite_builder.e

@@ -1,76 +0,0 @@
-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_SQLITE_BUILDER
-
-inherit
-	CMS_STORAGE_SQL_BUILDER
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	make
-			-- Initialize `Current'.
-		do
-		end
-
-feature -- Factory
-
-	storage (a_setup: CMS_SETUP): detachable CMS_STORAGE_SQLITE
-		local
-			s: STRING
-		do
-			if attached (create {APPLICATION_JSON_CONFIGURATION_HELPER}).new_database_configuration (a_setup.environment.application_config_path) as l_database_config then
-				s := "Driver=SQLite3 ODBC Driver;Database="
-				if attached l_database_config.database_name as db_name then
-					s.append (db_name)
-				end
-				s.append (";LongNames=0;Timeout=1000;NoTXN=0;SyncPragma=NORMAL;StepAPI=0;")
-				create Result.make (create {DATABASE_CONNECTION_ODBC}.login_with_connection_string (s))
-				--create Result.make (create {DATABASE_CONNECTION_ODBC}.login_with_connection_string (l_database_config.connection_string))
-				if Result.is_available then
-					if not Result.is_initialized then
-						initialize (a_setup, Result)
-					end
-				end
-			end
-		end
-
-	initialize (a_setup: CMS_SETUP; a_storage: CMS_STORAGE_STORE_SQL)
-		local
-			u: CMS_USER
-			r: CMS_USER_ROLE
-		do
-				-- Schema
-			a_storage.sql_execute_file_script (a_setup.environment.path.extended ("scripts").extended ("core.sql"))
-
-				-- Data	
-				-- Users
-			create u.make ("admin")
-			u.set_password ("istrator#")
-			u.set_email (a_setup.site_email)
-			a_storage.new_user (u)
-
-				-- Roles
-			create r.make ("anonymous")
-			a_storage.save_user_role (r)
-			create r.make ("authenticated")
-			r.add_permission ("create page")
-			r.add_permission ("edit page")
-			a_storage.save_user_role (r)
-
-				-- Test custom value
-
-			a_storage.set_custom_value ("abc", "123", "test")
-			a_storage.set_custom_value ("abc", "OK", "test")
-		end
-
-end

library/persistence/store_mysql/src/cms_storage_store_mysql.e

@@ -1,10 +1,10 @@
 note
-	description: "Summary description for {CMS_STORAGE_MYSQL}."
+	description: "Summary description for {CMS_STORAGE_STORE_MYSQL}."
 	date: "$Date: 2015-02-09 22:29:56 +0100 (lun., 09 févr. 2015) $"
 	revision: "$Revision: 96596 $"
 
 class
-	CMS_STORAGE_SQLITE
+	CMS_STORAGE_STORE_MYSQL
 
 inherit
 	CMS_STORAGE_STORE_SQL
@@ -26,4 +26,12 @@ feature -- Status report
 			Result := has_user
 		end
 
+feature -- Conversion
+
+	sql_statement (a_statement: STRING): STRING
+			-- <Precursor>
+		do
+			Result := a_statement
+		end
+
 end

library/persistence/store_mysql/src/cms_storage_store_mysql_builder.e

@@ -1,16 +1,18 @@
 note
 	description: "[
-			Objects that ...
+			Interface responsible to instantiate CMS_STORAGE_STORE_MYSQL object.
 		]"
 	author: "$Author: jfiat $"
 	date: "$Date: 2015-01-27 19:15:02 +0100 (mar., 27 janv. 2015) $"
 	revision: "$Revision: 96542 $"
 
 class
-	CMS_STORAGE_MYSQL_BUILDER
+	CMS_STORAGE_STORE_MYSQL_BUILDER
 
 inherit
-	CMS_STORAGE_SQL_BUILDER
+	CMS_STORAGE_STORE_SQL_BUILDER
+
+	GLOBAL_SETTINGS
 
 create
 	make
@@ -24,7 +26,7 @@ feature {NONE} -- Initialization
 
 feature -- Factory
 
-	storage (a_setup: CMS_SETUP): detachable CMS_STORAGE_MYSQL
+	storage (a_setup: CMS_SETUP): detachable CMS_STORAGE_STORE_MYSQL
 		local
 			conn: DATABASE_CONNECTION
 		do
@@ -32,6 +34,12 @@ feature -- Factory
 				create {DATABASE_CONNECTION_MYSQL} conn.login_with_connection_string (l_database_config.connection_string)
 				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.
+					if Result.is_available then
+						if not Result.is_initialized then
+							initialize (a_setup, Result)
+						end
+					end
 				end
 			end
 		end

library/persistence/store_mysql/src/database/database_connection_mysql.e

@@ -14,66 +14,24 @@ inherit
 		end
 
 create
-	make, make_common, make_basic, login_with_connection_string, login_with_schema
+	login, login_with_default, login_with_database_name, login_with_connection_string, login_with_schema
 
 feature -- Initialization
 
-	make_common
+	login_with_default
 			-- Create a database handler for MYSQL with common settings.
-		local
-			l_retried: BOOLEAN
 		do
-			create database_error_handler.make
-			create db_application.login (username, password)
-
-			if not l_retried then
-				db_application.set_hostname (hostname)
-				db_application.set_data_source (database_name)
-				db_application.set_base
-				create db_control.make
-				keep_connection := is_keep_connection
-				if keep_connection then
-					connect
-				end
-			else
-				create db_control.make
-			end
-		rescue
-			create database_error_handler.make
-			exception_as_error ((create {EXCEPTION_MANAGER}).last_exception)
-			l_retried := True
-			retry
+			login_with_database_name (default_database_name)
 		end
 
-	make_basic (a_database_name: STRING)
+	login_with_database_name (a_database_name: STRING)
 			-- Create a database handler and
 			-- set database_name to `a_database_name'.
-		local
-			l_retried: BOOLEAN
 		do
-			create database_error_handler.make
-			create db_application.login (username, password)
-
-			if not l_retried then
-				db_application.set_hostname (hostname)
-				db_application.set_data_source (a_database_name)
-				db_application.set_base
-				create db_control.make
-				keep_connection := is_keep_connection
-				if keep_connection then
-					connect
-				end
-			else
-				create db_control.make
-			end
-		rescue
-			create database_error_handler.make
-			exception_as_error ((create {EXCEPTION_MANAGER}).last_exception)
-			l_retried := True
-			retry
+			login (default_username, default_password, default_hostname, a_database_name, is_keep_connection)
 		end
 
-	make (a_username: STRING; a_password: STRING; a_hostname: STRING; a_database_name: STRING; connection: BOOLEAN)
+	login (a_username: STRING; a_password: STRING; a_hostname: STRING; a_database_name: STRING; connection: BOOLEAN)
 
 			-- Create a database handler for ODBC and set `username' to `a_username',
 			-- `password' to `a_password'
@@ -93,26 +51,23 @@ feature -- Initialization
 		end
 
 	login_with_connection_string (a_string: STRING)
-			-- Login with `a_connection_string'and immediately connect to database.
+			-- Login with `a_connection_string' and immediately connect to database.
 		local
-			l_string: LIST[STRING]
 			l_server: STRING
 			l_port: STRING
-			l_schema: STRING
+			l_database: STRING
 			l_user: STRING
 			l_password: STRING
 		do
 			create database_error_handler.make
-
-			l_string := a_string.split (';')
-			l_server := l_string.at (2).split ('=').at (2)
-			l_port := l_string.at (3).split ('=').at (2)
-			l_schema := l_string.at (4).split ('=').at (2)
-			l_user := l_string.at (5).split ('=').at (2)
-			l_password := l_string.at (6).split ('=').at (2)
+			l_server := connection_string_item (a_string, "Server", default_hostname)
+			l_database := connection_string_item (a_string, "Database", default_database_name)
+			l_port := connection_string_item (a_string, "Port", "3306")
+			l_user := connection_string_item (a_string, "Uid", default_username)
+			l_password := connection_string_item (a_string, "Pwd", default_password)
 
 			create db_application
-			db_application.set_application (l_schema)
+			db_application.set_application (l_database)
 			db_application.set_hostname (l_server + ":" + l_port)
 			db_application.login_and_connect (l_user, l_password)
 			db_application.set_base
@@ -120,6 +75,26 @@ feature -- Initialization
 			keep_connection := is_keep_connection
 		end
 
+	connection_string_item (a_connection_string: STRING; k: STRING; dft: STRING): STRING
+		local
+			i,j: INTEGER
+		do
+			i := a_connection_string.substring_index (k + "=", 1)
+			if i = 0 then
+				i := a_connection_string.substring_index (k.as_lower + "=", 1)
+			end
+			if i > 0 then
+				i := i + k.count + 1
+				j := a_connection_string.index_of (';', i)
+				if j = 0 then
+					j := a_connection_string.count + 1
+				end
+				Result := a_connection_string.substring (i, j - 1)
+			else
+				Result := dft
+			end
+		end
+
 	login_with_schema (a_schema: STRING; a_username: STRING; a_password: STRING)
 			-- Login with `a_connection_string'and immediately connect to database.
 		do

library/persistence/store_mysql/store_mysql-safe.ecf

@@ -1,6 +1,6 @@
 <?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="persistence_mysql" uuid="DC757CBD-D8C4-44D6-A07F-C1148D8D233E" library_target="persistence_mysql">
-	<target name="persistence_mysql">
+<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="store_mysql" uuid="DC757CBD-D8C4-44D6-A07F-C1148D8D233E" library_target="store_mysql">
+	<target name="store_mysql">
 		<root all_classes="true"/>
 		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
@@ -24,7 +24,7 @@
 				<exclude>/database/database_connection_odbc.e</exclude>
 			</file_rule>
 		</cluster>
-		<cluster name="persistence_mysql" location=".\src\" recursive="true">
+		<cluster name="persistence_store_mysql" location=".\src\" recursive="true">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>
 				<exclude>/CVS$</exclude>

library/persistence/store_mysql/tests/application.e

@@ -24,7 +24,7 @@ feature {NONE} -- Initialization
 
 			(create {CLEAN_DB}).clean_db(connection)
 
-			create {CMS_STORAGE_MYSQL} storage.make (connection)
+			create {CMS_STORAGE_STORE_MYSQL} storage.make (connection)
 			l_node := custom_node ("Content", "Summary", "Title")
 			storage.new_user (default_user)
 			storage.new_user (custom_user ("u2", "p2", "e2"))

library/persistence/store_mysql/tests/tests.ecf

@@ -11,7 +11,7 @@
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf"/>
 		<library name="model" location="..\..\..\model\cms_model-safe.ecf"/>
 		<library name="module_node" location="..\..\..\..\modules\node\node-safe.ecf"/>
-		<library name="persitence_mysql" location="..\persistence_mysql-safe.ecf" readonly="false"/>
+		<library name="persitence_store_mysql" location="..\store_mysql-safe.ecf" readonly="false"/>
 		<library name="process" location="$ISE_LIBRARY\library\process\process-safe.ecf"/>
 		<library name="testing" location="$ISE_LIBRARY\library\testing\testing-safe.ecf"/>
 		<cluster name="tests" location=".\" recursive="true">

library/persistence/store_mysql/tests/util/abstract_db_test.e

@@ -15,7 +15,7 @@ feature -- Database connection
 			create Result.login_with_schema ("cms_dev", "root", "")
 		end
 
-	storage: CMS_STORAGE_MYSQL
+	storage: CMS_STORAGE_STORE_MYSQL
 		once
 			create Result.make (connection)
 		end

library/persistence/store_odbc/src/cms_storage_store_odbc.e

@@ -0,0 +1,82 @@
+note
+	description: "Summary description for {CMS_STORAGE_STORE_ODBC}."
+	date: "$Date: 2015-02-09 22:29:56 +0100 (lun., 09 févr. 2015) $"
+	revision: "$Revision: 96596 $"
+
+class
+	CMS_STORAGE_STORE_ODBC
+
+inherit
+	CMS_STORAGE_STORE_SQL
+		redefine
+			make
+		end
+
+	CMS_CORE_STORAGE_SQL_I
+
+	CMS_USER_STORAGE_SQL_I
+
+	REFACTORING_HELPER
+
+create
+	make,
+	make_with_driver
+
+feature {NONE} -- Initialization
+
+	make (a_connection: DATABASE_CONNECTION)
+			-- <Precursor>
+		do
+			Precursor (a_connection)
+			create odbc_driver.make_from_string_general ("odbc")
+		end
+
+	make_with_driver (a_connection: DATABASE_CONNECTION; a_driver: detachable READABLE_STRING_GENERAL)
+		require
+			is_connected: a_connection.is_connected
+		do
+			make (a_connection)
+			if a_driver /= Void then
+				create odbc_driver.make_from_string_general (a_driver)
+			end
+		end
+
+feature -- Status report
+
+	odbc_driver: IMMUTABLE_STRING_32
+			-- Database's driver name.
+			--  sqlite, mysql, ...
+
+	is_initialized: BOOLEAN
+			-- Is storage initialized?
+		do
+			Result := has_user
+		end
+
+feature -- Conversion
+
+	sql_statement (a_statement: STRING): STRING
+			-- <Precursor>.
+		local
+			i: INTEGER
+		do
+			Result := a_statement
+			if odbc_driver.same_caseless_characters_general ("sqlite3", 1, 5, 1) then
+				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
+
+end

library/persistence/store_odbc/src/cms_storage_store_odbc_builder.e

@@ -0,0 +1,68 @@
+note
+	description: "[
+			Interface responsible to instantiate CMS_STORAGE_STORE_ODBC object.
+		]"
+	author: "$Author: jfiat $"
+	date: "$Date: 2015-02-13 13:08:13 +0100 (ven., 13 févr. 2015) $"
+	revision: "$Revision: 96616 $"
+
+class
+	CMS_STORAGE_STORE_ODBC_BUILDER
+
+inherit
+	CMS_STORAGE_STORE_SQL_BUILDER
+
+	GLOBAL_SETTINGS
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make
+			-- Initialize `Current'.
+		do
+		end
+
+feature -- Factory
+
+	storage (a_setup: CMS_SETUP): detachable CMS_STORAGE_STORE_ODBC
+		local
+			s: detachable STRING
+			conn: detachable DATABASE_CONNECTION
+		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 ("odbc") then
+					s := l_database_config.database_string
+					if attached reuseable_connection.item as d then
+						if s.same_string (d.name) then
+							conn := d.connection
+						end
+					end
+					if conn = Void or else not conn.is_connected then
+						create {DATABASE_CONNECTION_ODBC} conn.login_with_connection_string (s)
+						reuseable_connection.replace ([s, conn])
+					end
+					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.
+						if Result.is_available then
+							if not Result.is_initialized then
+								initialize (a_setup, Result)
+							end
+						end
+					end
+				else
+					-- Wrong mapping between storage name and storage builder!
+				end
+			end
+		end
+
+	reuseable_connection: CELL [detachable TUPLE [name: STRING; connection: DATABASE_CONNECTION]]
+		once
+			create Result.put (Void)
+		end
+
+end