Removed unused local variables.

Added export of node revisions.

cms-safe.ecf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="cms" uuid="8CC0D052-57D1-4CAA-AFF1-448FA290734B" library_target="cms">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="cms" uuid="8CC0D052-57D1-4CAA-AFF1-448FA290734B" library_target="cms">
 	<target name="cms">
 		<root all_classes="true"/>
 		<file_rule>
@@ -12,15 +12,19 @@
 		</option>
 		<mapping old_name="CMS_LAYOUT" new_name="CMS_ENVIRONMENT"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension-safe.ecf"/>
 		<library name="cms_app_env" location=".\library\app_env\app_env-safe.ecf"/>
+		<library name="cms_config" location=".\library\configuration\config-safe.ecf"/>
 		<library name="cms_model" location=".\library\model\cms_model-safe.ecf" readonly="false"/>
-		<library name="config" location=".\library\configuration\config-safe.ecf"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf"/>
 		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf" readonly="false"/>
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error-safe.ecf"/>
 		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http-safe.ecf"/>
 		<library name="i18n" location="$ISE_LIBRARY\library\i18n\i18n-safe.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
+		<library name="kmp_matcher" location="$ISE_LIBRARY\library\text\regexp\kmp_matcher\kmp_matcher-safe.ecf"/>
+		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf"/>
+		<library name="notification_mailer" location="$ISE_LIBRARY\contrib\library\runtime\process\notification_email\notification_email-safe.ecf"/>
 		<library name="smarty" location="$ISE_LIBRARY\contrib\library\text\template\smarty\smarty-safe.ecf" readonly="false"/>
 		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter-safe.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
@@ -28,7 +32,6 @@
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
 		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension-safe.ecf" readonly="false"/>
 		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html-safe.ecf" readonly="false"/>
-		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>

cms.ecf

@@ -13,15 +13,19 @@
 		</option>
 		<mapping old_name="CMS_LAYOUT" new_name="CMS_ENVIRONMENT"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension.ecf"/>
 		<library name="cms_app_env" location=".\library\app_env\app_env.ecf"/>
+		<library name="cms_config" location=".\library\configuration\config.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="kmp_matcher" location="$ISE_LIBRARY\library\text\regexp\kmp_matcher\kmp_matcher.ecf"/>
+		<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
+		<library name="notification_mailer" location="$ISE_LIBRARY\contrib\library\runtime\process\notification_email\notification_email.ecf"/>
 		<library name="smarty" location="$ISE_LIBRARY\contrib\library\text\template\smarty\smarty.ecf" readonly="false"/>
 		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
@@ -29,7 +33,6 @@
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
 		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension.ecf" readonly="false"/>
 		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html.ecf" readonly="false"/>
-		<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>

examples/demo/demo-safe.ecf

@@ -1,83 +1,83 @@
 <?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">
-<description>Example/demo for Eiffel ROC CMS library</description>
-<target name="common" abstract="true">
-	<file_rule>
-		<exclude>/EIFGENs$</exclude>
-		<exclude>/CVS$</exclude>
-		<exclude>/.svn$</exclude>
-	</file_rule>
-	<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="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_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_auth_module" location="..\..\modules\auth\auth-safe.ecf" readonly="false"/>
-	<library name="cms_node_module" location="..\..\modules\node\node-safe.ecf" readonly="false"/>
-	<!--
-	<library name="persistence_store_mysql" location="..\..\library\persistence\store_mysql\store_mysql-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>
-	<variable name="httpd_ssl_disabled" value="true"/><!-- for now ... due to issue with libcurl+eiffelnet ssl -->
-	<setting name="concurrency" value="thread"/>
-	<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"/>
-	<library name="default_nino" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\nino-safe.ecf"/>
-	<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
-	<cluster name="src" location=".\src\" recursive="true"/>
-</target>
-<target name="demo_cgi" extends="common">
-	<root class="EWF_ROC_SERVER" feature="make_and_launch"/>
-	<setting name="concurrency" value="none"/>
-	<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
-	<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
-	<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_standalone">
-</target>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="demo" uuid="3643E657-BCBE-46AA-931B-71EAEA877A18" library_target="demo">
+	<description>Example/demo for Eiffel ROC CMS library</description>
+	<target name="common" abstract="true">
+		<root class="DEMO_CMS_SERVER" feature="make_and_launch"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<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="thread"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="cms" location="..\..\cms-safe.ecf" readonly="false">
+			<option>
+				<assertions precondition="true" postcondition="true" supplier_precondition="true"/>
+			</option>
+		</library>
+		<library name="cms_admin_module" location="..\..\modules\admin\admin-safe.ecf" readonly="false"/>
+		<library name="cms_app_env" location="..\..\library\app_env\app_env-safe.ecf" readonly="false"/>
+		<library name="cms_auth_module" location="..\..\modules\auth\auth-safe.ecf" readonly="false"/>
+		<library name="cms_basic_auth_module" location="..\..\modules\basic_auth\basic_auth-safe.ecf" readonly="false"/>
+		<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_email_service" location="..\..\library\email\email-safe.ecf" readonly="false"/>
+		<library name="cms_feed_aggregator_module" location="..\..\modules\feed_aggregator\feed_aggregator-safe.ecf" readonly="false"/>
+		<library name="cms_google_search_module" location="..\..\modules\google_search\google_search-safe.ecf" readonly="false" use_application_options="true"/>
+		<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="cms_oauth_20_module" location="..\..\modules\oauth20\oauth20-safe.ecf" readonly="false"/>
+		<library name="cms_openid_module" location="..\..\modules\openid\openid-safe.ecf" readonly="false"/>
+		<library name="cms_recent_changes_module" location="..\..\modules\recent_changes\recent_changes-safe.ecf" readonly="false"/>
+		
+		<library name="persistence_sqlite3" location="..\..\library\persistence\sqlite3\sqlite3-safe.ecf" readonly="false">
+			<option>
+				<assertions/>
+			</option>
+		</library>
+		<library name="persistence_store_odbc" location="..\..\library\persistence\store_odbc\store_odbc-safe.ecf" />
+		<!--
+		<library name="persistence_store_mysql" location="..\..\library\persistence\store_mysql\store_mysql-safe.ecf" />
+		-->
+		<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">
+		<setting name="concurrency" value="thread"/>
+		<library name="any_launcher" location="..\..\launcher\any-safe.ecf" readonly="false"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
+	</target>
+	<target name="demo_standalone" extends="common">
+		<option debug="true">
+			<debug name="dbglog" enabled="true"/>
+		</option>
+		<setting name="concurrency" value="scoop"/>
+		<variable name="httpd_ssl_disabled" value="true"/>
+		<library name="standalone_launcher" location="..\..\launcher\standalone-safe.ecf" readonly="false"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
+	</target>
+	<target name="demo_standalone_none" extends="demo_standalone">
+		<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_cgi" extends="common">
+		<setting name="concurrency" value="none"/>
+		<library name="cgi_launcher" location="..\..\launcher\cgi-safe.ecf" readonly="false"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
+	</target>
+	<target name="demo_libfcgi" extends="common">
+		<setting name="concurrency" value="none"/>
+		<library name="libfcgi_launcher" location="..\..\launcher\libfcgi-safe.ecf" readonly="false"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
+	</target>
+	<target name="demo" extends="demo_standalone">
+	</target>
 </system>

examples/demo/install_modules.bat

@@ -0,0 +1,14 @@
+setlocal
+set ROC_CMD=call %~dp0..\..\tools\roc.bat
+set ROC_CMS_DIR=%~dp0
+
+%ROC_CMD% install --module ..\..\modules\admin	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\auth	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\basic_auth	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\blog	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\node	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\oauth20	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\openid	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\recent_changes	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\feed_aggregator	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --module ..\..\modules\google_search	--dir %ROC_CMS_DIR%

examples/demo/modules/blog/cms_blog_module.e

