Added basic auth for webapi.

Fixed filter setup when a module has more than one filter.

.gitignore

@@ -4,4 +4,6 @@ EIFGENs
 *.rc
 *.bak
 *.sqlite
+.*.swo
 Thumbs.db
+*.dll

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-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="cms" uuid="8CC0D052-57D1-4CAA-AFF1-448FA290734B" library_target="cms">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-17-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-17-0 http://www.eiffel.com/developers/xml/configuration-1-17-0.xsd" name="cms" uuid="8CC0D052-57D1-4CAA-AFF1-448FA290734B" library_target="cms">
 	<target name="cms">
 		<root all_classes="true"/>
 		<file_rule>
@@ -7,9 +7,12 @@
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="all" syntax="transitional">
-			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		<option warning="true">
 		</option>
+		<capability>
+			<concurrency support="scoop" use="scoop"/>
+			<void_safety support="all" use="all"/>
+		</capability>
 		<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"/>
@@ -20,15 +23,18 @@
 		<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="http_authorization" location="$ISE_LIBRARY\contrib\library\web\authentication\http_authorization\http_authorization-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="microdata" location="$ISE_LIBRARY\contrib\library\text\parser\microdata\microdata.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"/>
 		<library name="uri_template" location="$ISE_LIBRARY\contrib\library\text\parser\uri_template\uri_template-safe.ecf"/>
+		<library name="uuid" location="$ISE_LIBRARY\library\uuid\uuid-safe.ecf"/>
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
 		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension-safe.ecf" readonly="false"/>
 		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html-safe.ecf" readonly="false"/>

cms.ecf

@@ -8,8 +8,7 @@
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="false" void_safety="none" syntax="transitional">
-			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		<option warning="true" void_safety="none">
 		</option>
 		<mapping old_name="CMS_LAYOUT" new_name="CMS_ENVIRONMENT"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
@@ -21,6 +20,7 @@
 		<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="http_authorization" location="$ISE_LIBRARY\contrib\library\web\authentication\http_authorization\http_authorization.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"/>
@@ -30,6 +30,7 @@
 		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<library name="uri_template" location="$ISE_LIBRARY\contrib\library\text\parser\uri_template\uri_template.ecf"/>
+		<library name="uuid" location="$ISE_LIBRARY\library\uuid\uuid.ecf"/>
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
 		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension.ecf" readonly="false"/>
 		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html.ecf" readonly="false"/>

dev_modules/masquerade_auth/masquerade_api.e

@@ -0,0 +1,87 @@
+note
+	description: "API to manage CMS User session authentication"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	MASQUERADE_API
+
+inherit
+	CMS_AUTH_API_I
+
+	REFACTORING_HELPER
+
+create {MASQUERADE_AUTH_MODULE}
+	make_with_session_api
+
+feature {NONE} -- Initialization
+
+	make_with_session_api (a_api: CMS_API; a_session_api: CMS_SESSION_API)
+		do
+			session_api := a_session_api
+			make (a_api)
+		end
+
+feature -- Access
+
+	session_api: CMS_SESSION_API
+
+feature -- Status report
+
+	has_permission_to_masquerade (a_user: detachable CMS_USER): BOOLEAN
+		local
+			v: STRING
+		do
+			if attached cms_api.setup.string_8_item_or_default ("dev.masquerade", "permission") as s then
+				v := s
+				v.left_adjust
+				v.right_adjust
+				if v.is_case_insensitive_equal_general ("none") then
+				elseif v.is_case_insensitive_equal_general ("all") then
+					Result := True
+				elseif v.is_case_insensitive_equal_general ("permission") then
+					Result := cms_api.user_has_permission (a_user, "masquerade")
+				else
+						-- no!
+				end
+			end
+		end
+
+	is_authenticating (a_response: CMS_RESPONSE): BOOLEAN
+		do
+			if
+				a_response.is_authenticated and then
+				attached a_response.request.cookie (session_api.session_token)
+			then
+				Result := True
+			end
+		end
+
+feature -- Basic operation
+
+	process_user_login (a_user: CMS_USER; req: WSF_REQUEST; res: WSF_RESPONSE)
+		do
+			session_api.process_user_login (a_user, req, res)
+		end
+
+	process_user_logout (a_user: CMS_USER; req: WSF_REQUEST; res: WSF_RESPONSE)
+		do
+			session_api.process_user_logout (a_user, req, res)
+		end
+
+feature -- Access
+
+--	user_by_session_token (a_token: READABLE_STRING_32): detachable CMS_USER
+--			-- Retrieve user by token `a_token', if any.
+--		do
+--			Result := session_auth_storage.user_by_session_token (a_token)
+--		end
+
+--	has_user_token (a_user: CMS_USER): BOOLEAN
+--			-- Has the user `a_user' and associated session token?
+--		do
+--			Result := session_auth_storage.has_user_token (a_user)
+--		end
+
+
+end

dev_modules/masquerade_auth/masquerade_auth-safe.ecf

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="masquerade_auth" uuid="73DA3649-BA18-426C-91CD-5892D52C811C" library_target="masquerade_auth">
+	<target name="masquerade_auth">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option warning="true">
+		</option>
+		<setting name="concurrency" value="scoop"/>
+		<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="cms_auth_module" location="..\..\modules\auth\auth-safe.ecf" readonly="false"/>
+		<library name="cms_session_auth_module" location="..\..\modules\session_auth\cms_session_auth-safe.ecf" readonly="false"/>
+		<library name="cms_model" location="..\..\library\model\cms_model-safe.ecf" readonly="false"/>
+		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf"/>
+		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder-safe.ecf"/>
+		<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="http_authorization" location="$ISE_LIBRARY\contrib\library\web\authentication\http_authorization\http_authorization-safe.ecf" readonly="false"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
+		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
+		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension-safe.ecf" readonly="false"/>
+		<cluster name="src" location=".\" recursive="true"/>
+	</target>
+</system>

dev_modules/masquerade_auth/masquerade_auth_module.e

