Updated code to follow review comments.

Removed class cms_node_constants.
Updated Form response to use permission scopes.
Updated sqlquery to retrieve user author.
Added logger info in cms_response

cms-safe.ecf

@@ -19,12 +19,10 @@
 		<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="smarty" location="$ISE_LIBRARY\contrib\library\text\template\smarty\smarty-safe.ecf" readonly="false"/>
 		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter-safe.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
-		<library name="uri_template" location="$ISE_LIBRARY\contrib\library\text\parser\uri_template\uri_template-safe.ecf"/>
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf-safe.ecf"/>
 		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension-safe.ecf" readonly="false"/>
 		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html-safe.ecf" readonly="false"/>

cms.ecf

@@ -17,14 +17,12 @@
 		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf" readonly="false"/>
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
 		<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
-		<library name="i18n" location="$ISE_LIBRARY\library\i18n\i18n.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
 		<library name="cms_app_env" location=".\library\app_env\app_env.ecf"/>
 		<library name="cms_model" location=".\library\model\cms_model.ecf" readonly="false"/>
 		<library name="smarty" location="$ISE_LIBRARY\contrib\library\text\template\smarty\smarty.ecf" readonly="false"/>
 		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
-		<library name="uri_template" location="$ISE_LIBRARY\contrib\library\text\parser\uri_template\uri_template.ecf"/>
 		<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
 		<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html.ecf" readonly="false"/>
 		<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension.ecf" readonly="false"/>

examples/demo/modules/blog/cms_blog_module.e

@@ -11,6 +11,7 @@ inherit
 		redefine
 			register_hooks,
 			initialize,
+			is_installed,
 			install
 		end
 
@@ -52,6 +53,12 @@ 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
@@ -71,16 +78,17 @@ CREATE TABLE "blog_post_nodes"(
 						api.logger.put_error ("Could not initialize database for blog module", generating_type)
 					end
 				end
-				Precursor (api)
+				api.storage.set_custom_value ("is_initialized", "module-" + name, "yes")
 			end
 		end
 
 feature -- Access: router
 
-	setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
-			-- <Precursor>
+	router (a_api: CMS_API): WSF_ROUTER
+			-- Node router.
 		do
-			a_router.handle_with_request_methods ("/blogs/", create {WSF_URI_AGENT_HANDLER}.make (agent handle_blogs (?,?, a_api)), a_router.methods_get)
+			create Result.make (1)
+			Result.handle_with_request_methods ("/blogs/", create {WSF_URI_AGENT_HANDLER}.make (agent handle_blogs (?,?, a_api)), Result.methods_get)
 		end
 
 feature -- Hooks
@@ -94,7 +102,7 @@ feature -- Hooks
 		local
 			lnk: CMS_LOCAL_LINK
 		do
-			create lnk.make ("Blogs", "blogs/")
+			create lnk.make ("Blogs", "/blogs/")
 			a_menu_system.primary_menu.extend (lnk)
 		end
 

examples/demo/modules/demo/cms_demo_module.e

@@ -80,11 +80,12 @@ CREATE TABLE "tb_demo"(
 
 feature -- Access: router
 
-	setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
-			-- <Precursor>
+	router (a_api: CMS_API): WSF_ROUTER
+			-- Node router.
 		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))
+			create Result.make (2)
+			map_uri_template_agent (Result, "/demo/", agent handle_demo (?,?,a_api))
+			map_uri_template_agent (Result, "/demo/{id}", agent handle_demo_entry (?,?,a_api))
 		end
 
 feature -- Hooks
@@ -110,9 +111,9 @@ feature -- Hooks
 			if a_block_id.is_case_insensitive_equal_general ("demo-info") then
 				if a_response.request.request_uri.starts_with ("/demo/") then
 					create m.make_with_title (a_block_id, "Demo", 2)
-					create lnk.make ("demo: abc", "demo/abc")
+					create lnk.make ("/demo/abc", a_response.url ("/demo/abc", Void))
 					m.extend (lnk)
-					create lnk.make ("demo: 123", "demo/123")
+					create lnk.make ("/demo/123", a_response.url ("/demo/123", Void))
 					m.extend (lnk)
 					create mb.make (m)
 					a_response.add_block (mb, "sidebar_second")
@@ -125,7 +126,7 @@ feature -- Hooks
 			lnk: CMS_LOCAL_LINK
 --			perms: detachable ARRAYED_LIST [READABLE_STRING_8]
 		do
-			create lnk.make ("Demo", "demo/")
+			create lnk.make ("Demo", "/demo/")
 			a_menu_system.primary_menu.extend (lnk)
 		end
 
@@ -137,8 +138,8 @@ 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.add_error_message ("DEMO Module: not yet implemented")
+			r.set_main_content ("NODE module does not yet implement %"" + req.path_info + "%" ...")
+			r.add_error_message ("NODE Module: not yet implemented")
 			r.execute
 		end
 

examples/demo/site/scripts/core.sql

@@ -1,5 +1,35 @@
 BEGIN;
 
