Migrated most of the example and library to new design.

2015-03-31 14:50:20 +02:00
parent 7d2ce8a77f
commit 4907bc3085
124 changed files with 2399 additions and 1789 deletions
--- a/examples/filter/filter-safe.ecf
+++ b/examples/filter/filter-safe.ecf
@@ -1,30 +1,36 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-9-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-9-0 http://www.eiffel.com/developers/xml/configuration-1-9-0.xsd" name="filter" uuid="52FF4B77-0614-4D8B-9B96-C07EC852793E" library_target="filter">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="filter" uuid="52FF4B77-0614-4D8B-9B96-C07EC852793E" library_target="filter">
 	<target name="common">
 		<file_rule>
 			<exclude>/EIFGENs$</exclude>
 			<exclude>/\.git$</exclude>
 			<exclude>/\.svn$</exclude>
 		</file_rule>
-		<option debug="true" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
+		<option debug="true" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="transitional" syntax="provisional">
 			<debug name="nino" enabled="true"/>
 			<assertions precondition="true" postcondition="true" invariant="true" supplier_precondition="true"/>
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf" readonly="true"/>
-		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf" readonly="true"/>
-		<library name="http" location="../../library/network/protocol/http/http-safe.ecf" readonly="true"/>
-		<library name="json" location="..\..\contrib\library\text\parser\json\library\json-safe.ecf" readonly="true"/>
-		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf" readonly="true"/>
-		<library name="wsf_router_context" location="..\..\library\server\wsf\wsf_router_context-safe.ecf" readonly="true"/>
-		<library name="wsf_extension" location="..\..\library\server\wsf\wsf_extension-safe.ecf" readonly="true"/>
+		<library name="http" location="..\..\library\network\protocol\http\http-safe.ecf" readonly="true"/>
 		<library name="http_authorization" location="..\..\library\server\authentication\http_authorization\http_authorization-safe.ecf" readonly="true"/>
+		<library name="json" location="..\..\contrib\library\text\parser\json\library\json-safe.ecf" readonly="true"/>
+		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf" readonly="true"/>
+		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf" readonly="false"/>
+		<library name="wsf_extension" location="..\..\library\server\wsf\wsf_extension-safe.ecf" readonly="true"/>
+		<library name="wsf_router_context" location="..\..\library\server\wsf\wsf_router_context-safe.ecf" readonly="true"/>
 	</target>
 	<target name="filter_nino" extends="common">
 		<root class="FILTER_SERVER" feature="make"/>
 		<library name="default_nino" location="..\..\library\server\wsf\default\nino-safe.ecf" readonly="true"/>
 		<cluster name="filter" location="src\" recursive="true"/>
 	</target>
+	<target name="filter_standalone" extends="common">
+		<root class="FILTER_SERVER" feature="make"/>
+		<setting name="concurrency" value="scoop"/>
+		<library name="default_standalone" location="..\..\library\server\wsf\default\standalone-safe.ecf" readonly="true"/>
+		<cluster name="filter" location="src\" recursive="true"/>
+	</target>
 	<target name="filter_fcgi" extends="common">
 		<root class="FILTER_SERVER" feature="make"/>
 		<library name="default_libfcgi" location="..\..\library\server\wsf\default\libfcgi-safe.ecf"/>
--- a/examples/filter/src/database/database_api.e
+++ b/examples/filter/src/database/database_api.e
@@ -24,6 +24,24 @@ feature -- Initialization

 feature -- Access

+	user_by_id (a_id: INTEGER): detachable USER
+		do
+			Result := users.item (a_id)
+		end
+
+	user_by_name (a_name: READABLE_STRING_GENERAL): detachable USER
+		do
+			across
+				users as c
+			until
+				Result /= Void
+			loop
+				if attached c.item as u and then a_name.same_string (u.name) then
+					Result := u
+				end
+			end
+		end
+
 	user (a_id: INTEGER; a_name: detachable READABLE_STRING_GENERAL): detachable USER
 			-- User with id `a_id' or name `a_name'.
 		require
