From 9f1940c46d0251916af64acc265807503da9525f Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <github@djoce.net>
Date: Fri, 16 Mar 2012 15:17:22 +0100
Subject: [PATCH] Applied wsf_extension creation, and classes moved from wsf to
 wsf_extension

---
 draft/library/server/request/rest/rest-safe.ecf              | 1 +
 draft/library/server/request/rest/rest.ecf                   | 1 +
 draft/library/server/request/rest/src/rest_request_handler.e | 2 ++
 examples/upload_image/src/image_uploader.e                   | 2 --
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/draft/library/server/request/rest/rest-safe.ecf b/draft/library/server/request/rest/rest-safe.ecf
index 2d839c29..b7463177 100644
--- a/draft/library/server/request/rest/rest-safe.ecf
+++ b/draft/library/server/request/rest/rest-safe.ecf
@@ -11,6 +11,7 @@
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="wsf" location="..\..\..\..\..\library\server\wsf\wsf-safe.ecf" readonly="false"/>
+		<library name="wsf_extension" location="..\..\..\..\..\library\server\wsf_extension\wsf_extension-safe.ecf" readonly="false"/>
 		<library name="http" location="..\..\..\..\..\library\protocol\http\http-safe.ecf"/>
 		<library name="uri_template" location="..\..\..\..\..\library\protocol\uri_template\uri_template-safe.ecf"/>
 		<cluster name="contrib" location=".\src\contrib\" recursive="true">
diff --git a/draft/library/server/request/rest/rest.ecf b/draft/library/server/request/rest/rest.ecf
index 49870876..b876c63a 100644
--- a/draft/library/server/request/rest/rest.ecf
+++ b/draft/library/server/request/rest/rest.ecf
@@ -10,6 +10,7 @@
 		<option warning="true" full_class_checking="true"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="wsf" location="..\..\..\..\..\library\server\wsf\wsf.ecf"/>
+		<library name="wsf_extension" location="..\..\..\..\..\library\server\wsf_extension\wsf_extension.ecf" readonly="false"/>
 		<library name="http" location="..\..\..\..\..\library\protocol\http\http.ecf"/>
 		<library name="uri_template" location="..\..\..\..\..\library\protocol\uri_template\uri_template.ecf"/>
 		<cluster name="contrib" location=".\src\contrib\" recursive="true">
diff --git a/draft/library/server/request/rest/src/rest_request_handler.e b/draft/library/server/request/rest/src/rest_request_handler.e
index 9226f108..bbf799bf 100644
--- a/draft/library/server/request/rest/src/rest_request_handler.e
+++ b/draft/library/server/request/rest/src/rest_request_handler.e
@@ -10,6 +10,8 @@ deferred class
 inherit
 	WSF_HANDLER [C]
 
+	WSF_HANDLER_HELPER
+
 feature -- Access
 
 	authentication_required (req: WSF_REQUEST): BOOLEAN
diff --git a/examples/upload_image/src/image_uploader.e b/examples/upload_image/src/image_uploader.e
index f5ac8b64..d4a001db 100644
--- a/examples/upload_image/src/image_uploader.e
+++ b/examples/upload_image/src/image_uploader.e
@@ -12,8 +12,6 @@ inherit
 
 	WSF_URI_TEMPLATE_ROUTED_SERVICE
 
-	WSF_HANDLER_HELPER
-
 create
 	make