@@ -1,150 +0,0 @@
-note
-	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,
-			install,
-			blog_api
-		end
-
-	CMS_HOOK_MENU_SYSTEM_ALTER
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	make
-		do
-			name := "Blog demo module"
-			version := "1.0"
-			description := "Service to demonstrate new node for blog"
-			package := "demo"
-		end
-
-feature {CMS_API} -- Module Initialization			
-
-	initialize (api: CMS_API)
-			-- <Precursor>
-		local
-			ct: CMS_BLOG_NODE_TYPE
-		do
-			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))
-					-- Add support for CMS_BLOG, which requires a storage extension to store the optional "tags" value
-					-- For now, we only have extension based on SQL statement.
-				if attached {CMS_NODE_STORAGE_SQL} l_node_api.node_storage as l_sql_node_storage then
-					l_sql_node_storage.register_node_storage_extension (create {CMS_NODE_STORAGE_SQL_BLOG_EXTENSION}.make (l_sql_node_storage))
-				end
-			end
-		end
-
-feature {CMS_API} -- Module management
-
-	install (api: CMS_API)
-		local
-			sql: STRING
-		do
-				-- Schema
-			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 AUTO_INCREMENT NOT NULL CHECK("nid">=0),
-  `revision` INTEGER,
-  `tags` VARCHAR(255)
-);
-					]"
-					l_sql_storage.sql_execute_script (sql)
-					if l_sql_storage.has_error then
-						api.logger.put_error ("Could not initialize database for blog module", generating_type)
-					end
-				end
-				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
-
-	setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
-			-- <Precursor>
-		do
-			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_with_request_methods (l_uri_mapping, a_router.methods_get)
-
-				-- We can add a page number after /blogs/ to get older posts
-			a_router.handle_with_request_methods ("/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_with_request_methods ("/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_with_request_methods ("/blogs/user/{user}/page/{page}", l_blog_user_handler, a_router.methods_get)
-
-		end
-
-feature -- Hooks
-
-	register_hooks (a_response: CMS_RESPONSE)
-		do
-			a_response.subscribe_to_menu_system_alter_hook (Current)
-		end
-
-	menu_system_alter (a_menu_system: CMS_MENU_SYSTEM; a_response: CMS_RESPONSE)
-		local
-			lnk: CMS_LOCAL_LINK
-		do
-				-- Add the link to the blog to the main menu
-			create lnk.make ("Blogs", "blogs/")
-			a_menu_system.primary_menu.extend (lnk)
-		end
-end

examples/demo/modules/blog/cms_node_storage_sql_blog_extension.e

@@ -1,115 +0,0 @@
-note
-	description: "Storage extension for Blog nodes."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CMS_NODE_STORAGE_SQL_BLOG_EXTENSION
-
-inherit
-	CMS_NODE_STORAGE_EXTENSION [CMS_BLOG]
-
-	CMS_PROXY_STORAGE_SQL
-		rename
-			sql_storage as node_storage
-		redefine
-			node_storage
-		end
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	node_storage: CMS_NODE_STORAGE_SQL
-			-- <Precursor>
-
-feature -- Access
-
-	content_type: STRING
-		once
-			Result := {CMS_BLOG_NODE_TYPE}.name
-		end
-
-feature -- Persistence
-
-	store (a_node: CMS_BLOG)
-		local
-			l_parameters: STRING_TABLE [detachable ANY]
-			l_new_tags: detachable STRING_32
-			l_previous_tags: detachable STRING_32
-			l_update: BOOLEAN
-		do
-			error_handler.reset
-			if attached api as l_api then
-				l_api.logger.put_information (generator + ".store", Void)
-			end
-
-			create l_parameters.make (2)
-			l_parameters.put (a_node.id, "nid")
-			l_parameters.put (a_node.revision, "revision")
-
-			sql_query (sql_select_blog_data, l_parameters)
-			if not has_error then
-				if sql_rows_count = 1 then
-					l_previous_tags := sql_read_string_32 (3)
-					l_update := True
-				end
-				if attached a_node.tags as l_tags and then not l_tags.is_empty then
-					create l_new_tags.make (0)
-					across
-						l_tags as ic
-					loop
-						if not l_new_tags.is_empty then
-							l_new_tags.append_character (',')
-						end
-						l_new_tags.append (ic.item)
-					end
-				else
-					l_new_tags := Void
-				end
-				l_parameters.put (l_new_tags, "tags")
-				if l_update and l_new_tags /~ l_previous_tags then
-					sql_change (sql_update_blog_data, l_parameters)
-				elseif l_new_tags /= Void then
-					sql_change (sql_insert_blog_data, l_parameters)
-				else
-					-- no blog data, means everything is empty.
-				end
-			end
-		end
-
-	load (a_node: CMS_BLOG)
-		local
-			l_parameters: STRING_TABLE [ANY]
-			n: INTEGER
-		do
-			error_handler.reset
-			create l_parameters.make (2)
-			l_parameters.put (a_node.id, "nid")
-			l_parameters.put (a_node.revision, "revision")
-			sql_query (sql_select_blog_data, l_parameters)
-			if not has_error then
-				n := sql_rows_count
-				if n = 1 then
-						-- nid, revision, parent
-					if
-						attached sql_read_string_32 (3) as l_tags and then
-						not l_tags.is_whitespace
-					then
-							-- FIXME: find a simple way to access the declared content types.
-						a_node.set_tags_from_string (l_tags)
-					end
-				else
-					check unique_data: n = 0 end
-				end
-			end
-		end
-
-feature -- SQL
-
-	sql_select_blog_data: STRING = "SELECT nid, revision, tags FROM blog_post_nodes WHERE nid =:nid AND revision=:revision;"
-	sql_insert_blog_data: STRING = "INSERT INTO blog_post_nodes (nid, revision, tags) VALUES (:nid, :revision, :tags);"
-	sql_update_blog_data: STRING = "UPDATE blog_post_nodes SET nid=:nid, revision=:revision, tags=:tags WHERE nid=:nid AND revision=:revision;"
-
-end

examples/demo/modules/demo/cms_demo_module.e

@@ -12,7 +12,6 @@ inherit
 		redefine
 			register_hooks,
 			initialize,
-			is_installed,
 			install
 		end
 
@@ -27,12 +26,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)
@@ -49,12 +51,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
@@ -69,12 +65,12 @@ CREATE TABLE tb_demo(
   `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
 				end
-				api.storage.set_custom_value ("is_initialized", "module-" + name, "yes")
+				Precursor {CMS_MODULE}(api)
 			end
 		end
 
@@ -83,21 +79,21 @@ feature -- Access: router
 	setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
 			-- <Precursor>
 		do
-			map_uri_template_agent (a_router, "/demo/", agent handle_demo (?,?,a_api))
-			map_uri_template_agent (a_router, "/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
 
 	register_hooks (a_response: CMS_RESPONSE)
 		do
-			a_response.subscribe_to_menu_system_alter_hook (Current)
-			a_response.subscribe_to_block_hook (Current)
+			a_response.hooks.subscribe_to_menu_system_alter_hook (Current)
+			a_response.hooks.subscribe_to_block_hook (Current)
 		end
 
 	block_list: ITERABLE [like {CMS_BLOCK}.name]
 		do
-			Result := <<"demo-info">>
+			Result := <<"?demo-info">>
 		end
 
 	get_block_view (a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE)
@@ -107,8 +103,8 @@ feature -- Hooks
 			m: CMS_MENU
 			lnk: CMS_LOCAL_LINK
 		do
-			if a_block_id.is_case_insensitive_equal_general ("demo-info") then
-				if a_response.request.request_uri.starts_with ("/demo/") then
+			if a_block_id.same_string ("demo-info") then
+				if a_response.location.starts_with_general ("demo/") then
 					create m.make_with_title (a_block_id, "Demo", 2)
 					create lnk.make ("demo: abc", "demo/abc")
 					m.extend (lnk)
@@ -137,49 +133,31 @@ feature -- Handler
 			r: NOT_IMPLEMENTED_ERROR_CMS_RESPONSE
 		do
 			create r.make (req, res, a_api)
-			r.set_main_content ("DEMO module does not yet implement %"" + req.path_info + "%" ...")
+			r.set_main_content ("DEMO module does not yet implement %"" + req.percent_encoded_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/blocks.ini

@@ -0,0 +1,25 @@
+### Blocks settings
+
+#navigation.region=sidebar_first
+#navigation.condition=is_front
+management.conditions[]=path:admin*
+management.conditions[]=is_front
+
+#Feeds
+feed.news.weight=3
+feed.news.region=feed_news
+feed.news.region=content
+feed.news.condition=is_front
+
+feed.forum.weight=2
+feed.forum.region=feed_forum
+feed.forum.region=content
+feed.forum.condition=is_front
+feed.forum.options[size]=5
+
+#Updates
+recent_changes.region=content
+recent_changes.condition=is_front
+recent_changes.title=Updates
+recent_changes.options[size]=4
+

examples/demo/site/config/cms.ini

@@ -1,11 +1,30 @@
 [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
+
+[modules]
+# Module status
+#   *=on  -> modules are enabled by default
+#   *=off -> modules are disabled by default
+# Default is "on"
+# for each module, this can be overwritten with
+#  module_name= on or off
+*=all
+
+[blocks]
+@include=blocks.ini
+
+[admin]
+# CMS Installation, are accessible by "all", "none" or uppon "permission". (default is none)
+installation_access=all

examples/demo/site/config/demo.json

@@ -1,10 +1,15 @@
 {
 	"database": {
 		"datasource": {
-			"driver": "odbc",
-			"environment": "odbc-sqlite"
+			"driver": "sqlite3",
+			"environment": "sqlite3",
+			"-driver": "odbc",
+			"-environment": "odbc-sqlite"
 		},
 		"environments": {
+			"sqlite3": {
+				"connection_string":"Database=./site/database.sqlite3;"
+			},
 			"odbc-sqlite": {
 				"connection_string":"Driver=SQLite3 ODBC Driver;Database=./site/database.sqlite;LongNames=0;Timeout=1000;NoTXN=0;SyncPragma=NORMAL;StepAPI=0;"
 			},

examples/demo/site/config/modules/login/oauth2_gmail.json

@@ -1,7 +0,0 @@
-{
-	"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/admin/files/css/admin.css

@@ -0,0 +1,34 @@
+ul.cms-users {
+  list-style-type: none;
+  padding: 3px 3px 3px 3px;
+  border: solid 1px #ccc; }
+  ul.cms-users li {
+    border-top: dotted 1px #ccc; }
+    ul.cms-users li:first-child {
+      border-top: none; }
+  ul.cms-users li.cms_user a::before {
+    content: "[users] "; }
+
+ul.cms-roles {
+  list-style-type: none;
+  padding: 3px 3px 3px 3px;
+  border: solid 1px #ccc; }
+  ul.cms-roles li {
+    border-top: dotted 1px #ccc; }
+    ul.cms-roles li:first-child {
+      border-top: none; }
+  ul.cms-roles li.cms_role a::before {
+    content: "[roles] "; }
+
+ul.cms-permissions {
+  list-style-type: none;
+  padding: 3px 3px 3px 3px;
+  border: solid 1px #ccc; }
+  ul.cms-permissions li {
+    border-top: dotted 1px #ccc; }
+    ul.cms-permissions li:first-child {
+      border-top: none; }
+  ul.cms-permissions li.cms_permission a::before {
+    content: "[permission] "; }
+
+/*# sourceMappingURL=admin.css.map */

examples/demo/site/modules/admin/files/scss/admin.scss

@@ -0,0 +1,59 @@
+ul.cms-users {
+	
+	list-style-type: none;
+	padding: 3px 3px 3px 3px;
+	border: solid 1px #ccc;
+
+	li{
+		border-top: dotted 1px #ccc;
+		&:first-child {
+			border-top: none;
+		}
+	}
+
+	li.cms_user a::before {
+		content: "[users] ";
+	}
+}
+
+
+ul.cms-roles {
+	
+	list-style-type: none;
+	padding: 3px 3px 3px 3px;
+	border: solid 1px #ccc;
+
+	li{
+		border-top: dotted 1px #ccc;
+		&:first-child {
+			border-top: none;
+		}
+	}
+
+	li.cms_role a::before {
+		content: "[roles] ";
+	}
+}
+
+
+ul.cms-permissions {
+	
+	list-style-type: none;
+	padding: 3px 3px 3px 3px;
+	border: solid 1px #ccc;
+
+	li{
+		border-top: dotted 1px #ccc;
+		&:first-child {
+			border-top: none;
+		}
+	}
+
+	li.cms_permission a::before {
+		content: "[permission] ";
+	}
+}
+
+
+
+

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

@@ -8,10 +8,10 @@
 	</head>
 
 	<body>
-		<p>You have required a new password at <a href="...">ROC CMS</a></p>
+		<p>You have required a new password at <a href="$host">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>
+</html>

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

@@ -8,11 +8,11 @@
 	</head>
 
 	<body>
-		<p>You have request a new activation token at<a href="...">ROC CMS</a></p>
+		<p>You have request a new activation token 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>
+</html>

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

@@ -7,7 +7,7 @@
 	  <meta name="author" content="ROC CMS">
 	</head>
 	<body>
-		<p>Welcome to<a href="...">ROC CMS</a></p>
+		<p>Welcome to<a href="$host">ROC CMS</a></p>
 		<p>Thank you for joining us.</p>
 	</body>
-</html>
+</html>

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

@@ -0,0 +1,67 @@
+ 	<div class="primary-tabs">
+	 {if isset="$user"}
+		<h3>Account Information</h3>
+		<div>
+			<div>
+				<div>	
+			   		<label>Username:</label>  {$user.name/}
+			   	</div>
+			   	<div>	
+			   		<label>Email:</label>  {$user.email/}
+			   	</div>
+			   	<div>	
+			   		<label>Creation Date:</label>  {$user.creation_date/}
+			   	</div>
+			   	<div>	
+			   		<label>Last login:</label>  {$user.last_login_date/}
+			   	</div>	
+			   	<div>
+			   		<form method="get" action="{$site_url/}{$auth_login_strategy/}">
+    					<button type="submit">Logout</button>
+					</form>
+			   	</div>	
+			</div>
+    	</div>
+    	<hr>
+    	{include file="block_change_password.tpl" /}
+       	<hr>
+    	<h4>Roles</h4>
+    	<div>
+    		{foreach item="ic" from="$roles"}
+    			<div>	
+			   		<ul>
+			   			<li>
+			   				<strong>{$ic.name/}</strong>
+			   				<ul>
+			   					<li> <i>permissions</i> 
+				   					<ul>	
+					   					{foreach item="ip" from="$ic.permissions"}
+					   						<li>{$ip/}</li>
+					   					{/foreach}
+					   				</ul>
+					   			</li>	
+			   				</ul>		
+			   			</li>
+			   		</ul>
+			   	</div>
+    		{/foreach}
+    	</div>		
+
+
+    	<hr>
+    	<h4>Profile</h4>
+    	<div>
+    		{foreach item="the_value" key="the_name" from="$user.profile"}
+    			<div>	
+			   		<label>{$the_name/}:</label>  {$the_value/} 
+			   	</div>
+    		{/foreach}
+    	</div>		
+	{/if}
+	{unless isset="$user"}
+		<div>
+			<p> You are not logged in </p>
+				<a href="{$site_url/}account/roc-login">Go to the login page</a>
+		</div>	
+	{/unless}
+	</div>

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

@@ -0,0 +1,21 @@
+ <div>
+    <form action="{$site_url/}account/change-password" method="post">
+        <fieldset>
+            <legend>Change Password Form</legend>
+            <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/auth/templates/block_login.tpl

@@ -25,10 +25,5 @@
 				</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,32 @@
+ <div>
+    <form action="{$site_url/}account/new-password" method="post">
+        <fieldset>
+            <legend>Request new password by email</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>
+    <hr>
+    <form action="{$site_url/}account/new-password" method="post">
+        <fieldset>
+            <legend>Request new password by username</legend>
+            <div>
+                <input type="text" id="username" name="username"  value="{$username/}"  required/>
+                <label for="username">Username</label>
+                {if isset="$error_username"}
+                    <span><i>{$error_username/}</i></span> <br>
+                {/if}
+                <br>
+            </div>
+            <button type="submit">Send</button>
+        </fieldset>    
+    </form>
+
+</div>

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

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

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

@@ -1,5 +1,5 @@
  <div>
-    <form action="/account/reactivate" method="post">
+    <form action="{$site_url/}account/reactivate" method="post">
         <fieldset>
             <legend>Reactivate Form</legend>
             <div>

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

@@ -1,5 +1,5 @@
  <div>
-    <form action="/account/roc-register" method="post">
+    <form action="{$site_url/}account/roc-register" method="post">
         <fieldset>
             <legend>Register Form</legend>
             <div>

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

@@ -1,5 +1,5 @@
  <div>
-    <form action="/account/reset-password" method="post">
+    <form action="{$site_url/}account/reset-password" method="post">
         <fieldset>
             <legend>Generate New Password Form</legend>
             <div>

examples/demo/site/modules/basic_auth/files/js/roc_basic_auth.js

@@ -7,7 +7,7 @@ var userAgent = navigator.userAgent.toLowerCase();
 var firstLogIn = true;
  
 ROC_AUTH.login = function() {
-    var form = document.forms[0];
+    var form = document.forms['cms_basic_auth'];
     var username = form.username.value;
     var password = form.password.value;
 	  //var host = form.host.value;
@@ -25,7 +25,7 @@ ROC_AUTH.login = function() {
                     var newdiv = document.createElement('div');
 	                  newdiv.innerHTML = "<br>Invalid Credentials</br>";
                     newdiv.id = 'myModalFormId';
-                     $("body").append(newdiv);
+                     $(".primary-tabs").append(newdiv);
                } 
 	}else{  
          
@@ -39,7 +39,7 @@ ROC_AUTH.login = function() {
              if (request.readyState == 4) {
                  if (request.status==200) {
                         delete form;
-                        window.location=origin;
+                        window.location=window.location.origin;
                 }
                 else{
                   if (navigator.userAgent.toLowerCase().indexOf("firefox") != -1){                       
@@ -49,7 +49,7 @@ ROC_AUTH.login = function() {
                     var newdiv = document.createElement('div');
 	                   newdiv.innerHTML = "<br>Invalid Credentials</br>";
                     newdiv.id = 'myModalFormId';
-                    $("body").append(newdiv);
+                    $(".primary-tabs").append(newdiv);
                    } 
 
                   }
@@ -93,7 +93,7 @@ ROC_AUTH.login_with_redirect = function() {
                     var newdiv = document.createElement('div');
                       newdiv.innerHTML = "<br>Invalid Credentials</br>";
                     newdiv.id = 'myModalFormId';
-                    $("body").append(newdiv);
+                    $(".primary-tabs").append(newdiv);
                      $("#imgProgressRedirect").hide();
                } 
     }else{  
@@ -122,8 +122,8 @@ ROC_AUTH.login_with_redirect = function() {
                     var newdiv = document.createElement('div');
                        newdiv.innerHTML = "<br>Invalid Credentials</br>";
                     newdiv.id = 'myModalFormId';
-                    $("body").append(newdiv);
-                     $("#imgProgressRedirect").hide();    
+                    $(".primary-tabs").append(newdiv);
+                    $("#imgProgressRedirect").hide();    
                    } 
 
                   }
@@ -306,16 +306,20 @@ ROC_AUTH.create_form = function() {
 };
 
 
-var password = document.getElementById("password")
-  , confirm_password = document.getElementById("confirm_password");
+var password = document.getElementById("password");
+var 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('');
-  }
+  if ((password != null) && (confirm_password != null)) {
+    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;
+if ((password != null) && (confirm_password != null)) {
+  password.onchange = ROC_AUTH.validatePassword();
+  confirm_password.onkeyup = ROC_AUTH.validatePassword;
+}

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

@@ -0,0 +1,29 @@
+ 	<div class="primary-tabs">
+ 		{unless isset="$user"}
+			<h3>Login or <a href="{$site_url/}account/roc-register">Register</a></h3>
+		<div>
+			<div>	
+			    <form name="cms_basic_auth" action method="POST">
+					<div>
+						<input type="text" name="username" id="username" required>
+						<label>Username</label>
+					</div>
+										
+					<div>
+						<input  type="password" name="password"  id="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>	
+		{/unless}
+	</div>

examples/demo/site/modules/feed_aggregator/config/feeds.json

@@ -0,0 +1,28 @@
+{
+	"ids": ["news", "forum"],
+	"feeds": { 
+		"news": {
+			"title": "Eiffel related posts", 
+			"expiration": "21600",
+			"size": 5,
+			"locations": [
+					"https://bertrandmeyer.com/feed/",
+					"https://room.eiffel.com/blog/feed",
+					"https://room.eiffel.com/article/feed",
+					"https://room.eiffel.com/library/feed"
+					]
+			, "categories": ["Eiffel"]
+			,"option_description": "enabled"
+			},
+		"forum": {
+			"title": "Eiffel Forum",
+			"expiration": "21600",
+			"size": 5,
+			"locations": [
+					"https://groups.google.com/forum/feed/eiffel-users/msgs/atom.xml?num=15",
+					"http://stackoverflow.com/feeds/tag?tagnames=eiffel&sort=newest"
+				]
+			,"option_description": "enabled"
+		}
+	}
+}

examples/demo/site/modules/feed_aggregator/files/css/feed_aggregator.css

@@ -0,0 +1,53 @@
+div.feed ul {
+  list-style: none;
+  position: relative;
+  padding: 0;
+  margin: 0;
+  width: 99%;
+}
+div.feed li {
+  /* border-top: solid 1px #ddd; */
+  padding: 0;
+  margin: 0 0 5px 0;
+}
+div.feed li a {
+  font-weight: bold;
+}
+div.feed li .date {
+  font-weight: bold;
+  font-size: small;
+}
+div.feed li .category {
+  margin-left: 20px;
+  font-size: 8px;
+  height: 9px;
+  overflow: hidden;
+  color: #999;
+}
+div.feed li .description {
+  margin-left: 20px;
+  font-size: small;
+  height: 18px;
+  overflow: hidden;
+  color: #999;
+}
+div.feed li:hover {
+  margin-bottom: 23px;
+}
+div.feed li:hover .description {
+  padding: 5px;
+  position: absolute;
+  height: auto;
+  overflow-y: scroll;
+  overflow-x: scroll;
+  color: #000;
+  background-color: #fff;
+  border: solid 1px #000;
+  z-index: 10;
+}
+div.feed li:hover:last-child {
+  margin-bottom: 28px;
+}
+div.feed li .description::after {
+  content: "...";
+}

examples/demo/site/modules/feed_aggregator/files/scss/feed_aggregator.scss

@@ -0,0 +1,54 @@
+div.feed {
+	ul {
+		list-style: none;
+		position: relative;
+		padding: 0;
+		margin: 0;
+		width: 99%;
+	}
+	li {
+		/* border-top: solid 1px #ddd; */
+		padding: 0;
+		margin: 0 0 5px 0;
+
+		a {
+			font-weight: bold;
+		}
+		.date {
+			font-weight: bold;
+			font-size: small;
+		}
+		.category {
+			margin-left: 20px;
+			font-size: 8px;
+			height: 9px;
+			overflow: hidden;
+			color: #999;
+		}
+		.description {
+			margin-left: 20px;
+			font-size: small;
+			height: 18px;
+			overflow: hidden;
+			color: #999;
+		}
+		&:hover {
+			margin-bottom: 23px;
+			.description {
+				padding: 5px;
+				position: absolute;
+				height: auto;
+				overflow-y: scroll;
+				overflow-x: scroll;
+				color: #000;
+				background-color: #fff;
+				border: solid 1px #000;
+				z-index: 10;
+			}
+			&:last-child {
+				margin-bottom: 28px;
+			}
+		}
+		.description::after { content: "..."; }
+	}
+}

examples/demo/site/modules/google_search/config/google_search.json

@@ -0,0 +1,6 @@
+{
+    "gcse": {
+     		"cx":"",
+     		"secret_key":""
+     }	
+}

examples/demo/site/modules/google_search/templates/block_search.tpl

@@ -0,0 +1,40 @@
+<section>
+  <header>
+    <h2>Results for <kbd>{$result.current_page.search_terms/}</kbd></h2>
+  </header>
+  
+  <!-- list of results -->
+  <ol start="{$result.current_page.start_index/}">
+  
+    <!-- Item result -->
+    {foreach from="$result.items" item="item"}
+    <li>
+      <article>
+        <header>
+          <h3>
+            <cite>
+              <a href="{$item.link/}">{$item.title/}</a>
+            </cite>
+          </h3>
+        </header>
+        <blockquote cite="{$item.link/}">
+          <p>{$item.html_snippet/}</p>
+          <footer>
+            <p><abbr title="Uniform Resource Locator">Source</abbr> <a href="{$item.link/}">{$item.display_link/}</a></p>
+          </footer>
+        </blockquote>
+      </article>
+    </li>
+    {/foreach} 
+
+    
+  </ol>  
+  <ul class="cms-page-links">
+      {if isset="$result.previous_page"}
+        <li><a href="{$site_url/}gcse/?q={$result.previous_page.search_terms/}&amp;start={$result.previous_page.start_index/}&amp;num={$result.previous_page.count/}">Previous</a></li>
+      {/if}
+      {if isset="$result.next_page"}
+        <li><a href="{$site_url/}gcse/?q={$result.next_page.search_terms/}&amp;start={$result.next_page.start_index/}&amp;num={$result.next_page.count/}">Next</a></li>
+      {/if}
+  </ul>
+</section>

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

@@ -0,0 +1,37 @@
+
+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,
+	CONSTRAINT Unique_nid_revision UNIQUE (nid,revision)
+);
+
+CREATE TABLE node_revisions (
+	`nid`	INTEGER NOT NULL,
+	`revision`	INTEGER NOT NULL,
+	`title`	VARCHAR(255) NOT NULL,
+	`summary`	TEXT,
+	`content`	TEXT,
+	`format`	VARCHAR(128),
+	`author`	INTEGER,
+	`changed`	DATETIME NOT NULL,
+	`status`	INTEGER,
+	CONSTRAINT Unique_nid_revision PRIMARY KEY (nid,revision)
+);
+
+CREATE TABLE page_nodes(
+	`nid` INTEGER NOT NULL,
+	`revision` INTEGER NOT NULL,
+	`parent` INTEGER,
+	CONSTRAINT PK_nid_revision PRIMARY KEY (nid,revision)
+);
+

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

@@ -1,5 +1,5 @@
 
-CREATE TABLE `oauth2_consumers`(
+CREATE TABLE oauth2_consumers(
    `cid` INTEGER PRIMARY KEY NOT NULL CHECK(`cid`>=0),
    `name` VARCHAR(255) NOT NULL,
    `api_secret` TEXT  NOT NULL,

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

@@ -1,10 +1,13 @@
 
-CREATE TABLE :table_name (
+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,
+   `email` TEXT NOT NULL,
    CONSTRAINT `uid`
-    UNIQUE(`uid`)
+    UNIQUE(`uid`),
+   CONSTRAINT `email`
+    UNIQUE(`email`) 
    );
 

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

@@ -0,0 +1,32 @@
+	<hr>
+		{unless isempty="$oauth_associated"}
+    	<h4>Un-Associate Account with Oauth Consumer</h4>
+    	<div>
+    		{foreach item="consumer" from="$oauth_associated"}
+    			<div>
+    				<form method="post" action="{$site_url/}account/oauth-un-associate">
+						<input type="hidden" name="consumer" value="{$consumer/}"/>
+          				<div>
+                			<button type="submit">Unlink {$consumer/}</button>
+              			</div>
+          			</form>	
+			   	</div>
+    		{/foreach}
+    	</div>
+		{/unless}
+		{unless isempty="$oauth_not_associated"}
+    	<h4>Associate Account with Oauth Consumer</h4>
+    	<div>
+    		{foreach item="consumer" from="$oauth_not_associated"}
+    			<div>
+    				<form method="post" action="{$site_url/}account/oauth-associate">
+						<input type="hidden" name="consumer" value="{$consumer/}"/>
+          				<div>
+          				  <input type="email" id="email" name="email"  value="{$email/}"  required/>	
+                		  <button type="submit">Link with {$consumer/}</button>
+              			</div>  
+					</form>	
+			   	</div>
+    		{/foreach}
+    	</div>		
+		{/unless}

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/modules/openid/scripts/openid_consumers.sql

@@ -0,0 +1,11 @@
+
+CREATE TABLE openid_consumers(
+   `cid` INTEGER PRIMARY KEY NOT NULL CHECK(`cid`>=0),
+   `name` VARCHAR(255) NOT NULL,
+   `endpoint`  VARCHAR (255) NOT NULL,
+   CONSTRAINT `cid`
+    UNIQUE(`cid`),
+   CONSTRAINT `name`
+    UNIQUE(`name`)
+   );
+

examples/demo/site/modules/openid/scripts/openid_consumers_initialize.sql

@@ -0,0 +1,4 @@
+	-- Change the values TO_COMPLETE based on your API.
+	-- API SECTET KEY AND API PUBLIC KEY 
+INSERT INTO openid_consumers (name, endpoint) 
+VALUES ('yahoo', 'https://me.yahoo.com/');

examples/demo/site/modules/openid/scripts/openid_items.sql

@@ -0,0 +1,11 @@
+
+CREATE TABLE openid_items (
+   `uid` INTEGER PRIMARY KEY NOT NULL CHECK(`uid`>=0),
+   `identity` TEXT  NOT NULL,
+   `created` DATETIME NOT NULL,
+   CONSTRAINT `uid`
+    UNIQUE(`uid`),
+    CONSTRAINT `identity`
+    UNIQUE(`identity`)
+   );
+

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

@@ -0,0 +1,18 @@
+ <div>
+ 	<form action="{$site_url/}account/roc-openid-login" id="openid-login" method="POST">
+		<div>
+				<strong><label for="openid">OpenID identifier</label></strong><br/>
+				<input type="text" name="openid" value="" size="50"/>
+		</div>
+		<div><input type="submit" name="op" value="Validate"/></div>
+		<div hgv vtid="openid">Login with 			
+			{foreach item="item" from="$openid_consumers"}
+				<a href="{$site_url/}account/login-with-openid/{$item/}">{$item/}</a><br>
+			{/foreach}	
+	</form>
+	<div>
+	  {if isset="$error"}
+       <span><i>{$error/}</i></span> <br>
+      {/if}
+     </div> 
+</div>

examples/demo/site/scripts/node.sql

@@ -1,22 +0,0 @@
-
-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/themes/bootstrap/assets/css/style.css

@@ -51,16 +51,24 @@ ul.horizontal li {
 .sidebar {
   padding: 5px;
   margin: 3px;
-  border: solid 1px #ccc;
+  /* border: solid 1px #ccc; */
 }
 .sidebar#sidebar_first {
   width: 250px;
-  float: left;
+  position: fixed;
+  top: 45px;
+  left: 0;
+  bottom: 0;
+  width: 200px;
+  border-right: solid 1px #ddd;
 }
 .sidebar#sidebar_second {
   width: 250px;
   float: right;
 }
+.sidebar + .main {
+  margin-left: 200px;
+}
 
 #primary-tabs ul.horizontal {
   list-style-type: none;
@@ -76,3 +84,9 @@ ul.horizontal li {
   border-width: 2px 1px 0;
   padding: 2px 7px 1px;
 }
+
+#message li.error {
+  background-color: #f99;
+  border: solid 1px red;
+  padding: 5px 2px 5px 2px;
+}

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

@@ -0,0 +1,8 @@
+     $(document).ready(function() {
+       $('#gcse_search_form').submit(function() {
+           window.open('', 'formpopup', 'width=600,height=600,resizeable,scrollbars');
+           this.target = 'formpopup';
+       });
+   });
+
+

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

@@ -55,15 +55,24 @@ ul.horizontal {
 .sidebar {
 	padding: 5px;
 	margin: 3px;
-	border: solid 1px #ccc;
+	/* border: solid 1px #ccc; */
 	&#sidebar_first {
 		width: 250px;
-		float: left;
+		position: fixed;
+		top: 45px;
+		left: 0;
+		bottom: 0;
+		width: 200px;
+		border-right: solid 1px #ddd;
 	}
 	&#sidebar_second {
 		width: 250px;
 		float: right;
 	}
+
+	&+.main {
+		margin-left: 200px;
+	}
 }
 #primary-tabs {
 	ul.horizontal {
@@ -81,3 +90,8 @@ ul.horizontal {
 		}
 	}
 }
+#message li.error {
+	background-color: #f99;
+	border: solid 1px red;
+	padding: 5px 2px 5px 2px;
+}

examples/demo/site/themes/bootstrap/block/header_block.tpl

@@ -1,7 +0,0 @@
-	<div class='navbar navbar-inverse'>
-      <div class='navbar-inner nav-collapse' style="height: auto;">
-        <ul class="nav">
-          {$header_block/}
-        </ul>
-      </div>
-    </div>  

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

@@ -5,13 +5,15 @@
 	<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">
-
-	<!-- CMS Blog Module -->
-	<link rel="stylesheet" href="{$site_url/}theme/css/blog.css">
-
+ 
+	<!-- jQuery dep -->
 	<script src="{$site_url/}theme/js/jquery-1.10.2.min.js"></script>
-	<script src="{$site_url/}theme/js/roc_auth.js"></script>
+	<script src="{$site_url/}theme/js/popup_search.js"></script>
+
+{if isset="$head"}{$head/}{/if}
+{if isset="$styles"}{$styles/}{/if}
+{if isset="$scripts"}{$scripts/}{/if}
+{if isset="$head_lines"}{$head_lines/}{/if}	
 
 	<!-- bootstrap framework -->
 	<!-- Latest compiled and minified CSS -->
@@ -35,7 +37,17 @@
           {$page.primary_nav/}
       {/if}
     </div> 
-    
+	<!-- Page search -->
+	<div class="row">
+		<div class="col-md-2 col-md-offset-9">
+			<form action="{$site_url/}gcse" class="search-form" id="gcse_search_form">
+				<div class="form-group has-feedback">
+					<input type="search" class="form-control" name="q" id="gcse_search" placeholder="search">
+					<span class="glyphicon glyphicon-search form-control-feedback"></span>
+				</div>
+			</form>
+		</div>
+	</div>
     <!-- General Page Content -->
     <div id='content' class='row-fluid'>
 		<!-- Left Sidebar sidebar_first -->
@@ -48,7 +60,7 @@
 		{/unless}
 
         <!-- Highlighted, Help, Content -->      
-        <div class='span8 main'>
+        <div id='main' class='span8 main'>
           <!-- Highlighted Section -->
           {unless isempty="$page.region_highlighted"}
 		  <div id="highlighted">{$page.region_highlighted/}</div>
@@ -61,9 +73,15 @@
           <!-- Main Content Section -->
 		  {unless isempty="$page_title"}<h1 class="page-title">{$page_title/}</h1>{/unless}
           {$page.region_content/}   
+		  {if condition="$page.is_front"}
+			  {if isset="$page.region_feed_news"}
+				<div class="column" style="width: 45%; float: left">{$page.region_feed_news/}</div>
+			  {/if}
+			  {if isset="$page.region_feed_forum"}
+				<div class="column" style="width: 45%; float: left">{$page.region_feed_forum/}</div>
+			  {/if}
+		  {/if}
           </div>
-
-
       </div>
     </div>
 

examples/demo/site/themes/bootstrap/theme.info

@@ -8,7 +8,7 @@ regions[content] = Content
 regions[highlighted] = Highlighted
 regions[help] = Help
 regions[footer] = Footer
-regions[first_sidebar] = first sidebar
-regions[second_sidebar] = second sidebar
+regions[sidebar_first] = first sidebar
+regions[sidebar_second] = second sidebar
 regions[page_bottom] = Bottom
-navigation=default_nav
+navigation=default_nav

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

@@ -1 +0,0 @@
-	<h2>Help Section</h2>

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

@@ -1 +0,0 @@
-          <h1>Highlighted Section</h1>

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

@@ -1,8 +0,0 @@
-      <div class='span2 sidebar'>
-        <h3>Left Sidebar</h3>
-        <ul class="nav nav-tabs nav-stacked">
-          <li><a href='#'>Another Link 1</a></li>
-          <li><a href='#'>Another Link 2</a></li>
-          <li><a href='#'>Another Link 3</a></li>
-        </ul>
-      </div>

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

@@ -1,4 +0,0 @@
-          <h2>Main Content Section</h2>
-          <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum.<p> 
-
-          <p>Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem. Investigationes demonstraverunt lectores legere me lius quod ii legunt saepius. Claritas est etiam processus dynamicus, qui sequitur mutationem consuetudium lectorum. Mirum est notare quam littera gothica, quam nunc putamus parum claram, anteposuerit litterarum formas humanitatis per seacula quarta decima et quinta decima. Eodem modo typi, qui nunc nobis videntur parum clari, fiant sollemnes in futurum.</p>

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

@@ -1,9 +0,0 @@
-  <div id="footer">
-    <small>
-    <center>
-      <p class="text-muted"><a href="#" target="_blank" class="info">ROC Documentation </a>&nbsp;&nbsp;&nbsp;
-      <a href="http://www.eiffel.com/company/contact/" target="_blank" class="info">Questions? Comments? Let us know! </a></p>
-      <p>© Copyright 2014 Eiffel Software -- <a href="#" target="_blank" class="info">Privacy Policy</a>
-    </center>
-   </small>
-  </div>

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

@@ -1,34 +0,0 @@
-  <div class="navbar navbar-default" role="navigation">
-    <div class="container-fluid">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-        <span class="sr-only">Toggle navigation</span>
-      </button>
-      <a class="navbar-brand" href="{$site_url/}" itemprop="home" rel="home">{unless isset="$site_name"}Eiffel CMS{/unless}{if isset="$site_name"}{$site_name/}{/if}</a>
-
-    </div>
-    
-    <div class="navbar-collapse collapse">
-     
-      {if isset="$primary_nav"}
-        <ul class="nav navbar-nav navbar-left">
-             {foreach item="item" from="$primary_nav.items"}
-                <!-- TODO check if a menu item is active or not -->
-                <li class="active"><a href="{$item.location/}">{$item.title/}</a></li>
-             {/foreach}
-        </ul>
-      {/if}
-
-      {if isset="$secondary_nav"}
-        <ul class="nav navbar-nav navbar-right">
-              {foreach item="item" from="$secondary_nav.items"}
-                <!-- TODO check if a menu item is active or not -->
-                <li class="active"><a href="{$item.location/}">{$item.title/}</a></li>
-             {/foreach}
-        </ul>
-      {/if}  
-    </div>
-
-  </div>
-</div>
-

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

@@ -1,28 +0,0 @@
- {if isset="$default_nav"}
-  <div class="navbar navbar-default" role="navigation">
-    <div class="container-fluid">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-        <span class="sr-only">Toggle navigation</span>
-      </button>
-      <a class="navbar-brand" href="${site_url/}" itemprop="home" rel="home">{$page_title/}</a>
-    </div>
-    
-    <div class="navbar-collapse collapse">      
-  {/if}    
-
-      {if isset="$primary_nav"}
-            {$primary_nav/}
-      {/if}
-
-      {if isset="$secondary_nav"}
-          {$secondary_nav/}
-      {/if}  
- 
-{if isset="$default_nav"}
-  
-     </div>
-
-  </div>
-</div>
-{/if}  

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

@@ -1,6 +0,0 @@
-		<ul class="nav navbar-nav navbar-left">
-             {foreach item="item" from="$menu.items"}
-                <!-- TODO check if a menu item is active or not -->
-                <li class="active"><a href="{$item.location/}">{$item.title/}</a></li>
-             {/foreach}
-        </ul>

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

@@ -1,8 +0,0 @@
-	<div class='span2 sidebar'>
-         <h3>Right Sidebar</h3>
-         <ul class="nav nav-tabs nav-stacked">
-           <li><a href='#'>Another Link 1</a></li>
-           <li><a href='#'>Another Link 2</a></li>
-           <li><a href='#'>Another Link 3</a></li>
-         </ul>
-    </div>

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

@@ -1,7 +0,0 @@
-       <ul class="nav navbar-nav navbar-right">
-              {foreach item="item" from="$menu.items"}
-                <!-- TODO check if a menu item is active or not -->
-                <li class="active"><a href="{$item.location/}">{$item.title/}</a></li>
-             {/foreach}
-        </ul>
- 

examples/demo/site/www/static/css/dashboard.css

@@ -1,357 +0,0 @@
-/*
- * Base structure
- */
-
-/* Move down content because we have a fixed navbar that is 36px tall on small screen */
-body {
-	padding-top: 40px;
-}
-/* On large screen, we give it more space and the navbar is 30px tall. */
-@media (min-width: 768px) {
-	body {
-		padding-top: 45px;
-	}
-}
-
-
-/*
- * Global add-ons
- */
-
-h1 {
-	margin-top: initial;
-	margin-bottom: 5px;
-}
-
-h2.sub-header{
-	margin-top: 1px;
-	margin-bottom: 1px;
-	border-bottom: 1px solid #eee;
-}
-
-
-.container .jumbotron {
-	padding: 10px;
-	text-align: center;
-}
-
-
-/*
- * Sidebar
- */
-
-/* Hide for mobile, show later */
-.sidebar {
-	display: none;
-}
-@media (min-width: 768px) {
-	.sidebar {
-		position: fixed;
-		top: 0;
-		left: 0;
-		bottom: 0;
-		z-index: 1000;
-		display: block;
-		padding: 70px 20px 20px;
-		background-color: #f5f5f5;
-		border-right: 1px solid #eee;
-	}
-}
-
-/* Sidebar navigation */
-.nav-sidebar {
-	margin-left: -20px;
-	margin-right: -21px; /* 20px padding + 1px border */
-	margin-bottom: 20px;
-}
-.nav-sidebar > li > a {
-	padding-left: 20px;
-	padding-right: 20px;
-}
-.nav-sidebar > .active > a {
-	color: #fff;
-	background-color: #428bca;
-}
-
-
-/*
- * Main content
- */
-
-.main {
-	padding: 3px;
-}
-@media (min-width: 768px) {
-	.main {
-		padding-left: 15px;
-		padding-right: 15px;
-	}
-}
-.main .page-header {
-	margin-top: 0;
-}
-
-
-/*
- * Placeholder dashboard ideas
- */
-
-.placeholders {
-	margin-bottom: 30px;
-	text-align: center;
-}
-.placeholders h4 {
-	margin-bottom: 0;
-}
-.placeholder {
-	margin-bottom: 20px;
-}
-.placeholder img {
-	border-radius: 50%;
-}
-
-.navbar-default {
-	background-color:#194573;
-	border-color: #400040;
-}
-.navbar-default .navbar-brand {
-	color: #ffffff;
-}
-.navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus {
-	color: #ffffff;
-}
-.navbar-default .navbar-text {
-	color: #ffffff;
-}
-.navbar-default .navbar-nav > li > a {
-	color: #ffffff;
-}
-.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
-	color: #ffffff;
-}
-.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus {
-	color: #ffffff;
-	background-color: #400040;
-}
-.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
-	color: #ffffff;
-	background-color: #400040;
-}
-.navbar-default .navbar-toggle {
-	border-color: #400040;
-}
-.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
-	background-color: #400040;
-}
-.navbar-default .navbar-toggle .icon-bar {
-	background-color: #ffffff;
-}
-.navbar-default .navbar-collapse,
-.navbar-default .navbar-form {
-	border-color: #ffffff;
-}
-.navbar-default .navbar-link {
-	color: #ffffff;
-}
-.navbar-default .navbar-link:hover {
-	color: #ffffff;
-}
-
-@media (max-width: 767px) {
-	.navbar-default .navbar-nav .open .dropdown-menu > li > a {
-		color: #ffffff;
-	}
-	.navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
-		color: #ffffff;
-	}
-	.navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
-		color: #ffffff;
-		background-color: #400040;
-	}
-}
-
-.navbar-nav > li > a {padding-top:5px !important; padding-bottom:5px !important;}
-.navbar {min-height:30px !important}
-
-.navbar-brand {
-	float: left;
-	padding: 15px;
-	padding-top: 5px;
-	padding-right: 15px;
-	padding-bottom: 5px;
-	padding-left: 15px;
-	font-size: 18px;
-	line-height: 18px;
-	height: 30px;
-}
-
-
-/* Tooltips */
-.blue-tooltip + .tooltip > .tooltip-inner {background-color: #FF;}
-.blue-tooltip + .tooltip > .tooltip-arrow { border-bottom-color:#FF; }
-
-
-.tooltip.top .tooltip-arrow {
-	bottom: 0;
-	left: 50%;
-	margin-left: -5px;
-	border-top-color: #000000;
-	border-width: 5px 5px 0;
-}
-.tooltip-inner {
-	text-align: left;
-	color: #000;
-	background: #fff;
-	border: solid 1px #000000;
-	max-width: 450px
-}
-
-.tooltip.bottom .tooltip-arrow {
-	top: 0;
-	left: 50%;
-	margin-left: -5px;
-	border-bottom-color: #000000;
-	border-width: 0 5px 5px;
-}
-
-/* pre */
-pre {
-	word-wrap: code;
-	white-space: pre-wrap;
-	background-color:white;
-}
-
-
-/* Container -Fluid */
-.container-fluid {
-	padding: 0 2px;
-}
-@media (min-width: 768px) {
-	.container-fluid {
-		padding: 0 5px;
-	}
-}
-
-.container-fluid .row {
-	margin: 0px;
-}
-
-.row-padding {
-	margin-top: 25px;
-	margin-bottom: 25px;
-}
-
-/* Width for the text field to enter a bug report number in the reports page.
- * We put a maximum width to override the width value coming from `form-control'. */
-.form-bug-number-entry {
-	max-width: 100px;
-}
-
-/* Default width for the entries in a table like layout. */
-.form-inline .form-control {
-	width: 95%;
-}
-
-.form-inline .checkbox {
-	font-weight: initial;
-	vertical-align: top;
-}
-
-/* Note that there is also a class called label. */
-label {
-	padding-right: 5px;
-}
-
-.label {
-	padding: 0px;
-	padding-right: 5px;
-}
-
-.label-primary-api-default {
-	display: inline-block;
-	width: 105px;
-	text-align: left;
-	background: #fff;
-	color: #000;
-	font-size: 100%;
-	text-align: right;
-}
-
-
-.label-primary-api-interactions {
-	display: inline-block;
-	padding-right: 5px;
-	text-align: left;
-	color: #000;
-	font-size: 100%;
-}
-
-
-pre {
-	padding: 1.5px;
-	display: block;
-	margin: 0 0 10px;
-	font-size: 12px;
-	font-family: monospace;
-	line-height: 1.428571429;
-	word-break: break-word;
-	word-wrap: break-word;
-	color: #333;
-	border: 0px; 
-	border-radius: 4px;
-}
-
-
-/* No padding, so that nested columns are always properly aligned. */
-.col-xs-1,.col-sm-1,.col-md-1,.col-lg-1,.col-xs-2,.col-sm-2,.col-md-2,.col-lg-2,.col-xs-3,.col-sm-3,.col-md-3,.col-lg-3,.col-xs-4,.col-sm-4,.col-md-4,.col-lg-4,.col-xs-5,.col-sm-5,.col-md-5,.col-lg-5,.col-xs-6,.col-sm-6,.col-md-6,.col-lg-6,.col-xs-7,.col-sm-7,.col-md-7,.col-lg-7,.col-xs-8,.col-sm-8,.col-md-8,.col-lg-8,.col-xs-9,.col-sm-9,.col-md-9,.col-lg-9,.col-xs-10,.col-sm-10,.col-md-10,.col-lg-10,.col-xs-11,.col-sm-11,.col-md-11,.col-lg-11,.col-xs-12,.col-sm-12,.col-md-12,.col-lg-12 {
-	padding-left: 0px;
-	padding-right: 0px;
-}
-
-.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td {
-	padding:2px;
-	vertical-align: middle;
-}
-
-.form-control{
-	height:inherit;
-	padding: 1px 2px;
-	margin: 1px;
-}
-
-.btn {
-	padding: 1px 12px;
-	margin: 1px;
-	min-width: 100px;
-}
-
-.dropdown-toggle, .login {
-	cursor: pointer;
-}
-
-.pager {
-	margin:10px 0;
-}
-
-.pager li>a,.pager li>span {
-	padding:1px 12px;
-	border-radius:8px;
-}
-
-.well {
-	padding: 9px;
-	margin-bottom: 10px;
-	min-height: 44px;
-}
-
-.panel-heading {
-	background-color: #ddeaf2 !important;
-}
-
-.private-panel-border {
-	border: solid 1px #DBA458 !important;
-}
-
-.private-panel {
-	background-color: #f2eadd !important;
-}

examples/demo/site/www/static/js/roc.js

@@ -1,108 +0,0 @@
-/*
- * EWF CMS javascript based on JQuery
- */
-
-/**
- * Override jQuery.fn.init to guard against XSS attacks.
- *
- * See http://bugs.jquery.com/ticket/9521
- */
-
-(function () {
-  var jquery_init = jQuery.fn.init;
-  jQuery.fn.init = function (selector, context, rootjQuery) {
-    // If the string contains a "#" before a "<", treat it as invalid HTML.
-    if (selector && typeof selector === 'string') {
-      var hash_position = selector.indexOf('#');
-      if (hash_position >= 0) {
-        var bracket_position = selector.indexOf('<');
-        if (bracket_position > hash_position) {
-          throw 'Syntax error, unrecognized expression: ' + selector;
-        }
-      }
-    }
-    return jquery_init.call(this, selector, context, rootjQuery);
-  };
-  jQuery.fn.init.prototype = jquery_init.prototype;
-})();
-
-
-var ROC = ROC || { };
-
-$('body').on('click',"a[rel='node']",function(e){
-
-  e.preventDefault();
-  /*
-  if uncomment the above line, html5 nonsupported browers won't change the url but will display the ajax content;
-  if commented, html5 nonsupported browers will reload the page to the specified link.
-  */
-
-  //get the link location that was clicked
-  pageurl = $(this).attr('href');
-
-  spinner = "<span class='loading'><h3>Loading content..</h3><img src='/static/images/ajax-loader.gif' alt='loading...' class='spinner'></span>";  
-  //to get the ajax content and display in div with class 'main'
-  $.ajax({url:pageurl+'?rel=node',success: function(data){
-  $('.main').html(data);
-  }});
-
-  //to change the browser URL to the given link location
-  //if(pageurl!=window.location){
-  //window.history.pushState({path:pageurl},'',pageurl);
-  //}
-  //stop refreshing to the page given in
-  return false;
-});
-
-$('body').on('click',"a[rel='register']",function(e){
-
-  e.preventDefault();
-  /*
-  if uncomment the above line, html5 nonsupported browers won't change the url but will display the ajax content;
-  if commented, html5 nonsupported browers will reload the page to the specified link.
-  */
-
-  //get the link location that was clicked
-  pageurl = $(this).attr('href');
-
-  spinner = "<span class='loading'><h3>Loading content..</h3><img src='/static/images/ajax-loader.gif' alt='loading...' class='spinner'></span>";  
-  //to get the ajax content and display in div with class 'main'
-  $.ajax({url:pageurl+'?rel=node',success: function(data){
-  $('.main').html(data);
-  }});
-
-  //to change the browser URL to the given link location
-  //if(pageurl!=window.location){
-  //window.history.pushState({path:pageurl},'',pageurl);
-  //}
-  //stop refreshing to the page given in
-  return false;
-});
-
-
-
-$("a[rel='node']").click(function(e){
-	e.preventDefault();
-	/*
-	if uncomment the above line, html5 nonsupported browers won't change the url but will display the ajax content;
-	if commented, html5 nonsupported browers will reload the page to the specified link.
-	*/
-
-	//get the link location that was clicked
-	pageurl = $(this).attr('href');
-
-	spinner = "<span class='loading'><h3>Loading content..</h3><img src='/static/images/ajax-loader.gif' alt='loading...' class='spinner'></span>";  
-	//to get the ajax content and display in div with class 'main'
-	$.ajax({url:pageurl+'?rel=node',success: function(data){
-	$('.main').html(data);
-	}});
-
-	//to change the browser URL to the given link location
-	//if(pageurl!=window.location){
-	//window.history.pushState({path:pageurl},'',pageurl);
-	//}
-	//stop refreshing to the page given in
-	return false;
-});
-
-

examples/demo/src/demo_cms_execution.e

@@ -1,31 +1,21 @@
 note
-	description: "Summary description for {EWF_ROC_SERVER_EXECUTION}."
+	description: "[
+			CMS Execution for the demo server.
+		]"
 	date: "$Date$"
 	revision: "$Revision$"
 
 class