@@ -0,0 +1,268 @@
+note
+	description: "[
+			This module allows the use Session Based Authentication using Cookies to restrict access
+			by looking up users in the given providers.
+		]"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	MASQUERADE_AUTH_MODULE
+
+inherit
+	CMS_AUTH_MODULE_I
+		rename
+			module_api as masquerade_api
+		redefine
+			make,
+			setup_hooks,
+			initialize,
+			install,
+			permissions,
+			masquerade_api,
+			menu_system_alter
+		end
+
+	CMS_HOOK_BLOCK
+
+	CMS_HOOK_MENU_SYSTEM_ALTER
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make
+		do
+			Precursor
+			version := "1.0"
+			description := "Service to easily log as user at development time"
+			package := "debug"
+			disable -- Disabled by default
+			add_dependency ({CMS_SESSION_AUTH_MODULE})
+		end
+
+feature -- Access
+
+	name: STRING = "masquerade_auth"
+
+	permissions: LIST [READABLE_STRING_8]
+			-- List of permission ids, used by this module, and declared.
+		do
+			Result := Precursor
+			Result.extend ("masquerade")
+		end
+
+feature {CMS_API} -- Module Initialization			
+
+	initialize (a_api: CMS_API)
+			-- <Precursor>
+		do
+			Precursor (a_api)
+
+			if attached {CMS_SESSION_API} a_api.module_api ({CMS_SESSION_AUTH_MODULE}) as l_session_api then
+					-- API initialization
+				create masquerade_api.make_with_session_api (a_api, l_session_api)
+			end
+		end
+
+feature {CMS_API} -- Module management
+
+	install (api: CMS_API)
+		do
+			Precursor {CMS_AUTH_MODULE_I} (api) -- Mark it as installed.
+		end
+
+feature {CMS_API} -- Access: API
+
+	masquerade_api: detachable MASQUERADE_API
+			-- <Precursor>	
+
+feature -- Access: auth strategy	
+
+	login_title: STRING = "Masquerade"
+			-- Module specific login title.
+
+	login_location: STRING = "account/auth/roc-masquerade-login"
+
+	logout_location: STRING = "account/auth/roc-masquerade-logout"
+
+	is_authenticating (a_response: CMS_RESPONSE): BOOLEAN
+			-- <Precursor>
+		do
+			if attached masquerade_api as l_masquerade_api then
+				Result := l_masquerade_api.is_authenticating (a_response)
+			end
+		end
+
+feature -- Access: router
+
+	setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
+			-- <Precursor>
+		do
+			if attached masquerade_api as l_masquerade_api then
+				a_router.handle ("/" + login_location, create {WSF_URI_AGENT_HANDLER}.make (agent handle_login (a_api, ?, ?)), a_router.methods_head_get)
+				a_router.handle ("/" + logout_location, create {WSF_URI_AGENT_HANDLER}.make (agent handle_logout (a_api, l_masquerade_api, ?, ?)), a_router.methods_get_post)
+				a_router.handle ("/" + login_location, create {WSF_URI_AGENT_HANDLER}.make (agent handle_login_with_masquerade (a_api, l_masquerade_api,?, ?)), a_router.methods_post)
+			end
+		end
+
+feature {NONE} -- Implementation: routes
+
+	handle_login (api: CMS_API; req: WSF_REQUEST; res: WSF_RESPONSE)
+		local
+			r: CMS_RESPONSE
+		do
+			create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
+			if
+				attached masquerade_api as l_masquerade_api and then
+				l_masquerade_api.has_permission_to_masquerade (api.user)
+			then
+				if api.user_is_authenticated then
+					r.add_warning_message ("You are signed.")
+				end
+				r.add_block (login_block ("login", Void, r), "content")
+			else
+				r.add_error_message ("You are not allowed to use masquerade authentication!")
+			end
+			r.execute
+		end
+
+	handle_logout (api: CMS_API; a_masquerade_api: MASQUERADE_API ; req: WSF_REQUEST; res: WSF_RESPONSE)		local
+			r: CMS_RESPONSE
+		do
+			if attached api.user as l_user then
+				a_masquerade_api.process_user_logout (l_user, req, res)
+				create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
+			else
+					-- Not loggued in ... redirect to home
+				create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
+				r.set_status_code ({HTTP_CONSTANTS}.found)
+			end
+			if
+				attached {WSF_STRING} req.item ("destination") as p_destination and then
+				attached p_destination.value as v and then
+				v.is_valid_as_string_8
+			then
+				r.set_redirection (v.to_string_8)
+			else
+				r.set_redirection (req.absolute_script_url (""))
+			end
+
+			r.execute
+		end
+
+	handle_login_with_masquerade (api: CMS_API; a_masquerade_api: MASQUERADE_API; req: WSF_REQUEST; res: WSF_RESPONSE)
+		local
+			r: CMS_RESPONSE
+		do
+			if a_masquerade_api.has_permission_to_masquerade (api.user) then
+				if
+					attached {WSF_STRING} req.form_parameter ("username") as l_username
+				then
+					if
+						attached api.user_api.user_by_name (l_username.value) as l_user
+					then
+						a_masquerade_api.process_user_login (l_user, req, res)
+
+						create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
+						if
+							attached {WSF_STRING} req.item ("destination") as p_destination and then
+							attached p_destination.value as v and then
+							v.is_valid_as_string_8
+						then
+							r.set_redirection (v.to_string_8)
+						else
+							r.set_redirection ("")
+						end
+					else
+						create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
+						r.add_block (login_block ("login", Void, r), "content")
+					end
+				else
+					create {BAD_REQUEST_ERROR_CMS_RESPONSE} r.make (req, res, api)
+					r.add_block (login_block ("login", "Wrong username", r), "content")
+				end
+				r.execute
+			else
+				api.response_api.send_access_denied (Void, req, res)
+			end
+		end
+
+feature -- Hooks configuration
+
+	setup_hooks (a_hooks: CMS_HOOK_CORE_MANAGER)
+			-- Module hooks configuration.
+		do
+			Precursor (a_hooks)
+			a_hooks.subscribe_to_block_hook (Current)
+			a_hooks.subscribe_to_menu_system_alter_hook (Current)
+		end
+
+feature -- Hooks
+
+	block_list: ITERABLE [like {CMS_BLOCK}.name]
+		do
+			Result := <<"?login">>
+		end
+
+	get_block_view (a_block_id: READABLE_STRING_8; a_response: CMS_RESPONSE)
+		do
+			if a_block_id.is_case_insensitive_equal_general ("login") then
+				a_response.add_block (login_block (a_block_id, Void, a_response), "content")
+			end
+		end
+
+	menu_system_alter (a_menu_system: CMS_MENU_SYSTEM; a_response: CMS_RESPONSE)
+			-- Hook execution on collection of menu contained by `a_menu_system'
+			-- for related response `a_response'.
+		local
+			u: detachable CMS_USER
+		do
+			u := a_response.api.user
+			if
+				attached masquerade_api as l_masquerade_api and then
+				l_masquerade_api.has_permission_to_masquerade (u)
+			then
+				Precursor (a_menu_system, a_response)
+				if u /= Void then
+					a_menu_system.navigation_menu.extend (a_response.local_link ("Masquerade", login_location))
+				end
+			end
+		end
+
+feature {NONE} -- Block views
+
+	login_block (a_block_id: READABLE_STRING_8; a_err: detachable READABLE_STRING_8; a_response: CMS_RESPONSE): CMS_CONTENT_BLOCK
+		do
+			create Result.make (a_block_id, Void, login_html (a_err, a_response), Void)
+		end
+
+	login_html (a_err: detachable READABLE_STRING_8; a_response: CMS_RESPONSE): STRING
+		local
+			params: CMS_DATA_QUERY_PARAMETERS
+			u: CMS_USER
+		do
+			create Result.make_from_string ("<div class=%"login-box%">")
+			if a_err /= Void then
+				Result.append ("<div class=%"error%">")
+				Result.append (a_err)
+				Result.append ("</div>")
+			end
+			Result.append ("<form name=%"masquerade_auth%" action=%"" + a_response.site_url + login_location + "%" method=%"POST%">%N")
+			Result.append ("<div><input type=%"text%" name=%"username%" id=%"username%" required value=%"%"><label>Username</label></div>")
+			Result.append ("<button type=%"submit%">Login</button>")
+
+			create params.make (0, a_response.api.user_api.users_count.as_natural_32)
+			across
+				a_response.api.user_api.recent_users (params) as ic
+			loop
+				u := ic.item
+				Result.append ("<li>")
+				Result.append (a_response.html_encoded (a_response.api.user_display_name (u)))
+				Result.append ("</li>%N")
+			end
+			Result.append ("</form></div>")
+		end
+
+end

examples/demo/.gitignore