+CREATE TABLE "users"(
+  "uid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("uid">=0),
+  "name" VARCHAR(100) NOT NULL,
+  "password" VARCHAR(100) NOT NULL,
+  "salt" VARCHAR(100) NOT NULL,
+  "email" VARCHAR(250) NOT NULL,
+  "status" INTEGER,
+  "created" DATETIME NOT NULL,
+  "signed" DATETIME,
+  CONSTRAINT "name"
+    UNIQUE("name")
+);
+
+CREATE TABLE "roles"(
+  "rid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("rid">=0),
+  "name" VARCHAR(100) NOT NULL,
+  CONSTRAINT "name"
+    UNIQUE("name")
+);
+
+CREATE TABLE "users_roles"(
+  "uid" INTEGER NOT NULL CHECK("uid">=0),
+  "rid" INTEGER NOT NULL CHECK("rid">=0)
+);
+
+CREATE TABLE "role_permissions"(
+  "rid" INTEGER NOT NULL CHECK("rid">=0),
+  "permission" VARCHAR(255) NOT NULL,
+  "module" VARCHAR(255)
+);
 
 CREATE TABLE "logs"(
   "id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("id">=0),
@@ -15,14 +45,7 @@ CREATE TABLE "logs"(
 CREATE TABLE "custom_values"(
   "type" VARCHAR(255) NOT NULL,
   "name" VARCHAR(255) NOT NULL,
-  "value" TEXT
-);
-
-CREATE TABLE "path_aliases"(
-  "pid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("pid">=0),
-  "source" VARCHAR(255) NOT NULL,
-  "alias" VARCHAR(255) NOT NULL,
-  "lang" VARCHAR(12)
+  "value" VARCHAR(255) NOT NULL
 );
 
 COMMIT;

examples/demo/site/scripts/node.sql

@@ -1,18 +1,18 @@
 BEGIN;
 
-CREATE TABLE "nodes" (
-	"nid"	INTEGER NOT NULL CHECK("nid" > 0) PRIMARY KEY AUTOINCREMENT 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 "nodes"(
+  "nid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("nid">=0),
+  "revision" INTEGER,
+  "type" TEXT NOT NULL,
+  "title" VARCHAR(255) NOT NULL,
+  "summary" TEXT,
+  "content" MEDIUMTEXT NOT NULL,
+  "format" VARCHAR(255),
+  "author" INTEGER,
+  "publish" DATETIME,
+  "created" DATETIME NOT NULL,
+  "changed" DATETIME NOT NULL,
+  "status"  INTEGER
 );
 
 CREATE TABLE page_nodes(

examples/demo/site/scripts/user.sql

@@ -1,34 +0,0 @@
-BEGIN;
-
-CREATE TABLE "users"(
-  "uid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("uid">=0),
-  "name" VARCHAR(100) NOT NULL,
-  "password" VARCHAR(100) NOT NULL,
-  "salt" VARCHAR(100) NOT NULL,
-  "email" VARCHAR(250) NOT NULL,
-  "status" INTEGER,
-  "created" DATETIME NOT NULL,
-  "signed" DATETIME,
-  CONSTRAINT "name"
-    UNIQUE("name")
-);
-
-CREATE TABLE "roles"(
-  "rid" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL CHECK("rid">=0),
-  "name" VARCHAR(100) NOT NULL,
-  CONSTRAINT "name"
-    UNIQUE("name")
-);
-
-CREATE TABLE "users_roles"(
-  "uid" INTEGER NOT NULL CHECK("uid">=0),
-  "rid" INTEGER NOT NULL CHECK("rid">=0)
-);
-
-CREATE TABLE "role_permissions"(
-  "rid" INTEGER NOT NULL CHECK("rid">=0),
-  "permission" VARCHAR(255) NOT NULL,
-  "module" VARCHAR(255)
-);
-
-COMMIT;

library/model/src/link/cms_local_link.e

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

library/persistence/implementation/store/cms_storage_store_sql.e

@@ -1,5 +1,6 @@
 note
-	description: "Storage based on Eiffel Store component."
+	description: "Summary description for {CMS_STORAGE_STORE_SQL}."
+	author: ""
 	date: "$Date: 2015-02-13 13:08:13 +0100 (ven., 13 févr. 2015) $"
 	revision: "$Revision: 96616 $"
 
@@ -7,7 +8,9 @@ deferred class
 	CMS_STORAGE_STORE_SQL
 
 inherit
-	CMS_STORAGE_SQL
+	CMS_STORAGE
+
+	CMS_STORAGE_SQL_I
 
 feature {NONE} -- Initialization
 
@@ -22,6 +25,7 @@ feature {NONE} -- Initialization
 			create {DATABASE_HANDLER_IMPL} db_handler.make (a_connection)
 
 			create error_handler.make
+--			error_handler.add_synchronization (db_handler.database_error_handler)
 		end
 
 feature -- Status report

library/persistence/implementation/store/cms_storage_store_sql_builder.e

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

library/persistence/mysql/src/cms_storage_mysql_builder.e

@@ -1,6 +1,6 @@
 note
 	description: "[
-			Interface responsible to instantiate CMS_STORAGE_MYSQL object.
+			Objects that ...
 		]"
 	author: "$Author: jfiat $"
 	date: "$Date: 2015-01-27 19:15:02 +0100 (mar., 27 janv. 2015) $"
@@ -10,9 +10,7 @@ class
 	CMS_STORAGE_MYSQL_BUILDER
 
 inherit
-	CMS_STORAGE_STORE_SQL_BUILDER
-
-	GLOBAL_SETTINGS
+	CMS_STORAGE_SQL_BUILDER
 
 create
 	make
@@ -34,12 +32,6 @@ feature -- Factory
 				create {DATABASE_CONNECTION_MYSQL} conn.login_with_connection_string (l_database_config.connection_string)
 				if conn.is_connected then
 					create Result.make (conn)
-					set_map_zero_null_value (False)	--| This way we map 0 to 0, instead of Null as default.
-					if Result.is_available then
-						if not Result.is_initialized then
-							initialize (a_setup, Result)
-						end
-					end
 				end
 			end
 		end

library/persistence/sqlite/src/cms_storage_sqlite.e

@@ -1,5 +1,5 @@
 note
-	description: "Summary description for {CMS_STORAGE_SQLITE}."
+	description: "Summary description for {CMS_STORAGE_MYSQL}."
 	date: "$Date: 2015-02-09 22:29:56 +0100 (lun., 09 févr. 2015) $"
 	revision: "$Revision: 96596 $"
 

library/persistence/sqlite/src/cms_storage_sqlite_builder.e

@@ -1,6 +1,6 @@
 note
 	description: "[
-			Interface responsible to instantiate CMS_STORAGE_SQLITE object.
+			Objects that ...
 		]"
 	author: "$Author: jfiat $"
 	date: "$Date: 2015-02-13 13:08:13 +0100 (ven., 13 févr. 2015) $"
@@ -10,9 +10,7 @@ class
 	CMS_STORAGE_SQLITE_BUILDER
 
 inherit
-	CMS_STORAGE_STORE_SQL_BUILDER
-
-	GLOBAL_SETTINGS
+	CMS_STORAGE_SQL_BUILDER
 
 create
 	make
@@ -29,7 +27,6 @@ feature -- Factory
 	storage (a_setup: CMS_SETUP): detachable CMS_STORAGE_SQLITE
 		local
 			s: STRING
-			conn: DATABASE_CONNECTION
 		do
 			if attached (create {APPLICATION_JSON_CONFIGURATION_HELPER}).new_database_configuration (a_setup.environment.application_config_path) as l_database_config then
 				s := "Driver=SQLite3 ODBC Driver;Database="
@@ -37,17 +34,75 @@ feature -- Factory
 					s.append (db_name)
 				end
 				s.append (";LongNames=0;Timeout=1000;NoTXN=0;SyncPragma=NORMAL;StepAPI=0;")
-				create {DATABASE_CONNECTION_ODBC} conn.login_with_connection_string (s)
-				if conn.is_connected then
-					create Result.make (conn)
-					set_map_zero_null_value (False)	--| This way we map 0 to 0, instead of Null as default.
-					if Result.is_available then
-						if not Result.is_initialized then
-							initialize (a_setup, Result)
-						end
+				create Result.make (create {DATABASE_CONNECTION_ODBC}.login_with_connection_string (s))
+				--create Result.make (create {DATABASE_CONNECTION_ODBC}.login_with_connection_string (l_database_config.connection_string))
+				if Result.is_available then
+					if not Result.is_initialized then
+						initialize (a_setup, Result)
 					end
 				end
 			end
 		end
 
+	initialize (a_setup: CMS_SETUP; a_storage: CMS_STORAGE_STORE_SQL)
+		local
+			u: CMS_USER
+			l_anonymous_role, l_authenticated_role, r: CMS_USER_ROLE
+			l_roles: LIST [CMS_USER_ROLE]
+		do
+				--| Schema
+			a_storage.sql_execute_file_script (a_setup.environment.path.extended ("scripts").extended ("core.sql"))
+
+				--| Roles
+			create l_anonymous_role.make ("anonymous")
+			a_storage.save_user_role (l_anonymous_role)
+
+			create l_authenticated_role.make ("authenticated")
+			a_storage.save_user_role (l_authenticated_role)
+
+				--| Users
+			create u.make ("admin")
+			u.set_password ("istrator#")
+			u.set_email (a_setup.site_email)
+			a_storage.new_user (u)
+
+				--| Node			
+				-- FIXME: move that initialization to node module
+			l_anonymous_role.add_permission ("view any page")
+			a_storage.save_user_role (l_anonymous_role)
+
+			l_authenticated_role.add_permission ("create page")
+			l_authenticated_role.add_permission ("view any page")
+			l_authenticated_role.add_permission ("edit own page")
+			l_authenticated_role.add_permission ("delete own page")
+			a_storage.save_user_role (l_authenticated_role)
+
+
+			--| For testing purpose, to be removed later.
+
+				-- Roles, view role for testing.
+			create r.make ("view")
+			r.add_permission ("view page")
+			a_storage.save_user_role (r)
+
+			create {ARRAYED_LIST [CMS_USER_ROLE]} l_roles.make (1)
+			l_roles.force (r)
+
+			create u.make ("auth")
+			u.set_password ("enticated#")
+			u.set_email (a_setup.site_email)
+			a_storage.new_user (u)
+
+			create u.make ("test")
+			u.set_password ("test#")
+			u.set_email (a_setup.site_email)
+			a_storage.new_user (u)
+
+			create u.make ("view")
+			u.set_password ("only#")
+			u.set_email (a_setup.site_email)
+			u.set_roles (l_roles)
+			a_storage.new_user (u)
+		end
+
 end

modules/basic_auth/basic_auth_module.e

@@ -37,11 +37,12 @@ feature {NONE} -- Initialization
 
 feature -- Access: router
 
-	setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
-			-- <Precursor>
+	router (a_api: CMS_API): WSF_ROUTER
+			-- Node router.
 		do
-			configure_api_login (a_api, a_router)
-			configure_api_logoff (a_api, a_router)
+			create Result.make (2)
+			configure_api_login (a_api, Result)
+			configure_api_logoff (a_api, Result)
 		end
 
 feature -- Access: filter
@@ -109,9 +110,9 @@ feature -- Hooks
 			lnk: CMS_LOCAL_LINK
 		do
 			if attached a_response.current_user (a_response.request) as u then
-				create lnk.make (u.name +  " (Logout)", "basic_auth_logoff?destination=" + a_response.request.request_uri)
+				create lnk.make (u.name +  " (Logout)", "/basic_auth_logoff?destination=" + a_response.request.request_uri)
 			else
-				create lnk.make ("Login", "basic_auth_login?destination=" + a_response.request.request_uri)
+				create lnk.make ("Login", "/basic_auth_login?destination=" + a_response.request.request_uri)
 			end
 --			if not a_menu_system.primary_menu.has (lnk) then
 				lnk.set_weight (99)

modules/basic_auth/filter/basic_auth_filter.e

@@ -22,12 +22,11 @@ feature -- Basic operations
 			-- Execute the filter.
 		local
 			l_auth: HTTP_AUTHORIZATION
-			utf: UTF_CONVERTER
 		do
 			api.logger.put_debug (generator + ".execute ", Void)
 			create l_auth.make (req.http_authorization)
 			if attached req.raw_header_data as l_raw_data then
-			   api.logger.put_debug (generator + ".execute " + utf.escaped_utf_32_string_to_utf_8_string_8 (l_raw_data), Void)
+			   api.logger.put_debug (generator + ".execute " + l_raw_data, Void)
 			end
 				-- A valid user
 			if

modules/node/cms_node_api.e

@@ -16,21 +16,20 @@ inherit
 
 	REFACTORING_HELPER
 
-create {NODE_MODULE}
-	make_with_storage
+create
+	make
 
-feature {NONE} -- Initialization
-
-	make_with_storage (a_api: CMS_API; a_node_storage: CMS_NODE_STORAGE_I)
-		do
-			node_storage := a_node_storage
-			make (a_api)
-		end
+feature {NONE} -- Implementation
 
 	initialize
 			-- <Precursor>
 		do
 			Precursor
+			if attached {CMS_STORAGE_SQL_I} storage as l_storage_sql then
+				create {CMS_NODE_STORAGE_SQL} node_storage.make (l_storage_sql)
+			else
+				create {CMS_NODE_STORAGE_NULL} node_storage.make
+			end
 			initialize_node_types
 		end
 
@@ -171,38 +170,30 @@ feature -- URL
 			-- or URI of path for selection of new content possibilities if ct is Void.
 		do
 			if ct /= Void then
-				Result := "node/add/" + ct.name
+				Result := "/node/add/" + ct.name
 			else
-				Result := "node/"
+				Result := "/node/"
 			end
 		end
 
-	node_link (a_node: CMS_NODE): CMS_LOCAL_LINK
-			-- CMS link for node `a_node'.
-		require
-			a_node.has_id
-		do
-			create Result.make (a_node.title, cms_api.path_alias (node_path (a_node)))
-		end
-
 	node_path (a_node: CMS_NODE): STRING
 			-- URI path for node `a_node'.
 			-- using the /node/{nid} url.
 		require
 			a_node.has_id
 		do
-			Result := "node/" + a_node.id.out
+			Result := "/node/" + a_node.id.out
 		end
 
 	nodes_path: STRING
 			-- URI path for list of nodes.
 		do
-			Result := "nodes"
+			Result := "/nodes"
 		end
 
 feature -- Access: Node
 
-	nodes_count: NATURAL_64
+	nodes_count: INTEGER_64
 		do
 			Result := node_storage.nodes_count
 		end
@@ -213,17 +204,10 @@ feature -- Access: Node
 			Result := node_storage.nodes
 		end
 
-	trashed_nodes (a_user: CMS_USER): LIST [CMS_NODE]
-			-- List of nodes with status in {CMS_NODE_API}.trashed.
-			-- if the current user is admin, it will retrieve all the trashed nodes
-		do
-			Result := node_storage.trashed_nodes (a_user.id)
-		end
-
-	recent_nodes (params: CMS_DATA_QUERY_PARAMETERS): ITERABLE [CMS_NODE]
+	recent_nodes (a_offset, a_rows: INTEGER): LIST [CMS_NODE]
 			-- List of the `a_rows' most recent nodes starting from  `a_offset'.
 		do
-			Result := node_storage.recent_nodes (params.offset.to_integer_32, params.size.to_integer_32)
+			Result := node_storage.recent_nodes (a_offset, a_rows)
 		end
 
 	node (a_id: INTEGER_64): detachable CMS_NODE
@@ -250,11 +234,6 @@ feature -- Access: Node
 				Result := a_node
 			end
 
-				-- Update link with aliasing.
-			if a_node /= Void and then a_node.has_id then
-				a_node.set_link (node_link (a_node))
-			end
-
 				-- Update partial user if needed.
 			if
 				Result /= Void and then
@@ -280,17 +259,16 @@ feature -- Access: Node
 
 feature -- Permission Scope: Node
 
-	has_permission_for_action_on_node (a_action: READABLE_STRING_8; a_node: CMS_NODE; a_user: detachable CMS_USER; ): BOOLEAN
-			-- Has permission to execute action `a_action' on node `a_node', by eventual user `a_user'?
-		local
-			l_type_name: READABLE_STRING_8
+	permission_scope (u: detachable CMS_USER; a_node: CMS_NODE): STRING
+			-- Result 'own' if the user `u' is the owner of the node `a_node', in other case
+			-- `any'.
 		do
-			l_type_name := a_node.content_type
-			Result := cms_api.user_has_permission (a_user, a_action + " any " + l_type_name)
-			if not Result and a_user /= Void then
-				if is_author_of_node (a_user, a_node) then
-					Result := cms_api.user_has_permission (a_user, a_action + " own " + l_type_name)
-				end
+			-- FIXME: check if this is ok, since a role may have "any" permission enabled, and "own" disabled,
+			--        in this case, we should check both permissions
+			--        obviously such case should be rare, and look like bad configured permissions, but this may occurs.
+			Result := "any"
+			if u /= Void and then is_author_of_node (u, a_node) then
+				Result := "own"
 			end
 		end
 
@@ -324,21 +302,6 @@ feature -- Change: Node
 			node_storage.update_node (a_node)
 		end
 
-	trash_node (a_node: CMS_NODE)
-			-- Trash node `a_node'.
-			--! remove the node from the storage.
-		do
-			node_storage.trash_node (a_node)
-		end
-
-
-	restore_node (a_node: CMS_NODE)
-			-- Restore node `a_node'.
-			-- From {CMS_NODE_API}.trashed to {CMS_NODE_API}.not_published.
-		do
-			node_storage.restore_node (a_node)
-		end
-
 
 feature -- Node status
 

modules/node/content/cms_node.e

@@ -54,7 +54,6 @@ feature -- Conversion
 						a_node.format
 					)
 			set_status (a_node.status)
-			set_link (a_node.link)
 		end
 
 feature -- Access
@@ -143,11 +142,6 @@ feature -- status report
 			Result := a_content_type.is_case_insensitive_equal (content_type)
 		end
 
-feature -- Access: menu		
-
-	link: detachable CMS_LOCAL_LINK
-			-- Associated menu link.
-
 feature -- Element change
 
 	set_content (a_content: like content; a_summary: like summary; a_format: like format)
@@ -164,9 +158,6 @@ feature -- Element change
 			-- Assign `title' with `a_title'.
 		do
 			title := a_title
-			if attached link as lnk then
-				lnk.set_title (a_title)
-			end
 		ensure
 			title_assigned: title = a_title
 		end
@@ -220,14 +211,6 @@ feature -- Element change
 			auther_set: author = u
 		end
 
-	set_link (a_link: like link)
-			-- Set `link' to `a_link'.
-		do
-			link := a_link
-		end
-
-feature -- Status change		
-
 	mark_not_published
 			-- Set status to not_published.
 		do
@@ -245,13 +228,14 @@ feature -- Status change
 		end
 
 	mark_trashed
-			-- Set status to trashed.
+			-- Set status to published
 		do
 			set_status ({CMS_NODE_API}.trashed)
 		ensure
 			status_trash: status = {CMS_NODE_API}.trashed
 		end
 
+
 feature {CMS_NODE_STORAGE_I} -- Access: status change.
 
 	set_status (a_status: like status)

modules/node/handler/cms_node_type_webform_manager.e

@@ -9,8 +9,6 @@ deferred class
 inherit
 	CMS_NODE_TYPE_WEBFORM_MANAGER_I [G]
 
-	SHARED_WSF_PERCENT_ENCODER
-
 feature -- Forms ...		
 
 	populate_form (response: NODE_RESPONSE; f: CMS_FORM; a_node: detachable CMS_NODE)
@@ -20,7 +18,6 @@ feature -- Forms ...
 			ta: WSF_FORM_TEXTAREA
 			tselect: WSF_FORM_SELECT
 			opt: WSF_FORM_SELECT_OPTION
-			l_uri: detachable READABLE_STRING_8
 		do
 			create ti.make ("title")
 			ti.set_label ("Title")
@@ -68,47 +65,6 @@ feature -- Forms ...
 			fset.extend (tselect)
 
 			f.extend (fset)
-
-				-- Path alias
-			create ti.make ("path_alias")
-			ti.set_label ("Path")
-			ti.set_size (70)
-			if a_node /= Void and then a_node.has_id then
-				if attached a_node.link as lnk then
-					l_uri := lnk.location
-				else
-					l_uri := percent_encoder.percent_decoded_string (response.api.path_alias (response.node_api.node_path (a_node)))
-				end
-				ti.set_text_value (l_uri)
-				ti.set_description ("Optionally specify an alternative URL path by which this content can be accessed. For example, type 'about' when writing an about page. Use a relative path or the URL alias won't work.")
-				ti.set_validation_action (agent (fd: WSF_FORM_DATA; a_response: CMS_RESPONSE)
-						do
-							if
-								attached fd.string_item ("path_alias") as f_path_alias
-							then
-								if a_response.api.is_valid_path_alias (f_path_alias) then
-										-- Ok.
-								elseif f_path_alias.is_empty then
-										-- Ok
-								elseif f_path_alias.starts_with_general ("/") then
-									fd.report_invalid_field ("path_alias", "Path alias should not start with a slash '/' .")
-								elseif f_path_alias.has_substring ("://") then
-									fd.report_invalid_field ("path_alias", "Path alias should not be absolute url .")
-								else
-										-- TODO: implement full path alias validation
-								end
-							end
-						end(?, response)
-					)
-			end
-			if
-				attached f.fields_by_name ("title") as l_title_fields and then
-				attached l_title_fields.first as l_title_field
-			then
-				f.insert_after (ti, l_title_field)
-			else
-				f.extend (ti)
-			end
 		end
 
 	update_node	(response: NODE_RESPONSE; fd: WSF_FORM_DATA; a_node: CMS_NODE)
@@ -204,31 +160,12 @@ feature -- Output
 			node_api := a_response.node_api
 
 			a_response.add_variable (a_node, "node")
-			lnk := a_response.node_local_link (a_node, a_response.translation ("View", Void))
+			create lnk.make ("View", node_api.node_path (a_node))
 			lnk.set_weight (1)
 			a_response.add_to_primary_tabs (lnk)
-
-			if a_node.status = {CMS_NODE_API}.trashed then
-				create lnk.make ("Trash", node_api.node_path (a_node) + "/trash")
-				lnk.set_weight (2)
-				a_response.add_to_primary_tabs (lnk)
-			else
-					-- Node in {{CMS_NODE_API}.published} or {CMS_NODE_API}.not_published} status.
-				create lnk.make ("Edit", node_api.node_path (a_node) + "/edit")
-				lnk.set_weight (2)
-				a_response.add_to_primary_tabs (lnk)
-
-				if
-					a_node /= Void and then
-					a_node.id > 0 and then
-					attached node_api.node_type_for (a_node) as l_type and then
-					node_api.has_permission_for_action_on_node ("delete", a_node, a_response.current_user (a_response.request))
-				then
-					create lnk.make ("Delete", node_api.node_path (a_node) + "/delete")
-					lnk.set_weight (3)
-					a_response.add_to_primary_tabs (lnk)
-				end
-			end
+			create lnk.make ("Edit", node_api.node_path (a_node) + "/edit")
+			lnk.set_weight (2)
+			a_response.add_to_primary_tabs (lnk)
 
 			create s.make_empty
 			s.append ("<div class=%"info%"> ")

modules/node/handler/cms_page_node_type_webform_manager.e

@@ -1,5 +1,6 @@
 note
 	description: "Summary description for {CMS_PAGE_NODE_TYPE_WEBFORM_MANAGER}."
+	author: ""
 	date: "$Date$"
 	revision: "$Revision$"
 

modules/node/handler/node_form_response.e

@@ -26,7 +26,7 @@ feature {NONE} -- Initialization
 	initialize
 		do
 			Precursor
-			create {CMS_TO_WSF_THEME} wsf_theme.make (Current, theme)
+			create {WSF_CMS_THEME} wsf_theme.make (Current, theme)
 		end
 
 	wsf_theme: WSF_THEME
@@ -37,7 +37,7 @@ feature -- Execution
 			-- Computed response message.
 		local
 			b: STRING_8
-			f: like new_edit_form
+			f: like edit_form
 			fd: detachable WSF_FORM_DATA
 			nid: INTEGER_64
 		do
@@ -48,96 +48,43 @@ feature -- Execution
 				attached node_api.node (nid) as l_node
 			then
 				if attached node_api.node_type_for (l_node) as l_type then
- 					fixme ("refactor: process_edit, process_create porcess edit")
- 					if
-						request.path_info.ends_with_general ("/edit") and then
-						node_api.has_permission_for_action_on_node ("edit", l_node, current_user (request))
-					then
-						f := new_edit_form (l_node, url (request.path_info, Void), "edit-" + l_type.name, l_type)
-						invoke_form_alter (f, fd)
+					if has_permission ("edit " + node_api.permission_scope (current_user (request), l_node) + " " +  l_type.name) then
+						f := edit_form (l_node, url (request.path_info, Void), "edit-" + l_type.name, l_type)
 						if request.is_post_request_method then
 							f.validation_actions.extend (agent edit_form_validate (?, b))
 							f.submit_actions.extend (agent edit_form_submit (?, l_node, l_type, b))
 							f.process (Current)
 							fd := f.last_data
 						end
-						if l_node.has_id then
-							add_to_menu (node_local_link (l_node, translation ("View", Void)), primary_tabs)
-							add_to_menu (create {CMS_LOCAL_LINK}.make (translation ("Edit", Void), node_api.node_path (l_node) + "/edit"), primary_tabs)
-							add_to_menu (create {CMS_LOCAL_LINK}.make ("Delete", node_api.node_path (l_node) + "/delete"), primary_tabs)
-						end
 
 						if attached redirection as l_location then
 								-- FIXME: Hack for now
 							set_title (l_node.title)
+							add_to_menu (create {CMS_LOCAL_LINK}.make ("View", node_url (l_node)), primary_tabs)
+							add_to_menu (create {CMS_LOCAL_LINK}.make ("Edit", "/node/" + l_node.id.out + "/edit"), primary_tabs)
+
 							b.append (html_encoded (l_type.title) + " saved")
 						else
-							set_title (formatted_string (translation ("Edit $1 #$2", Void), [l_type.title, l_node.id]))
-							f.append_to_html (wsf_theme, b)
-						end
-					elseif
-						request.path_info.ends_with_general ("/delete") and then
-						node_api.has_permission_for_action_on_node ("delete", l_node, current_user (request))
-					then
-						f := new_delete_form (l_node, url (request.path_info, Void), "delete-" + l_type.name, l_type)
-						invoke_form_alter (f, fd)
-						if request.is_post_request_method then
-							f.process (Current)
-							fd := f.last_data
-						end
-						if l_node.has_id then
-							add_to_menu (node_local_link (l_node, translation ("View", Void)), primary_tabs)
-							add_to_menu (create {CMS_LOCAL_LINK}.make (translation ("Edit", Void), node_api.node_path (l_node) + "/edit"), primary_tabs)
-							add_to_menu (create {CMS_LOCAL_LINK}.make ("Delete", node_api.node_path (l_node) + "/delete"), primary_tabs)
-						end
+							set_title ("Edit " + html_encoded (l_type.title) + " #" + l_node.id.out)
 
-						if attached redirection as l_location then
-								-- FIXME: Hack for now
-							set_title (l_node.title)
-							b.append (html_encoded (l_type.title) + " deleted")
-						else
-							set_title (formatted_string (translation ("Delete $1 #$2", Void), [l_type.title, l_node.id]))
-							f.append_to_html (wsf_theme, b)
-						end
-					elseif
-						request.path_info.ends_with_general ("/trash") and then
-						node_api.has_permission_for_action_on_node ("trash", l_node, current_user (request))
-					then
-						f := new_trash_form (l_node, url (request.path_info, Void), "trash-" + l_type.name, l_type)
-						invoke_form_alter (f, fd)
-						if request.is_post_request_method then
-							f.process (Current)
-							fd := f.last_data
-						end
-						if l_node.has_id then
-							add_to_menu (node_local_link (l_node, translation ("View", Void)), primary_tabs)
-							add_to_menu (create {CMS_LOCAL_LINK}.make ("Trash", node_api.node_path (l_node) + "/Trash"), primary_tabs)
-						end
+							add_to_menu (create {CMS_LOCAL_LINK}.make ("View", node_url (l_node)), primary_tabs)
+							add_to_menu (create {CMS_LOCAL_LINK}.make ("Edit", "/node/" + l_node.id.out + "/edit"), primary_tabs)
 
-						if attached redirection as l_location then
-								-- FIXME: Hack for now
-							set_title (l_node.title)
-							b.append (html_encoded (l_type.title) + " trashed")
-						else
-							set_title (formatted_string (translation ("Trash $1 #$2", Void), [l_type.title, l_node.id]))
 							f.append_to_html (wsf_theme, b)
 						end
 					else
-						b.append ("<h1>")
-						b.append (translation ("Access denied", Void))
-						b.append ("</h1>")
+						b.append ("<h1>Access denied</h1>")
 					end
 				else
-					set_title (translation ("Unknown node", Void))
+					set_title ("Unknown node")
 				end
 			elseif
 				attached {WSF_STRING} request.path_parameter ("type") as p_type and then
 				attached node_api.node_type (p_type.value) as l_type
 			then
-				if has_permissions (<<"create any", "create " +  l_type.name>>) then
+				if has_permission ("create " +  l_type.name) then
 					if attached l_type.new_node (Void) as l_node then
-						f := new_edit_form (l_node, url (request.path_info, Void), "edit-" + l_type.name, l_type)
-						invoke_form_alter (f, fd)
+						f := edit_form (l_node, url (request.path_info, Void), "edit-" + l_type.name, l_type)
 						if request.is_post_request_method then
 							f.validation_actions.extend (agent edit_form_validate (?, b))
 							f.submit_actions.extend (agent edit_form_submit (?, l_node, l_type, b))
@@ -147,33 +94,27 @@ feature -- Execution
 
 						set_title ("Edit " + html_encoded (l_type.title) + " #" + l_node.id.out)
 
-						if l_node.has_id then
-							add_to_menu (node_local_link (l_node, translation ("View", Void)), primary_tabs)
-							add_to_menu (create {CMS_LOCAL_LINK}.make (translation ("Edit", Void), node_api.node_path (l_node) + "/edit"), primary_tabs)
-						end
+						add_to_menu (create {CMS_LOCAL_LINK}.make ("View", node_url (l_node)), primary_tabs)
+						add_to_menu (create {CMS_LOCAL_LINK}.make ("Edit", "/node/" + l_node.id.out + "/edit"), primary_tabs)
 
 						f.append_to_html (wsf_theme, b)
 					else
-						b.append ("<h1>")
-						b.append (translation ("Server error", Void))
-						b.append ("</h1>")
+						b.append ("<h1>Server error</h1>")
 					end
 				else
-					b.append ("<h1>")
-					b.append (translation ("Access denied", Void))
-					b.append ("</h1>")
+					b.append ("<h1>Access denied</h1>")
 				end
 			else
-				set_title (translation ("Create new content ...", Void))
+				set_title ("Create new content ...")
 				b.append ("<ul id=%"content-types%">")
 				across
 					node_api.node_types as ic
 				loop
 					if
 						attached ic.item as l_node_type and then
-						has_permissions (<<"create any", "create " + l_node_type.name>>)
+						(has_permission ("create any") or has_permission ("create " + l_node_type.name))
 					then
-						b.append ("<li>" + link (l_node_type.name, "node/add/" + l_node_type.name, Void))
+						b.append ("<li>" + link (l_node_type.name, "/node/add/" + l_node_type.name, Void))
 						if attached l_node_type.description as d then
 							b.append ("<div class=%"description%">" + d + "</div>")
 						end
@@ -219,7 +160,6 @@ feature -- Form
 			l_preview: BOOLEAN
 			l_node: detachable CMS_NODE
 			s: STRING
-			l_path_alias: detachable READABLE_STRING_8
 		do
 			l_preview := attached {WSF_STRING} fd.item ("op") as l_op and then l_op.same_string ("Preview")
 			if not l_preview then
@@ -251,34 +191,16 @@ feature -- Form
 				end
 				node_api.save_node (l_node)
 				if attached current_user (request) as u then
-					api.log ("node",
-							"User %"" + user_html_link (u) + "%" " + s + " node " + node_html_link (l_node, a_type.name + " #" + l_node.id.out),
-							0, node_local_link (l_node, Void)
-						)
+					api.log ("node", "User %"" + user_link (u) + "%" " + s + " node " + link (a_type.name +" #" + l_node.id.out, "/node/" + l_node.id.out , Void), 0, node_local_link (l_node))
 				else
-					api.log ("node", "Anonymous " + s + " node " + a_type.name +" #" + l_node.id.out, 0, node_local_link (l_node, Void))
+					api.log ("node", "Anonymous " + s + " node " + a_type.name +" #" + l_node.id.out, 0, node_local_link (l_node))
 				end
 				add_success_message ("Node #" + l_node.id.out + " saved.")
-
-				if
-					attached fd.string_item ("path_alias") as f_path_alias and then
-					not f_path_alias.is_empty
-				then
-					l_path_alias := percent_encoder.partial_encoded_string (f_path_alias, <<'/'>>)
-						-- Path alias, are always from the root of the cms.
-					api.set_path_alias (node_api.node_path (l_node), l_path_alias, False)
-					l_node.set_link (create {CMS_LOCAL_LINK}.make (l_node.title, l_path_alias))
-				else
-					l_node.set_link (node_api.node_link (l_node))
-				end
-				if attached l_node.link as lnk then
-					set_redirection (lnk.location)
-				end
+				set_redirection (node_url (l_node))
 			end
 		end
 
-	new_edit_form (a_node: detachable CMS_NODE; a_url: READABLE_STRING_8; a_name: STRING; a_node_type: CMS_NODE_TYPE [CMS_NODE]): CMS_FORM
-			-- Create a web form named `a_name' for node `a_node' (if set), using form action url `a_url', and for type of node `a_node_type'.
+	edit_form (a_node: detachable CMS_NODE; a_url: READABLE_STRING_8; a_name: STRING; a_type: CMS_NODE_TYPE [CMS_NODE]): CMS_FORM
 		local
 			f: CMS_FORM
 			ts: WSF_FORM_SUBMIT_INPUT
@@ -294,7 +216,8 @@ feature -- Form
 			end
 			f.extend (th)
 
-			populate_form (a_node_type, f, a_node)
+			fill_edit_form (a_type, f, a_node)
+
 			f.extend_html_text ("<br/>")
 
 			create ts.make ("op")
@@ -305,90 +228,20 @@ feature -- Form
 			ts.set_default_value ("Preview")
 			f.extend (ts)
 
-			Result := f
-		end
-
-
-	new_delete_form (a_node: detachable CMS_NODE; a_url: READABLE_STRING_8; a_name: STRING; a_node_type: CMS_NODE_TYPE [CMS_NODE]): CMS_FORM
-			-- Create a web form named `a_name' for node `a_node' (if set), using form action url `a_url', and for type of node `a_node_type'.
-		local
-			f: CMS_FORM
-			ts: WSF_FORM_SUBMIT_INPUT
-		do
-			create f.make (a_url, a_name)
-
-			f.extend_html_text ("<br/>")
-			f.extend_html_text ("<legend>Are you sure you want to delete?</legend>")
-
-				-- TODO check if we need to check for has_permissions!!
-			if
-				a_node /= Void and then
-				a_node.id > 0
-			then
+			if a_node /= Void and then a_node.id > 0 and then has_permission ("delete " + a_name) then
 				create ts.make ("op")
 				ts.set_default_value ("Delete")
 				fixme ("[
-					ts.set_default_value (translation ("Delete"))
+					ts.set_default_value (i18n ("Delete"))i18n or other name such as "translated" or "translation
 					]")
 				f.extend (ts)
-				fixme ("wsf_html: add support for HTML5 input attributes!!! ")
-				f.extend_html_text("<input type='submit' value='Cancel' formmethod='GET', formaction='/node/"+a_node.id.out+"'>" )
 			end
 
 			Result := f
 		end
 
-
-	new_trash_form (a_node: detachable CMS_NODE; a_url: READABLE_STRING_8; a_name: STRING; a_node_type: CMS_NODE_TYPE [CMS_NODE]): CMS_FORM
-			-- Create a web form named `a_name' for node `a_node' (if set), using form action url `a_url', and for type of node `a_node_type'.
-		local
-			f: CMS_FORM
-			ts: WSF_FORM_SUBMIT_INPUT
-		do
-			create f.make (a_url, a_name)
-
-			f.extend_html_text ("<br/>")
-			f.extend_html_text ("<legend>Are you sure you want to trash the current node?</legend>")
-			if
-				a_node /= Void and then
-				a_node.id > 0
-			then
-				create ts.make ("op")
-				ts.set_default_value ("Trash")
-				fixme ("[
-					ts.set_default_value (translation ("Trash"))
-					]")
-				f.extend (ts)
-			end
-			f.extend_html_text ("<br/>")
-			f.extend_html_text ("<legend>Do you want to restore the current node?</legend>")
-			if
-				a_node /= Void and then
-				a_node.id > 0
-			then
-				create ts.make ("op")
-				ts.set_default_value ("Restore")
-				fixme ("[
-					ts.set_default_value (translation ("Restore"))
-					]")
-				f.extend (ts)
-			end
-			Result := f
-		end
-
-
-	populate_form (a_content_type: CMS_NODE_TYPE [CMS_NODE]; a_form: WSF_FORM; a_node: detachable CMS_NODE)
-			-- Fill the web form `a_form' with data from `a_node' if set,
-			-- and apply this to content type `a_content_type'.
-		do
-			if attached node_api.node_type_webform_manager (a_content_type) as wf then
-				wf.populate_form (Current, a_form, a_node)
-			end
-		end
-
 	new_node (a_content_type: CMS_NODE_TYPE [CMS_NODE]; a_form_data: WSF_FORM_DATA; a_node: detachable CMS_NODE): CMS_NODE
-			-- Node creation with form_data `a_form_data' for the given content type `a_content_type'
-			-- using optional `a_node' to get extra node data.
+			--
 		do
 			if attached node_api.node_type_webform_manager (a_content_type) as wf then
 				Result := wf.new_node (Current, a_form_data, a_node)
@@ -405,4 +258,11 @@ feature -- Form
 			end
 		end
 
+	fill_edit_form (a_content_type: CMS_NODE_TYPE [CMS_NODE]; a_form: WSF_FORM; a_node: detachable CMS_NODE)
+		do
+			if attached node_api.node_type_webform_manager (a_content_type) as wf then
+				wf.populate_form (Current, a_form, a_node)
+			end
+		end
+
 end

modules/node/handler/node_handler.e

@@ -89,14 +89,6 @@ feature -- HTTP Methods
 				check valid_url: req.path_info.starts_with_general ("/node/") end
 				create edit_response.make (req, res, api, node_api)
 				edit_response.execute
-			elseif req.path_info.ends_with_general ("/delete")  then
-				check valid_url: req.path_info.starts_with_general ("/node/") end
-				create edit_response.make (req, res, api, node_api)
-				edit_response.execute
-			elseif req.path_info.ends_with_general ("/trash")  then
-				check valid_url: req.path_info.starts_with_general ("/node/") end
-				create edit_response.make (req, res, api, node_api)
-				edit_response.execute
 			else
 					-- Display existing node
 				l_nid := node_id_path_parameter (req)
@@ -124,26 +116,14 @@ feature -- HTTP Methods
 		do
 			fixme ("Refactor code: extract methods: edit_node and add_node")
 			if req.path_info.ends_with_general ("/edit") then
-				create edit_response.make (req, res, api, node_api)
-				edit_response.execute
-			elseif req.path_info.ends_with_general ("/delete") then
 				if
 					attached {WSF_STRING} req.form_parameter ("op") as l_op and then
 					l_op.value.same_string ("Delete")
 				then
 					do_delete (req, res)
-				end
-			elseif req.path_info.ends_with_general ("/trash") then
-				if
-					attached {WSF_STRING} req.form_parameter ("op") as l_op and then
-					l_op.value.same_string ("Trash")
-				then
-					do_trash (req, res)
-				elseif
-					attached {WSF_STRING} req.form_parameter ("op") as l_op and then
-					l_op.value.same_string ("Restore")
-				then
-					do_restore (req, res)
+				else
+					create edit_response.make (req, res, api, node_api)
+					edit_response.execute
 				end
 			elseif req.path_info.starts_with_general ("/node/add/") then
 				create edit_response.make (req, res, api, node_api)
@@ -170,7 +150,7 @@ feature -- HTTP Methods
 						l_id.is_integer and then
 						attached node_api.node (l_id.integer_value) as l_node
 					then
-						if node_api.has_permission_for_action_on_node ("delete", l_node, current_user (req)) then
+						if api.user_has_permission (l_user, "delete " + node_api.permission_scope (l_user, l_node) + " " +  l_node.content_type) then
 							node_api.delete_node (l_node)
 							res.send (create {CMS_REDIRECTION_RESPONSE_MESSAGE}.make (req.absolute_script_url ("")))
 						else
@@ -194,62 +174,6 @@ feature -- HTTP Methods
 			send_not_implemented ("REST API not yet implemented", req, res)
 		end
 
-feature {NONE} -- Trash:Restore
-
-	do_trash (req: WSF_REQUEST; res: WSF_RESPONSE)
-			-- Trash a node from the database.
-		do
-			if attached current_user (req) as l_user then
-				if attached {WSF_STRING} req.path_parameter ("id") as l_id then
-					if
-						l_id.is_integer and then
-						attached node_api.node (l_id.integer_value) as l_node
-					then
-						if node_api.has_permission_for_action_on_node ("trash", l_node, current_user (req)) then
-							node_api.trash_node (l_node)
-							res.send (create {CMS_REDIRECTION_RESPONSE_MESSAGE}.make (req.absolute_script_url ("")))
-						else
-							send_access_denied (req, res)
-								-- send_not_authorized ?
-						end
-					else
-						do_error (req, res, l_id)
-					end
-				else
-					(create {INTERNAL_SERVER_ERROR_CMS_RESPONSE}.make (req, res, api)).execute
-				end
-			else
-				send_access_denied (req, res)
-			end
-		end
-
-	do_restore (req: WSF_REQUEST; res: WSF_RESPONSE)
-			-- Restore a node: From {CMS_NODE_API}.trashed to {CMS_NODE_API}.not_published.
-		do
-			if attached current_user (req) as l_user then
-				if attached {WSF_STRING} req.path_parameter ("id") as l_id then
-					if
-						l_id.is_integer and then
-						attached node_api.node (l_id.integer_value) as l_node
-					then
-						if node_api.has_permission_for_action_on_node ("trash", l_node, current_user (req)) then
-							node_api.restore_node (l_node)
-							res.send (create {CMS_REDIRECTION_RESPONSE_MESSAGE}.make (req.absolute_script_url ("")))
-						else
-							send_access_denied (req, res)
-								-- send_not_authorized ?
-						end
-					else
-						do_error (req, res, l_id)
-					end
-				else
-					(create {INTERNAL_SERVER_ERROR_CMS_RESPONSE}.make (req, res, api)).execute
-				end
-			else
-				send_access_denied (req, res)
-			end
-		end
-
 feature -- Error
 
 	do_error (req: WSF_REQUEST; res: WSF_RESPONSE; a_id: detachable WSF_STRING)

modules/node/handler/node_response.e

@@ -51,63 +51,36 @@ feature -- Helpers
 			end
 		end
 
-feature -- Helpers: cms link
+feature -- Helpers
 
-	user_local_link (u: CMS_USER; a_opt_title: detachable READABLE_STRING_GENERAL): CMS_LOCAL_LINK
+	user_local_link (u: CMS_USER): CMS_LINK
 		do
-			if a_opt_title /= Void then
-				create Result.make (a_opt_title, user_url (u))
-			else
-				create Result.make (u.name, user_url (u))
-			end
+			create {CMS_LOCAL_LINK} Result.make (u.name, user_url (u))
 		end
 
-	node_local_link (n: CMS_NODE; a_opt_title: detachable READABLE_STRING_GENERAL): CMS_LOCAL_LINK
+	node_local_link (n: CMS_NODE): CMS_LINK
 		do
-			if attached n.link as lnk then
-				Result := lnk
-			else
-				Result := node_api.node_link (n)
-			end
-			if a_opt_title /= Void and then not Result.title.same_string_general (a_opt_title) then
-				create Result.make (a_opt_title, Result.location)
-			end
+			create {CMS_LOCAL_LINK} Result.make (n.title, node_url (n))
 		end
 
-feature -- Helpers: html link
-
-	user_html_link (u: CMS_USER): like link
+	user_link (u: CMS_USER): like link
 		do
-			Result := link (u.name, "user/" + u.id.out, Void)
+			Result := link (u.name, "/user/" + u.id.out, Void)
 		end
 
-	node_html_link (n: CMS_NODE; a_opt_title: detachable READABLE_STRING_GENERAL): like link
-		local
-			l_title: detachable READABLE_STRING_GENERAL
+	node_link (n: CMS_NODE): like link
 		do
-			if a_opt_title /= Void then
-				l_title := a_opt_title
-			else
-				l_title := n.title
-			end
-			Result := link (l_title, node_api.node_path (n), Void)
-
+			Result := link (n.title, "/node/" + n.id.out, Void)
 		end
 
-feature -- Helpers: URL		
-
 	user_url (u: CMS_USER): like url
-		require
-			u_with_id: u.has_id
 		do
-			Result := url ("user/" + u.id.out, Void)
+			Result := url ("/user/" + u.id.out, Void)
 		end
 
 	node_url (n: CMS_NODE): like url
-		require
-			n_with_id: n.has_id
 		do
-			Result := url (node_api.node_link (n).location, Void)
+			Result := url ("/node/" + n.id.out, Void)
 		end
 
 end

modules/node/handler/node_view_response.e

@@ -27,7 +27,7 @@ feature {NONE} -- Initialization
 	initialize
 		do
 			Precursor
-			create {CMS_TO_WSF_THEME} wsf_theme.make (Current, theme)
+			create {WSF_CMS_THEME} wsf_theme.make (Current, theme)
 		end
 
 	wsf_theme: WSF_THEME

modules/node/handler/nodes_handler.e

@@ -37,64 +37,36 @@ feature -- HTTP Methods
 	do_get (req: WSF_REQUEST; res: WSF_RESPONSE)
 			-- <Precursor>
 		local
-			l_response: CMS_RESPONSE
+			l_page: CMS_RESPONSE
 			s: STRING
 			n: CMS_NODE
-			lnk: CMS_LOCAL_LINK
-			l_page_helper: CMS_PAGINATION_GENERATOR
-			s_pager: STRING
-			l_count: NATURAL_64
 		do
-				-- At the moment the template are hardcoded, but we can
+				-- At the moment the template is hardcoded, but we can
 				-- get them from the configuration file and load them into
 				-- the setup class.
 
-			l_count := node_api.nodes_count
+			create {GENERIC_VIEW_CMS_RESPONSE} l_page.make (req, res, api)
+			l_page.add_variable (node_api.nodes, "nodes")
 
-			create {GENERIC_VIEW_CMS_RESPONSE} l_response.make (req, res, api)
 
-			create s.make_empty
-			if l_count > 1 then
-				l_response.set_title ("Listing " + l_count.out + " nodes")
-			else
-				l_response.set_title ("Listing " + l_count.out + " node")
-			end
-
-			create s_pager.make_empty
-			create l_page_helper.make ("nodes/?page={page}&size={size}", node_api.nodes_count, 25) -- FIXME: Make this default page size a global CMS settings
-			l_page_helper.get_setting_from_request (req)
-			if l_page_helper.pages_count > 1 then
-				l_page_helper.append_to_html (l_response, s_pager)
-				if l_page_helper.page_size > 25 then
-					s.append (s_pager)
-				end
-			end
-
-			if attached node_api.recent_nodes (create {CMS_DATA_QUERY_PARAMETERS}.make (l_page_helper.current_page_offset, l_page_helper.page_size)) as lst then
+				-- NOTE: for development purposes we have the following hardcode output.
+			create s.make_from_string ("<p>Nodes:</p>")
+			if attached node_api.nodes as lst then
 				s.append ("<ul class=%"cms-nodes%">%N")
 				across
 					lst as ic
 				loop
 					n := ic.item
-					lnk := node_api.node_link (n)
 					s.append ("<li class=%"cms_type_"+ n.content_type +"%">")
-					s.append (l_response.link (lnk.title, lnk.location, Void))
-					debug
-						if attached node_api.content_type (n.content_type) as ct then
-							s.append ("<span class=%"description%">")
-							s.append (html_encoded (ct.title))
-							s.append ("</span>")
-						end
-					end
+					s.append (l_page.link (n.title + " (#" + n.id.out + ")", node_api.node_path (n), Void))
 					s.append ("</li>%N")
 				end
 				s.append ("</ul>%N")
 			end
-				-- Again the pager at the bottom, if needed
-			s.append (s_pager)
 
-			l_response.set_main_content (s)
-			l_response.execute
+			l_page.set_main_content (s)
+			l_page.add_block (create {CMS_CONTENT_BLOCK}.make ("nodes_warning", Void, "/nodes/ is not yet fully implemented<br/>", Void), "highlighted")
+			l_page.execute
 		end
 
 end

modules/node/handler/trash_handler.e

@@ -1,78 +0,0 @@
-note
-	description: "Request handler related to /trash "
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	TRASH_HANDLER
-
-
-inherit
-	CMS_NODE_HANDLER
-
-	WSF_URI_HANDLER
-		rename
-			new_mapping as new_uri_mapping
-		end
-
-	WSF_RESOURCE_HANDLER_HELPER
-		redefine
-			do_get
-		end
-
-	REFACTORING_HELPER
-
-create
-	make
-
-feature -- execute
-
-	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
-			-- Execute request handler
-		do
-			execute_methods (req, res)
-		end
-
-feature -- HTTP Methods
-
-	do_get (req: WSF_REQUEST; res: WSF_RESPONSE)
-			-- <Precursor>
-		local
-			l_page: CMS_RESPONSE
-			s: STRING
-			n: CMS_NODE
-			lnk: CMS_LOCAL_LINK
-		do
-				-- At the moment the template is hardcoded, but we can
-				-- get them from the configuration file and load them into
-				-- the setup class.
-
-			create {GENERIC_VIEW_CMS_RESPONSE} l_page.make (req, res, api)
-
-			if attached current_user (req) as l_user then
-
-				l_page.add_variable (node_api.trashed_nodes (l_user), "nodes")
-
-					-- NOTE: for development purposes we have the following hardcode output.
-				create s.make_from_string ("<p>Nodes:</p>")
-				if attached node_api.trashed_nodes (l_user) as lst then
-					s.append ("<ul class=%"cms-nodes%">%N")
-					across
-						lst as ic
-					loop
-						n := ic.item
-						lnk := node_api.node_link (n)
-						s.append ("<li class=%"cms_type_"+ n.content_type +"%">")
-						s.append (l_page.link (lnk.title, lnk.location, Void))
-						s.append ("</li>%N")
-					end
-					s.append ("</ul>%N")
-				end
-
-				l_page.set_main_content (s)
-				-- l_page.add_block (create {CMS_CONTENT_BLOCK}.make ("nodes_warning", Void, "/nodes/ is not yet fully implemented<br/>", Void), "highlighted")
-				l_page.execute
-			end
-		end
-
-end

modules/node/handler/wsf_cms_theme.e

@@ -1,10 +1,10 @@
 note
-	description: "Theme from the EWF framework, but dedicated for the CMS."
+	description: "Summary description for {WSF_CMS_THEME}."
 	date: "$Date$"
 	revision: "$Revision$"
 
 class
-	CMS_TO_WSF_THEME
+	WSF_CMS_THEME
 
 inherit
 	WSF_THEME
@@ -25,14 +25,13 @@ feature -- Access
 
 	request: WSF_REQUEST
 
-	response: CMS_RESPONSE
+	response: detachable CMS_RESPONSE
 
 	cms_theme: CMS_THEME
 
 feature -- Element change
 
 	set_response (a_response: CMS_RESPONSE)
-			-- Set `response' to `a_response'.
 		do
 			response := a_response
 		end
@@ -40,15 +39,20 @@ feature -- Element change
 feature -- Core
 
 	site_url: READABLE_STRING_8
-			-- CMS site url.
 		do
-			Result := response.site_url
+			if attached response as r then
+				Result := r.site_url
+			else
+				Result := request.absolute_script_url ("")
+			end
 		end
 
 	base_url: detachable READABLE_STRING_8
 			-- Base url if any.
 		do
-			Result := response.base_url
+			if attached response as r then
+				Result := r.base_url
+			end
 		end
 
 end

modules/node/node_module.e

@@ -9,12 +9,14 @@ class
 inherit
 
 	CMS_MODULE
+		rename
+			module_api as node_api
 		redefine
 			register_hooks,
 			initialize,
 			is_installed,
 			install,
-			module_api
+			node_api
 		end
 
 	CMS_HOOK_MENU_SYSTEM_ALTER
@@ -41,26 +43,15 @@ feature {NONE} -- Initialization
 
 feature {CMS_API} -- Module Initialization			
 
-	initialize (a_api: CMS_API)
+	initialize (api: CMS_API)
 			-- <Precursor>
 		local
 			p1,p2: CMS_PAGE
 			ct: CMS_PAGE_NODE_TYPE
 			l_node_api: like node_api
-			l_node_storage: CMS_NODE_STORAGE_I
 		do
-			Precursor (a_api)
-
-				-- Storage initialization
-			if attached {CMS_STORAGE_SQL_I} a_api.storage as l_storage_sql then
-				create {CMS_NODE_STORAGE_SQL} l_node_storage.make (l_storage_sql)
-			else
-				-- FIXME: in case of NULL storage, should Current be disabled?
-				create {CMS_NODE_STORAGE_NULL} l_node_storage.make
-			end
-
-				-- Node API initialization
-			create l_node_api.make_with_storage (a_api, l_node_storage)
+			Precursor (api)
+			create l_node_api.make (api)
 			node_api := l_node_api
 
 				-- Add support for CMS_PAGE, which requires a storage extension to store the optional "parent" id.
@@ -70,7 +61,7 @@ feature {CMS_API} -- Module Initialization
 
 					-- FIXME: the following code is mostly for test purpose/initialization, remove later
 				if l_sql_node_storage.sql_table_items_count ("page_nodes") = 0 then
-					if attached a_api.user_api.user_by_id (1) as u then
+					if attached api.user_api.user_by_id (1) as u then
 						create ct
 						p1 := ct.new_node (Void)
 						p1.set_title ("Welcome")
@@ -90,53 +81,46 @@ feature {CMS_API} -- Module Initialization
 					-- FIXME: maybe provide a default solution based on file system, when no SQL storage is available.
 					-- IDEA: we could also have generic extension to node system, that handle generic addition field.
 			end
-		ensure then
-			node_api_set: node_api /= Void
 		end
 
 feature {CMS_API} -- Module management
 
-	is_installed (a_api: CMS_API): BOOLEAN
+	is_installed (api: CMS_API): BOOLEAN
 			-- Is Current module installed?
 		do
-			if attached {CMS_STORAGE_SQL_I} a_api.storage as l_sql_storage then
+			if attached {CMS_STORAGE_SQL_I} api.storage as l_sql_storage then
 				Result := l_sql_storage.sql_table_exists ("nodes") and
 					l_sql_storage.sql_table_exists ("page_nodes")
 			end
 		end
 
-	install (a_api: CMS_API)
+	install (api: CMS_API)
 		do
 				-- Schema
-			if attached {CMS_STORAGE_SQL_I} a_api.storage as l_sql_storage then
-				l_sql_storage.sql_execute_file_script (a_api.setup.environment.path.extended ("scripts").extended (name).appended_with_extension ("sql"))
+			if attached {CMS_STORAGE_SQL_I} api.storage as l_sql_storage then
+				l_sql_storage.sql_execute_file_script (api.setup.environment.path.extended ("scripts").extended (name).appended_with_extension ("sql"))
 			end
 		end
 
 feature {CMS_API} -- Access: API
 
-	module_api: detachable CMS_MODULE_API
-			-- <Precursor>
-		do
-			if attached node_api as l_api then
-				Result := l_api
-			else
-					-- Current is initialized, so node_api should be set.
-				check has_node_api: False end
-			end
-		end
-
 	node_api: detachable CMS_NODE_API
 			-- <Precursor>
 
 feature -- Access: router
 
-	setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
-			-- <Precursor>
+	router (a_api: CMS_API): WSF_ROUTER
+			-- Node router.
+		local
+			l_node_api: like node_api
 		do
-			if attached node_api as l_node_api then
-				configure_web (a_api, l_node_api, a_router)
+			l_node_api := node_api
+			if l_node_api = Void then
+				create l_node_api.make (a_api)
+				node_api := l_node_api
 			end
+			create Result.make (2)
+			configure_web (a_api, l_node_api, Result)
 		end
 
 	configure_web (a_api: CMS_API; a_node_api: CMS_NODE_API; a_router: WSF_ROUTER)
@@ -144,7 +128,6 @@ feature -- Access: router
 			l_node_handler: NODE_HANDLER
 			l_nodes_handler: NODES_HANDLER
 			l_uri_mapping: WSF_URI_MAPPING
-			l_trash_handler: TRASH_HANDLER
 		do
 				-- TODO: for now, focused only on web interface, add REST api later. [2015-April-29]
 			create l_node_handler.make (a_api, a_node_api)
@@ -153,8 +136,6 @@ feature -- Access: router
 
 			a_router.handle_with_request_methods ("/node/add/{type}", l_node_handler, a_router.methods_get_post)
 			a_router.handle_with_request_methods ("/node/{id}/edit", l_node_handler, a_router.methods_get_post)
-			a_router.handle_with_request_methods ("/node/{id}/delete", l_node_handler, a_router.methods_get_post)
-			a_router.handle_with_request_methods ("/node/{id}/trash", l_node_handler, a_router.methods_get_post)
 
 			a_router.handle_with_request_methods ("/node/{id}", l_node_handler, a_router.methods_get)
 				-- For now: no REST API handling... a_router.methods_get_put_delete + a_router.methods_get_post)