-	EWF_ROC_SERVER_EXECUTION
+	DEMO_CMS_EXECUTION
 
 inherit
 	CMS_EXECUTION
-		redefine
-			initialize
-		end
-
-	REFACTORING_HELPER
-
-	SHARED_LOGGER
 
 create
 	make
 
 feature {NONE} -- Initialization
 
-	initialize
-		do
-			Precursor
-		end
-
 	initial_cms_setup: CMS_DEFAULT_SETUP
 			-- CMS setup.
 		local
@@ -39,46 +29,61 @@ feature {NONE} -- Initialization
 			create Result.make (l_env)
 		end
 
-feature -- CMS setup
+feature -- CMS storage
 
 	setup_storage (a_setup: CMS_SETUP)
 		do
-			debug ("refactor_fixme")
-				to_implement ("To implement custom storage")
-			end
+			a_setup.storage_drivers.force (create {CMS_STORAGE_SQLITE3_BUILDER}.make, "sqlite3")
 --			a_setup.storage_drivers.force (create {CMS_STORAGE_STORE_MYSQL_BUILDER}.make, "mysql")
 			a_setup.storage_drivers.force (create {CMS_STORAGE_STORE_ODBC_BUILDER}.make, "odbc")
 		end
 
+feature -- CMS modules
+
 	setup_modules (a_setup: CMS_SETUP)
 			-- Setup additional modules.
 		local
 			m: CMS_MODULE
 		do
