Updated EWF Windows tools to install EWF into EiffelStudio source tree.

reason: the named character reference ' (the apostrophe, U+0027) was introduced in XML 1.0 but does not appear in HTML. Authors should therefore use ' instead of ' to work as expected in HTML 4 user agents.

contrib/library/network/server/nino/package.iron

@@ -8,7 +8,8 @@ note
 	title: Eiffel Nino Web Server
 	description: Simple HTTPd server written in Eiffel
 	tags: web, httpd, server
+	copyright: Javier Velilla, Jocelyn Fiat and Eiffel Software.
 	license: Eiffel Forum v2
-	copyright: Javier Velilla, Jocelyn Fiat.
+	link[license]: http://www.eiffel.com/licensing/forum.txt
 
 end

examples/restbucksCRUD/restbucks-safe.ecf

@@ -10,11 +10,6 @@
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="connector_standalone" location="..\..\library\server\ewsgi\connectors\standalone\standalone-safe.ecf" readonly="false">
-			<option debug="true">
-				<debug name="standalone" enabled="true"/>
-			</option>
-		</library>
 		<library name="conneg" location="..\..\library\network\protocol\content_negotiation\conneg-safe.ecf"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf" readonly="false"/>
 		<library name="default_standalone" location="..\..\library\server\wsf\default\standalone-safe.ecf" readonly="false"/>

examples/simple_file/service_file.ecf

@@ -7,7 +7,6 @@
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="connector_standalone" location="..\..\library\server\ewsgi\connectors\standalone\standalone-safe.ecf"/>
 		<library name="default_standalone" location="..\..\library\server\wsf\default\standalone-safe.ecf"/>
 		<library name="http" location="..\..\library\network\protocol\http\http-safe.ecf"/>
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf"/>

examples/upload_image/upload_image-safe.ecf

@@ -13,11 +13,6 @@
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="connector_standalone" location="..\..\library\server\ewsgi\connectors\standalone\standalone-safe.ecf" readonly="false" use_application_options="true">
-			<option>
-				<assertions precondition="true" check="true" invariant="true" supplier_precondition="true"/>
-			</option>
-		</library>
 		<library name="default_standalone" location="..\..\library\server\wsf\default\standalone-safe.ecf" readonly="false" use_application_options="true"/>
 		<library name="encoder" location="..\..\library\text\encoder\encoder-safe.ecf" readonly="false"/>
 		<library name="http" location="..\..\library\network\protocol\http\http-safe.ecf" readonly="false"/>

library/network/http_client/package.iron

@@ -3,13 +3,25 @@ package http_client
 project
 	http_client = "http_client-safe.ecf"
 	http_client = "http_client.ecf"
+	libcurl_http_client = "libcurl_http_client-safe.ecf"
+	libcurl_http_client = "libcurl_http_client.ecf"
+	net_http_client = "net_http_client-safe.ecf"
+	net_http_client = "net_http_client.ecf"
 
 note
---	title: 
+	title: HTTP client
---	description: 
+	description:  "[
---	tags: 
+			Provides simple routines to perform http requests, and get associated response.
---	license: 
+			It has two implementations:
---	copyright: 
+				- using Eiffel cURL (i.e libcurl)
---	link[doc]: "Documentation" http:// 
+				- using EiffelNET (and the EiffelNET SSL extension)
+		]"
+	collection:EWF
+	tags: http,client,network,request,web,curl,EWF
+	copyright: 1984-2016 Eiffel Software and others
+	license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
+	link[license]: http://www.eiffel.com/licensing/forum.txt
+	link[source]: "github" https://github.com/EiffelWebFramework/EWF/tree/master/library/network/http_client
+	link[doc]: "Documentation" https://github.com/EiffelWebFramework/EWF/tree/master/library/network/http_client/README.md
 
 end

library/network/protocol/content_negotiation/package.iron

@@ -5,11 +5,16 @@ project
 	conneg = "conneg.ecf"
 
 note