@@ -163,13 +144,6 @@ feature -- Access: router
 			create l_nodes_handler.make (a_api, a_node_api)
 			create l_uri_mapping.make_trailing_slash_ignored ("/nodes", l_nodes_handler)
 			a_router.map_with_request_methods (l_uri_mapping, a_router.methods_get)
-
-				--Trash
-
-			create l_trash_handler.make (a_api, a_node_api)
-			create l_uri_mapping.make_trailing_slash_ignored ("/trash", l_trash_handler)
-			a_router.map_with_request_methods (l_uri_mapping, a_router.methods_get)
-
 		end
 
 feature -- Hooks
@@ -200,13 +174,10 @@ feature -- Hooks
 			lnk: CMS_LOCAL_LINK
 --			perms: detachable ARRAYED_LIST [READABLE_STRING_8]
 		do
-			create lnk.make ("List of nodes", "nodes")
+			create lnk.make ("List of nodes", a_response.url ("/nodes", Void))
 			a_menu_system.primary_menu.extend (lnk)
 
-			create lnk.make ("Trash", "trash")
-			a_menu_system.primary_menu.extend (lnk)
-
-			create lnk.make ("Create ..", "node")
+			create lnk.make ("Create ..", a_response.url ("/node/", Void))
 			a_menu_system.primary_menu.extend (lnk)
 		end
 