-			create {NODE_MODULE} m.make (a_setup)
-			m.enable
+			create {CMS_ADMIN_MODULE} m.make
 			a_setup.register_module (m)
 
+				-- Auth
 			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_DEBUG_MODULE} m.make
-			m.enable
+			create {CMS_BASIC_AUTH_MODULE} m.make
 			a_setup.register_module (m)
 
-			create {CMS_DEMO_MODULE} m.make
-			m.enable
+			create {CMS_OAUTH_20_MODULE} m.make
+			a_setup.register_module (m)
+
+			create {CMS_OPENID_MODULE} m.make
+			a_setup.register_module (m)
+
+				-- Nodes
+			create {CMS_NODE_MODULE} m.make (a_setup)
 			a_setup.register_module (m)
 
 			create {CMS_BLOG_MODULE} m.make
-			m.enable
+			a_setup.register_module (m)
+
+				-- Recent changes
+			create {CMS_RECENT_CHANGES_MODULE} m.make
+			a_setup.register_module (m)
+
+				-- Recent changes
+			create {FEED_AGGREGATOR_MODULE} m.make
+			a_setup.register_module (m)
+
+				-- Miscellanious
+			create {CMS_DEBUG_MODULE} m.make
+			a_setup.register_module (m)
+
+			create {CMS_DEMO_MODULE} m.make
+			a_setup.register_module (m)
+
+			create {GOOGLE_CUSTOM_SEARCH_MODULE} m.make
 			a_setup.register_module (m)
 		end
 