---	title: 
+	title: CONneg Content Negotiation
---	description: 
+	description: "[
---	tags: 
+			CONneg is a library that provides utilities to select the best repesentation of a resource for a client where there are multiple representations available.
---	license: 
+		]"
---	copyright: 
+	collection: EWF
---	link[doc]: "Documentation" http:// 
+	tags: content,accept,conneg,negotiation,EWF,web,request
+	copyright: 2011-2016, Javier Velilla, Jocelyn Fiat, Eiffel Software and others
+	license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
+	link[license]: http://www.eiffel.com/licensing/forum.txt
+	link[source]: "github" https://github.com/EiffelWebFramework/EWF/tree/master/library/network/protocol/content_negotiation
+	link[doc]: "Documentation" https://github.com/EiffelWebFramework/EWF/tree/master/library/network/protocol/content_negotiation/README.md
 
 end

library/network/protocol/http/package.iron

@@ -5,11 +5,22 @@ project
 	http = "http.ecf"
 
 note
---	title: 
+	title: HTTP protocol
---	description: 
+	description: "[
---	tags: 
+			Collection of interfaces related to HTTP protocol:
---	license: 
+				- header
---	copyright: 
+				- status codes, request methods
---	link[doc]: "Documentation" http:// 
+				- content type, media type, mime type.
+				- cookie
+				- date used in web protocol
+				- file extension mime mapping
+		]"
+	collection: EWF
+	tags: http,web,header,status,method,type,mime,cookie
+	license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
+	copyright: 2011-2016, Jocelyn Fiat, Eiffel Software and others
+	link[license]: http://www.eiffel.com/licensing/forum.txt
+	link[source]: "github" https://github.com/EiffelWebFramework/EWF/tree/master/library/network/protocol/http
+	link[doc]: "Documentation" https://github.com/EiffelWebFramework/EWF/tree/master/library/network/protocol/http/README.md
 
 end

library/runtime/process/notification_email/package.iron

@@ -5,11 +5,21 @@ project
 	notification_email = "notification_email.ecf"
 
 note
---	title: 
+	title: Notification Email
---	description: 
+	description: "[
---	tags: 
+			Abstract interface to send message via various mailers:
---	license: 
+				- smtp
---	copyright: 
+				- sendmail
---	link[doc]: "Documentation" http:// 
+				- external script
+				- store on local file
+				- ...
+		]"
+	collection: EWF
+	tags: message,smtp,sendmail,mailer
+	copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
+	link[license]: http://www.eiffel.com/licensing/forum.txt
+	link[source]: "github" https://github.com/EiffelWebFramework/EWF/tree/master/library/runtime/process/notification_email
 
 end
+

library/security/openid/package.iron

@@ -3,14 +3,17 @@ package openid
 project
 	openid = "consumer/openid.ecf"
 	openid = "consumer/openid-safe.ecf"
-	demo = "consumer/demo/demo-safe.ecf"
 
 note
 	title: Eiffel OpenID
-	description: OpenID library (for now only consumer)
+	description: OpenID consumer library 
-	tags: openid,security
+	tags: openid,security,web,authentication,sso
 	license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
---	copyright: 
+	copyright: 2011-2016, Jocelyn Fiat, Eiffel Software and others
---	link[doc]: "Documentation" http:// 
+	license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
+	link[license]: http://www.eiffel.com/licensing/forum.txt
+	link[source]: "github" https://github.com/EiffelWebFramework/EWF/tree/master/library/security/http_authorization
+	link[doc]: "Documentation" https://github.com/EiffelWebFramework/EWF/tree/master/library/security/http_authorization/README.md
 
 end
+

library/server/authentication/http_authorization/package.iron

@@ -5,11 +5,16 @@ project
 	http_authorization = "http_authorization.ecf"
 
 note