modules/node/persistence/cms_node_storage_i.e

@@ -43,8 +43,6 @@ feature {NONE} -- Implementation
 
 	extended_store (a_node: CMS_NODE)
 			-- Store extended data from `a_node'.
-		require
-			not error_handler.has_error
 		do
 			if attached node_storage_extension (a_node) as ext then
 				ext.store_node (a_node)
@@ -53,17 +51,16 @@ feature {NONE} -- Implementation
 
 	extended_load (a_node: CMS_NODE)
 			-- Load extended data into `a_node'.
-		require
-			not error_handler.has_error
 		do
 			if attached node_storage_extension (a_node) as ext then
 				ext.load_node (a_node)
 			end
 		end
 
+
 feature -- Access		
 
-	nodes_count: NATURAL_64
+	nodes_count: INTEGER_64
 			-- Count of nodes.
 		deferred
 		end
@@ -73,11 +70,6 @@ feature -- Access
 		deferred
 		end
 
-	trashed_nodes (a_user_id: INTEGER_64): LIST [CMS_NODE]
-			-- List of nodes by user `a_user_id'.
-		deferred
-		end
-
 	recent_nodes (a_lower: INTEGER; a_count: INTEGER): LIST [CMS_NODE]
 			-- List of recent `a_count' nodes with an offset of `lower'.
 		deferred
@@ -115,8 +107,6 @@ feature -- Change: Node
 			no_id: not a_node.has_id
 			valid_user: attached a_node.author as l_author and then l_author.id > 0
 		deferred
-		ensure
-			has_id: not error_handler.has_error implies a_node.has_id
 		end
 
 	update_node (a_node: CMS_NODE)
@@ -143,35 +133,32 @@ feature -- Change: Node
 		deferred
 		end
 
-	trash_node (a_node: CMS_NODE)
-			-- Trash `a_node'.
-		do
-			if a_node.has_id then
-				trash_node_by_id (a_node.id)
-			end
-		end
+--	update_node_title (a_user_id: like {CMS_USER}.id; a_node_id: like {CMS_NODE}.id; a_title: READABLE_STRING_32)
+--			-- Update node title to `a_title', node identified by id `a_node_id'.
+--			-- The user `a_user_id' is an existing or new collaborator.
+--		require
+--			valid_node_id: a_node_id > 0
+--			valid_user_id: a_user_id > 0
+--		deferred
+--		end
 
-	restore_node (a_node: CMS_NODE)
-			-- Restore `a_node'.
-		do
-			if a_node.has_id then
-				restore_node_by_id (a_node.id)
-			end
-		end
+--	update_node_summary (a_user_id: like {CMS_USER}.id; a_node_id: like {CMS_NODE}.id; a_summary: READABLE_STRING_32)
+--			-- Update node summary to `a_summary', node identified by id `a_node_id'.
+--			-- The user `a_user_id' is an existing or new collaborator.
+--		require
+--			valid_id: a_node_id > 0
+--			valid_user_id: a_user_id > 0
+--		deferred
+--		end
 
-	trash_node_by_id (a_id: INTEGER_64)
-			-- Trash node by id `a_id'.
-		require
-			valid_node_id: a_id > 0
-		deferred
-		end
-
-	restore_node_by_id (a_id: INTEGER_64)
-			-- Restore node by id `a_id'.
-		require
-			valid_node_id: a_id > 0
-		deferred
-		end
+--	update_node_content (a_user_id: like {CMS_USER}.id; a_node_id: like {CMS_NODE}.id; a_content: READABLE_STRING_32)
+--			-- Update node content to `a_content', node identified by id `a_node_id'.
+--			-- The user `a_user_id' is an existing or new collaborator.
+--		require
+--			valid_id: a_node_id > 0
+--			valid_user_id: a_user_id > 0
+--		deferred
+--		end
 
 feature -- Helpers
 

modules/node/persistence/cms_node_storage_null.e

@@ -30,7 +30,7 @@ feature -- Error Handling
 
 feature -- Access: node
 
-	nodes_count: NATURAL_64
+	nodes_count: INTEGER_64
 			-- Count of nodes.
 		do
 		end
@@ -41,12 +41,6 @@ feature -- Access: node
 			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
 		end
 
-	trashed_nodes (a_user_id: INTEGER_64): LIST [CMS_NODE]
-			-- List of nodes by user `a_user_id'.
-		do
-			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
-		end
-
 	recent_nodes (a_lower: INTEGER; a_count: INTEGER): LIST [CMS_NODE]
 			-- List of the `a_count' most recent nodes, starting from `a_lower'.
 		do
@@ -86,16 +80,6 @@ feature -- Node
 		do
 		end
 
-	trash_node_by_id (a_id: INTEGER_64)
-			-- <Precursor>
-		do
-		end
-
-	restore_node_by_id (a_id: INTEGER_64)
-			-- <Precursor>
-		do
-		end
-
 --	update_node_title (a_user_id: like {CMS_NODE}.id; a_node_id: like {CMS_NODE}.id; a_title: READABLE_STRING_32)
 --			-- <Precursor>
 --		do

modules/node/persistence/cms_node_storage_sql.e

@@ -22,14 +22,14 @@ create
 
 feature -- Access	
 
-	nodes_count: NATURAL_64
+	nodes_count: INTEGER_64
 			-- Number of items nodes.
 		do
 			error_handler.reset
 			write_information_log (generator + ".nodes_count")
 			sql_query (sql_select_nodes_count, Void)
 			if sql_rows_count = 1 then