examples/demo/src/demo_cms_server.e

@@ -0,0 +1,18 @@
+note
+	description: "[
+				DEMO application server.
+			]"
+	date: "$Date: 2015-02-09 22:29:56 +0100 (lun., 09 févr. 2015) $"
+	revision: "$Revision: 96596 $"
+
+class
+	DEMO_CMS_SERVER
+
+inherit
+	ROC_CMS_LAUNCHER [DEMO_CMS_EXECUTION]
+
+create
+	make_and_launch
+
+end
+

launcher/README.txt

@@ -0,0 +1,10 @@
+Collection of ROC CMS launcher ready to use.
+
+- Include any-safe.ecf to use any of cgi, libfcgi or standalone connector.
+- Include standalone-safe.ecf to use standalone connector.
+- Include libfcgi-safe.ecf to use libfcgi connector.
+- Include cgi-safe.ecf to use cgi connector.
+
+In application, the root class need to inherit from ROC_CMS_LAUNCHER with adapted CMS_EXECUTION
+descendant.
+

launcher/any-safe.ecf

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="launcher" uuid="6FDCA393-AFC3-436B-A58A-870923967C86" library_target="launcher">
+	<target name="common" abstract="true">
+		<root all_classes="true"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="cms" location="..\cms-safe.ecf"/>
+		<library name="cms_app_env" location="..\library\app_env\app_env-safe.ecf" readonly="false"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
+	</target>
+	<target name="launcher" extends="common">
+		<library name="cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\cgi-safe.ecf"/>
+		<library name="libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\libfcgi-safe.ecf"/>
+		<library name="nino" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\nino-safe.ecf"/>
+		<library name="standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\standalone-safe.ecf"/>
+		<cluster name="src" location=".\" recursive="false"/>
+		<cluster name="launcher" location=".\any\" recursive="true"/>
+	</target>
+</system>

