Migrated most of the example and library to new design.

library/server/wsf/tests/src/test_wsf_request.e

@@ -17,14 +17,9 @@ inherit
 			on_clean
 		end
 
-	TEST_SERVICE
-		undefine
-			default_create
-		end
-
 feature {NONE} -- Events
 
-	web_app: detachable NINO_SERVICE
+	web_app: detachable NINO_SERVICE [TEST_EXECUTION]
 
 	port_number: INTEGER
 	base_url: detachable STRING
@@ -32,7 +27,7 @@ feature {NONE} -- Events
 	on_prepare
 			-- <Precursor>
 		local
-			app: NINO_SERVICE
+			app: NINO_SERVICE [TEST_EXECUTION]
 			wt: WORKER_THREAD
 			e: EXECUTION_ENVIRONMENT
 		do
@@ -43,7 +38,7 @@ feature {NONE} -- Events
 
 				port_number := 0
 				base_url := "/test/"
-				create app.make_custom (to_wgi_service, base_url)
+				create app.make_custom (base_url)
 				web_app := app
 
 				create wt.make (agent app.listen (port_number))

library/server/wsf/tests/src/test_wsf_response_test_suite.e

@@ -7,15 +7,13 @@ class
 	TEST_WSF_RESPONSE_TEST_SUITE
 
 inherit
-	WSF_TO_WGI_SERVICE
-		rename
-			default_create as df_wgi,
-			execute as execute_wgi
-		end
 	EQA_TEST_SET
 		redefine
 			on_prepare
-		select
+		end
+
+	WGI_EXPORTER
+		undefine
 			default_create
 		end
 
@@ -23,7 +21,6 @@ feature {NONE} -- Events
 
 	on_prepare
 		do
-			make_from_service (create {WSF_SERVICE_NULL})
 		end
 
 feature -- Test Cases
@@ -96,7 +93,7 @@ feature -- Test Cases
 		end
 
 
-		test_add_multiple_cookie_with_similar_cookie_name_2
+	test_add_multiple_cookie_with_similar_cookie_name_2
 		local
 			w_res: WSF_RESPONSE
 			l_cookie: WSF_COOKIE

library/server/wsf/tests/src/wsf_service_null.e

@@ -1,26 +0,0 @@
-note
-	description: "[
-	Mock implementation of the WGI_SERVICE interface.
-
-	Used for testing the ewf core and also web applications
-	]"
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	WSF_SERVICE_NULL
-
-inherit
-
-	WSF_SERVICE
-
-
-feature -- Execute	
-	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
-			-- Execute the request
-			-- See `req.input' for input stream
-    		--     `req.meta_variables' for the CGI meta variable
-			-- and `res' for output buffer
-		do
-		end
-end