---	title: 
+	title: HTTP Authorization
---	description: 
+	description: "[
---	tags: 
+			Class to manipulate HTTP 'Authorization' header value.
---	license: 
+		]"
---	copyright: 
+	collection: EWF
---	link[doc]: "Documentation" http:// 
+	tags: http,authorization,authentication,web
+	copyright: 2011-2016, Jocelyn Fiat, Eiffel Software and others
+	license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
+	link[license]: http://www.eiffel.com/licensing/forum.txt
+	link[source]: "github" https://github.com/EiffelWebFramework/EWF/tree/master/library/server/authentication/http_authorization
 
 end
+

library/server/ewsgi/package.iron

@@ -3,21 +3,28 @@ package ewsgi
 project
 	ewsgi = "ewsgi-safe.ecf"
 	ewsgi = "ewsgi.ecf"
-	ewsgi_spec = "ewsgi_spec-safe.ecf"
-	ewsgi_spec = "ewsgi_spec.ecf"
 	connector_cgi = "connectors/cgi/cgi-safe.ecf"
 	connector_cgi = "connectors/cgi/cgi.ecf"
 	connector_libfcgi = "connectors/libfcgi/libfcgi-safe.ecf"
 	connector_libfcgi = "connectors/libfcgi/libfcgi.ecf"
-	connector_nino = "connectors/nino/nino-safe.ecf"
-	connector_nino = "connectors/nino/nino.ecf"
 	connector_null = "connectors/null/null-safe.ecf"
 	connector_null = "connectors/null/null.ecf"
+	connector_standalone = "connectors/standalone/standalone-safe.ecf"
+	connector_standalone = "connectors/standalone/standalone.ecf"
+	httpd = "connectors/standalone/src/httpd/httpd-safe.ecf"
+	httpd = "connectors/standalone/src/httpd/httpd.ecf"
 
 note
 	title: EWSGI
-	description: EWSGI specification, and a few connectors.
+	description: "[
-	tags: web, httpd, ewf
+			Eiffel Web Server Gateway Interface (EWSGI) specification, and a few connectors.
-	license: Eiffel Forum v2
+		]"
-
+	collection: EWF
+	tags: ewsgi,cgi,web,httpd,ewf
+	copyright: 2011-2016, Jocelyn Fiat, Eiffel Software and others
+	license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
+	link[license]: http://www.eiffel.com/licensing/forum.txt
+	link[source]: "github" https://github.com/EiffelWebFramework/EWF/tree/master/library/server/ewsgi
+	link[doc]: "Documentation" https://github.com/EiffelWebFramework/EWF/tree/master/library/server/ewsgi/doc
 end
+

library/server/libfcgi/package.iron

@@ -0,0 +1,25 @@
+package libfcgi
+
+setup
+	compile_library = Clib
+
+project
+	libfcgi = "libfcgi-safe.ecf"
+	libfcgi = "libfcgi.ecf"
+
+note
+	title: Eiffel libfcgi wrapper
+	description: "[
+			Wrapper on modified libfcgi.
+			(modification: added 64 bits support)
+			It brings implementation for FCGI protocol.
+		]"
+	collection: EWF
+	tags: fcgi,libfcgi,cgi,http,web,ewf
+	copyright: 2011-2016, Jocelyn Fiat, Javier Velilla, Eiffel Software and others
+	license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
+	link[license]: http://www.eiffel.com/licensing/forum.txt
+	link[source]: "Github" https://github.com/EiffelWebFramework/EWF/library/server/libfcgi
+	link[doc]: "Documentation" http://eiffelwebframework.github.io/EWF/
+
+end

library/server/wsf/package.iron

@@ -1,3 +1,14 @@
+note
+	title: Web Server Foundation
+	description: Core of the Eiffel Web Framework, used to build web server application.
+	tags: ewf,server,httpd,request,connector
+	license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
+	link[license]: https://github.com/EiffelWebFramework/EWF/blob/master/LICENSE
+	link[source]: "Github" https://github.com/EiffelWebFramework/EWF
+	link[doc]: "Documentation" http://eiffelwebframework.github.io/EWF/
+
+end
+
 package wsf
 
 project