launcher/any.ecf

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="launcher" uuid="6FDCA393-AFC3-436B-A58A-870923967C86" library_target="launcher">
+	<target name="common" abstract="true">
+		<root all_classes="true"/>
+		<option void_safety="none" />
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="cms" location="..\cms.ecf"/>
+		<library name="cms_app_env" location="..\library\app_env\app_env.ecf" readonly="false"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
+	</target>
+	<target name="launcher" extends="common">
+		<library name="cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\cgi.ecf"/>
+		<library name="libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\libfcgi.ecf"/>
+		<library name="nino" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\nino.ecf"/>
+		<library name="standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\standalone.ecf"/>
+		<cluster name="src" location=".\" recursive="false"/>
+		<cluster name="launcher" location=".\any\" recursive="true"/>
+	</target>
+</system>

launcher/any/application_launcher.e

@@ -0,0 +1,19 @@
+note
+	description: "[
+				Effective class for APPLICATION_LAUNCHER_I
+
+				You can put modification in this class
+			]"
+	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
+	revision: "$Revision: 36 $"
+
+class
+	APPLICATION_LAUNCHER [G -> WSF_EXECUTION create make end]
+
+inherit
+	APPLICATION_LAUNCHER_I [G]
+
+feature -- Custom
+
+end
+

launcher/any/application_launcher_i.e

