diff --git a/library/server/request/rest/license.lic b/library/server/request/rest/license.lic
new file mode 100644
index 00000000..c929225f
--- /dev/null
+++ b/library/server/request/rest/license.lic
@@ -0,0 +1 @@
+reference:forum2
diff --git a/library/server/request/rest/rest-safe.ecf b/library/server/request/rest/rest-safe.ecf
new file mode 100644
index 00000000..a6865a9a
--- /dev/null
+++ b/library/server/request/rest/rest-safe.ecf
@@ -0,0 +1,28 @@
+
+
+
+
+
+ /EIFGENs$
+ /\.git$
+ /\.svn$
+
+
+
+
+
+
+
+
+
+ /html$
+
+
+
+
+
+ /contrib$
+
+
+
+
diff --git a/library/server/request/rest/rest.ecf b/library/server/request/rest/rest.ecf
new file mode 100644
index 00000000..0c5c4034
--- /dev/null
+++ b/library/server/request/rest/rest.ecf
@@ -0,0 +1,28 @@
+
+
+
+
+
+ /EIFGENs$
+ /\.git$
+ /\.svn$
+
+
+
+
+
+
+
+
+
+ /html$
+
+
+
+
+
+ /contrib$
+
+
+
+
diff --git a/library/server/request/rest/src/application/rest_application.e b/library/server/request/rest/src/application/rest_application.e
new file mode 100644
index 00000000..b4536020
--- /dev/null
+++ b/library/server/request/rest/src/application/rest_application.e
@@ -0,0 +1,31 @@
+note
+ description: "Summary description for {REST_APPLICATION}."
+ author: ""
+ date: "$Date$"
+ revision: "$Revision$"
+
+deferred class
+ REST_APPLICATION [H -> REST_REQUEST_HANDLER [C], C -> REST_REQUEST_HANDLER_CONTEXT]
+
+inherit
+ ROUTED_APPLICATION [H, C]
+ redefine
+ router
+ end
+
+feature -- Setup
+
+ router: REST_REQUEST_ROUTER [H, C]
+ -- Request router
+
+;note
+ copyright: "Copyright (c) 1984-2011, Eiffel Software and others"
+ license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+ source: "[
+ Eiffel Software
+ 5949 Hollister Ave., Goleta, CA 93117 USA
+ Telephone 805-685-1006, Fax 805-685-6869
+ Website http://www.eiffel.com
+ Customer support http://support.eiffel.com
+ ]"
+end
diff --git a/library/server/request/rest/src/context/rest_request_handler_context.e b/library/server/request/rest/src/context/rest_request_handler_context.e
new file mode 100644
index 00000000..4fbf9913
--- /dev/null
+++ b/library/server/request/rest/src/context/rest_request_handler_context.e
@@ -0,0 +1,78 @@
+note
+ description: "Summary description for {REST_REQUEST_HANDLER_CONTEXT}."
+ author: ""
+ date: "$Date$"
+ revision: "$Revision$"
+
+deferred class
+ REST_REQUEST_HANDLER_CONTEXT
+
+inherit
+ REQUEST_HANDLER_CONTEXT
+
+feature -- Status report
+
+ script_absolute_url (a_path: STRING): STRING
+ -- Absolute Url for the script if any, extended by `a_path'
+ do
+ Result := request.absolute_script_url (a_path)
+ end
+
+ script_url (a_path: STRING): STRING
+ -- Url relative to script name if any, extended by `a_path'
+ require
+ a_path_attached: a_path /= Void
+ do
+ Result := request.script_url (a_path)
+ end
+
+ url (args: detachable STRING; abs: BOOLEAN): STRING
+ -- Associated url based on `path' and `args'
+ -- if `abs' then return absolute url
+ local
+ s,t: detachable STRING
+ do
+ s := args
+ if s /= Void and then s.count > 0 then
+ create t.make_from_string (path)
+ if s[1] /= '/' then
+ t.append_character ('/')
+ t.append (s)
+ else
+ t.append (s)
+ end
+ s := t
+ else
+ s := path
+ end
+ if abs then
+ Result := script_absolute_url (s)
+ else
+ Result := script_url (s)
+ end
+ ensure
+ result_attached: Result /= Void
+ end
+
+ authenticated: BOOLEAN
+ do
+ if request.http_authorization /= Void then
+ Result := True
+ end
+ end
+
+ authenticated_identifier: detachable READABLE_STRING_32
+ do
+ end
+
+note
+ copyright: "Copyright (c) 1984-2011, Eiffel Software and others"
+ license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+ source: "[
+ Eiffel Software
+ 5949 Hollister Ave., Goleta, CA 93117 USA
+ Telephone 805-685-1006, Fax 805-685-6869
+ Website http://www.eiffel.com
+ Customer support http://support.eiffel.com
+ ]"
+end
diff --git a/library/server/request/rest/src/context/rest_request_uri_handler_context.e b/library/server/request/rest/src/context/rest_request_uri_handler_context.e
new file mode 100644
index 00000000..d9f91e76
--- /dev/null
+++ b/library/server/request/rest/src/context/rest_request_uri_handler_context.e
@@ -0,0 +1,28 @@
+note
+ description: "Summary description for {REQUEST_URI_HANDLER_CONTEXT}."
+ author: ""
+ date: "$Date$"
+ revision: "$Revision$"
+
+class
+ REST_REQUEST_URI_HANDLER_CONTEXT
+
+inherit
+ REQUEST_URI_HANDLER_CONTEXT
+
+ REST_REQUEST_HANDLER_CONTEXT
+
+create
+ make
+
+note
+ copyright: "2011-2011, Eiffel Software and others"
+ license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+ source: "[
+ Eiffel Software
+ 5949 Hollister Ave., Goleta, CA 93117 USA
+ Telephone 805-685-1006, Fax 805-685-6869
+ Website http://www.eiffel.com
+ Customer support http://support.eiffel.com
+ ]"
+end
diff --git a/library/server/request/rest/src/context/rest_request_uri_template_handler_context.e b/library/server/request/rest/src/context/rest_request_uri_template_handler_context.e
new file mode 100644
index 00000000..eefa61e7
--- /dev/null
+++ b/library/server/request/rest/src/context/rest_request_uri_template_handler_context.e
@@ -0,0 +1,28 @@
+note
+ description: "Summary description for {REQUEST_URI_TEMPLATE_HANDLER_CONTEXT}."
+ author: ""
+ date: "$Date$"
+ revision: "$Revision$"
+
+class
+ REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT
+
+inherit
+ REQUEST_URI_TEMPLATE_HANDLER_CONTEXT
+
+ REST_REQUEST_HANDLER_CONTEXT
+
+create
+ make
+
+note
+ copyright: "2011-2011, Eiffel Software and others"
+ license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+ source: "[
+ Eiffel Software
+ 5949 Hollister Ave., Goleta, CA 93117 USA
+ Telephone 805-685-1006, Fax 805-685-6869
+ Website http://www.eiffel.com
+ Customer support http://support.eiffel.com
+ ]"
+end
diff --git a/library/server/request/rest/src/contrib/doc/html/html_page.e b/library/server/request/rest/src/contrib/doc/html/html_page.e
new file mode 100644
index 00000000..d203a8ab
--- /dev/null
+++ b/library/server/request/rest/src/contrib/doc/html/html_page.e
@@ -0,0 +1,184 @@
+note
+ description: "Summary description for {HTML_PAGE}."
+ date: "$Date$"
+ revision: "$Revision$"
+
+class
+ HTML_PAGE
+
+inherit
+ HTML_UTILITIES
+
+create
+ make
+
+feature {NONE} -- Initialization
+
+ make (a_title: like title)
+ do
+ create {ARRAYED_LIST [like html_attributes.item]} html_attributes.make (0)
+ create head.make (a_title)
+ create {ARRAYED_LIST [like body_attributes.item]} body_attributes.make (0)
+ create body.make_empty
+ initialize
+ end
+
+ initialize
+ -- Initialize
+ do
+ create headers.make
+ end
+
+feature -- Access
+
+ headers: EWF_HEADER
+
+feature -- Recycle
+
+ recycle
+ do
+ html_attributes.wipe_out
+ headers.recycle
+ head.recycle
+ body_attributes.wipe_out
+ body.wipe_out
+ internal_header_string := Void
+ internal_message_string := Void
+ end
+
+feature -- Access
+
+ html_attributes: LIST [TUPLE [name: STRING; value: STRING]]
+
+ head: HTML_PAGE_HEAD
+
+ body_attributes: LIST [TUPLE [name: STRING; value: STRING]]
+
+ body: STRING
+
+feature -- Query
+
+ title: detachable STRING
+ do
+ Result := head.title
+ end
+
+ add_html_ttribute (a: like html_attributes.item)
+ do
+ html_attributes.force (a)
+ end
+
+ add_body_attribute (a: like body_attributes.item)
+ do
+ body_attributes.force (a)
+ end
+
+ set_body (s: like body)
+ -- Set `body' to `s'
+ do
+ body := s
+ end
+
+feature -- Element change
+
+ set_title (t: like title)
+ do
+ head.title := t
+ end
+
+feature -- Output
+
+ compute
+ -- Compute the string output
+ local
+ s, t: STRING
+ do
+ --| HTML beginning
+ create s.make (128)
+ s.append_string ("%N")
+
+ --| Head
+ head.compute --| Be sure to have a fresh string
+ t := head.string
+ if not t.is_empty then
+ s.append_string (t)
+ s.append_character ('%N')
+ end
+
+ --| Body
+ s.append_string ("%N")
+ s.append_string (body)
+ s.append_string (" ")
+
+ --| End
+ s.append_string ("