@@ -0,0 +1,4 @@
+site/db/*
+site/files/*
+site/export/*
+site/import/*

examples/demo/demo.ecf

@@ -8,11 +8,11 @@
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option debug="true" warning="true" full_class_checking="false" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="all" syntax="transitional">
+		<option debug="true" warning="true" void_safety="all">
 			<debug name="dbglog" enabled="true"/>
 		</option>
 		<setting name="executable_name" value="demo"/>
-		<setting name="concurrency" value="thread"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="cms" location="..\..\cms-safe.ecf" readonly="false">
 			<option>
@@ -20,25 +20,28 @@
 			</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_comments_module" location="..\..\modules\comments\comments-safe.ecf" readonly="false"/>
 		<library name="cms_contact_module" location="..\..\modules\contact\contact-safe.ecf" readonly="false"/>
 		<library name="cms_custom_block_module" location="..\..\modules\custom_block\custom_block-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_files_module" location="..\..\modules\files\files-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_google_search_20_module" location="..\..\modules\google_search_20\google_search_20-safe.ecf" readonly="false" use_application_options="true"/>
+		<library name="cms_messaging_module" location="..\..\modules\messaging\messaging-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="cms_seo_module" location="..\..\modules\seo\seo-safe.ecf" readonly="false"/>
+		<library name="cms_sitemap_module" location="..\..\modules\sitemap\sitemap-safe.ecf" readonly="false"/>
 		<library name="cms_session_auth_module" location="..\..\modules\session_auth\cms_session_auth-safe.ecf" readonly="false"/>
-		<library name="cms_taxnomy_module" location="..\..\modules\taxonomy\taxonomy-safe.ecf" readonly="false"/>
+		<library name="masquerade_auth_module" location="..\..\dev_modules\masquerade_auth\masquerade_auth-safe.ecf" readonly="false"/>
+		<library name="cms_taxonomy_module" location="..\..\modules\taxonomy\taxonomy-safe.ecf" readonly="false"/>
+		<library name="embedded_video_module" location="..\..\modules\embedded_video\embedded_video-safe.ecf" readonly="false"/>
+		<library name="cms_wikitext_module" location="..\..\modules\wikitext\wikitext-safe.ecf" readonly="false"/>
 		<library name="persistence_sqlite3" location="..\..\library\persistence\sqlite3\sqlite3-safe.ecf" readonly="false"/>
 		<!--
 			 By default, commented, since it depends on specific environment settings.
@@ -71,6 +74,13 @@
 	<target name="demo_standalone_scoop" extends="demo_standalone">
 		<setting name="concurrency" value="scoop"/>
 	</target>
+	<target name="demo_standalone_scoop_ssl" extends="demo_standalone_scoop">
+		<setting name="concurrency" value="scoop"/>
+		<variable name="httpd_ssl_enabled" value="true"/>
+		<variable name="libcurl_http_client_disabled" value="true"/>
+		<variable name="net_http_client_disabled" value="false"/>
+		<variable name="netssl_http_client_enabled" value="true"/>
+	</target>
 	<target name="demo_cgi" extends="common">
 		<setting name="concurrency" value="none"/>
 		<library name="cgi_launcher" location="..\..\launcher\cgi-safe.ecf" readonly="false"/>

examples/demo/demo.ini

@@ -1,3 +0,0 @@
-port=9090
-#port=12345
-#verbose=true

examples/demo/demo_no_mysql-safe

@@ -0,0 +1,51 @@
+<?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_no_mysql" uuid="F8399C5A-9495-4418-B4DC-F38C22EE4683" library_target="demo_no_mysql">
+	<target name="common" abstract="true">
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="concurrency" value="none"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="cms" location="..\..\cms-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="layout" location="..\..\library\layout\layout-safe.ecf" readonly="false"/>
+		<library name="persistence_sqlite" location="..\..\library\persistence\sqlite\persistence_sqlite-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"/>
+		<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"/>
+		<cluster name="launcher" location=".\launcher\any\" recursive="true"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
+	</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"/>
+		<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"/>
+		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
+		<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
+	</target>
+	<target name="demo" extends="demo_nino">
+	</target>
+</system>

examples/demo/install_modules.bat

@@ -3,19 +3,4 @@ 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\contact	--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%
-%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\seo	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\session_auth	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\taxonomy	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\files	--dir %ROC_CMS_DIR%
-%ROC_CMD% install --module ..\..\modules\custom_block	--dir %ROC_CMS_DIR%
+%ROC_CMD% install --config roc.cfg

examples/demo/launcher/any/application_launcher.e

@@ -1,19 +0,0 @@
-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
-

examples/demo/launcher/any/application_launcher_i.e

@@ -1,127 +0,0 @@
-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
-
-

examples/demo/launcher/default/application_launcher.e

@@ -1,19 +0,0 @@
-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
-

examples/demo/launcher/default/application_launcher_i.e

@@ -1,26 +0,0 @@
-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
-
-

examples/demo/modules/demo/cms_demo_module-safe.ecf

@@ -7,8 +7,8 @@
 			<exclude>/.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
-		</option>
+		<option warning="true"/>
+		<setting name="concurrency" value="scoop"/>
 		<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" location="..\..\..\..\cms-safe.ecf" readonly="false"/>

examples/demo/modules/demo/cms_demo_module.e

@@ -1,8 +1,8 @@
 note
 	description: "Summary description for {CMS_DEMO_MODULE}."
 	author: ""
-	date: "$Date: 2015-02-13 13:08:13 +0100 (ven., 13 févr. 2015) $"
-	revision: "$Revision: 96616 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	CMS_DEMO_MODULE

examples/demo/roc.cfg

@@ -0,0 +1,35 @@
+{
+	"name": "demo",
+	"project": "demo-safe.ecf",
+	"location": ".",
+	"site_directory": "site",
+	"themes": {
+		"admin": 			{ "location": "../../themes/admin", "mode": "link" }
+	},
+	"modules": {
+		"core": 			{ "location": "../../modules/core" },
+		"admin": 			{ "location": "../../modules/admin" },
+		"auth": 			{ "location": "../../modules/auth" },
+		"basic_auth": 		{ "location": "../../modules/basic_auth" },
+		"blog": 			{ "location": "../../modules/blog" },
+		"contact": 			{ "location": "../../modules/contact" },
+		"feed_aggregator": 	{ "location": "../../modules/feed_aggregator" },
+		"google_search": 	{ "location": "../../modules/google_search" },
+		"google_search_20": { "location": "../../modules/google_search_20" },
+		"node": 			{ "location": "../../modules/node" },
+		"oauth20": 			{ "location": "../../modules/oauth20" },	
+		"openid": 			{ "location": "../../modules/openid" },
+		"recent_changes": 	{ "location": "../../modules/recent_changes" },
+		"seo": 				{ "location": "../../modules/seo" },
+		"sitemap": 			{ "location": "../../modules/sitemap" },
+		"session_auth": 	{ "location": "../../modules/session_auth" },
+		"taxonomy": 		{ "location": "../../modules/taxonomy" },
+		"files": 			{ "location": "../../modules/files" },
+		"custom_block": 	{ "location": "../../modules/custom_block" },
+		"embedded_video":	{ "location": "../../modules/embedded_video" },
+		"wikitext": 		{ "location": "../../modules/wikitext" },
+		"messaging": 		{ "location": "../../modules/messaging" },
+		"comments": 		{ "location": "../../modules/comments" },
+		"masquerade": 		{ "location": "../../dev_modules/masquerade" }
+	}
+}

examples/demo/server.crt

@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICWDCCAcGgAwIBAgIJAJnXGtV+PtiYMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQwHhcNMTUwNDAzMjIxNTA0WhcNMTYwNDAyMjIxNTA0WjBF
+MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50
+ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
+gQDFMK6ojzg+KlklhTossR13c51izMgGc3B0z9ttfHIcx2kxra3HtHcKIl5wSUvn
+G8zmSyFAyQTs5LUv65q46FM9qU8tP+vTeFCfNXvjRcIEpouta3J53K0xuUlxz4d4
+4D6qvdDWAez/0AkI4y5etW5zXtg7IQorJhsI9TmfGuruzwIDAQABo1AwTjAdBgNV
+HQ4EFgQUbWpk2HoHa0YqpEwr7CGEatBFTMkwHwYDVR0jBBgwFoAUbWpk2HoHa0Yq
+pEwr7CGEatBFTMkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQAi+h4/
+IgEocWkdRZBKHEcTrRxz5WhEDJMoVo9LhnXvCfn1G/4p6Un6sYv7Xzpi9NuSY8uV
+cjfJJXhtF3AtyZ70iTAxWaRWjGaZ03PYOjlledJ5rqJEt6CCn8m+JsfznduZvbxQ
+zQ6jCLXfyD/tvemB+yYEI3NntvRKx5/zt6Q26Q==
+-----END CERTIFICATE-----

examples/demo/server.ini

@@ -0,0 +1,9 @@
+port=9090
+#port=12345
+verbose=true
+socket_timeout=60
+socket_recv_timeout=45
+keep_alive_timeout=25
+ssl_enabled=false
+ssl_ca_key=server.key
+ssl_ca_crt=server.crt

examples/demo/server.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDFMK6ojzg+KlklhTossR13c51izMgGc3B0z9ttfHIcx2kxra3H
+tHcKIl5wSUvnG8zmSyFAyQTs5LUv65q46FM9qU8tP+vTeFCfNXvjRcIEpouta3J5
+3K0xuUlxz4d44D6qvdDWAez/0AkI4y5etW5zXtg7IQorJhsI9TmfGuruzwIDAQAB
+AoGAR5efMg+dieRyLU8rieJcImxVbfOPg9gRsjdtIVkXTR+RL7ow59q7hXBo/Td/
+WU8cm1gXoJ/bK+71YYqWyB+BaLRIWvRWb7Gdw203tu4e136Ca5uuY+71qdbVTVcl
+NQ7J+T+eAQFP+a+DdT3ZQxu9eze87SMbu6i5YSpIk2kusOECQQDunv/DQ+nc+NgR
+DF+Td3sNYUVRT9a1CWi6abAG6reXwp8MS4NobWDf+Ps4JODhEEwlIdq5qL7qqYBZ
+Gc1TJJ53AkEA0404Fn6vAzzegBcS4RLlYTK7nMr0m4pMmDMCI6YzAYdMmKHp1e6f
+IwxSmQrmwyAgwcT01bc0+A8yipcC2BWQaQJBAJ01QZm635OGmos41KsKF5bsE8gL
+SpBBH69Yu/ECqGwie7iU84FUNnO4zIHjwghlPVVlZX3Vz9o4S+fn2N9DC+cCQGyZ
+QyCxGdC0r5fbwHJQS/ZQn+UGfvlVzqoXDVMVn3t6ZES6YZrT61eHnOM5qGqklIxE
+Old3vDZXPt/MU8Zvk3kCQBOgUx2VxvTrHN37hk9/QIDiM62+RenBm1M3ah8xTosf
+1mSeEb6d9Kwb3TgPBmA7YXzJuAQfRIvEPMPxT5SSr6Q=
+-----END RSA PRIVATE KEY-----

examples/demo/site/config/cms.ini

@@ -22,6 +22,7 @@ email=noreply@example.com
 # Name of website theme. 
 theme=bootstrap
 
+
 [notification]
 # By default, notification.email = site.email
 # you can change here the email that will receive internal messages.
@@ -34,7 +35,7 @@ subject_prefix=[Eiffel CMS]
 #from=...
 smtp=localhost:25
 #sendmail=site\bin\roc_sendmail.bat
-output=site\db\mailer.log
+output=site\db\mails
 
 [modules]
 # Module status
@@ -43,7 +44,7 @@ output=site\db\mailer.log
 # Default is "on"
 # for each module, this can be overwritten with
 #  module_name= on or off
-*=all
+#*=on
 
 [blocks]
 @include=blocks.ini
@@ -56,6 +57,15 @@ output=site\db\mailer.log
 #openid.token=
 #oauth.token=
 
-[admin]
+[webapi]
+mode=on
+
+[administration]
+base_path=/roc-admin
+theme=admin
 # CMS Installation, are accessible by "all", "none" or uppon "permission". (default is none)
 installation_access=all
+
+[dev]
+# masquerade: all, none, permission. Default is none.
+masquerade=all

examples/demo/site/db/mails/README.md

@@ -0,0 +1 @@
+This directory can be used to keep emails sent by the CMS.

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

@@ -1,34 +1,67 @@
 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] "; }
+  border: solid 1px #ccc;
+}
+ul.cms-users li {
+  border-top: dotted 1px #ccc;
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
+}
+ul.cms-users li:first-child {
+  border-top: none;
+}
+ul.cms-users li span {
+  flex-grow: 1;
+  flex-basis: 20px;
+  padding-left: 2px;
+  text-align: left;
+}
+ul.cms-users li span.identifier a::before {
+  content: "[user] ";
+}
+ul.cms-users li span.roles {
+  color: #090;
+  font-weight: bold;
+}
 
 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] "; }
+  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: "[role] ";
+}
 
 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] "; }
+  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 */
+form#modules_collection thead td {
+  font-weight: bold;
+}
+form#modules_collection tr {
+  border-bottom: dotted 1px #ccc;
+}
+form#modules_collection td {
+  padding: 3px;
+}

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