-				Result := sql_read_natural_64 (1)
+				Result := sql_read_integer_64 (1)
 			end
 		end
 
@@ -59,36 +59,6 @@ feature -- Access
 --			end
 		end
 
-	trashed_nodes (a_user_id: INTEGER_64): LIST [CMS_NODE]
-			-- List of nodes.
-		local
-			l_parameters: STRING_TABLE [detachable ANY]
-		do
-			create {ARRAYED_LIST [CMS_NODE]} Result.make (0)
-
-			error_handler.reset
-			write_information_log (generator + ".trash_nodes")
-
-			from
-				create l_parameters.make (1)
-				if a_user_id > 1 then
-					-- Not admin user
-					l_parameters.put (a_user_id, "author")
-					sql_query (sql_select_trash_nodes_by_author, l_parameters)
-				else
-					sql_query (sql_select_trash_nodes, Void)
-				end
-				sql_start
-			until
-				sql_after
-			loop
-				if attached fetch_node as l_node then
-					Result.force (l_node)
-				end
-				sql_forth
-			end
-		end
-
 	recent_nodes (a_lower: INTEGER; a_count: INTEGER): LIST [CMS_NODE]
 			-- List of recent `a_count' nodes with an offset of `lower'.
 		local
@@ -177,7 +147,7 @@ feature -- Change: Node
 			l_time: DATE_TIME
 		do
 			create l_time.make_now_utc
-			write_information_log (generator + ".delete_node {" + a_id.out + "}")
+			write_information_log (generator + ".delete_node")
 
 			error_handler.reset
 			create l_parameters.make (1)
@@ -187,39 +157,50 @@ feature -- Change: Node
 			sql_change (sql_delete_node, l_parameters)
 		end
 
+--	update_node_title (a_user_id: like {CMS_USER}.id; a_node_id: like {CMS_NODE}.id; a_title: READABLE_STRING_32)
+--			-- <Precursor>
+--		local
+--			l_parameters: STRING_TABLE [detachable ANY]
+--		do
+--			-- FIXME: unused a_user_id !
+--			error_handler.reset
+--			write_information_log (generator + ".update_node_title")
+--			create l_parameters.make (3)
+--			l_parameters.put (a_title, "title")
+--			l_parameters.put (create {DATE_TIME}.make_now_utc, "changed")
+--			l_parameters.put (a_node_id, "nid")
+--			sql_change (sql_update_node_title, l_parameters)
+--		end
 
-	trash_node_by_id (a_id: INTEGER_64)
-			-- <Precursor>
-		local
-			l_parameters: STRING_TABLE [ANY]
-			l_time: DATE_TIME
-		do
-			create l_time.make_now_utc
-			write_information_log (generator + ".trash_node {" + a_id.out + "}")
-
-			error_handler.reset
-			create l_parameters.make (1)
-			l_parameters.put (a_id, "nid")
-			sql_change (sql_trash_node, l_parameters)
-		end
-
-	restore_node_by_id (a_id: INTEGER_64)
-			-- <Precursor>
-		local
-			l_parameters: STRING_TABLE [ANY]
-			l_time: DATE_TIME
-		do
-			create l_time.make_now_utc
-			write_information_log (generator + ".restore_node {" + a_id.out + "}")
-
-			error_handler.reset
-			create l_parameters.make (1)
-			l_parameters.put (l_time, "changed")
-			l_parameters.put ({CMS_NODE_API}.not_published, "status")
-			l_parameters.put (a_id, "nid")
-			sql_change (sql_restore_node, l_parameters)
-		end
+--	update_node_summary (a_user_id: Like {CMS_USER}.id; a_node_id: like {CMS_NODE}.id; a_summary: READABLE_STRING_32)
+--			-- <Precursor>
+--		local
+--			l_parameters: STRING_TABLE [detachable ANY]
+--		do
+--			-- FIXME: unused a_user_id !
+--			error_handler.reset
+--			write_information_log (generator + ".update_node_summary")
+--			create l_parameters.make (3)
+--			l_parameters.put (a_summary, "summary")
+--			l_parameters.put (create {DATE_TIME}.make_now_utc, "changed")
+--			l_parameters.put (a_node_id, "nid")
+--			sql_change (sql_update_node_summary, l_parameters)
+--		end
 
+--	update_node_content (a_user_id: Like {CMS_USER}.id;a_node_id: like {CMS_NODE}.id; a_content: READABLE_STRING_32)
+--			-- <Precursor>
+--		local
+--			l_parameters: STRING_TABLE [detachable ANY]
+--		do
+--			-- FIXME: unused a_user_id !
+--			error_handler.reset
+--			write_information_log (generator + ".update_node_content")
+--			create l_parameters.make (3)
+--			l_parameters.put (a_content, "content")
+--			l_parameters.put (create {DATE_TIME}.make_now_utc, "changed")
+--			l_parameters.put (a_node_id, "nid")
+--			sql_change (sql_update_node_content, l_parameters)
+--		end
 
 feature {NONE} -- Implementation
 
@@ -267,14 +248,8 @@ feature {NONE} -- Implementation
 					a_node.set_revision (1) -- New object.
 				end
 			end
-			if not error_handler.has_error then
-				extended_store (a_node)
-			end
-			if error_handler.has_error then
-				sql_rollback_transaction
-			else
-				sql_commit_transaction
-			end
+			extended_store (a_node)
+			sql_commit_transaction
 		end
 
 feature -- Helpers
@@ -298,17 +273,9 @@ feature {NONE} -- Queries
 			-- SQL Query to retrieve all nodes.
 			--| note: {CMS_NODE_API}.trashed = -1
 
-	sql_select_trash_nodes: STRING = "SELECT * FROM Nodes WHERE status = -1 ;"
-			-- SQL Query to retrieve all trahsed nodes.
-			--| note: {CMS_NODE_API}.trashed = -1		
+	sql_select_node_by_id: STRING = "SELECT nid, revision, type, title, summary, content, format, author, publish, created, changed, status FROM Nodes WHERE nid =:nid ORDER BY revision desc, publish desc LIMIT 1;"
 
-	sql_select_trash_nodes_by_author: STRING = "SELECT * FROM Nodes WHERE status = -1 and author = :author ;"
-			-- SQL Query to retrieve all nodes by a given author.
-			--| note: {CMS_NODE_API}.trashed = -1				
-
-	sql_select_node_by_id: STRING = "SELECT nid, revision, type, title, summary, content, format, author, publish, created, changed, status FROM Nodes WHERE nid =:nid ORDER BY revision DESC, publish DESC LIMIT 1;"
-
-	sql_select_recent_nodes: STRING = "SELECT nid, revision, type, title, summary, content, format, author, publish, created, changed, status FROM Nodes ORDER BY nid DESC, publish DESC LIMIT :rows OFFSET :offset ;"
+	sql_select_recent_nodes: STRING = "SELECT nid, revision, type, title, summary, content, format, author, publish, created, changed, status FROM Nodes ORDER BY nid desc, publish desc LIMIT :rows OFFSET :offset ;"
 
 	sql_insert_node: STRING = "INSERT INTO nodes (revision, type, title, summary, content, format, publish, created, changed, status, author) VALUES (1, :type, :title, :summary, :content, :format, :publish, :created, :changed, :status, :author);"
 			-- SQL Insert to add a new node.
@@ -321,12 +288,6 @@ feature {NONE} -- Queries
 	sql_delete_node: STRING = "UPDATE nodes SET changed=:changed, status =:status WHERE nid=:nid"
 			-- Soft deletion with free metadata.
 
-	sql_trash_node: STRING = "DELETE FROM nodes WHERE nid=:nid"
-			-- Physical deletion with free metadata.		
-
-	sql_restore_node: STRING = "UPDATE nodes SET changed=:changed, status =:status WHERE nid=:nid"
-			-- Restore node to  {CMS_NODE_API}.not_publised.
-
 --	sql_update_node_author: STRING  = "UPDATE nodes SET author=:author WHERE nid=:nid;"
 
 --	sql_update_node_title: STRING ="UPDATE nodes SET title=:title, changed=:changed, revision = revision + 1 WHERE nid=:nid;"

package.iron

@@ -1,31 +0,0 @@
-package ROC_cms
-
-project
-	cms = "cms-safe.ecf"
-	cms = "cms.ecf"
-	app_env = "library/app_env/app_env-safe.ecf"
-	app_env = "library/app_env/app_env.ecf"
-	config = "library/configuration/config-safe.ecf"
-	config = "library/configuration/config.ecf"
-	app_env = "library/layout/layout-safe.ecf"
-	app_env = "library/layout/layout.ecf"
-	cms_model = "library/model/cms_model-safe.ecf"
-	cms_model = "library/model/cms_model.ecf"
-	persistence_mysql = "library/persistence/mysql/persistence_mysql-safe.ecf"
-	persistence_mysql = "library/persistence/mysql/persistence_mysql.ecf"
-	persistence_sqlite = "library/persistence/sqlite/persistence_sqlite-safe.ecf"
-	persistence_sqlite = "library/persistence/sqlite/persistence_sqlite.ecf"
-	basic_auth = "modules/basic_auth/basic_auth-safe.ecf"
-	basic_auth = "modules/basic_auth/basic_auth.ecf"
-	node = "modules/node/node-safe.ecf"
-	node = "modules/node/node.ecf"
-
-note
-	title: ROC CMS
-	description: CMS written with Eiffel
-	tags: cms, web, rest, api
-	license: Eiffel Forum v2
-	copyright: Jocelyn Fiat, Javier Velilla, Eiffel Software
-	link[source]: "Github" https://github.com/EiffelWebFramework/ROC.git
-
-end

src/configuration/cms_default_setup.e

@@ -39,21 +39,17 @@ feature {NONE} -- Initialization
 		end
 
 	configure
-		local
-			l_url: like site_url
 		do
 				--| Site id, used to identified a site, this could be set to a uuid, or else
 			site_id := text_item_or_default ("site.id", "_EWF_CMS_NO_ID_")
 
 				-- Site url: optional, but ending with a slash
-			l_url := string_8_item ("site_url")
-			if l_url /= Void and then not l_url.is_empty then
-				if l_url [l_url.count] /= '/' then
-					l_url := l_url + "/"
+			site_url := string_8_item ("site_url")
+			if attached site_url as l_url and then not l_url.is_empty then
+				if l_url[l_url.count] /= '/' then
+					site_url := l_url + "/"
 				end
 			end
-			site_url := l_url
-
 				-- Site name
 			site_name := text_item_or_default ("site.name", "EWF::CMS")
 
@@ -88,7 +84,7 @@ feature {NONE} -- Initialization
 	initialize_modules
 				-- Intialize core modules.
 		local
---			m: CMS_MODULE
+			m: CMS_MODULE
 		do
 			-- Core
 --			create {BASIC_AUTH_MODULE} m.make

src/configuration/cms_setup.e

@@ -62,7 +62,7 @@ feature -- Access: Site
 			-- Mainly used for internal notification.
 
 	site_url: detachable READABLE_STRING_8
-			-- Optional url of current CMS site.
+			-- Optional base url of the site.
 
 	front_page_path: detachable READABLE_STRING_8
 			-- Optional path defining the front page.

src/kernel/form/cms_lower_upper_pager.e

@@ -1,15 +0,0 @@
-note
-	description: "Pager widget for ROC CMS."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CMS_LOWER_UPPER_PAGER
-
-inherit
-	WSF_WIDGET_PAGER
-
-create
-	make
-
-end

src/modules/cms_debug_module.e

@@ -36,10 +36,11 @@ feature {NONE} -- Initialization
 
 feature -- Router
 
-	setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
-			-- <Precursor>
+	router (a_api: CMS_API): WSF_ROUTER
+			-- Router configuration.
 		do
-			a_router.handle ("/debug/", create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (agent handle_debug (a_api, ?, ?)))
+			create Result.make (1)
+			Result.handle ("/debug/", create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (agent handle_debug (a_api, ?, ?)))
 		end
 
 feature -- Hooks configuration

src/persistence/cms_data_query_parameters.e

@@ -1,88 +0,0 @@
-note
-	description: "[
-			Parameters associated with data query.
-			It could be query over http, or storage.
-		]"
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CMS_DATA_QUERY_PARAMETERS
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	make (a_offset: NATURAL_64; a_size: NATURAL)
-		do
-			offset := a_offset
-			size := a_size
-		ensure
-			size_set: size = a_size
-			offset_set: offset = a_offset
-		end
-
-feature -- Access
-
-	size: NATURAL assign set_size
-			-- Number of items per page.
-
-	offset: NATURAL_64 assign set_offset
-			--  lower index of `items' pagination.
-
-	order_by: detachable READABLE_STRING_8
-			-- field to order by.
-
-	order_ascending: BOOLEAN
-			-- is ascending ordering?
-
-feature -- Element change
-
-	set_size (a_size: NATURAL)
-			-- Set `size' with `a_size'.
-		do
-			size := a_size
-		ensure
-			size_set: size = a_size
-		end
-
-	set_offset (a_offset: NATURAL_64)
-			-- Set offset with `a_offset'.
-		do
-			offset := a_offset
-		ensure
-			limit_set: offset = a_offset
-		end
-
-	set_ascending_order_by_field (a_field: detachable READABLE_STRING_8)
-			-- Pager with a order_by `a_field' asc.	
-		do
-			if a_field /= Void then
-				order_by := a_field
-				order_ascending := True
-			else
-				order_by := Void
-			end
-		ensure
-			order_by_unset: a_field = Void implies order_by = Void
-			order_by_set: a_field /= Void implies attached order_by as l_order_by and then l_order_by.same_string (a_field)
-			asc_true: order_ascending
-		end
-
-	set_descending_order_by_field (a_field: detachable READABLE_STRING_8)
-			-- Pager sorting descending with field `a_field' if set, otherwise remove sorting.	
-		do
-			if a_field /= Void then
-				order_by := a_field
-				order_ascending := False
-			else
-				order_by := Void
-			end
-		ensure
-			order_by_unset: a_field = Void implies order_by = Void
-			order_by_set: a_field /= Void implies attached order_by as l_order_by and then l_order_by.same_string (a_field)
-			asc_fasle: not order_ascending
-		end
-
-end

src/persistence/cms_storage_null.e

@@ -14,11 +14,6 @@ inherit
 			default_create
 		end
 
-	CMS_USER_STORAGE_NULL
-		undefine
-			default_create
-		end
-
 	REFACTORING_HELPER
 		rename
 			default_create as default_create_rh
@@ -45,34 +40,74 @@ feature -- Status report
 			Result := True
 		end
 
-feature -- URL aliases
+feature -- Access: user
 
-	set_path_alias (a_source: READABLE_STRING_8; a_alias: READABLE_STRING_8)
-			-- <Precursor>.
+	has_user: BOOLEAN
+			-- Has any user?
 		do
 		end
 
-	replace_path_alias (a_source: READABLE_STRING_8; a_previous_alias: detachable READABLE_STRING_8; a_alias: READABLE_STRING_8)
-			-- Replace eventual previous alias `a_previous_alias' with a new alias `a_alias'
-			-- on source `a_source'.
+	users: LIST [CMS_USER]
+		do
+			create {ARRAYED_LIST [CMS_USER]} Result.make (0)
+		end
+
+	user_by_id (a_id: like {CMS_USER}.id): detachable CMS_USER
 		do
 		end
 
-	unset_path_alias (a_source: READABLE_STRING_8; a_alias: READABLE_STRING_8)
-			-- Unalias `a_source' from `a_alias'.
+	user_by_name (a_name: like {CMS_USER}.name): detachable CMS_USER
 		do
 		end
 
-	path_alias (a_source: READABLE_STRING_8): detachable READABLE_STRING_8
-			-- Return eventual path alias associated with `a_source'.
+	user_by_email (a_email: like {CMS_USER}.email): detachable CMS_USER
 		do
 		end
 
-	source_of_path_alias (a_alias: READABLE_STRING_8): detachable READABLE_STRING_8
-			-- Source path for alias `a_alias'.
+	is_valid_credential (l_auth_login, l_auth_password: READABLE_STRING_32): BOOLEAN
 		do
 		end
 
+feature -- Change: user
+
+	new_user (a_user: CMS_USER)
+			-- Add a new user `a_user'.
+		do
+			a_user.set_id (1)
+		end
+
+	update_user (a_user: CMS_USER)
+			-- Update user `a_user'.
+		do
+		end
+
+
+feature -- Access: roles and permissions
+
+	user_role_by_id (a_id: like {CMS_USER_ROLE}.id): detachable CMS_USER_ROLE
+		do
+		end
+
+	user_roles_for (a_user: CMS_USER): LIST [CMS_USER_ROLE]
+			-- User roles for user `a_user'.
+			-- Note: anonymous and authenticated roles are not included.
+		do
+			create {ARRAYED_LIST [CMS_USER_ROLE]} Result.make (0)
+		end
+
+	user_roles: LIST [CMS_USER_ROLE]
+		do
+			create {ARRAYED_LIST [CMS_USER_ROLE]} Result.make (0)
+		end
+
+feature -- Change: roles and permissions		
+
+	save_user_role (a_user_role: CMS_USER_ROLE)
+		do
+		end
+
+
+
 feature -- Logs
 
 	save_log (a_log: CMS_LOG)
@@ -80,8 +115,6 @@ feature -- Logs
 		do
 		end
 
-feature -- Custom		
-
 	set_custom_value (a_name: READABLE_STRING_8; a_value: attached like custom_value; a_type: detachable READABLE_STRING_8)
 			-- Save data `a_name:a_value' for type `a_type' (or default if none).
 		do