@@ -11,29 +22,35 @@ project
 	wsf_router_context = "wsf_router_context.ecf"
 	wsf_session = "wsf_session-safe.ecf"
 	wsf_session = "wsf_session.ecf"
-	wsf_all = "connector/all-safe.ecf"
 	wsf_cgi = "connector/cgi-safe.ecf"
 	wsf_cgi = "connector/cgi.ecf"
 	wsf_libfcgi = "connector/libfcgi-safe.ecf"
 	wsf_libfcgi = "connector/libfcgi.ecf"
-	wsf_nino = "connector/nino-safe.ecf"
-	wsf_nino = "connector/nino.ecf"
 	wsf_openshift = "connector/openshift-safe.ecf"
 	default_cgi = "default/cgi-safe.ecf"
 	default_cgi = "default/cgi.ecf"
 	default_libfcgi = "default/libfcgi-safe.ecf"
 	default_libfcgi = "default/libfcgi.ecf"
-	default_nino = "default/nino-safe.ecf"
-	default_nino = "default/nino.ecf"
 	default_openshift = "default/openshift-safe.ecf"
+	wsf_standalone = "connector/standalone-safe.ecf"
+	wsf_standalone = "connector/standalone.ecf"
+	default_standalone = "default/standalone-safe.ecf"
+	default_standalone = "default/standalone.ecf"
 
 note
 	title: Web Server Foundation
-	description: Core of the Eiffel Web Framework, used to build web server application.
+	description: "[
-	tags: ewf,server,httpd,request,connector
+			Core of the Eiffel Web Framework (EWF).
+			Provide the request, response, router, ... interfaces.
+			The foundation to build web server application.
+		]"
+	tags: ewf,server,httpd,request,connector,web
+	collection: EWF
+	copyright: 2011-2016, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others
 	license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
-	link[license]: https://github.com/EiffelWebFramework/EWF/blob/master/LICENSE
+	link[license]: http://www.eiffel.com/licensing/forum.txt
-	link[source]: "Github" https://github.com/EiffelWebFramework/EWF
+	link[source]: "Github" https://github.com/EiffelWebFramework/EWF/library/server/wsf
 	link[doc]: "Documentation" http://eiffelwebframework.github.io/EWF/
 
 end
+

library/text/encoder/package.iron

@@ -0,0 +1,26 @@
+package encoder
+
+project
+	encoder = "encoder-safe.ecf"
+	encoder = "encoder.ecf"
+
+note
+	title: Text encoders
+	description: "[
+			Text encoders used in web technologies:
+				- HTML encoder
+				- XML encoder
+				- JSON encoder
+				- UTF8
+				- BASE64
+		]"
+	collection: EWF
+	tags: html,xml,percent encoding,web,json,utf
+	copyright: 2011-2016, Jocelyn Fiat, Eiffel Software and others
+	license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
+	link[license]: http://www.eiffel.com/licensing/forum.txt
+	link[source]: "Github" https://github.com/EiffelWebFramework/EWF/library/text/encoder
+	link[doc]: "Documentation" https://github.com/EiffelWebFramework/EWF/blob/master/library/text/encoder/README.md
+
+end
+

library/text/encoder/src/html_encoder.e