@@ -1,5 +1,4 @@
 ul.cms-users {
-	
 	list-style-type: none;
 	padding: 3px 3px 3px 3px;
 	border: solid 1px #ccc;
@@ -9,10 +8,22 @@ ul.cms-users {
 		&:first-child {
 			border-top: none;
 		}
-	}
-
-	li.cms_user a::before {
-		content: "[users] ";
+		display: flex;
+		flex-direction: row;
+		align-items: flex-start;
+		span {
+			flex-grow: 1;
+			flex-basis: 20px;
+			padding-left: 2px;
+			text-align: left;
+			&.identifier a::before {
+				content: "[user] ";
+			}
+			&.roles {
+				color: #090;
+				font-weight: bold;
+			}
+		}
 	}
 }
 
@@ -31,7 +42,7 @@ ul.cms-roles {
 	}
 
 	li.cms_role a::before {
-		content: "[roles] ";
+		content: "[role] ";
 	}
 }
 
@@ -54,6 +65,16 @@ ul.cms-permissions {
 	}
 }
 
-
+form#modules_collection {
+	thead td {
+		font-weight: bold;
+	}
+	tr {
+		border-bottom: dotted 1px #ccc;
+	}
+	td {
+		padding: 3px;
+	}
+}
 
 

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

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

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

@@ -8,6 +8,9 @@
 			<div>	
 				<label>Email:</label>  {$user.email/}
 			</div>
+			<div>	
+				<label>Profile name:</label>  {$user.profile_name/}
+			</div>
 			<div>	
 				<label>Creation Date:</label>  {$user.creation_date/} (UTC)
 			</div>

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

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

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

@@ -4,6 +4,7 @@
 		<h3>Login or <a href="{$site_url/}account/roc-register">Register</a></h3>
 		<div>
 			<form name="cms_basic_auth" action="{$site_url/}roc-basic-login" method="POST">
+				{unless isempty="$site_destination"}<input type="hidden" name="destination" value="{$site_destination/}">{/unless}
 				<input type="hidden" name="host" id="host" value="{$site_url/}">
 				<div>
 					<input type="text" name="username" id="username" required>

examples/demo/site/modules/blog/scripts/install.sql

@@ -1,6 +0,0 @@
-CREATE TABLE blog_post_nodes(
-  `nid` INTEGER NOT NULL CHECK("nid">=0),
-  `revision` INTEGER NOT NULL,
-  `tags` VARCHAR(255),
-  CONSTRAINT PK_nid_revision PRIMARY KEY (nid,revision)
-);

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

@@ -0,0 +1,18 @@
+div.comments-box div.title {
+  font-size: x-large;
+}
+div.comments-box ul.comments {
+  border-top: solid 1px #eee;
+  padding: 0 0 0 20px;
+  border-left: solid 5px #eee;
+  list-style-type: none;
+}
+div.comments-box ul.comments li.comment {
+  border-bottom: solid 1px #eee;
+}
+div.comments-box ul.comments li.comment > span.author {
+  font-weight: bold;
+}
+div.comments-box ul.comments li.comment > span.info {
+  font-style: italic;
+}

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

@@ -0,0 +1,17 @@
+div.comments-box {
+	div.title {
+		font-size: x-large;
+	}
+	ul.comments {
+		border-top: solid 1px #eee;
+		padding: 0 0 0 20px;
+		border-left: solid 5px #eee;
+		list-style-type: none;
+		li.comment {
+			border-bottom: solid 1px #eee;
+			&>span.author { font-weight: bold; }
+			&>span.info { font-style: italic; }
+		}
+	}
+
+}

examples/demo/site/modules/comments/scripts/install.sql

