Added SCOOP support for WSF.

WSF_SERVICE is deeply changed, and addition of WSF_EXECUTION. Todo: code cleaning, removing useless things.
2015-03-24 23:21:49 +01:00
parent ddf73077b3
commit bf0eb9a02d
51 changed files with 951 additions and 316 deletions
--- a/examples/debug/debug.ecf
+++ b/examples/debug/debug.ecf
@@ -18,12 +18,20 @@
 	</target>
 	<target name="debug_any" extends="common">
 		<root class="EWF_DEBUG_SERVER" feature="make_and_launch"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="cgi" location="..\..\library\server\wsf\connector\cgi-safe.ecf" readonly="false"/>
-		<library name="libfcgi" location="..\..\library\server\wsf\connector\libfcgi-safe.ecf"/>
-		<library name="nino" location="..\..\library\server\wsf\connector\nino-safe.ecf"/>
+		<library name="httpd" location="..\..\library\server\wsf\connector\httpd-safe.ecf" readonly="false"/>
+		<library name="libfcgi" location="..\..\library\server\wsf\connector\libfcgi-safe.ecf" readonly="false"/>
+		<library name="nino" location="..\..\library\server\wsf\connector\nino-safe.ecf" readonly="false"/>
 		<cluster name="launcher" location=".\launcher\any\" recursive="true"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
+	<target name="debug_httpd" extends="common">
+		<root class="EWF_DEBUG_SERVER" feature="make_and_launch"/>
+		<library name="default_httpd" location="..\..\library\server\wsf\default\httpd-safe.ecf" readonly="false"/>
+		<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
+	</target>
 	<target name="debug_nino" extends="common">
 		<root class="EWF_DEBUG_SERVER" feature="make_and_launch"/>
 		<library name="default_nino" location="..\..\library\server\wsf\default\nino-safe.ecf"/>
@@ -32,7 +40,7 @@
 	</target>
 	<target name="debug_cgi" extends="common">
 		<root class="EWF_DEBUG_SERVER" feature="make_and_launch"/>
-		<library name="default_cgi" location="..\..\library\server\wsf\default\cgi-safe.ecf"/>
+		<library name="default_cgi" location="..\..\library\server\wsf\default\cgi-safe.ecf" readonly="false"/>
 		<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
--- a/examples/debug/launcher/any/application_launcher.e
+++ b/examples/debug/launcher/any/application_launcher.e
@@ -8,10 +8,10 @@ note
 	revision: "$Revision: 36 $"

 class
-	APPLICATION_LAUNCHER
+	APPLICATION_LAUNCHER [G -> WSF_EXECUTION create make end]

 inherit
-	APPLICATION_LAUNCHER_I
+	APPLICATION_LAUNCHER_I [G]

 feature -- Custom

--- a/examples/debug/launcher/any/application_launcher_i.e
+++ b/examples/debug/launcher/any/application_launcher_i.e
@@ -10,24 +10,26 @@ note
 	revision: "$Revision: 36 $"

 deferred class
-	APPLICATION_LAUNCHER_I
+	APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]

 inherit
 	SHARED_EXECUTION_ENVIRONMENT

 feature -- Execution