@@ -0,0 +1,127 @@
+note
+	description: "[
+			Specific application launcher
+
+			DO NOT EDIT THIS CLASS
+
+			you can customize APPLICATION_LAUNCHER
+		]"
+	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
+	revision: "$Revision: 36 $"
+
+deferred class
+	APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]
+
+inherit
+	SHARED_EXECUTION_ENVIRONMENT
+
+feature -- Execution
+
+	launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+		local
+			nature: like launcher_nature
+		do
+			nature := launcher_nature
+			if nature = Void then
+				launch_standalone (opts)
+			elseif nature = nature_standalone then
+				launch_standalone (opts)
+			elseif nature = nature_nino then
+				launch_nino (opts)
+			elseif nature = nature_cgi then
+				launch_cgi (opts)
+			elseif nature = nature_libfcgi then
+				launch_libfcgi (opts)
+			else
+				-- bye bye
+				(create {EXCEPTIONS}).die (-1)
+			end
+		end
+
+feature {NONE} -- Access
+
+	launcher_nature: detachable READABLE_STRING_8
+			-- Initialize the launcher nature
+			-- either cgi, libfcgi, or nino.
+			--| We could extend with more connector if needed.
+			--| and we could use WSF_DEFAULT_SERVICE_LAUNCHER to configure this at compilation time.
+		local
+			p: PATH
+			ext: detachable READABLE_STRING_32
+		do
+			create p.make_from_string (execution_environment.arguments.command_name)
+			if attached p.entry as l_entry then
+				ext := l_entry.extension
+			end
+			if ext /= Void then
+				if ext.same_string (nature_standalone) then
+					Result := nature_standalone
+				end
+				if ext.same_string (nature_nino) then
+					Result := nature_nino
+				end
+				if ext.same_string (nature_cgi) then
+					Result := nature_cgi
+				end
+				if ext.same_string (nature_libfcgi) or else ext.same_string ("fcgi") then
+					Result := nature_libfcgi
+				end
+			end
+			Result := default_nature
+		end
+
+feature {NONE} -- standalone		
+
+	nature_standalone: STRING = "standalone"
+
+	launch_standalone (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+		local
+			launcher: WSF_STANDALONE_SERVICE_LAUNCHER [G]
+		do
+			create launcher.make_and_launch (opts)
+		end
+
+feature {NONE} -- nino		
+
+	nature_nino: STRING = "nino"
+
+	launch_nino (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+		local
+			launcher: WSF_NINO_SERVICE_LAUNCHER [G]
+		do
+			create launcher.make_and_launch (opts)
+		end
+
+feature {NONE} -- cgi
+
+	nature_cgi: STRING = "cgi"
+
+	launch_cgi (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+		local
+			launcher: WSF_CGI_SERVICE_LAUNCHER [G]
+		do
+			create launcher.make_and_launch (opts)
+		end
+
+feature {NONE} -- libfcgi
+
+	nature_libfcgi: STRING = "libfcgi"
+
+	launch_libfcgi (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+		local
+			launcher: WSF_LIBFCGI_SERVICE_LAUNCHER [G]
+		do
+			create launcher.make_and_launch (opts)
+		end
+
+feature -- Default
+
+	default_nature: STRING
+		do
+			Result := nature_standalone
+		end
+
+
+end
+
+

launcher/cgi-safe.ecf

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="cgi_launcher" uuid="0FE4F1D0-BB70-4C7F-A66E-B27F1D718109" library_target="cgi_launcher">
+	<target name="common" abstract="true">
+		<root all_classes="true"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="cms" location="..\cms-safe.ecf"/>
+		<library name="cms_app_env" location="..\library\app_env\app_env-safe.ecf" readonly="false"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
+	</target>
+	<target name="cgi_launcher" extends="common">
+		<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
+		<cluster name="src" location=".\" recursive="false"/>
+		<cluster name="launcher" location=".\default\" recursive="true"/>
+	</target>
+</system>

launcher/default/application_launcher.e

@@ -0,0 +1,19 @@
+note
+	description: "[
+				Effective class for APPLICATION_LAUNCHER_I
+
+				You can put modification in this class
+			]"
+	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
+	revision: "$Revision: 36 $"
+
+class
+	APPLICATION_LAUNCHER [G -> WSF_EXECUTION create make end]
+
+inherit
+	APPLICATION_LAUNCHER_I [G]
+
+feature -- Custom
+
+end
+

launcher/default/application_launcher_i.e

@@ -0,0 +1,26 @@
+note
+	description: "[
+			Specific application launcher
+
+			DO NOT EDIT THIS CLASS
+
+			you can customize APPLICATION_LAUNCHER
+		]"
+	date: "$Date: 2015-02-09 22:29:56 +0100 (lun., 09 févr. 2015) $"
+	revision: "$Revision: 96596 $"
+
+deferred class
+	APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]
+
+feature -- Execution
+
+	launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+		local
+			launcher: WSF_DEFAULT_SERVICE_LAUNCHER [G]
+		do
+			create launcher.make_and_launch (opts)
+		end
+
+end
+
+

launcher/libfcgi-safe.ecf

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="libfcgi_launcher" uuid="04D7D1EA-059B-4024-B0DE-BBB57AB2D00C" library_target="libfcgi_launcher">
+	<target name="common" abstract="true">
+		<root all_classes="true"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="cms" location="..\cms-safe.ecf"/>
+		<library name="cms_app_env" location="..\library\app_env\app_env-safe.ecf" readonly="false"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
+	</target>
+	<target name="libfcgi_launcher" extends="common">
+		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
+		<cluster name="src" location=".\" recursive="false"/>
+		<cluster name="launcher" location=".\default\" recursive="true"/>
+	</target>
+</system>

launcher/libfcgi.ecf

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="libfcgi_launcher" uuid="04D7D1EA-059B-4024-B0DE-BBB57AB2D00C" library_target="libfcgi_launcher">
+	<target name="common" abstract="true">
+		<root all_classes="true"/>
+		<option void_safety="none" />
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="cms" location="..\cms.ecf"/>
+		<library name="cms_app_env" location="..\library\app_env\app_env.ecf" readonly="false"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
+	</target>
+	<target name="libfcgi_launcher" extends="common">
+		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi.ecf"/>
+		<cluster name="src" location=".\" recursive="false"/>
+		<cluster name="launcher" location=".\default\" recursive="true"/>
+	</target>
+</system>

launcher/roc_cms_launcher.e

@@ -1,12 +1,12 @@
 note
 	description: "[
-				application service
+				Reusable ROC CMS launcher.
 			]"
 	date: "$Date: 2015-02-09 22:29:56 +0100 (lun., 09 févr. 2015) $"
 	revision: "$Revision: 96596 $"
 
 class
-	EWF_ROC_SERVER
+	ROC_CMS_LAUNCHER [G -> CMS_EXECUTION create make end]
 
 inherit
 	WSF_LAUNCHABLE_SERVICE
@@ -37,16 +37,27 @@ feature {NONE} -- Initialization
 			-- Initialize current service.
 		local
 			env: CMS_ENVIRONMENT
+			l_app_name: detachable READABLE_STRING_32
 		do
 			Precursor
-			create {WSF_SERVICE_LAUNCHER_OPTIONS_FROM_INI} service_options.make_from_file ("demo.ini")
 			create env.make_default
+			l_app_name := optional_application_name
+			if l_app_name = Void then
+				l_app_name := env.name
+			end
+			create {WSF_SERVICE_LAUNCHER_OPTIONS_FROM_INI} service_options.make_from_file (l_app_name + ".ini")
 			initialize_logger (env)
 		end
 
+	optional_application_name: detachable READABLE_STRING_32
+			-- Optional application name.
+			--| Redefine if needed.
+		do
+		end
+
 feature {NONE} -- Launch operation
 
-	launcher: APPLICATION_LAUNCHER [EWF_ROC_SERVER_EXECUTION]
+	launcher: APPLICATION_LAUNCHER [G]
 
 	launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
 		local
@@ -70,7 +81,7 @@ feature {NONE} -- Launch operation
 						l_message.append ("%N%N")
 					end
 				else
-					l_message.append ("The application crash without available information")
+					l_message.append ("The application crashed without information.")
 					l_message.append ("%N%N")
 				end
 				-- send email shutdown

launcher/standalone-safe.ecf

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="standalone_launcher" uuid="F42660A9-26C2-466B-A63C-C7823C808BE7" library_target="standalone_launcher">
+	<target name="common" abstract="true">
+		<root all_classes="true"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="cms" location="..\cms-safe.ecf"/>
+		<library name="cms_app_env" location="..\library\app_env\app_env-safe.ecf" readonly="false"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
+	</target>
+	<target name="standalone_launcher" extends="common">
+		<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone-safe.ecf"/>
+		<library name="standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\standalone-safe.ecf"/>
+		<cluster name="src" location=".\" recursive="false"/>
+		<cluster name="launcher" location=".\default\" recursive="true"/>
+	</target>
+</system>

launcher/standalone.ecf

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="standalone_launcher" uuid="F42660A9-26C2-466B-A63C-C7823C808BE7" library_target="standalone_launcher">
+	<target name="common" abstract="true">
+		<root all_classes="true"/>
+		<option void_safety="none" />
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="cms" location="..\cms.ecf"/>
+		<library name="cms_app_env" location="..\library\app_env\app_env.ecf" readonly="false"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
+	</target>
+	<target name="standalone_launcher" extends="common">
+		<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone.ecf"/>
+		<library name="standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\connector\standalone.ecf"/>
+		<cluster name="src" location=".\" recursive="false"/>
+		<cluster name="launcher" location=".\default\" recursive="true"/>
+	</target>
+</system>

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/configuration/src/config_reader.e

@@ -33,11 +33,53 @@ feature -- Query
 			end
 		end
 
+	resolved_text_list_item (k: READABLE_STRING_GENERAL): detachable LIST [READABLE_STRING_32]
+			-- List of String item associated with key `k',
+			-- and expanded values to resolved variables ${varname}.
+		do
+			if attached text_list_item (k) as lst then
+				from
+					lst.start
+				until
+					lst.after
+				loop
+					lst.replace (resolved_expression (lst.item))
+					lst.forth
+				end
+			end
+		end
+
+	resolved_text_table_item (k: READABLE_STRING_GENERAL): detachable STRING_TABLE [READABLE_STRING_32]
+			-- Table of String item associated with key `k',
+			-- and expanded values to resolved variables ${varname}.
+		do
+			if attached text_table_item (k) as tb then
+				from
+					tb.start
+				until
+					tb.after
+				loop
+					tb.replace (resolved_expression (tb.item_for_iteration), tb.key_for_iteration)
+					tb.forth
+				end
+			end
+		end
+
 	text_item (k: READABLE_STRING_GENERAL): detachable READABLE_STRING_32
 			-- String item associated with key `k'.
 		deferred
 		end
 
+	text_list_item (k: READABLE_STRING_GENERAL): detachable LIST [READABLE_STRING_32]
+			-- List of String item associated with key `k'.
+		deferred
+		end
+
+	text_table_item (k: READABLE_STRING_GENERAL): detachable STRING_TABLE [READABLE_STRING_32]
+			-- Table of String item associated with key `k'.
+		deferred
+		end
+		
 	integer_item (k: READABLE_STRING_GENERAL): INTEGER
 			-- Integer item associated with key `k'.
 		deferred
@@ -109,7 +151,7 @@ feature -- Duplication
 		end
 
 note
-	copyright: "2011-2014, Jocelyn Fiat, Eiffel Software and others"
+	copyright: "2011-2015, Jocelyn Fiat, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software

library/configuration/src/ini_config.e