@@ -0,0 +1,13 @@
+CREATE TABLE comments(
+  `cid`	INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT UNIQUE,
+  `content` TEXT,
+  `format` 	VARCHAR(128),
+  `author`	INTEGER,
+  `author_name`	VARCHAR(255),
+  `created`	DATETIME NOT NULL,
+  `changed`	DATETIME NOT NULL,
+  `status`	INTEGER,
+  `parent` INTEGER,
+  `entity` 	VARCHAR(255),		/* Associated entity */
+  `entity_type`	VARCHAR(255) 	/* Type of associated entity */
+);

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

@@ -1,4 +1,29 @@
 
+CREATE TABLE `logs`(
+  `id` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `category` VARCHAR(255) NOT NULL,
+  `level` INTEGER NOT NULL,
+  `uid` INTEGER,
+  `message` TEXT NOT NULL,
+  `info` TEXT,
+  `link` TEXT,
+  `date` DATETIME NOT NULL
+);
+
+CREATE TABLE `custom_values`(
+  `type` VARCHAR(255) NOT NULL,
+  `name` VARCHAR(255) NOT NULL,
+  `value` TEXT
+);
+
+CREATE TABLE `path_aliases`(
+  `pid` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,
+  `source` VARCHAR(255) NOT NULL,
+  `alias` VARCHAR(255) NOT NULL,
+  `lang` VARCHAR(12)
+);
+
+
 CREATE TABLE `users`(
   `uid` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,
   `name` VARCHAR(100) NOT NULL,
@@ -8,6 +33,7 @@ CREATE TABLE `users`(
   `status` INTEGER,
   `created` DATETIME NOT NULL,
   `signed` DATETIME,
+  `profile_name` VARCHAR(250) NULL,
   CONSTRAINT `name`
     UNIQUE(`name`)
 );

examples/demo/site/modules/core/scripts/updates/core-1.0.0.1.sql

@@ -0,0 +1,2 @@
+ALTER TABLE users ADD profile_name VARCHAR(250) NULL;
+

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

@@ -2,6 +2,7 @@
 	"blocks": {
 		"test":	{
 			"title": "Custom block test",
+			"is_raw": "yes",
 			"region": "footer",
 			"weight": 100,
 			"conditions": ["path:demo/*"]

examples/demo/site/modules/custom_block/templates/block_test.tpl

@@ -1,3 +0,0 @@
-<div>
-This is a nice custom block test for site {$sitename/}.
-</div>

examples/demo/site/modules/google_search_20/config/google_search_20.json-dist

@@ -0,0 +1,5 @@
+{
+    "gcse": {
+     		"search_engine_id":""
+          }	
+}

examples/demo/site/modules/google_search_20/templates/block_gcse_search_form.tpl

@@ -0,0 +1,6 @@
+<form action="{$site_url/}gcse20" class="search-form" id="search-form">
+	<div class="form-group has-feedback">
+		<input type="search" class="form-control" name="q" id="search-query" placeholder="search" value="{htmlentities}{$cms_search_query/}{/htmlentities}" >
+		<span class="glyphicon glyphicon-search form-control-feedback"></span>
+	</div>
+</form>

examples/demo/site/modules/google_search_20/templates/block_gcse_search_results.tpl

@@ -0,0 +1,7 @@
+<section>
+  <header>
+    <h2>Results for <kbd>{$cms_search_query/}</kbd></h2>
+  </header>
+  
+   <gcse:searchresults-only></gcse:searchresults-only>
+</section>

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

@@ -0,0 +1,15 @@
+.messaging-box fieldset {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  overflow: scroll;
+  height: 50ex;
+  line-height: 2.5ex;
+}
+.messaging-box fieldset div {
+  width: 300px;
+}
+.messaging-box fieldset input[type="checkbox"] {
+  margin-right: 5px;
+  margin-left: 3px;
+}

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

@@ -0,0 +1,18 @@
+.messaging-box {
+	fieldset {
+		display: flex; 
+		flex-wrap: wrap;
+		align-items: flex-start;
+		div {
+			width: 300px;
+		}
+
+		overflow:scroll; 
+		height:50ex;
+		line-height: 2.5ex;
+		input[type="checkbox"] {
+			margin-right: 5px;
+			margin-left: 3px;
+		}
+	}
+}

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

@@ -9,6 +9,9 @@ ul.cms-nodes li {
 ul.cms-nodes li:first-child {
   border-top: none;
 }
+ul.cms-nodes li span.author, ul.cms-nodes li span.info {
+  float: right;
+}
 ul.cms-nodes li.cms_type_page a::before {
   content: "[page] ";
 }

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

@@ -8,6 +8,9 @@ ul.cms-nodes {
 		&:first-child {
 			border-top: none;
 		}
+		span.author, span.info {
+			float: right;
+		}
 	}
 	li.cms_type_page a::before {
 		content: "[page] ";

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

@@ -8,6 +8,7 @@ CREATE TABLE nodes (
 	`content`	TEXT,
 	`format`	VARCHAR(128),
 	`author`	INTEGER,
+	`editor`	INTEGER,
 	`publish`	DATETIME,
 	`created`	DATETIME NOT NULL,
 	`changed`	DATETIME NOT NULL,
@@ -23,15 +24,9 @@ CREATE TABLE node_revisions (
 	`content`	TEXT,
 	`format`	VARCHAR(128),
 	`author`	INTEGER,
+	`editor`	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/node/scripts/page.sql

@@ -0,0 +1,8 @@
+
+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/node/scripts/updates/node-1.0.0.1.sql

@@ -0,0 +1,7 @@
+ALTER TABLE nodes ADD editor INTEGER ;
+UPDATE nodes SET editor = author;
+
+ALTER TABLE node_revisions ADD editor INTEGER ;
+UPDATE node_revisions SET editor = author;
+
+

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

@@ -1,7 +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>
+				<a href="{$site_url/}account/auth/login-with-oauth/{$item/}">Login with {$item/}</a><br>
 			{/foreach}	
 		</div>    	
 	</div>

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

@@ -4,6 +4,7 @@
 	<h3>Login or <a href="{$site_url/}account/roc-register">Register</a></h3>
 	<div>
 		<form name="cms_session_auth" action="{$site_url/}account/auth/roc-session-login" method="POST">
+			{unless isempty="$site_destination"}<input type="hidden" name="destination" value="{$site_destination/}">{/unless}
 			<div>
 				<input type="text" name="username" id="username" required value="{$username/}">
 				<label>Username</label>

examples/demo/site/modules/sitemap/files/sitemap.xsl

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="2.0" 
+                xmlns:html="http://www.w3.org/TR/REC-html40"
+                xmlns:sitemap="http://www.sitemaps.org/schemas/sitemap/0.9"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:output method="html" version="1.0" encoding="UTF-8" indent="yes"/>
+	<xsl:template match="/">
+		<html xmlns="http://www.w3.org/1999/xhtml">
+			<head>
+				<title>XML Sitemap</title>
+				<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+				<style type="text/css">
+					body {
+						font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana;
+						font-size: 13px;
+					}	
+
+					#header {
+						text-align: center;
+						padding-top: 14px;
+						padding-bottom: 29px;
+					}				
+					
+					h1 {
+						font-weight: normal;
+						font-size: 24px;
+						line-height: 20px;
+						color: #333333;
+					}
+
+					h2 {
+						font-weight: normal;
+						font-size: 13px;
+						color: #aaaaaa;
+						line-height: 10px;
+					}
+					
+					#content {
+						background: #f8f8f8;
+						border-top: 1px solid #dddddd;
+						padding-top: 50px;
+					}
+
+					#content a:visited,
+					#content tr:hover a:visited {
+						color: #68009c;
+					}
+
+					table {
+						margin: 0 auto;
+						text-align: left;
+					}
+
+					tr#table-header:hover {
+						background: none;
+					}
+
+					tr:hover {
+						background: #ebebeb;
+					}
+
+					#content tr:hover a {
+						color: #6e6e6e;						
+					}
+
+					td {
+						color: #6e6e6e;
+						font-size: 12px;
+						border-bottom: 1px solid #dddddd;
+						padding: 11px 5px 13px;
+					}
+					
+					th {
+						color: #333333;
+						font-size: 12px;
+						border-bottom: 1px solid #dddddd;
+						padding: 5px 50px 17px 5px;
+					}
+					
+					#footer {
+						background: #f8f8f8;
+						font-size: 13px;
+						color: #aaaaaa;
+						padding: 54px 0 20px;
+						text-align: center;						
+					}
+					
+					a {
+						color: #2384c6;
+					}			
+					a:hover {
+						color: #6e6e6e;
+						text-decoration: none;
+					}		
+				</style>
+			</head>
+			<body>
+				<div id="header">
+					<h1>XML Sitemap</h1>
+					<h2>This is a XML Sitemap which is supposed to be processed by <a href="http://www.google.com">Google search engine</a>.</h2>
+				</div>
+				<div id="content">
+					<table cellpadding="5" cellspacing="0">
+						<tr id="table-header">
+							<th>URL</th>
+							<th>Priority</th>
+							<th>Change Frequency</th>
+							<th>LastChange (GMT)</th>
+						</tr>
+						<xsl:variable name="lower" select="'abcdefghijklmnopqrstuvwxyz'"/>
+						<xsl:variable name="upper" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/>
+						<xsl:for-each select="sitemap:urlset/sitemap:url">
+							<tr>
+								<xsl:if test="position() mod 2 != 1">
+									<xsl:attribute  name="class">high</xsl:attribute>
+								</xsl:if>
+								<td>
+									<xsl:variable name="itemURL">
+										<xsl:value-of select="sitemap:loc"/>
+									</xsl:variable>
+									<a href="{$itemURL}">
+										<xsl:value-of select="sitemap:loc"/>
+									</a>
+								</td>
+								<td>
+									<xsl:value-of select="concat(sitemap:priority*100,'%')"/>
+								</td>
+								<td>
+									<xsl:value-of select="concat(translate(substring(sitemap:changefreq, 1, 1),concat($lower, $upper),concat($upper, $lower)),substring(sitemap:changefreq, 2))"/>
+								</td>
+								<td>
+									<xsl:value-of select="concat(substring(sitemap:lastmod,0,11),concat(' ', substring(sitemap:lastmod,12,5)))"/>
+								</td>
+							</tr>
+						</xsl:for-each>
+					</table>
+				</div>
+			</body>
+		</html>
+	</xsl:template>
+</xsl:stylesheet>

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

@@ -0,0 +1,15 @@
+#main code, #main e, #main eiffel {
+  display: block;
+  font-family: monospace;
+  white-space: pre-wrap;
+  border: solid 1px #ccc;
+  background-color: #fff;
+  line-height: 1.3;
+  padding: 10px;
+  margin: 2px 0 2px 0;
+}
+#main code.inline, #main e.inline, #main eiffel.inline {
+  display: inline-block;
+  padding: 0 2px 0 2px;
+  margin: 0;
+}

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