src/persistence/cms_storage_sql_builder.e

@@ -0,0 +1,15 @@
+note
+	description: "[
+			Objects that ...
+		]"
+	author: "$Author: jfiat $"
+	date: "$Date: 2015-01-27 19:15:02 +0100 (mar., 27 janv. 2015) $"
+	revision: "$Revision: 96542 $"
+
+deferred class
+	CMS_STORAGE_SQL_BUILDER
+
+inherit
+	CMS_STORAGE_BUILDER
+
+end

src/persistence/cms_storage_sql_i.e

@@ -217,21 +217,6 @@ feature -- Access
 		deferred
 		end
 
-	sql_read_natural_64 (a_index: INTEGER): NATURAL_64
-			-- Retrieved value at `a_index' position in `item'.
-		local
-			l_item: like sql_item
-		do
-			l_item := sql_item (a_index)
-			if attached {NATURAL_64} l_item as i then
-				Result := i
-			elseif attached {NATURAL_64_REF} l_item as l_value then
-				Result := l_value.item
-			else
-				Result := sql_read_integer_64 (a_index).to_natural_64
-			end
-		end
-
 	sql_read_integer_64 (a_index: INTEGER): INTEGER_64
 			-- Retrieved value at `a_index' position in `item'.
 		local

src/persistence/core/cms_core_storage_i.e

@@ -1,6 +1,6 @@
 note
 	description: "[
-			CMS Storage for core functionalities.
+			Objects that ...
 		]"
 	author: "$Author$"
 	date: "$Date$"
@@ -19,34 +19,6 @@ feature -- Error Handling
 		deferred
 		end
 
-feature -- URL aliases
-
-	set_path_alias (a_source: READABLE_STRING_8; a_alias: READABLE_STRING_8)
-			-- Alias `a_source' with `a_alias'.
-		deferred
-		end
-
-	replace_path_alias (a_source: READABLE_STRING_8; a_previous_alias: detachable READABLE_STRING_8; a_alias: READABLE_STRING_8)
-			-- Replace eventual previous alias `a_previous_alias' with a new alias `a_alias'
-			-- on source `a_source'.
-		deferred
-		end
-
-	unset_path_alias (a_source: READABLE_STRING_8; a_alias: READABLE_STRING_8)
-			-- Unalias `a_source' from `a_alias'.
-		deferred
-		end
-
-	path_alias (a_source: READABLE_STRING_8): detachable READABLE_STRING_8
-			-- Return eventual path alias associated with `a_source'.
-		deferred
-		end
-
-	source_of_path_alias (a_alias: READABLE_STRING_8): detachable READABLE_STRING_8
-			-- Source path for alias `a_alias'.
-		deferred
-		end
-
 feature -- Logs
 
 	save_log (a_log: CMS_LOG)

src/persistence/core/cms_core_storage_sql_i.e

@@ -18,123 +18,6 @@ inherit
 
 	SHARED_LOGGER
 
-feature -- URL aliases
-
-	set_path_alias (a_source: READABLE_STRING_8; a_alias: READABLE_STRING_8)
-			-- <Precursor>
-		local
-			l_parameters: STRING_TABLE [detachable ANY]
-		do
-			error_handler.reset
-
-			create l_parameters.make (2)
-			l_parameters.put (a_source, "source")
-			l_parameters.put (a_alias, "alias")
-			if attached source_of_path_alias (a_alias) as l_path then
-				if a_source.same_string (l_path) then
-						-- already up to date
-				else
-					error_handler.add_custom_error (0, "alias exists", "Path alias %"" + a_alias + "%" already exists!")
-				end
-			else
-				sql_change (sql_insert_path_alias, l_parameters)
-			end
-		end
-
-	replace_path_alias (a_source: READABLE_STRING_8; a_previous_alias: detachable READABLE_STRING_8; a_alias: READABLE_STRING_8)
-			-- <Precursor>
-		local
-			l_parameters: STRING_TABLE [detachable ANY]
-			l_previous_alias: detachable READABLE_STRING_8
-		do
-			error_handler.reset
-
-			if a_previous_alias = Void then
-				l_previous_alias := path_alias (a_source)
-			else
-				l_previous_alias := a_previous_alias
-			end
-			if
-				l_previous_alias /= Void and then
-				not a_alias.same_string (l_previous_alias)
-			then
-				create l_parameters.make (3)
-				l_parameters.put (a_source, "source")
-				l_parameters.put (l_previous_alias, "old")
-				l_parameters.put (a_alias, "alias")
-
-				sql_change (sql_update_path_alias, l_parameters)
-			end
-		end
-
-	unset_path_alias (a_source: READABLE_STRING_8; a_alias: READABLE_STRING_8)
-			-- <Precursor>	
-		local
-			l_parameters: STRING_TABLE [detachable ANY]
-		do
-			error_handler.reset
-
-			if attached source_of_path_alias (a_alias) as l_path then
-				if a_source.same_string (l_path) then
-						-- Found
-					create l_parameters.make (1)
-					l_parameters.put (a_alias, "alias")
-					sql_change (sql_delete_path_alias, l_parameters)
-				else
-					error_handler.add_custom_error (0, "alias mismatch", "Path alias %"" + a_alias + "%" is not related to source %"" + a_source + "%"!")
-				end
-			else
-					-- No such alias
-			end
-		end
-
-	path_alias (a_source: READABLE_STRING_8): detachable READABLE_STRING_8
-			-- <Precursor>
-		local
-			l_parameters: STRING_TABLE [detachable ANY]
-		do
-			error_handler.reset
-			create l_parameters.make (1)
-			l_parameters.put (a_source, "source")
-			sql_query (sql_select_path_source, l_parameters)
-			if not has_error then
-				if sql_rows_count = 1 then
-					Result := sql_read_string (1)
-				end
-			end
-		end
-
-	source_of_path_alias (a_alias: READABLE_STRING_8): detachable READABLE_STRING_8
-			-- <Precursor>
-		local
-			l_parameters: STRING_TABLE [detachable ANY]
-		do
-			error_handler.reset
-			create l_parameters.make (1)
-			l_parameters.put (a_alias, "alias")
-			sql_query (sql_select_path_alias, l_parameters)
-			if not has_error then
-				if sql_rows_count = 1 then
-					Result := sql_read_string (1)
-				end
-			end
-		end
-
-	sql_select_path_alias: STRING = "SELECT source FROM path_aliases WHERE alias=:alias ;"
-			-- SQL select path aliases.
-
-	sql_select_path_source: STRING = "SELECT alias FROM path_aliases WHERE source=:source ORDER BY pid DESC LIMIT 1;"
-			-- SQL select latest path aliasing :source.			
-
-	sql_insert_path_alias: STRING = "INSERT INTO path_aliases (source, alias) VALUES (:source, :alias);"
-			-- SQL insert path alias.			
-
-	sql_update_path_alias: STRING = "UPDATE path_aliases SET alias=:alias WHERE source=:source AND alias=:old ;"
-			-- SQL update path alias.
-
-	sql_delete_path_alias: STRING = "DELETE FROM path_aliases WHERE alias=:alias;"
-			-- SQL delete path alias			
-
 feature -- Logs
 
 	save_log (a_log: CMS_LOG)

src/persistence/sql/cms_storage_fs_i.e

@@ -1,107 +0,0 @@
-note
-	description: "Interface used to implement CMS Storage based on File system."
-	date: "$Date: 2015-02-13 13:08:13 +0100 (ven., 13 févr. 2015) $"
-	revision: "$Revision: 96616 $"
-
-deferred class
-	CMS_STORAGE_FS_I
-
-inherit
-	SHARED_LOGGER
-
-feature {NONE} -- Initialization
-
-	make (a_location: PATH; a_api: CMS_API)
-		do
-			location := a_location
-			api := a_api
-			create error_handler.make
-		end
-
-feature -- Access
-
-	api: CMS_API
-			-- Associated CMS api.
-
-	location: PATH
-			-- File system location.
-
-feature -- Error handler
-
-	error_handler: ERROR_HANDLER
-			-- Error handler.
-
-	has_error: BOOLEAN
-			-- Last operation reported error.
-		do
-			Result := error_handler.has_error
-		end
-
-	reset_error
-			-- Reset errors.
-		do
-			error_handler.reset
-		end
-
-feature -- Helpers
-
-	save_to_file (a_text: STRING; opt_name: detachable READABLE_STRING_GENERAL)
-		local
-			s: READABLE_STRING_GENERAL
-			now: DATE_TIME
-			fut: WSF_FILE_UTILITIES [RAW_FILE]
-		do
-			create fut
-			if opt_name /= Void then
-				s := opt_name
-			else
-				create now.make_now_utc
-				s := date_to_yyyymmdd_hhmmss_string (now)
-			end
-			if attached fut.new_file (location.extended (s)) as f then
-				f.put_string (a_text)
-				f.close
-			else
-				error_handler.add_custom_error (0, "saving failure", Void)
-			end
-		end
-
-	date_to_yyyymmdd_hhmmss_string (d: DATE_TIME): STRING
-		local
-			i: INTEGER
-		do
-			create Result.make_empty
-			Result.append_integer (d.year)
-			Result.append_character ('-')
-			i := d.month
-			if i < 10 then
-				Result.append_integer (0)
-			end
-			Result.append_integer (i)
-			Result.append_character ('-')
-			i := d.day
-			if i < 10 then
-				Result.append_integer (0)
-			end
-			Result.append_integer (i)
-			Result.append_character ('_')
-			i := d.hour
-			if i < 10 then
-				Result.append_integer (0)
-			end
-			Result.append_integer (i)
-			Result.append_character ('-')
-			i := d.minute
-			if i < 10 then
-				Result.append_integer (0)
-			end
-			Result.append_integer (i)
-			Result.append_character ('-')
-			i := d.second
-			if i < 10 then
-				Result.append_integer (0)
-			end
-			Result.append_integer (i)
-		end
-
-end

src/persistence/sql/cms_storage_sql.e

@@ -1,15 +0,0 @@
-note
-	description: "CMS Storage based on SQL statement."
-	date: "$Date: 2015-02-13 13:08:13 +0100 (ven., 13 févr. 2015) $"
-	revision: "$Revision: 96616 $"
-
-deferred class
-	CMS_STORAGE_SQL
-
-inherit
-	CMS_STORAGE
-
-	CMS_STORAGE_SQL_I
-
-
-end

src/persistence/sql/cms_storage_sql_builder.e

@@ -1,91 +0,0 @@
-note
-	description: "[
-			Common ancestor for builders responsible to instantiate storage based
-			on SQL statement storage.
-		]"
-	author: "$Author: jfiat $"
-	date: "$Date: 2015-01-27 19:15:02 +0100 (mar., 27 janv. 2015) $"
-	revision: "$Revision: 96542 $"
-
-deferred class
-	CMS_STORAGE_SQL_BUILDER
-
-inherit
-	CMS_STORAGE_BUILDER
-
-feature -- Initialization
-
-	initialize (a_setup: CMS_SETUP; a_storage: CMS_STORAGE_SQL)
-		local
-			u: CMS_USER
-			l_anonymous_role, l_authenticated_role, r: CMS_USER_ROLE
-			l_roles: LIST [CMS_USER_ROLE]
-		do
-				--| Schema
-			a_storage.sql_execute_file_script (a_setup.environment.path.extended ("scripts").extended ("core.sql"))
-			a_storage.sql_execute_file_script (a_setup.environment.path.extended ("scripts").extended ("user.sql"))
-
-				--| Roles
-			create l_anonymous_role.make ("anonymous")
-			a_storage.save_user_role (l_anonymous_role)
-
-			create l_authenticated_role.make ("authenticated")
-			a_storage.save_user_role (l_authenticated_role)
-
-				--| Users
-			create u.make ("admin")
-			u.set_password ("istrator#")
-			u.set_email (a_setup.site_email)
-			a_storage.new_user (u)
-
-				--| Node			
-				-- FIXME: move that initialization to node module
-				-- TODO: should we move the initialization to an
-				--! external configuration file?
-				--! at the moment we only have 1 admin to the whole site.
-				--! is that ok?
-			l_anonymous_role.add_permission ("view any page")
-			a_storage.save_user_role (l_anonymous_role)
-
-			l_authenticated_role.add_permission ("create page")
-			l_authenticated_role.add_permission ("view any page")
-			l_authenticated_role.add_permission ("edit any page")
-			l_authenticated_role.add_permission ("delete page")
-			l_authenticated_role.add_permission ("trash page")
-			l_authenticated_role.add_permission ("view own page")
-			l_authenticated_role.add_permission ("edit own page")
-			l_authenticated_role.add_permission ("delete own page")
-			l_authenticated_role.add_permission ("trash own page")
-			a_storage.save_user_role (l_authenticated_role)
-
-
-			--|-------------------------------------------|--
-			--| For testing purpose, to be removed later. |--
-			--|-------------------------------------------|--
-
-				-- Roles, view role for testing.
-			create r.make ("view")
-			r.add_permission ("view any page")
-			a_storage.save_user_role (r)
-
-			create {ARRAYED_LIST [CMS_USER_ROLE]} l_roles.make (1)
-			l_roles.force (r)
-
-			create u.make ("auth")
-			u.set_password ("enticated#")
-			u.set_email (a_setup.site_email)
-			a_storage.new_user (u)
-
-			create u.make ("test")
-			u.set_password ("test#")
-			u.set_email (a_setup.site_email)
-			a_storage.new_user (u)
-
-			create u.make ("view")
-			u.set_password ("only#")
-			u.set_email (a_setup.site_email)
-			u.set_roles (l_roles)
-			a_storage.new_user (u)
-		end
-
-end

src/persistence/user/cms_user_storage_null.e

@@ -1,79 +0,0 @@
-note
-	description: "Summary description for {CMS_USER_STORAGE_NULL}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-deferred class
-	CMS_USER_STORAGE_NULL
-
-inherit
-	CMS_USER_STORAGE_I
-
-feature -- Access: user
-
-	has_user: BOOLEAN
-			-- Has any user?
-		do
-		end
-
-	users: LIST [CMS_USER]
-		do
-			create {ARRAYED_LIST [CMS_USER]} Result.make (0)
-		end
-
-	user_by_id (a_id: like {CMS_USER}.id): detachable CMS_USER
-		do
-		end
-
-	user_by_name (a_name: like {CMS_USER}.name): detachable CMS_USER
-		do
-		end
-
-	user_by_email (a_email: like {CMS_USER}.email): detachable CMS_USER
-		do
-		end
-
-	is_valid_credential (l_auth_login, l_auth_password: READABLE_STRING_32): BOOLEAN
-		do
-		end
-
-feature -- Change: user
-
-	new_user (a_user: CMS_USER)
-			-- Add a new user `a_user'.
-		do
-			a_user.set_id (1)
-		end
-
-	update_user (a_user: CMS_USER)
-			-- Update user `a_user'.
-		do
-		end
-
-
-feature -- Access: roles and permissions
-
-	user_role_by_id (a_id: like {CMS_USER_ROLE}.id): detachable CMS_USER_ROLE
-		do
-		end
-
-	user_roles_for (a_user: CMS_USER): LIST [CMS_USER_ROLE]
-			-- User roles for user `a_user'.
-			-- Note: anonymous and authenticated roles are not included.
-		do
-			create {ARRAYED_LIST [CMS_USER_ROLE]} Result.make (0)
-		end
-
-	user_roles: LIST [CMS_USER_ROLE]
-		do
-			create {ARRAYED_LIST [CMS_USER_ROLE]} Result.make (0)
-		end
-
-feature -- Change: roles and permissions		
-
-	save_user_role (a_user_role: CMS_USER_ROLE)
-		do
-		end
-
-end

src/service/cms_api.e

@@ -148,15 +148,17 @@ feature -- Permissions system
 
 feature -- Query: module
 
-	module (a_type: TYPE [CMS_MODULE]): detachable CMS_MODULE
+	module (a_type: TYPE [detachable CMS_MODULE]): detachable CMS_MODULE
 			-- Enabled module typed `a_type', if any.
 			--| usage: if attached module ({FOO_MODULE}) as mod then ...
 		local
---			t: STRING_8
+			t: STRING_8
 			l_type: TYPE [detachable CMS_MODULE]
 		do
---			t := type_name_without_annotation (a_type)
-
+			t := a_type.name
+			if t.starts_with ("!") then
+				t.remove_head (1)
+			end
 			across
 				setup.modules as ic
 			until
@@ -169,12 +171,8 @@ feature -- Query: module
 					l_type := Result.generating_type
 					if a_type ~ l_type then
 							-- Found
-					elseif
-						attached a_type.attempt (Result) and then attached l_type.generating_type.attempt (a_type)
-					then
+					elseif t.same_string (l_type.name) then
 							-- Found
---					elseif t.same_string (type_name_without_annotation (l_type)) then
---							-- Found
 					else
 						Result := Void
 					end