@@ -61,7 +61,11 @@ feature -- Encoder
 						Result.extend (c)
 					when '%"' then Result.append_string (""")
 					when '&' then Result.append_string ("&")
-					when '%'' then Result.append_string ("'")
+					when '%'' then Result.append_string ("'")
+						-- The named character reference ' (the apostrophe, U+0027) 
+						-- was introduced in XML 1.0 but does not appear in HTML. 
+						-- Authors should therefore use ' instead of ' 
+						-- to work as expected in HTML 4 user agents.
 					when '<' then Result.append_string ("&lt;")
 					when '>' then Result.append_string ("&gt;")
 					else

library/text/parser/feed/package.iron

@@ -0,0 +1,19 @@
+package feed
+
+project
+	feed = "feed-safe.ecf"
+	feed = "feed.ecf"
+
+note
+	title: Eiffel FEED parser
+	description: "[
+			RSS2.0 and ATOM feed parser.
+			Feed visitor including HTML generation from FEED Eiffel objects.
+		]"
+	tags: rss,atom,feed,html,generator,parser
+	copyright: 2011-2016, Jocelyn Fiat, Eiffel Software and others
+	license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
+	link[license]: http://www.eiffel.com/licensing/forum.txt
+	link[source]: "github" https://github.com/EiffelWebFramework/EWF/tree/master/library/text/parser/feed
+
+end

library/text/parser/uri_template/package.iron

@@ -5,11 +5,20 @@ project
 	uri_template = "uri_template.ecf"
 
 note
---	title: 
+	title: URI Template
---	description: 
+	description: "[
---	tags: 
+			Implement URI Template as described at http://tools.ietf.org/rfc/rfc6570.txt
---	license: 
+
---	copyright: 
+			Support for URI template string expansion
---	link[doc]: "Documentation" http:// 
+			But also partial URI Template matching
+		]"
+	collection: EWF
+	tags: uri template,router,generator,url
+	copyright: 2011-2016, Jocelyn Fiat, Javier Velilla, Eiffel Software and others
+	license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
+	link[license]: http://www.eiffel.com/licensing/forum.txt
+	link[source]: "github" https://github.com/EiffelWebFramework/EWF/tree/master/library/text/parser/uri_template
+	link[doc]: "Documentation" https://github.com/EiffelWebFramework/EWF/tree/master/library/text/parser/uri_template/README.md
 
 end
+

library/utility/general/error/package.iron

@@ -9,9 +9,13 @@ note
 	description: "[
 			Errors and associated handler, to manage errors and also provides a way to synchronize one or many error handlers. 
 			This is convenient to propagate error from a layer to another without adding unwanted dependencies.
-	tags: error
+		]"
+	collection: EWF
+	tags: error,framework
 	license: Eiffel Forum License v2
 	copyright: Jocelyn Fiat, Eiffel Software and others.
 	link[license]: http://www.eiffel.com/licensing/forum.txt
+	link[source]: "github" https://github.com/EiffelWebFramework/EWF/tree/master/library/utility/general/error 
 
 end
+

tools/bin/ecf_tool.bat

@@ -11,9 +11,9 @@ if "%ECF_TOOL_PATH%" == "" goto SEARCH_ECF_TOOL
 goto START
 
 :SEARCH_ECF_TOOL
-for %%f in (ecf_tool.exe) do (
+:: for %%f in (ecf_tool.exe) do (
-    if exist "%%~dp$PATH:f" set ECF_TOOL_PATH="%%~dp$PATH:f"
+::		if exist "%%~dp$PATH:f" set ECF_TOOL_PATH="%%~dp$PATH:f"
- )
+:: )
 if "%ECF_TOOL_PATH%" == "" goto BUILD_ECF_TOOL
 echo Using ecf_tool.exe from %ECF_TOOL_PATH%
 goto START

tools/install_ewf.bat

@@ -147,7 +147,7 @@ set TMP_ECF_TOOL_CMD=%~dp0\bin\ecf_tool.bat
 goto call_ecf_update
 
 :call_ecf_update
-call %TMP_ECF_TOOL_CMD% updater --root %TMP_TARGET_DIR% --force %2 %3 %4 %5 %6 %7 %8 %9 %TMP_TARGET_DIR%\contrib
+call %TMP_ECF_TOOL_CMD% updater --root %TMP_TARGET_DIR% --include %TMP_TARGET_DIR%\library --include %TMP_TARGET_DIR%\contrib\library --force %TMP_TARGET_DIR%\contrib
 
 :end
 del %TMP_EXCLUDE%