@@ -0,0 +1,18 @@
+#main {
+	code, e, eiffel {
+		display: block;
+		font-family: monospace;
+		white-space: pre-wrap;
+		border: solid 1px #ccc;
+		background-color: #fff;
+		line-height: 1.3;
+		padding: 10px;
+		margin: 2px 0 2px 0;
+
+		&.inline {
+			display: inline-block;
+			padding: 0 2px 0 2px;
+			margin: 0;
+		}
+	}
+}

examples/demo/site/scripts/core.sql

@@ -1,23 +0,0 @@
-CREATE TABLE `logs`(
-  `id` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,
-  `category` VARCHAR(255) NOT NULL,
-  `level` INTEGER NOT NULL,
-  `uid` INTEGER,
-  `message` TEXT NOT NULL,
-  `info` TEXT,
-  `link` TEXT,
-  `date` DATETIME NOT NULL
-);
-
-CREATE TABLE `custom_values`(
-  `type` VARCHAR(255) NOT NULL,
-  `name` VARCHAR(255) NOT NULL,
-  `value` TEXT
-);
-
-CREATE TABLE `path_aliases`(
-  `pid` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL,
-  `source` VARCHAR(255) NOT NULL,
-  `alias` VARCHAR(255) NOT NULL,
-  `lang` VARCHAR(12)
-);

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

@@ -47,6 +47,9 @@ ul.horizontal li {
   padding: 5px;
   font-style: italic;
 }
+#content .preview {
+  border: solid 1px red;
+}
 
 .sidebar {
   padding: 5px;

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

@@ -51,6 +51,9 @@ ul.horizontal {
 		padding: 5px;
 		font-style: italic;
 	}
+	.preview {
+		border: solid 1px red;
+	}
 }
 .sidebar {
 	padding: 5px;

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

@@ -4,11 +4,11 @@
   <meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<!-- EWF CMS -->
-	<link rel="stylesheet" href="{$site_url/}theme/css/style.css">
+	<link rel="stylesheet" href="{$theme_path/}css/style.css">
  
 	<!-- jQuery dep -->
-	<script src="{$site_url/}theme/js/jquery-1.10.2.min.js"></script>
-	<script src="{$site_url/}theme/js/popup_search.js"></script>
+	<script src="{$theme_path/}js/jquery-1.10.2.min.js"></script>
+	<script src="{$theme_path/}js/popup_search.js"></script>
 
 {if isset="$head"}{$head/}{/if}
 {if isset="$styles"}{$styles/}{/if}
@@ -37,17 +37,14 @@
           {$page.primary_nav/}
       {/if}
     </div> 
+	{if isset="$page.regions.search"}
 	<!-- 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>
+			{$page.regions.search/}
 		</div>
 	</div>
+	{/if}
     <!-- General Page Content -->
     <div id='content' class='row-fluid'>
 		<!-- Left Sidebar sidebar_first -->

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

@@ -0,0 +1,6 @@
+			<form action="{$site_url/}search" class="search-form" id="search-form">
+				<div class="form-group has-feedback">
+					<input type="search" class="form-control" name="q" id="search-query" placeholder="search" value="{htmlentities}{$cms_search_query/}{/htmlentities}" >
+					<span class="glyphicon glyphicon-search form-control-feedback"></span>
+				</div>
+			</form>

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

@@ -4,6 +4,7 @@ author=jvelilla
 version=0.1
 regions[page_top] = Top
 regions[header] = Header
+regions[search] = Search
 regions[content] = Content
 regions[highlighted] = Highlighted
 regions[help] = Help

examples/demo/src/demo_cms_execution.e

@@ -53,8 +53,11 @@ feature -- CMS modules
 			a_setup.register_module (create {CMS_OPENID_MODULE}.make)
 			a_setup.register_module (create {CMS_SESSION_AUTH_MODULE}.make)
 
+				-- User
+
 				-- Nodes
-			a_setup.register_module (create {CMS_NODE_MODULE}.make (a_setup))
+			a_setup.register_module (create {CMS_NODE_MODULE}.make)
+			a_setup.register_module (create {CMS_PAGE_MODULE}.make)
 			a_setup.register_module (create {CMS_BLOG_MODULE}.make)
 
 				-- Files
@@ -65,10 +68,16 @@ feature -- CMS modules
 
 				-- Misc
 			a_setup.register_module (create {CMS_SEO_MODULE}.make)
+			a_setup.register_module (create {CMS_SITEMAP_MODULE}.make)
+			a_setup.register_module (create {CMS_COMMENTS_MODULE}.make)
 
 				-- Taxonomy
 			a_setup.register_module (create {CMS_TAXONOMY_MODULE}.make)
 
+				-- Wiki
+			a_setup.register_module (create {WIKITEXT_MODULE}.make)
+			a_setup.register_module (create {EMBEDDED_VIDEO_MODULE}.make)
+
 				-- Recent changes
 			a_setup.register_module (create {CMS_RECENT_CHANGES_MODULE}.make)
 
@@ -76,11 +85,15 @@ feature -- CMS modules
 			a_setup.register_module (create {FEED_AGGREGATOR_MODULE}.make)
 
 				-- Miscellanious
-			a_setup.register_module (create {GOOGLE_CUSTOM_SEARCH_MODULE}.make)
+			a_setup.register_module (create {CMS_MESSAGING_MODULE}.make)
+			a_setup.register_module (create {GOOGLE_CUSTOM_SEARCH_MODULE_20}.make)
 			a_setup.register_module (create {CMS_CUSTOM_BLOCK_MODULE}.make)
 			a_setup.register_module (create {CMS_DEBUG_MODULE}.make)
 			a_setup.register_module (create {CMS_DEMO_MODULE}.make)
 
+				-- Dev
+			a_setup.register_module (create {MASQUERADE_AUTH_MODULE}.make)
+
 		end
 
 end

examples/demo/src/demo_cms_server.e

@@ -2,17 +2,24 @@ note
 	description: "[
 				DEMO application server.
 			]"