@@ -188,12 +186,7 @@ feature -- Query: module
 			-- Enabled module API associated with module typed `a_type'.
 		do
 			if attached module (a_type) as mod then
-				if mod.is_enabled then
-					if not mod.is_initialized then
-						mod.initialize (Current)
-					end
-					Result := mod.module_api
-				end
+				Result := mod.module_api
 			end
 		end
 
@@ -239,73 +232,6 @@ feature -- Query: API
 			Result := l_api
 		end
 
-feature -- Path aliases	
-
-	is_valid_path_alias (a_alias: READABLE_STRING_8): BOOLEAN
-		do
-			Result := a_alias.is_empty or else not a_alias.starts_with_general ("/")
-		end
-
-	set_path_alias (a_source, a_alias: READABLE_STRING_8; a_keep_previous: BOOLEAN)
-			-- Set `a_alias' as alias of `a_source',
-			-- and eventually unset previous alias if any.
-		require
-			valid_alias: is_valid_path_alias (a_alias)
-		local
-			l_continue: BOOLEAN
-		do
-			if attached storage.path_alias (a_source) as l_existing_alias then
-				if a_alias.same_string (l_existing_alias) then
-						-- Already aliased as expected
-				else
-						-- New alias
-					if a_keep_previous then
-						l_continue := True
-					else
-						storage.replace_path_alias (a_source, l_existing_alias, a_alias)
-					end
-				end
-			elseif a_alias.is_whitespace then
-					-- Ignore
-			elseif a_source.same_string (a_alias) then
-					-- No need for alias
-			else
-				l_continue := True
-			end
-			if l_continue then
-				storage.set_path_alias (a_source, a_alias)
-			end
-		end
-
-	unset_path_alias (a_source: READABLE_STRING_8; a_alias: READABLE_STRING_8)
-		do
-			storage.unset_path_alias (a_source, a_alias)
-		end
-
-	path_alias (a_source: READABLE_STRING_8): READABLE_STRING_8
-			-- Path alias associated with `a_source' or the source itself.
-		do
-			Result := a_source
-			if attached storage.path_alias (Result) as l_path then
-				Result := l_path
-			end
-		end
-
-	source_of_path_alias (a_alias: READABLE_STRING_8): READABLE_STRING_8
-			-- Resolved path for alias `a_alias'.
-			--| the CMS supports aliases for path, and then this function simply returns
-			--| the effective target path/url for this `a_alias'.
-			--| For instance: articles/2015/may/this-is-an-article can be an alias to node/123
-			--| This function will return "node/123".
-			--| If the alias is bad (i.e does not alias real path), then this function
-			--| returns the alias itself.
-		do
-			Result := a_alias
-			if attached storage.source_of_path_alias (Result) as l_path then
-				Result := l_path
-			end
-		end
-
 feature -- Element Change: Error
 
 	reset_error
@@ -322,41 +248,6 @@ feature {NONE}-- Implemenation
 	internal_user_api: detachable like user_api
 			-- Cached value for `user_api'.
 
-	type_name_without_annotation (a_type: TYPE [detachable ANY]): STRING
-			-- Type name for `a_type, without any annotation.
-			-- Used by `module' to search by type.
-		local
-			i,j,n: INTEGER
-			c: CHARACTER
-		do
-			create Result.make_from_string (a_type.name)
-			from
-				i := 1
-				n := Result.count
-			until
-				i > n
-			loop
-				c := Result[i]
-				if c = '!' or c = '?' then
-					Result.remove (i)
-					n := n - 1
-				elseif c.is_lower then
-					j := Result.index_of (' ', i + 1)
-					if j > 0 then
-						Result.remove_substring (i, j)
-						n := n - (j - i)
-					end
-				else
-					i := i + 1
-				end
-			end
-			if Result.starts_with ("!") or Result.starts_with ("?") then
-				Result.remove_head (1)
-			elseif Result.starts_with ("detachable ") then
-				Result.remove_head (11)
-			end
-		end
-
 feature -- Environment
 
 	module_configuration (a_module_name: READABLE_STRING_GENERAL; a_name: detachable READABLE_STRING_GENERAL): detachable CONFIG_READER

src/service/cms_api_options.e

@@ -14,10 +14,4 @@ create
 	make,
 	make_from_manifest
 
-convert
-	make_from_manifest ({ ARRAY [TUPLE [key: STRING; value: detachable ANY]],
-						  ARRAY [TUPLE [STRING_8, ARRAY [TUPLE [STRING_8, STRING_32]]]],
-						  ARRAY [TUPLE [STRING_8, ARRAY [TUPLE [STRING_8, STRING_8]]]]
-						})
-
 end

src/service/cms_module.e

@@ -32,57 +32,44 @@ feature {CMS_API} -- Module Initialization
 			-- Initialize Current module with `api'.
 		require
 			is_enabled: is_enabled
-			is_not_initialized: not is_initialized
 		do
 				-- Redefine to process specific module initialization.
-			is_initialized := True
-		ensure
-			is_initialized: is_initialized
 		end
 
-feature -- Status		
-
-	is_initialized: BOOLEAN
-			-- Is Current module initialized?
-
 feature {CMS_API} -- Access: API
 
 	module_api: detachable CMS_MODULE_API
 			-- Eventual module api.
-		require
-			is_initialized: is_initialized
-		do
-				-- No API by default.
-		end
 
 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")
+			Result := is_enabled
+				-- FIXME: implement proper installation status.
 		end
 
 	install (api: CMS_API)
 		require
 			is_not_installed: not is_installed (api)
 		do
-			api.storage.set_custom_value ("is_initialized", "module-" + name, "yes")
+				-- Not Yet Supported
 		end
 
 	uninstall (api: CMS_API)
 		require
 			is_installed: is_installed (api)
 		do
-			api.storage.set_custom_value ("is_initialized", "module-" + name, "no")
+				-- Not Yet Supported
 		end
 
 feature -- Router
 
-	setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
-			-- Setup url dispatching for Current module.
+	router (a_api: CMS_API): WSF_ROUTER
+			-- Router configuration.
 		require
-			is_initialized: is_initialized
+			is_enabled: is_enabled
 		deferred
 		end
 

src/service/cms_module_api.e

@@ -1,5 +1,6 @@
 note
 	description: "Summary description for {CMS_MODULE_API}."
+	author: ""
 	date: "$Date: 2015-02-13 14:54:27 +0100 (ven., 13 févr. 2015) $"
 	revision: "$Revision: 96620 $"
 

src/service/cms_module_collection.e

@@ -1,5 +1,6 @@
 note
-	description: "Collection of CMS modules."
+	description: "Summary description for {CMS_MODULE_COLLECTION}."
+	author: ""
 	date: "$Date: 2015-02-09 22:29:56 +0100 (lun., 09 févr. 2015) $"
 	revision: "$Revision: 96596 $"
 

src/service/cms_service.e

@@ -16,9 +16,7 @@ inherit
 		undefine
 			requires_proxy
 		redefine
-			execute_default,
-			create_router,
-			router
+			execute_default
 		end
 
 	WSF_FILTERED_SERVICE
@@ -84,17 +82,10 @@ feature {NONE} -- Initialization
 
 feature -- Settings: router
 
-	router: CMS_ROUTER
-
-	create_router
-			-- Create `router'.
-		do
-			create router.make (api, 30)
-		end
-
 	setup_router
 			-- <Precursor>
 		local
+			l_module: CMS_MODULE
 			l_api: like api
 			l_router: like router
 		do
@@ -109,7 +100,8 @@ feature -- Settings: router
 			across
 				modules as ic
 			loop
-				ic.item.setup_router (l_router, l_api)
+				l_module := ic.item
+				l_router.import (l_module.router (l_api))
 			end
 				-- Configure files handler.
 			configure_api_file_handler (l_router)

src/service/filter/cms_error_filter.e

@@ -19,17 +19,15 @@ feature -- Basic operations
 
 	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
 			-- Execute the filter
-		local
-			utf: UTF_CONVERTER
 		do
 			fixme ("Check if it's ok to add new fetures CMS_API.has_error:BOOLEAN and CMS_API.error_description.")
 			if not api.has_error then
 				api.logger.put_information (generator + ".execute with req: " + req.debug_output, Void)
 				if attached req.raw_header_data as l_header_data  then
-					api.logger.put_debug (generator + ".execute with req header: " + utf.escaped_utf_32_string_to_utf_8_string_8 (l_header_data), Void)
+					api.logger.put_debug (generator + ".execute with req header: " + l_header_data, Void)
 				end
 				if attached req.raw_input_data as l_input_data  then
-					api.logger.put_debug (generator + ".execute with req input: " + utf.escaped_utf_32_string_to_utf_8_string_8 (l_input_data), Void)
+					api.logger.put_debug (generator + ".execute with req input: " + l_input_data, Void)
 				end
 				execute_next (req, res)
 			else

src/service/handler/cms_handler.e

@@ -36,18 +36,6 @@ feature -- Response helpers
 --			res.send (create {CMS_REDIRECTION_RESPONSE_MESSAGE}.make (a_location))
 		end
 
-	send_bad_request_message (res: WSF_RESPONSE)
-			-- Send via `res' a bad request response.
-		do
-			res.send (create {CMS_CUSTOM_RESPONSE_MESSAGE}.make ({HTTP_STATUS_CODE}.bad_request))
-		end
-
-	send_not_found_message (res: WSF_RESPONSE)
-			-- Send via `res' a bad request response.
-		do
-			res.send (create {CMS_CUSTOM_RESPONSE_MESSAGE}.make ({HTTP_STATUS_CODE}.not_found))
-		end
-
 	send_access_denied_message (res: WSF_RESPONSE)
 			-- Send via `res' an access denied response.
 		do

src/service/misc/cms_request_util.e

@@ -70,4 +70,14 @@ feature -- Media Type
 			end
 		end
 
+feature -- Absolute Host
+
+	absolute_host (req: WSF_REQUEST; a_path:STRING): STRING
+		do
+			Result := req.absolute_script_url (a_path)
+			if Result.last_index_of ('/', Result.count) = Result.count then
+				Result.remove_tail (1)
+			end
+		end
+
 end

src/service/misc/cms_url_utilities.e

@@ -13,7 +13,6 @@ inherit
 feature -- Core
 
 	site_url: READABLE_STRING_8
-			-- Absolute site URL of Current CMS site.
 		deferred
 		end
 

src/service/path/cms_router.e

@@ -1,52 +0,0 @@
-note
-	description: "Specific version of WSF_ROUTER for CMS component."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CMS_ROUTER
-
-inherit
-	WSF_ROUTER
-		rename
-			make as make_router
-		redefine
-			path_to_dispatch
-		end
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	make (a_api: CMS_API; a_capacity: INTEGER)
-		do
-			api := a_api
-			make_router (a_capacity)
-		end
-
-	api: CMS_API
-
-feature {WSF_ROUTER_MAPPING} -- Dispatch helper
-
-	path_to_dispatch (req: WSF_REQUEST): READABLE_STRING_8
-			-- Path used by the router, to apply url dispatching of request `req'.
-		local
-			l_path: STRING_8
-		do
-			create l_path.make_from_string (Precursor (req))
-			if not l_path.is_empty and l_path [1] = '/' then
-				l_path.remove_head (1)
-			end
-			Result := api.source_of_path_alias (l_path)
-			if Result.is_empty then
-				Result := "/"
-			elseif Result [1] /= '/' then
-				create l_path.make (Result.count + 1)
-				l_path.append_character ('/')
-				l_path.append (Result)
-				Result := l_path
-			end
-		end
-
-end

src/service/response/cms_response.e

@@ -3,8 +3,8 @@ note
 			Generic CMS Response.
 			It builds the content to get process to render the output.
 		]"
-	date: "$Date: 2015-05-20 11:48:26 +0200 (mer., 20 mai 2015) $"
-	revision: "$Revision: 97327 $"
+	date: "$Date: 2015-02-16 20:14:19 +0100 (lun., 16 févr. 2015) $"
+	revision: "$Revision: 96643 $"
 
 deferred class
 	CMS_RESPONSE
@@ -29,7 +29,6 @@ feature {NONE} -- Initialization
 
 	initialize
 		do
-			initialize_site_url
 			get_theme
 			create menu_system.make
 			initialize_block_region_settings
@@ -37,35 +36,6 @@ feature {NONE} -- Initialization
 			register_hooks
 		end
 
-	initialize_site_url
-				-- Initialize site and base url.
-		local
-			l_url: detachable STRING_8
-			i,j: INTEGER
-		do
-				--| WARNING: do not use `absolute_url' and `url', since it relies on site_url and base_url.
-			if attached setup.site_url as l_site_url and then not l_site_url.is_empty then
-				create l_url.make_from_string (l_site_url)
-			else
-				l_url := request.absolute_script_url ("/")
-			end
-			check is_not_empty: not l_url.is_empty end
-			if l_url [l_url.count] /= '/' then
-				l_url.append_character ('/')
-			end
-			site_url := l_url
-			i := l_url.substring_index ("://", 1)
-			if i > 0 then
-				j := l_url.index_of ('/', i + 3)
-				if j > 0 then
-					base_url := l_url.substring (j, l_url.count)
-				end
-			end
-		ensure
-			site_url_set: site_url /= Void
-			site_url_ends_with_slash: site_url.ends_with_general ("/")
-		end
-
 	register_hooks
 		local
 			l_module: CMS_MODULE
@@ -106,35 +76,6 @@ feature -- Access
 	redirection: detachable READABLE_STRING_8
 			-- Location for eventual redirection.
 