@@ -32,18 +50,9 @@ feature -- Access
 			n: like {USER}.name
 		do
 			if a_id > 0 then
-				Result := users.item (a_id)
+				Result := user_by_id (a_id)
 			elseif a_name /= Void then
-				n := a_name.as_string_8
-				across
-					users as c
-				until
-					Result /= Void
-				loop
-					if attached c.item as u and then u.name.same_string (n) then
-						Result := u
-					end
-				end
+				Result := user_by_name (a_name)
 			end
 		ensure
 			Result /= Void implies ((a_id > 0 and then Result.id = a_id) xor (a_name /= Void and then Result.name.same_string_general (a_name)))
@@ -52,6 +61,6 @@ feature -- Access
 	users: HASH_TABLE [USER, INTEGER]

 ;note
-	copyright: "2011-2012, Olivier Ligot, Jocelyn Fiat and others"
+	copyright: "2011-2015, Olivier Ligot, Jocelyn Fiat and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end
--- a/examples/filter/src/filter/authentication_filter.e
+++ b/examples/filter/src/filter/authentication_filter.e
@@ -48,18 +48,31 @@ feature {NONE} -- Implementation
 			-- Handle forbidden.
 		local
 			h: HTTP_HEADER
+			s: STRING
 		do
 			create h.make
 			h.put_content_type_text_plain
 			h.put_content_length (a_description.count)
 			h.put_current_date
-			h.put_header_key_value ({HTTP_HEADER_NAMES}.header_www_authenticate, "Basic realm=%"User%"")
+			s := "Basic realm=%"For this demo, use any of: "
+			across
+				db_access.users as ic
+			loop
+				s.append_character ('(')
+				s.append (ic.item.name)
+				s.append_character (':')
+				s.append (ic.item.password)
+				s.append_character (')')
+				s.append_character (' ')
+			end
+			s.append_character ('"')
+			h.put_header_key_value ({HTTP_HEADER_NAMES}.header_www_authenticate, s)
 			res.set_status_code ({HTTP_STATUS_CODE}.unauthorized)
 			res.put_header_text (h.string)
 			res.put_string (a_description)
 		end

 note
-	copyright: "2011-2014, Olivier Ligot, Jocelyn Fiat and others"
+	copyright: "2011-2015, Olivier Ligot, Jocelyn Fiat and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end
--- a/examples/filter/src/filter_server.e
+++ b/examples/filter/src/filter_server.e
@@ -8,18 +8,7 @@ class
 	FILTER_SERVER

 inherit
-	ANY
-
-	WSF_DEFAULT_SERVICE
-
-	WSF_ROUTED_SERVICE
-		undefine
-			execute
-		end
-
-	WSF_FILTERED_SERVICE
-
-	SHARED_EJSON
+	WSF_DEFAULT_SERVICE [FILTER_SERVER_EXECUTION]

 create
 	make
@@ -31,9 +20,6 @@ feature {NONE} -- Initialization
 			l_message: STRING
 			l_factory: INET_ADDRESS_FACTORY
 		do
-			initialize_router
-			initialize_filter
-			initialize_json
 			set_service_option ("port", port)
 			create l_message.make_empty
 			l_message.append_string ("Launching filter server at ")
@@ -46,60 +32,13 @@ feature {NONE} -- Initialization
 			make_and_launch
 		end

-	create_filter
-			-- Create `filter'
-		do
-			create {WSF_CORS_FILTER} filter
-		end
-
-	setup_filter
-			-- Setup `filter'
-		local
-			l_routing_filter: WSF_ROUTING_FILTER
-			l_logging_filter: WSF_LOGGING_FILTER
-		do
-			create l_routing_filter.make (router)
-			l_routing_filter.set_execute_default_action (agent execute_default)
-			filter.set_next (l_routing_filter)
-
-			create l_logging_filter
-			l_routing_filter.set_next (l_logging_filter)
-		end
-
-	setup_router
-			-- Setup `router'
-		local
-			l_options_filter: WSF_CORS_OPTIONS_FILTER
-			l_authentication_filter: AUTHENTICATION_FILTER
-			l_user_filter: USER_HANDLER
-			l_methods: WSF_REQUEST_METHODS
-		do
-			create l_options_filter.make (router)
-			create l_authentication_filter
-			create l_user_filter
-
-			l_options_filter.set_next (l_authentication_filter)
-			l_authentication_filter.set_next (l_user_filter)
-
-			create l_methods
-			l_methods.enable_options
-			l_methods.enable_get
-			router.handle_with_request_methods ("/user/{userid}", create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (agent l_options_filter.execute), l_methods)
-		end
-
-	initialize_json
-			-- Initialize `json'.
-		do
-			json.add_converter (create {JSON_USER_CONVERTER}.make)
-		end
-
 feature {NONE} -- Implementation

 	port: INTEGER = 9090
 			-- Port number

 note