-	date: "$Date: 2015-02-09 22:29:56 +0100 (lun., 09 févr. 2015) $"
-	revision: "$Revision: 96596 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	DEMO_CMS_SERVER
 
 inherit
 	ROC_CMS_LAUNCHER [DEMO_CMS_EXECUTION]
+		redefine
+			optional_application_name
+		end
 
 create
 	make_and_launch
 
+feature -- Access	
+
+	optional_application_name: STRING_32 = "server"
+
 end
 

launcher/any-safe.ecf

@@ -1,7 +1,8 @@
 <?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">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="launcher" uuid="6FDCA393-AFC3-436B-A58A-870923967C86" library_target="launcher">
 	<target name="common" abstract="true">
 		<root all_classes="true"/>
+		<setting name="concurrency" value="scoop"/>
 		<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"/>
@@ -10,7 +11,6 @@
 	<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"/>

launcher/any.ecf

@@ -1,8 +1,9 @@
 <?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">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-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" />
+		<setting name="concurrency" value="scoop"/>
 		<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"/>
@@ -11,7 +12,6 @@
 	<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"/>

launcher/any/application_launcher.e

@@ -4,8 +4,8 @@ note
 
 				You can put modification in this class
 			]"
-	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
-	revision: "$Revision: 36 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	APPLICATION_LAUNCHER [G -> WSF_EXECUTION create make end]

launcher/any/application_launcher_i.e

@@ -6,8 +6,8 @@ note
 
 			you can customize APPLICATION_LAUNCHER
 		]"
-	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
-	revision: "$Revision: 36 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 deferred class
 	APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]
@@ -26,8 +26,6 @@ feature -- Execution
 				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
@@ -42,7 +40,7 @@ feature {NONE} -- Access
 
 	launcher_nature: detachable READABLE_STRING_8
 			-- Initialize the launcher nature
-			-- either cgi, libfcgi, or nino.
+			-- either cgi, libfcgi, or standalone.
 			--| We could extend with more connector if needed.
 			--| and we could use WSF_DEFAULT_SERVICE_LAUNCHER to configure this at compilation time.
 		local
@@ -57,9 +55,6 @@ feature {NONE} -- Access
 				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
@@ -81,17 +76,6 @@ feature {NONE} -- standalone
 			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"
@@ -121,7 +105,4 @@ feature -- Default
 			Result := nature_standalone
 		end
 
-
 end
-
-

launcher/cgi-safe.ecf

@@ -1,7 +1,8 @@
 <?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">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="cgi_launcher" uuid="0FE4F1D0-BB70-4C7F-A66E-B27F1D718109" library_target="cgi_launcher">
 	<target name="common" abstract="true">
 		<root all_classes="true"/>
+		<setting name="concurrency" value="scoop"/>
 		<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"/>

launcher/default/application_launcher.e

@@ -4,8 +4,8 @@ note
 
 				You can put modification in this class
 			]"
-	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
-	revision: "$Revision: 36 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	APPLICATION_LAUNCHER [G -> WSF_EXECUTION create make end]

launcher/default/application_launcher_i.e

@@ -6,8 +6,8 @@ note
 
 			you can customize APPLICATION_LAUNCHER
 		]"
-	date: "$Date: 2015-02-09 22:29:56 +0100 (lun., 09 févr. 2015) $"
-	revision: "$Revision: 96596 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 deferred class
 	APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]

launcher/libfcgi-safe.ecf

@@ -1,7 +1,8 @@
 <?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">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="libfcgi_launcher" uuid="04D7D1EA-059B-4024-B0DE-BBB57AB2D00C" library_target="libfcgi_launcher">
 	<target name="common" abstract="true">
 		<root all_classes="true"/>
+		<setting name="concurrency" value="scoop"/>
 		<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"/>

launcher/libfcgi.ecf

@@ -1,8 +1,9 @@
 <?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">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-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" />
+		<setting name="concurrency" value="scoop"/>
 		<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"/>

launcher/roc_cms_launcher.e

@@ -2,8 +2,8 @@ note
 	description: "[
 				Reusable ROC CMS launcher.
 			]"
-	date: "$Date: 2015-02-09 22:29:56 +0100 (lun., 09 févr. 2015) $"
-	revision: "$Revision: 96596 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	ROC_CMS_LAUNCHER [G -> CMS_EXECUTION create make end]

launcher/standalone-safe.ecf

@@ -1,7 +1,8 @@
 <?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">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="standalone_launcher" uuid="F42660A9-26C2-466B-A63C-C7823C808BE7" library_target="standalone_launcher">
 	<target name="common" abstract="true">
 		<root all_classes="true"/>
+		<setting name="concurrency" value="scoop"/>
 		<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"/>

launcher/standalone.ecf

@@ -1,8 +1,9 @@
 <?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">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-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" />
+		<setting name="concurrency" value="scoop"/>
 		<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/app_env/app_env-safe.ecf

@@ -4,13 +4,11 @@
 	<target name="app_env">
 		<root all_classes="true"/>
 		<option warning="true" void_safety="all">
-			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
-		<setting name="console_application" value="true"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
 		<library name="logging" location="$ISE_LIBRARY\library\runtime\logging\logging-safe.ecf"/>
-		<library name="thread" location="$ISE_LIBRARY\library\thread\thread-safe.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true">
 			<file_rule>
 				<exclude>/EIFGENs$</exclude>

library/app_env/src/application_environment.e

@@ -11,8 +11,8 @@ note
 				- templates (html, Collection+JSON, ...)
 				- ...
 		]"
-	date: "$Date: 2015-02-05 10:25:53 +0100 (jeu., 05 févr. 2015) $"
-	revision: "$Revision: 96584 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	APPLICATION_ENVIRONMENT

library/app_env/src/configuration/application_json_configuration_helper.e

@@ -1,7 +1,7 @@
 note
 	description: "Provide access to json configuration"
-	date: "$Date: 2015-01-27 19:15:02 +0100 (mar., 27 janv. 2015) $"
-	revision: "$Revision: 96542 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	APPLICATION_JSON_CONFIGURATION_HELPER

library/app_env/src/configuration/database_configuration.e

@@ -1,7 +1,7 @@
 note
 	description: "Object that represent Database configuration settings"
-	date: "$Date: 2015-02-09 22:29:56 +0100 (lun., 09 févr. 2015) $"
-	revision: "$Revision: 96596 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	DATABASE_CONFIGURATION

library/app_env/src/configuration/logger_configuration.e

@@ -1,7 +1,7 @@
 note
 	description: "Object that represents Logger configuration settings"
-	date: "$Date: 2015-02-03 19:11:23 +0100 (mar., 03 févr. 2015) $"
-	revision: "$Revision: 96575 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	LOGGER_CONFIGURATION

library/app_env/src/error/basic_error_handler.e

@@ -1,7 +1,7 @@
 note
 	description: "Object handling error information"
-	date: "$Date: 2014-08-20 15:21:15 -0300 (mi., 20 ago. 2014) $"
-	revision: "$Revision: 95678 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	BASIC_ERROR_HANDLER