@@ -119,14 +119,47 @@ feature -- Access: Config Reader
 
 	text_item (k: READABLE_STRING_GENERAL): detachable READABLE_STRING_32
 			-- String item associated with key `k'.	
-		local
-			obj: like item
 		do
-			obj := item (k)
-			if attached {READABLE_STRING_32} obj as s32 then
-				Result := s32
-			elseif attached {READABLE_STRING_8} obj as s then
-				Result := utf.utf_8_string_8_to_escaped_string_32 (s)
+			Result := value_to_string_32 (item (k))
+		end
+
+	text_list_item (k: READABLE_STRING_GENERAL): detachable LIST [READABLE_STRING_32]
+			-- List of String item associated with key `k'.
+		do
+			if attached {LIST [READABLE_STRING_8]} item (k) as l_list then
+				create {ARRAYED_LIST [READABLE_STRING_32]} Result.make (l_list.count)
+				Result.compare_objects
+				across
+					l_list as ic
+				until
+					Result = Void
+				loop
+					if attached value_to_string_32 (ic.item) as s32 then
+						Result.force (s32)
+					else
+						Result := Void
+					end
+				end
+			end
+		end
+
+	text_table_item (k: READABLE_STRING_GENERAL): detachable STRING_TABLE [READABLE_STRING_32]
+			-- Table of String item associated with key `k'.
+		do
+			if attached {STRING_TABLE [READABLE_STRING_8]} item (k) as l_list then
+				create {STRING_TABLE [READABLE_STRING_32]} Result.make (l_list.count)
+				Result.compare_objects
+				across
+					l_list as ic
+				until
+					Result = Void
+				loop
+					if attached value_to_string_32 (ic.item) as s32 then
+						Result.force (s32, ic.key)
+					else
+						Result := Void
+					end
+				end
 			end
 		end
 
@@ -226,6 +259,15 @@ feature -- Access
 
 feature {NONE} -- Implementation
 
+	value_to_string_32 (obj: detachable ANY): detachable STRING_32
+		do
+			if attached {READABLE_STRING_32} obj as s32 then
+				Result := s32
+			elseif attached {READABLE_STRING_8} obj as s then
+				Result := utf.utf_8_string_8_to_escaped_string_32 (s)
+			end
+		end
+
 	item_from_values (a_values: STRING_TABLE [ANY]; k: READABLE_STRING_GENERAL): detachable ANY
 		local
 			i,j: INTEGER
@@ -400,7 +442,17 @@ feature {NONE} -- Implementation
 							j := k.index_of (']', i + 1)
 							if j = i + 1 then -- ends_with "[]"
 								k.keep_head (i - 1)
-								if attached {LIST [STRING_8]} items.item (k) as l_list then
+								if 
+									a_section_prefix /= Void and then
+									attached {LIST [STRING_8]} items.item (a_section_prefix + {STRING_32} "." + k) as l_list
+								then
+									lst := l_list
+								elseif 
+									attached last_section_name as l_section_prefix and then
+									attached {LIST [STRING_8]} items.item (l_section_prefix + {STRING_32} "." + k) as l_list
+								then
+									lst := l_list
+								elseif attached {LIST [STRING_8]} items.item (k) as l_list then
 									lst := l_list
 								else
 									create {ARRAYED_LIST [STRING_8]} lst.make (1)
@@ -414,7 +466,17 @@ feature {NONE} -- Implementation
 								sk.left_adjust
 								sk.right_adjust
 								k.keep_head (i - 1)
-								if attached {STRING_TABLE [STRING_8]} items.item (k) as l_table then
+								if 
+									a_section_prefix /= Void and then
+									attached {STRING_TABLE [STRING_8]} items.item (a_section_prefix + {STRING_32} "." + k) as l_table
+								then
+									tb := l_table
+								elseif 
+									attached last_section_name as l_section_prefix and then
+									attached {STRING_TABLE [STRING_8]} items.item (l_section_prefix + {STRING_32} "." + k) as l_table
+								then
+									tb := l_table
+								elseif attached {STRING_TABLE [STRING_8]} items.item (k) as l_table then
 									tb := l_table
 								else
 									create tb.make (1)
@@ -460,7 +522,7 @@ feature {NONE} -- Implementation
 invariant
 
 note
-	copyright: "2011-2014, Jocelyn Fiat, Eiffel Software and others"
+	copyright: "2011-2015, Jocelyn Fiat, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software

library/configuration/src/json_config.e

@@ -63,10 +63,46 @@ feature -- Access: Config Reader
 	text_item (k: READABLE_STRING_GENERAL): detachable READABLE_STRING_32
 			-- String item associated with query `k'.
 		do
-			if attached {JSON_STRING} item (k) as l_string then
-				Result := l_string.unescaped_string_32
-			elseif attached {JSON_NUMBER} item (k) as l_number then
-				Result := l_number.item
+			Result := value_to_string_32 (item (k))
+		end
+
+	text_list_item (k: READABLE_STRING_GENERAL): detachable LIST [READABLE_STRING_32]
+			-- List of String item associated with key `k'.
+		do
+			if attached {JSON_ARRAY} item (k) as l_array then
+				create {ARRAYED_LIST [READABLE_STRING_32]} Result.make (l_array.count)
+				Result.compare_objects
+				across
+					l_array as ic
+				until
+					Result = Void
+				loop
+					if attached value_to_string_32 (ic.item) as s32 then
+						Result.force (s32)
+					else
+						Result := Void
+					end
+				end
+			end
+		end
+
+	text_table_item (k: READABLE_STRING_GENERAL): detachable STRING_TABLE [READABLE_STRING_32]
+			-- Table of String item associated with key `k'.
+		do
+			if attached {JSON_OBJECT} item (k) as obj then
+				create {STRING_TABLE [READABLE_STRING_32]} Result.make (obj.count)
+				Result.compare_objects
+				across
+					obj as ic
+				until
+					Result = Void
+				loop
+					if attached value_to_string_32 (ic.item) as s32 then
+						Result.force (s32, ic.key.item)
+					else
+						Result := Void
+					end
+				end
 			end
 		end
 
@@ -105,6 +141,15 @@ feature -- Access
 
 feature {NONE} -- Implementation
 
+	value_to_string_32 (v: detachable ANY): detachable STRING_32
+		do
+			if attached {JSON_STRING} v as l_string then
+				Result := l_string.unescaped_string_32
+			elseif attached {JSON_NUMBER} v as l_number then
+				Result := l_number.item
+			end
+		end
+
 	object_json_value (a_object: JSON_OBJECT; a_query: READABLE_STRING_32): detachable JSON_VALUE
 			-- Item associated with query `a_query' from object `a_object' if any.
 		local
@@ -163,7 +208,7 @@ feature {NONE} -- JSON
 		end
 
 note
-	copyright: "2011-2014, Jocelyn Fiat, Eiffel Software and others"
+	copyright: "2011-2015, Jocelyn Fiat, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software

library/configuration/tests/config_tests-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="config_tests" uuid="AD1DE0F7-BC8A-4A17-9A44-56C917BD5604">
+<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="config_tests" library_target="config_tests" uuid="AD1DE0F7-BC8A-4A17-9A44-56C917BD5604">
 	<target name="config_tests">
 		<root class="TEST_CONFIG_READER_SET" feature="default_create"/>
 		<file_rule>

library/configuration/tests/test_config_reader_set.e

@@ -21,6 +21,18 @@ feature -- Test
 			create {INI_CONFIG} cfg.make_from_string ("[
 				foo = bar
 				
+				collection[] = a
+				collection[] = b
+				collection[] = c
+				collection[] = 1
+				collection[] = 2
+				collection[] = 3
+				
+				table[a] = 1
+				table[b] = 2
+				table[c] = 3
+				table[d] = test
+				
 				[first]
 				abc = 1
 				def = and so on
@@ -58,6 +70,21 @@ feature -- Test
 			assert ("has_item (second.is)", cfg.has_item ("second.is"))
 			assert ("item (second.is)",  attached cfg.text_item ("second.is")  as v and then v.same_string_general ("2"))
 
+			assert ("has_item (collection)", cfg.has_item ("collection"))
+			assert ("item (collection)",  attached cfg.text_list_item ("collection") as lst and then (
+							lst.has ("a") and lst.has ("b") and lst.has ("c") and lst.has ("1") and lst.has ("2") and lst.has ("3")
+						)
+					)
+					
+			assert ("has_item (table)", cfg.has_item ("table"))
+			assert ("item (table)",  attached cfg.text_table_item ("table") as tb and then (
+							tb.item ("a") ~ {STRING_32} "1" and 
+							tb.item ("b") ~ {STRING_32} "2" and 
+							tb.item ("c") ~ {STRING_32} "3" and 
+							tb.item ("d") ~ {STRING_32} "test"							
+						)
+					)
+
 			if attached cfg.sub_config ("second") as cfg_second then
 				assert ("has_item (is)", cfg_second.has_item ("is"))
 				assert ("item (is)",  attached cfg_second.text_item ("is")  as v and then v.same_string_general ("2"))
@@ -141,7 +168,9 @@ feature -- Test
 						"is": 2,
 						"the": 3,
 						"end": 4
-					}
+					},
+					"collection": ["a", "b", "c", 1, 2, 3],
+					"table": { "a": 1, "b": 2, "c": 3, "d" : "test" }
 				}
 			]")
 
@@ -164,6 +193,21 @@ feature -- Test
 			assert ("item (second.the)",  attached cfg.text_item ("second.the")  as v and then v.same_string_general ("3"))
 			assert ("item (second.end)",  attached cfg.text_item ("second.end")  as v and then v.same_string_general ("4"))
 
+			assert ("has_item (collection)", cfg.has_item ("collection"))
+			assert ("item (collection)",  attached cfg.text_list_item ("collection") as lst and then (
+							lst.has ("a") and lst.has ("b") and lst.has ("c") and lst.has ("1") and lst.has ("2") and lst.has ("3")
+						)
+					)
+					
+			assert ("has_item (table)", cfg.has_item ("table"))
+			assert ("item (table)",  attached cfg.text_table_item ("table") as tb and then (
+							tb.item ("a") ~ {STRING_32} "1" and 
+							tb.item ("b") ~ {STRING_32} "2" and 
+							tb.item ("c") ~ {STRING_32} "3" and 
+							tb.item ("d") ~ {STRING_32} "test"							
+						)
+					)
+
 			if attached cfg.sub_config ("second") as cfg_second then
 				assert ("has_item (is)", cfg_second.has_item ("is"))
 				assert ("item (is)",  attached cfg_second.text_item ("is")  as v and then v.same_string_general ("2"))

library/email/email-safe.ecf

@@ -0,0 +1,17 @@
+<?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="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

@@ -7,8 +7,8 @@ class
 	EMAIL_SERVICE
 
 inherit
-
 	SHARED_ERROR
+
 	SHARED_LOGGER
 
 create
@@ -26,14 +26,9 @@ feature {NONE} -- Initialization
 
 	initialize
 			-- Initialize service.
-		local
-			l_address_factory: INET_ADDRESS_FACTORY
 		do
 			admin_email := parameters.admin_email
-
-				-- Get local host name needed in creation of SMTP_PROTOCOL.
-			create l_address_factory
-			create smtp_protocol.make (parameters.smtp_server, l_address_factory.create_localhost.host_name)
+			create {NOTIFICATION_SMTP_MAILER} mailer.make (parameters.smtp_server)
 			set_successful
 		end
 
@@ -43,7 +38,7 @@ feature {NONE} -- Initialization
 	admin_email: IMMUTABLE_STRING_8
 			-- Site admin's email.
 
-	smtp_protocol: SMTP_PROTOCOL
+	mailer: NOTIFICATION_MAILER
 			-- SMTP protocol.
 
 feature -- Basic Operations
@@ -60,38 +55,34 @@ feature -- Basic Operations
 
 	send_message (a_from_address, a_to_address: READABLE_STRING_8; a_subjet: READABLE_STRING_GENERAL; a_content: READABLE_STRING_GENERAL)
 		local
-			l_email: EMAIL
+			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_with_entry (a_from_address, a_to_address)
-			l_email.set_message (utf.escaped_utf_32_string_to_utf_8_string_8 (a_content))
-			l_email.add_header_entry ({EMAIL_CONSTANTS}.H_subject, utf.escaped_utf_32_string_to_utf_8_string_8 (a_subjet))
-			l_email.add_header_entry ("MIME-Version:", "1.0")
-			l_email.add_header_entry ("Content-Type", "text/html; charset=utf-8")
+			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: EMAIL)
+	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.")
-				smtp_protocol.initiate_protocol
-				smtp_protocol.transfer (a_email)
-				smtp_protocol.close_protocol
+				mailer.process_email (a_email)
 				write_information_log (generator + ".send_email Email sent.")
-				if smtp_protocol.error then
+				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 )
+				write_error_log (generator + ".send_email Email not send " + last_error_message)
 			end
 		rescue
 			set_last_error_from_exception (generator + ".send_email")