-	copyright: "2011-2014, Olivier Ligot, Jocelyn Fiat and others"
+	copyright: "2011-2015, Olivier Ligot, Jocelyn Fiat and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/examples/filter/src/filter_server_execution.e
+++ b/examples/filter/src/filter_server_execution.e
@@ -0,0 +1,82 @@
+note
+	description : "Filter example."
+	author      : "Olivier Ligot"
+	date        : "$Date$"
+	revision    : "$Revision$"
+
+class
+	FILTER_SERVER_EXECUTION
+
+inherit
+	WSF_FILTERED_ROUTED_EXECUTION
+		redefine
+			initialize
+		end
+
+	SHARED_EJSON
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	initialize
+		do
+			Precursor
+			initialize_json
+		end
+
+	create_filter
+			-- Create `filter'
+		do
+			create {WSF_CORS_FILTER} filter
+		end
+
+	setup_filter
+			-- Setup `filter'
+		local
+			l_logging_filter: WSF_LOGGING_FILTER
+		do
+			create l_logging_filter
+			filter.set_next (l_logging_filter)
+		end
+
+	setup_router
+			-- Setup `router'
+		local
+			l_options_filter: WSF_CORS_OPTIONS_FILTER
+			l_authentication_filter: AUTHENTICATION_FILTER
+			l_user_filter: USER_HANDLER
+			l_methods: WSF_REQUEST_METHODS
+		do
+			create l_options_filter.make (router)
+			create l_authentication_filter
+			create l_user_filter
+
+			l_options_filter.set_next (l_authentication_filter)
+			l_authentication_filter.set_next (l_user_filter)
+
+			create l_methods
+			l_methods.enable_options
+			l_methods.enable_get
+			router.handle_with_request_methods ("/user/{userid}", create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (agent l_options_filter.execute), l_methods)
+		end
+
+	initialize_json
+			-- Initialize `json'.
+		once
+				-- See SHARED_EJSON, and the once function per thread `json'.
+			json.add_converter (create {JSON_USER_CONVERTER}.make)
+		end
+
+note
+	copyright: "2011-2015, Olivier Ligot, Jocelyn Fiat 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
--- a/examples/filter/src/resource/user_handler.e
+++ b/examples/filter/src/resource/user_handler.e
@@ -41,7 +41,7 @@ feature -- Basic operations
 		local
 			id :  STRING
 		do
-			if attached req.orig_path_info as orig_path then
+			if attached req.path_info as orig_path then
 				id := get_user_id_from_path (orig_path)
 				if attached retrieve_user (id) as l_user then
 					if l_user ~ req.execution_variable ("user") then
@@ -86,12 +86,14 @@ feature {NONE} -- Implementation
 	retrieve_user (id: STRING) : detachable USER
 			-- Retrieve the user by id if it exist, in other case, Void
 		do
-			if id.is_integer and then Db_access.users.has (id.to_integer) then
-				Result := db_access.users.item (id.to_integer)
+			if id.is_integer then
+				Result := db_access.user_by_id (id.to_integer)
+			else
+				Result := db_access.user_by_name (id)
 			end
 		end

 note
-	copyright: "2011-2013, Olivier Ligot, Jocelyn Fiat and others"
+	copyright: "2011-2015, Olivier Ligot, Jocelyn Fiat and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end