-	location: STRING_8
-			-- Associated cms local location.
-		do
-			create Result.make_from_string (request.percent_encoded_path_info)
-			if not Result.is_empty and then Result[1] = '/' then
-				Result.remove_head (1)
-			end
-		end
-
-feature -- Internationalization (i18n)
-
-	translation (a_text: READABLE_STRING_GENERAL; opts: detachable CMS_API_OPTIONS): STRING_32
-			-- Translated text `a_text' according to expected context (lang, ...)
-			-- and adapt according to options eventually set by `opts'.
-		do
-			to_implement ("Implement i18n support [2015-may]")
-			Result := a_text.as_string_32
-		end
-
-	formatted_string (a_text: READABLE_STRING_GENERAL; args: TUPLE): STRING_32
-			-- Format `a_text' using arguments `args'.
-			--| ex: formatted_string ("hello $1, see page $title.", ["bob", "contact"] -> "hello bob, see page contact"
-		local
-			l_formatter: CMS_STRING_FORMATTER
-		do
-			create l_formatter
-			Result := l_formatter.formatted_string (a_text, args)
-		end
-
 feature -- API
 
 	api: CMS_API
@@ -202,13 +143,16 @@ feature -- URL utilities
 			end
 		end
 
-	site_url: IMMUTABLE_STRING_8
-			-- Absolute site url.
+	site_url: READABLE_STRING_8
+		do
+			Result := absolute_host (request, "")
+		end
 
-	base_url: detachable IMMUTABLE_STRING_8
+	base_url: detachable READABLE_STRING_8
 			-- Base url if any.
 			--| Usually it is Void, but it could be
 			--|  /project/demo/
+			--| FIXME: for now, no way to change that. Always at the root "/"
 
 feature -- Access: CMS
 
@@ -219,7 +163,7 @@ feature -- Access: CMS
 
 	front_page_url: READABLE_STRING_8
 		do
-			Result := absolute_url ("/", Void)
+			Result := request.absolute_script_url ("/")
 		end
 
 	values: CMS_VALUE_TABLE
@@ -238,33 +182,16 @@ feature -- Permission
 	has_permission (a_permission: READABLE_STRING_GENERAL): BOOLEAN
 			-- Does current user has permission `a_permission' ?
 		do
+			api.logger.put_information (generator + ".has_permission", a_permission)
 			Result := user_has_permission (current_user (request), a_permission)
 		end
 
-	has_permissions (a_permission_list: ITERABLE [READABLE_STRING_GENERAL]): BOOLEAN
-			-- Does current user has any of the permissions `a_permission_list' ?
-		do
-			Result := user_has_permissions (current_user (request), a_permission_list)
-		end
-
 	user_has_permission (a_user: detachable CMS_USER; a_permission: READABLE_STRING_GENERAL): BOOLEAN
 			-- Does `a_user' has permission `a_permission' ?
 		do
 			Result := api.user_has_permission (a_user, a_permission)
 		end
 
-	user_has_permissions (a_user: detachable CMS_USER; a_permission_list: ITERABLE [READABLE_STRING_GENERAL]): BOOLEAN
-			-- Does `a_user' has any of the permissions `a_permission_list' ?
-		do
-			across
-				a_permission_list as ic
-			until
-				Result
-			loop
-				Result := user_has_permission (a_user, ic.item)
-			end
-		end
-
 feature -- Head customization
 
 	add_additional_head_line (s: READABLE_STRING_8; a_allow_duplication: BOOLEAN)
@@ -842,9 +769,9 @@ feature -- Theme
 				create l_info.make_default
 			end
 			if l_info.engine.is_case_insensitive_equal_general ("smarty") then
-				create {SMARTY_CMS_THEME} theme.make (setup, l_info, site_url)
+				create {SMARTY_CMS_THEME} theme.make (setup, l_info)
 			else
-				create {MISSING_CMS_THEME} theme.make (setup, l_info, site_url)
+				create {MISSING_CMS_THEME} theme.make (setup)
 				status_code := {HTTP_STATUS_CODE}.service_unavailable
 				to_implement ("Check how to add the Retry-after, http://tools.ietf.org/html/rfc7231#section-6.6.4 and http://tools.ietf.org/html/rfc7231#section-7.1.3")
 			end
@@ -870,7 +797,7 @@ feature -- Generation
 			lnk: CMS_LINK
 		do
 				-- Menu
-			create {CMS_LOCAL_LINK} lnk.make ("Home", "")
+			create {CMS_LOCAL_LINK} lnk.make ("Home", "/")
 			lnk.set_weight (-10)
 			add_to_primary_menu (lnk)
 			invoke_menu_system_alter (menu_system)
@@ -956,8 +883,8 @@ feature -- Generation
 			end
 
 				-- Variables
-			page.register_variable (absolute_url ("", Void), "site_url")
-			page.register_variable (absolute_url ("", Void), "host") -- Same as `site_url'.
+			page.register_variable (request.absolute_script_url (""), "site_url")
+			page.register_variable (request.absolute_script_url (""), "host") -- Same as `site_url'.
 			page.register_variable (request.is_https, "is_https")
 			if attached current_user_name (request) as l_user then
 				page.register_variable (l_user, "user")
@@ -1065,9 +992,6 @@ feature -- Generation
 			l_is_active: BOOLEAN
 		do
 			create qs.make_from_string (request.percent_encoded_path_info)
-			if qs.starts_with ("/") then
-				qs.remove_head (1)
-			end
 			l_is_active := qs.same_string (a_lnk.location)
 			if not l_is_active then
 				if attached request.query_string as l_query_string and then not l_query_string.is_empty then
@@ -1141,8 +1065,8 @@ feature {NONE} -- Execution
 --					h.put_location (l_location)
 					response.redirect_now (l_location)
 				else
---					h.put_location (request.absolute_url (l_location, Void))
-					response.redirect_now (absolute_url (l_location, Void))
+--					h.put_location (request.absolute_script_url (l_location))
+					response.redirect_now (request.absolute_script_url (l_location))
 				end
 			else
 				h.put_header_object (header)

src/service/response/error/bad_request_error_cms_response.e

@@ -20,7 +20,7 @@ feature -- Generation
 
 	custom_prepare (page: CMS_HTML_PAGE)
 		do
-			page.register_variable (absolute_url (request.path_info, Void), "request")
+			page.register_variable (request.absolute_script_url (request.path_info), "request")
 			page.set_status_code ({HTTP_STATUS_CODE}.bad_request)
 			page.register_variable (page.status_code.out, "code")
 		end

src/service/response/error/forbidden_error_cms_response.e

@@ -20,7 +20,7 @@ feature -- Generation
 
 	custom_prepare (page: CMS_HTML_PAGE)
 		do
-			page.register_variable (absolute_url (request.path_info, Void), "request")
+			page.register_variable (request.absolute_script_url (request.path_info), "request")
 			page.set_status_code ({HTTP_STATUS_CODE}.forbidden)
 			page.register_variable (page.status_code.out, "code")
 		end

src/service/response/error/internal_server_error_cms_response.e

@@ -20,7 +20,7 @@ feature -- Generation
 
 	custom_prepare (page: CMS_HTML_PAGE)
 		do
-			page.register_variable (absolute_url (request.path_info, Void), "request")
+			page.register_variable (request.absolute_script_url (request.path_info), "request")
 			page.set_status_code ({HTTP_STATUS_CODE}.internal_server_error)
 			page.register_variable (page.status_code.out, "code")
 		end

src/service/response/error/not_found_error_cms_response.e

@@ -20,7 +20,7 @@ feature -- Generation
 
 	custom_prepare (page: CMS_HTML_PAGE)
 		do
-			page.register_variable (absolute_url (request.path_info, Void), "request")
+			page.register_variable (request.absolute_script_url (request.path_info), "request")
 			page.set_status_code ({HTTP_STATUS_CODE}.not_found)
 			page.register_variable (page.status_code.out, "code")
 		end

src/service/response/error/not_implemented_error_cms_response.e

@@ -20,7 +20,7 @@ feature -- Generation
 
 	custom_prepare (page: CMS_HTML_PAGE)
 		do
-			page.register_variable (absolute_url (request.path_info, Void), "request")
+			page.register_variable (request.absolute_script_url (request.path_info), "request")
 			page.set_status_code ({HTTP_STATUS_CODE}.not_implemented)
 			page.register_variable (page.status_code.out, "code")
 		end

src/service/response/message/cms_custom_response_message.e

@@ -1,64 +0,0 @@
-note
-	description: "Custom cms response message."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CMS_CUSTOM_RESPONSE_MESSAGE
-
-inherit
-	CMS_RESPONSE_MESSAGE
-		redefine
-			send_payload_to
-		end
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	make (a_code: INTEGER)
-			-- Set `status_code' to `a_code'.
-		require
-			a_code_valid: a_code > 0
-		do
-			initialize
-			status_code := a_code
-		end
-
-feature -- Access
-
-	payload: detachable READABLE_STRING_8
-			-- Optional payload.
-
-feature -- Element change
-
-	set_status_code (a_code: INTEGER)
-			-- Set `status_code' to `a_code'.
-		require
-			a_code_valid: a_code > 0
-		do
-			status_code := a_code
-		end
-
-	set_payload (s: detachable READABLE_STRING_8)
-			-- Set `payload' to `s'.
-		do
-			if s /= Void then
-				payload := s
-				header.put_content_length (s.count)
-			else
-			end
-		end
-
-feature {WSF_RESPONSE} -- Output
-
-	send_payload_to (res: WSF_RESPONSE)
-			-- Send payload data to response `res'.
-		do
-			if attached payload as s then
-				res.put_string (s)
-			end
-		end
-
-end

src/support/cms_pagination_generator.e

@@ -1,284 +0,0 @@
-note
-	description: "Pagination class to generate html pagination links and header summary."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CMS_PAGINATION_GENERATOR
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	make (a_resource: READABLE_STRING_8; a_count: NATURAL_64; a_page_size: NATURAL)
-			-- Create an object with a pages of size `a_page_size'.
-			-- If `a_page_size' is zero, use default pagination size.
-		require
-			a_page_size > 0
-		do
-			create resource.make (a_resource)
-			set_page_size (a_page_size)
-			set_upper (a_count)
-			set_current_page_index (1)
-
-			maximum_ith_page_links := 7
-			page_parameter_id := "page"
-			size_parameter_id := "size"
-			set_first_text_id ("<<")
-			set_prev_text_id ("<")
-			set_next_text_id (">")
-			set_last_text_id (">>")
-		end
-
-feature -- Access
-
-	resource: URI_TEMPLATE
-			-- Resource associated with current pager.
-
-	page_size: NATURAL
-			-- Number of items per page.
-
-	upper: NATURAL_64
-			-- number of items.
-			-- if zero, no upper limit.
-
-	current_page_index: INTEGER
-			-- Current page index.
-
-	current_page_offset: NATURAL_64
-			-- Lower index - 1 for current page.
-		do
-			if current_page_index > 1 then
-				Result := (current_page_index - 1).to_natural_32 * page_size
-			else
-				Result := 0
-			end
-		end
-
-feature -- Status report			
-
-	has_upper_limit: BOOLEAN
-			-- Upper limit known?
-		do
-			Result := upper > 0
-		end
-
-	pages_count: INTEGER
-			-- Number of pages.
-			-- If upper is
-		require
-			has_upper_limit: has_upper_limit
-		do
-			Result := (upper // page_size.as_natural_64).to_integer_32
-			if upper \\ page_size.to_natural_64 > 0 then
-				Result := Result + 1
-			end
-		end
-
-feature -- Parameters			
-
-	page_parameter_id: STRING
-			-- Parameter id for page value.
-
-	size_parameter_id: STRING
-			-- Parameter id for size value.
-
-	maximum_ith_page_links: INTEGER
-			-- Maximum number of numeric ith page link.
-			-- ex: max = 6 gives "1 2 3 4 5 6 ... > >>".
-
-	label_first: IMMUTABLE_STRING_32
-	label_previous: IMMUTABLE_STRING_32
-	label_next: IMMUTABLE_STRING_32
-	label_last: IMMUTABLE_STRING_32
-
-feature -- Element change
-
-	set_page_size (a_size: NATURAL)
-			-- Set `page_size' to `a_size'.
-		do
-			page_size := a_size
-		end
-
-	set_upper (a_upper: NATURAL_64)
-			-- Set pages count, or upper limit `upper' to `a_size'.
-		do
-			upper := a_upper
-		end
-
-	set_current_page_index (a_page_index: like current_page_index)
-			-- Set Current page index to `a_page_index'.
-		do
-			current_page_index := a_page_index
-		end
-
-	set_page_parameter_id (a_id: READABLE_STRING_8)
-			-- Set "page" query parameter to `a_id'.
-		do
-			page_parameter_id := a_id
-		end
-
-	set_size_parameter_id (a_id: READABLE_STRING_8)
-			-- Set "size" query parameter to `a_id'.
-		do
-			size_parameter_id := a_id
-		end
-
-	get_setting_from_request (req: WSF_REQUEST)
-			-- Get various pager related settings from request `req' query paramenters.
-			-- Using `page_parameter_id' and `size_parameter_id' value for parameter names.
-		do
-				-- Size
-			if
-				attached {WSF_STRING} req.query_parameter (size_parameter_id) as l_size and then
-				attached l_size.value as l_value and then
-				l_value.is_natural
-			then
-				set_page_size (l_value.to_natural_32)
-			else
-					-- Keep default size
-			end
-
-				-- Page
-			if
-				attached {WSF_STRING} req.query_parameter (page_parameter_id) as l_page and then
-				l_page.is_integer
-			then
-				set_current_page_index (l_page.integer_value)
-			else
-				set_current_page_index (1)
-			end
-		end
-
-	set_first_text_id (s: READABLE_STRING_GENERAL)
-			-- Set label for "First" link to `s'.
-			-- default: "<<"
-		do
-			create label_first.make_from_string_general (s)
-		end
-
-	set_prev_text_id (s: READABLE_STRING_GENERAL)
-			-- Set label for "Prev" link to `s'.
-			-- default: "<"
-		do
-			create label_previous.make_from_string_general (s)
-		end
-
-	set_next_text_id (s: READABLE_STRING_GENERAL)
-			-- Set label for "Next" link to `s'.
-			-- default: ">"
-		do
-			create label_next.make_from_string_general (s)
-		end
-
-	set_last_text_id (s: READABLE_STRING_GENERAL)
-			-- Set label for "Last" link to `s'.
-			-- default: ">>"
-		do
-			create label_last.make_from_string_general (s)
-		end
-
-	set_maximum_ith_page_links (nb: INTEGER)
-			-- Set `maximum_ith_page_links' to `nb'.
-		do
-			maximum_ith_page_links := nb
-		end
-
-feature -- Conversion
-
-	pagination_links: ARRAYED_LIST [CMS_LOCAL_LINK]
-			-- CMS local links related to Current paginations.
-		local
-			lnk: CMS_LOCAL_LINK
-			tb: HASH_TABLE [detachable ANY, STRING_8]
-			curr, max: INTEGER
-			i,j: INTEGER
-		do
-			create Result.make (maximum_ith_page_links)
-
-			curr := current_page_index
-			if has_upper_limit then
-				max := pages_count
-			else
-				max := curr + page_size.to_integer_32
-			end
-
-			create tb.make (2)
-			tb.force (page_size, size_parameter_id)
-			tb.force (1, page_parameter_id)
-			if curr > 1 then
-				create lnk.make (label_first, resource.expanded_string (tb))
-				Result.force (lnk)
-			end
-
-			if curr > 1 then
-				tb.force (curr - 1, "page")
-				create lnk.make (label_previous, resource.expanded_string (tb))
-				Result.force (lnk)
-			end
-			from
-				if curr >= maximum_ith_page_links // 2 then
-					i := curr - (maximum_ith_page_links // 2)
-				else
-					i := 1
-				end
-				j := 0
-			until
-				j >= maximum_ith_page_links or (has_upper_limit and then i > max)
-			loop
-				tb.force (i, "page")
-				create lnk.make (i.out, resource.expanded_string (tb))
-				lnk.set_is_active (i = curr)
-				Result.force (lnk)
-				j := j + 1
-				i := i + 1
-			end
-			if not has_upper_limit or else i < max then
-				tb.force (i, "page")
-				create lnk.make ("...", resource.expanded_string (tb))
-				Result.force (lnk)
-			end
-
-			if curr < max then
-				tb.force (curr + 1, "page")
-				create lnk.make (label_next, resource.expanded_string (tb))
-				Result.force (lnk)
-			end
-
-			if upper > 0 and curr /= max then
-				tb.force (max, "page")
-				create lnk.make (label_last, resource.expanded_string (tb))
-				Result.force (lnk)
-			end
-		end
-
-feature -- Convertion
-
-	append_to_html (a_response: CMS_RESPONSE; a_output: STRING)
-			-- Append html pager to `a_output' in the context of `a_response'.
-			-- note: First, [Prev], [Next], Last.
-		local
-			lnk: CMS_LOCAL_LINK
-		do
-			a_output.append ("<ul class=%"pagination%">%N")
-			across
-				pagination_links as ic
-			loop
-				lnk := ic.item
-				if lnk.is_active then
-					a_output.append ("<li class=%"active%">")
-				elseif lnk.title.same_string (label_previous) then
-					a_output.append ("<li class=%"previous%">")
-				elseif lnk.title.same_string (label_next) then
-					a_output.append ("<li class=%"next%">")
-				else
-					a_output.append ("<li>")
-				end
-				a_output.append (a_response.link (lnk.title, lnk.location, Void))
-				a_output.append ("</li>")
-			end
-			a_output.append ("</ul>")
-		end
-
-end

src/support/cms_string_formatter.e

@@ -1,23 +0,0 @@
-note
-	description: "Format a text using arguments."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CMS_STRING_FORMATTER
-
-feature -- Conversion
-
-	formatted_string (a_string: READABLE_STRING_GENERAL; args: TUPLE): STRING_32
-		do
-			Result := i18n_formatter.formatted_string (a_string, args)
-		end
-
-feature {NONE} -- Implementation
-
-	i18n_formatter: I18N_STRING_FORMATTER
-		once
-			create Result
-		end
-
-end

src/theme/cms_theme.e

@@ -1,7 +1,7 @@
 note
 	description: "Abstract class describing a generic theme"
-	date: "$Date: 2015-05-20 11:48:26 +0200 (mer., 20 mai 2015) $"
-	revision: "$Revision: 97327 $"
+	date: "$Date: 2015-02-16 12:52:35 +0100 (lun., 16 févr. 2015) $"
+	revision: "$Revision: 96630 $"
 
 deferred class
 	CMS_THEME
@@ -9,8 +9,6 @@ deferred class
 inherit
 	CMS_ENCODERS
 
-	CMS_URL_UTILITIES
-
 	REFACTORING_HELPER
 
 
@@ -18,12 +16,6 @@ feature {NONE} -- Access
 
 	setup:  CMS_SETUP
 
-	site_url: IMMUTABLE_STRING_8
-			-- Absolute URL for Current CMS site.
-
-	base_url: detachable IMMUTABLE_STRING_8
-			-- Optional base url of current CMS site.
-
 feature -- Access
 
 	name: STRING
@@ -49,31 +41,6 @@ feature -- Status report
 			Result := across regions as ic some a_region_name.is_case_insensitive_equal (ic.item) end
 		end
 
-feature -- Element change
-
-	set_site_url (a_url: READABLE_STRING_8)
-			-- Set `site_url' to `a_url'.
-		require
-			a_url.ends_with_general ("/")
-		local
-			i,j: INTEGER
-		do
-			base_url := Void
-			if a_url [a_url.count] = '/' then
-				create site_url.make_from_string (a_url)
-			else
-				create site_url.make_from_string (a_url + "/")
-			end
-
-			i := a_url.substring_index ("://", 1)
-			if i > 0 then
-				j := a_url.index_of ('/', i + 3)
-				if j > 0 then
-					create base_url.make_from_string (a_url.substring (j, a_url.count))
-				end
-			end
-		end
-
 feature -- Conversion
 
 	menu_html (a_menu: CMS_MENU; is_horizontal: BOOLEAN; a_options: detachable CMS_HTML_OPTIONS): STRING_8
@@ -166,11 +133,7 @@ feature {NONE} -- Implementation
 			else
 				s.append ("<li class=%""+ cl + "%">")
 			end
-			s.append ("<a href=%"")
-			s.append (url (lnk.location, Void))
-			s.append ("%">")
-			s.append (html_encoded (lnk.title))
-			s.append ("</a>")
+			s.append ("<a href=%"" +  (lnk.location) + "%">" + html_encoded (lnk.title) + "</a>")
 			if
 				(lnk.is_expanded or lnk.is_collapsed) and then
 				attached lnk.children as l_children

src/theme/missing_theme/missing_cms_theme.e

@@ -18,19 +18,15 @@ create
 
 feature {NONE} -- Initialization
 
-	make (a_setup: like setup; a_info: like information; abs_site_url: READABLE_STRING_8)
+	make (a_setup: like setup)
 		do
 			setup := a_setup
-			information := a_info
-			set_site_url (abs_site_url)
 		ensure
 			setup_set: setup = a_setup
 		end
 
 feature -- Access
 
-	information: CMS_THEME_INFORMATION
-
 	name: STRING = "missing theme"
 
 	regions: ARRAY [STRING]

src/theme/smarty_theme/smarty_cms_theme.e

@@ -14,7 +14,7 @@ create
 
 feature {NONE} -- Initialization
 
-	make (a_setup: like setup; a_info: like information; abs_site_url: READABLE_STRING_8)
+	make (a_setup: like setup; a_info: like information;)
 		do
 			setup := a_setup
 			information := a_info
@@ -23,7 +23,6 @@ feature {NONE} -- Initialization
 			else
 				templates_directory := a_setup.theme_location
 			end
-			set_site_url (abs_site_url)
 		ensure
 			setup_set: setup = a_setup
 			information_set: information = a_info

src/theme/wsf/wsf_cms_theme.e

@@ -1,17 +0,0 @@
-note
-	description: "Summary description for {WSF_CMS_THEME}."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	WSF_CMS_THEME
-
-obsolete "Use CMS_TO_WSF_THEME [2015-May]"
-
-inherit
-	CMS_TO_WSF_THEME
-
-create
-	make
-
-end