library/app_env/src/error/shared_error.e

@@ -1,7 +1,7 @@
 note
 	description: "Provides error information"
-	date: "$Date: 2014-08-20 15:21:15 -0300 (mi., 20 ago. 2014) $"
-	revision: "$Revision: 95678 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	SHARED_ERROR

library/app_env/src/logger/logging_facility.e

@@ -1,7 +1,7 @@
 note
 	description: "Wrapper class providing synchronize logging access."
-	date: "$Date: 2014-08-20 15:21:15 -0300 (mi., 20 ago. 2014) $"
-	revision: "$Revision: 95678 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	LOGGING_FACILITY

library/app_env/src/logger/shared_logger.e

@@ -1,7 +1,7 @@
 note
 	description: "Provides logger information"
-	date: "$Date: 2015-02-05 10:25:53 +0100 (jeu., 05 févr. 2015) $"
-	revision: "$Revision: 96584 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	SHARED_LOGGER

library/configuration/config-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" uuid="A3762109-D650-40A1-B55A-7D236A17903F" library_target="config">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="config" uuid="A3762109-D650-40A1-B55A-7D236A17903F" library_target="config">
 	<target name="config">
 		<root all_classes="true"/>
 		<file_rule>
@@ -7,8 +7,9 @@
 			<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 warning="true">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true"/>

library/configuration/src/config_reader.e

@@ -1,8 +1,8 @@
 note
 	description: "Summary description for {CONFIG_READER}."
 	author: ""
-	date: "$Date: 2014-12-18 16:37:11 +0100 (jeu., 18 déc. 2014) $"
-	revision: "$Revision: 96383 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 deferred class
 	CONFIG_READER

library/configuration/src/ini_config.e

@@ -44,8 +44,8 @@ note
 				@include=file-to-include
 
 		]"
-	date: "$Date: 2015-03-09 19:25:49 +0100 (lun., 09 mars 2015) $"
-	revision: "$Revision: 96797 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	INI_CONFIG

library/configuration/src/json_config.e

@@ -1,7 +1,7 @@
 note
 	description: "Object parsing a JSON configuration file."
-	date: "$Date: 2014-12-18 16:37:11 +0100 (jeu., 18 déc. 2014) $"
-	revision: "$Revision: 96383 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	JSON_CONFIG
@@ -148,7 +148,9 @@ feature -- Access
 			-- `k' can be a single name such as "foo",
 			-- or a qualified name such as "foo.bar" (assuming that "foo" is associated with a JSON object).
 		do
-			if attached json_value as obj then
+			if k.is_empty then
+				Result := json_value
+			elseif attached json_value as obj then
 				Result := object_json_value (obj, k.to_string_32)
 			end
 		end

library/configuration/tests/test_config_reader_set.e

@@ -2,9 +2,9 @@ note
 	description: "[
 			Testing suite for CONFIG_READER .
 		]"
-	author: "$Author: jfiat $"
-	date: "$Date: 2014-12-18 16:37:11 +0100 (jeu., 18 déc. 2014) $"
-	revision: "$Revision: 96383 $"
+	author: "$Author$"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	TEST_CONFIG_READER_SET

library/email/email-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="email_service" uuid="261DC9D5-C3A0-498D-A063-0BB6C80423CC" library_target="email_service">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-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>
@@ -7,8 +7,9 @@
 			<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 warning="true">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<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"/>

library/email/email_service.e

@@ -1,7 +1,7 @@
 note
 	description: "Basic Email Service"
-	date: "$Date: 2015-04-30 05:45:25 -0300 (ju. 30 de abr. de 2015) $"
-	revision: "$Revision: 97218 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	EMAIL_SERVICE

library/email/email_service_parameters.e

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

library/gcse/gcse-safe.ecf

@@ -1,5 +1,5 @@
 <?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="gcse" uuid="81645CEF-4651-45CF-A890-B126E4A6D78C" library_target="gcse">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="gcse" uuid="81645CEF-4651-45CF-A890-B126E4A6D78C" library_target="gcse">
 	<target name="gcse">
 		<root all_classes="true"/>
 		<file_rule>
@@ -8,10 +8,8 @@
 			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
 		</file_rule>
-		<option warning="true" void_safety="all">
-			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
-		</option>
-		<setting name="console_application" value="true"/>
+		<option warning="true"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="http_client_extension" location="..\http_client_extension\http_client_extension-safe.ecf" readonly="false"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>

library/gcse/src/gcse_api.e

@@ -4,8 +4,8 @@ note
 		Example call:
 		GET https://www.googleapis.com/customsearch/v1?key=INSERT_YOUR_API_KEY&cx=017576662512468239146:omuauf_lfve&q=lectures
 	]"
-	date: "$Date: 2015-10-09 08:11:07 -0300 (vi., 09 oct. 2015) $"
-	revision: "$Revision: 97973 $"
+	date: "$Date$"
+	revision: "$Revision$"
 	EIS: "name=Google Custom Search Engine", "src=https://developers.google.com/custom-search/json-api/v1/using_rest", "protocol=uri"
 
 class

library/gcse/src/gcse_page.e

@@ -1,7 +1,7 @@
 note
 	description: "Represent metadata describing the query for the current set of results."
-	date: "$Date: 2015-10-09 08:11:07 -0300 (vi., 09 oct. 2015) $"
-	revision: "$Revision: 97973 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	GCSE_PAGE

library/gcse/src/gcse_page_item.e

@@ -1,7 +1,7 @@
 note
 	description: "Represent a search result, include the URL, title and text snippets that describe the result"
-	date: "$Date: 2015-10-09 08:11:07 -0300 (vi., 09 oct. 2015) $"
-	revision: "$Revision: 97973 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	GCSE_PAGE_ITEM

library/gcse/src/gcse_page_map.e

@@ -16,8 +16,8 @@ note
 		    ]
 		   }		
 	]"
-	date: "$Date: 2015-10-09 08:11:07 -0300 (vi., 09 oct. 2015) $"
-	revision: "$Revision: 97973 $"
+	date: "$Date$"
+	revision: "$Revision$"
 	EIS: "name=PageMaps", "src=https://developers.google.com/custom-search/docs/structured_data#pagemaps", "protocol=url"
 
 class

library/gcse/src/gcse_query_parameters.e

@@ -148,8 +148,8 @@ note
 					"i": include
 					sort	string	The sort expression to apply to the results.
 ]"
-	date: "$Date: 2015-10-08 07:51:29 -0300 (ju., 08 oct. 2015) $"
-	revision: "$Revision: 97966 $"
+	date: "$Date$"
+	revision: "$Revision$"
 	EIS: "GCSE parameters", "src=https://developers.google.com/custom-search/json-api/v1/reference/cse/list", "protocol=URI"
 
 class

library/gcse/src/gcse_response.e

@@ -7,8 +7,8 @@ note
 		Search infromation
 		Items: array of actual search results.
 	]"
-	date: "$Date: 2015-10-08 07:51:29 -0300 (ju., 08 oct. 2015) $"
-	revision: "$Revision: 97966 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	GCSE_RESPONSE

library/gcse/test/application.e

@@ -1,7 +1,7 @@
 note
 	description : "test application root class"
-	date        : "$Date: 2015-12-02 10:27:38 -0300 (mi. 02 de dic. de 2015) $"
-	revision    : "$Revision: 98180 $"
+	date        : "$Date$"
+	revision    : "$Revision$"
 
 class
 	APPLICATION

library/gcse/test/gcse_api_test_set.e

@@ -3,8 +3,8 @@ note
 		Eiffel tests that can be executed by testing tool.
 	]"
 	author: "EiffelStudio test wizard"
-	date: "$Date: 2015-10-08 07:51:29 -0300 (ju., 08 oct. 2015) $"
-	revision: "$Revision: 97966 $"
+	date: "$Date$"
+	revision: "$Revision$"
 	testing: "type/manual"
 
 class