-	launch (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+	launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
 		local
 			nature: like launcher_nature
 		do
 			nature := launcher_nature
-			if nature = Void or else nature = nature_nino then
-				launch_nino (a_service, opts)
+			if nature = Void or else nature = nature_httpd then
+				launch_httpd (opts)
+			elseif nature = nature_nino then
+				launch_nino (opts)
 			elseif nature = nature_cgi then
-				launch_cgi (a_service, opts)
+				launch_cgi (opts)
 			elseif nature = nature_libfcgi then
-				launch_libfcgi (a_service, opts)
+				launch_libfcgi (opts)
 			else
 				-- bye bye
 				(create {EXCEPTIONS}).die (-1)
@@ -43,14 +45,16 @@ feature {NONE} -- Access
 			--| and we could use WSF_DEFAULT_SERVICE_LAUNCHER to configure this at compilation time.
 		local
 			p: PATH
-			l_entry_name: READABLE_STRING_32
 			ext: detachable READABLE_STRING_32
 		do
 			create p.make_from_string (execution_environment.arguments.command_name)
 			if attached p.entry as l_entry then
-				ext := l_entry.extension 
+				ext := l_entry.extension
 			end
 			if ext /= Void then
+				if ext.same_string (nature_httpd) then
+					Result := nature_httpd
+				end
 				if ext.same_string (nature_nino) then
 					Result := nature_nino
 				end
@@ -61,39 +65,51 @@ feature {NONE} -- Access
 					Result := nature_libfcgi
 				end
 			end
+			Result := nature_httpd
+		end
+
+feature {NONE} -- nino		
+
+	nature_httpd: STRING = "httpd"
+
+	launch_httpd (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+		local
+			launcher: WSF_HTTPD_SERVICE_LAUNCHER [G]
+		do
+			create launcher.make_and_launch (opts)
 		end

 feature {NONE} -- nino		

 	nature_nino: STRING = "nino"

-	launch_nino (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+	launch_nino (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
 		local
-			launcher: WSF_NINO_SERVICE_LAUNCHER
+			launcher: WSF_NINO_SERVICE_LAUNCHER [G]
 		do
-			create launcher.make_and_launch (a_service, opts)
+			create launcher.make_and_launch (opts)
 		end

 feature {NONE} -- cgi

 	nature_cgi: STRING = "cgi"

-	launch_cgi (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+	launch_cgi (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
 		local
-			launcher: WSF_CGI_SERVICE_LAUNCHER
+			launcher: WSF_CGI_SERVICE_LAUNCHER [G]
 		do
-			create launcher.make_and_launch (a_service, opts)
+			create launcher.make_and_launch (opts)
 		end

 feature {NONE} -- libfcgi

 	nature_libfcgi: STRING = "libfcgi"

-	launch_libfcgi (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+	launch_libfcgi (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
 		local
-			launcher: WSF_LIBFCGI_SERVICE_LAUNCHER
+			launcher: WSF_LIBFCGI_SERVICE_LAUNCHER [G]
 		do
-			create launcher.make_and_launch (a_service, opts)
+			create launcher.make_and_launch (opts)
 		end


--- a/examples/debug/launcher/default/application_launcher.e
+++ b/examples/debug/launcher/default/application_launcher.e
@@ -8,10 +8,10 @@ note
 	revision: "$Revision: 36 $"

 class
-	APPLICATION_LAUNCHER
+	APPLICATION_LAUNCHER [G -> WSF_EXECUTION create make end]

 inherit
-	APPLICATION_LAUNCHER_I
+	APPLICATION_LAUNCHER_I [G]

 feature -- Custom

--- a/examples/debug/launcher/default/application_launcher_i.e
+++ b/examples/debug/launcher/default/application_launcher_i.e
@@ -10,15 +10,15 @@ note
 	revision: "$Revision: 36 $"

 deferred class
-	APPLICATION_LAUNCHER_I
+	APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]

 feature -- Execution

-	launch (a_service: WSF_SERVICE; opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+	launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
 		local
-			launcher: WSF_SERVICE_LAUNCHER
+			launcher: WSF_SERVICE_LAUNCHER [G]
 		do
-			create {WSF_DEFAULT_SERVICE_LAUNCHER} launcher.make_and_launch (a_service, opts)
+			create {WSF_DEFAULT_SERVICE_LAUNCHER [G]} launcher.make_and_launch (opts)
 		end

 end
--- a/examples/debug/src/ewf_debug_execution.e
+++ b/examples/debug/src/ewf_debug_execution.e
@@ -0,0 +1,27 @@
+note
+	description: "Summary description for {EWF_DEBUG_EXECUTION}."
+	author: ""
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	EWF_DEBUG_EXECUTION
+
+inherit
+	WSF_EXECUTION
+
+create
+	make
+
+feature -- Execution
+
+	execute
+		local
+			dbg: WSF_DEBUG_HANDLER
+		do
+			response.put_error ("DEBUG uri=" + request.request_uri + "%N")
+			create dbg.make
+			dbg.execute_starts_with ("", request, response)
+		end
+
+end
--- a/examples/debug/src/ewf_debug_server.e
+++ b/examples/debug/src/ewf_debug_server.e
@@ -14,7 +14,7 @@ inherit
 			initialize
 		end

-	APPLICATION_LAUNCHER
+	APPLICATION_LAUNCHER [EWF_DEBUG_EXECUTION]

 create
 	make_and_launch
@@ -30,14 +30,14 @@ feature {NONE} -- Initialization
 --			set_service_option ("base", "/www-debug/debug_service.fcgi/")
 		end

-	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
-		local
-			dbg: WSF_DEBUG_HANDLER
-		do
-			res.put_error ("DEBUG" + req.request_uri + "%N")
-			create dbg.make
-			dbg.execute_starts_with ("", req, res)
-		end
+--	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
+--		local
+--			dbg: WSF_DEBUG_HANDLER
+--		do
+--			res.put_error ("OH NO uri=" + req.request_uri + "%N")
+--			create dbg.make
+--			dbg.execute_starts_with ("", req, res)
+--		end

 end

--- a/examples/simple/simple.ecf
+++ b/examples/simple/simple.ecf
@@ -13,6 +13,14 @@
 		<library name="http" location="..\..\library\network\protocol\http\http-safe.ecf"/>
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf"/>
 	</target>
+	<target name="simple_httpd" extends="common">
+		<root class="APPLICATION" feature="make_and_launch"/>
+		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<library name="default_httpd" location="..\..\library\server\wsf\default\httpd-safe.ecf"/>
+		<cluster name="simple" location=".\" recursive="true"/>
+	</target>
 	<target name="simple_nino" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
 		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
--- a/examples/simple_file/home.html
+++ b/examples/simple_file/home.html
@@ -1,13 +1,11 @@
 <html>
 	<head>
-		Eiffel REST services
+		<title>EWF simple_file example</title>
 	</head>

 	<body>
-		Welcome to the Eiffel REST services site, here you will find a lot of <br/>
-		resources about REST and our solution
-
-
+		<h1>EWF simple_file example</h1>
+		This is a static html file served by EWF.
 	</body>

-</html>
+</html>
--- a/examples/simple_file/service_file.e
+++ b/examples/simple_file/service_file.e
@@ -7,18 +7,20 @@ class
 	SERVICE_FILE

 inherit
-	WSF_DEFAULT_SERVICE
+	WSF_DEFAULT_SERVICE [SERVICE_FILE_EXECUTION]
+		redefine
+			initialize
+		end

 create
 	make_and_launch

 feature {NONE} -- Initialization

-	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
-		local
-			f: WSF_FILE_RESPONSE
+	initialize
 		do
-			create f.make_html ("home.html")
-			res.send (f)
+			Precursor
+			set_service_option ("port", 9090)
 		end
+
 end
--- a/examples/simple_file/service_file.ecf
+++ b/examples/simple_file/service_file.ecf
@@ -6,8 +6,8 @@
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="connector_nino" location="..\..\library\server\ewsgi\connectors\nino\nino-safe.ecf"/>
-		<library name="default_nino" location="..\..\library\server\wsf\default\nino-safe.ecf"/>
+		<library name="connector_httpd" location="..\..\library\server\ewsgi\connectors\httpd\httpd-safe.ecf"/>
+		<library name="default_httpd" location="..\..\library\server\wsf\default\httpd-safe.ecf"/>
 		<library name="http" location="../../library/network/protocol/http/http-safe.ecf"/>
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf"/>
 		<cluster name="service_file" location=".\" recursive="true">
--- a/examples/simple_file/service_file_execution.e
+++ b/examples/simple_file/service_file_execution.e
@@ -0,0 +1,26 @@
+note
+	description: "Summary description for {SERVICE_FILE_EXECUTION}."
+	author: ""
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	SERVICE_FILE_EXECUTION
+
+inherit
+	WSF_EXECUTION
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	execute
+		local
+			f: WSF_FILE_RESPONSE
+		do
+			create f.make_html ("home.html")
+			response.send (f)
+		end
+
+end