Ensured that EWF compiles with 7.2

(note about ecf version
   1-10-0 void_safety="all" <-->  1-11-0 void_safety="transitional"
   1-10-0 void_safety="all" <---  1-11-1 void_safety="all"
)

.gitignore

@@ -3,5 +3,4 @@ tests/temp/
 .svn/
 *.swp
 *~
-*.scm
 *#

CONTRIBUTING.md

@@ -1,142 +0,0 @@
-# Contributing to this project
-
-Please take a moment to review this document in order to make the contribution
-process easy and effective for everyone involved.
-
-Following these guidelines helps to communicate that you respect the time of
-the developers managing and developing this open source project. In return,
-they should reciprocate that respect in addressing your issue or assessing
-patches and features.
-
-
-## Using the issue tracker
-
-The issue tracker is the preferred channel for [bug reports](#bugs),
-[features requests](#features) and [submitting pull
-requests](#pull-requests), but please respect the following restrictions:
-
-* Please **do not** use the issue tracker for personal support requests (use
-  [Stack Overflow](http://stackoverflow.com) or IRC).
-
-* Please **do not** derail or troll issues. Keep the discussion on topic and
-  respect the opinions of others.
-
-
-<a name="bugs"></a>
-## Bug reports
-
-A bug is a _demonstrable problem_ that is caused by the code in the repository.
-Good bug reports are extremely helpful - thank you!
-
-Guidelines for bug reports:
-
-1. **Use the GitHub issue search** &mdash; check if the issue has already been
-   reported.
-
-2. **Check if the issue has been fixed** &mdash; try to reproduce it using the
-   latest `master` or development branch in the repository.
-
-3. **Isolate the problem** &mdash; ideally create a [reduced test
-   case](http://css-tricks.com/6263-reduced-test-cases/) and a live example.
-
-A good bug report shouldn't leave others needing to chase you up for more
-information. Please try to be as detailed as possible in your report. What is
-your environment? What steps will reproduce the issue? What browser(s) and OS
-experience the problem? What would you expect to be the outcome? All these
-details will help people to fix any potential bugs.
-
-Example:
-
-> Short and descriptive example bug report title
->
-> A summary of the issue and the browser/OS environment in which it occurs. If
-> suitable, include the steps required to reproduce the bug.
->
-> 1. This is the first step
-> 2. This is the second step
-> 3. Further steps, etc.
->
-> `<url>` - a link to the reduced test case
->
-> Any other information you want to share that is relevant to the issue being
-> reported. This might include the lines of code that you have identified as
-> causing the bug, and potential solutions (and your opinions on their
-> merits).
-
-
-<a name="features"></a>
-## Feature requests
-
-Feature requests are welcome. But take a moment to find out whether your idea
-fits with the scope and aims of the project. It's up to *you* to make a strong
-case to convince the project's developers of the merits of this feature. Please
-provide as much detail and context as possible.
-
-
-<a name="pull-requests"></a>
-## Pull requests
-
-Good pull requests - patches, improvements, new features - are a fantastic
-help. They should remain focused in scope and avoid containing unrelated
-commits.
-
-**Please ask first** before embarking on any significant pull request (e.g.
-implementing features, refactoring code, porting to a different language),
-otherwise you risk spending a lot of time working on something that the
-project's developers might not want to merge into the project.
-
-Please adhere to the coding conventions used throughout a project (indentation,
-accurate comments, etc.) and any other requirements (such as test coverage).
-
-Adhering to the following this process is the best way to get your work
-included in the project:
-
-1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork,
-   and configure the remotes:
-
-   ```bash
-   # Clone your fork of the repo into the current directory
-   git clone https://github.com/<your-username>/<repo-name>
-   # Navigate to the newly cloned directory
-   cd <repo-name>
-   # Assign the original repo to a remote called "upstream"
-   git remote add upstream https://github.com/<upstream-owner>/<repo-name>
-   ```
-
-2. If you cloned a while ago, get the latest changes from upstream:
-
-   ```bash
-   git checkout <dev-branch>
-   git pull upstream <dev-branch>
-   ```
-
-3. Create a new topic branch (off the main project development branch) to
-   contain your feature, change, or fix:
-
-   ```bash
-   git checkout -b <topic-branch-name>
-   ```
-
-4. Commit your changes in logical chunks. Please adhere to these [git commit
-   message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
-   or your code is unlikely be merged into the main project. Use Git's
-   [interactive rebase](https://help.github.com/articles/interactive-rebase)
-   feature to tidy up your commits before making them public.
-
-5. Locally merge (or rebase) the upstream development branch into your topic branch:
-
-   ```bash
-   git pull [--rebase] upstream <dev-branch>
-   ```
-
-6. Push your topic branch up to your fork:
-
-   ```bash
-   git push origin <topic-branch-name>
-   ```
-
-7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
-    with a clear title and description.
-
-**IMPORTANT**: By submitting a patch, you agree to allow the project owner to
-license your work under the same license as that used by the project.

README.md

@@ -3,27 +3,6 @@
 
 ## Overview
 
-The Eiffel Web Framework (EWF) provides Eiffel users with a layer to build anything on top of the http protocol such as websites, web API/services. 
-
-This layer is multi-platform: it can be set on Windows, Linux operating systems, and in addition it can run on top of any httpd servers such as Apache2, IIS, nginx, lighttpd. EWF includes as well a standalone httpd web server component, written in Eiffel, which enables users to run easily a web server on their machine, or even embed this component in any application written with Eiffel.
-
-Currently EWF offers a collection of Eiffel libraries designed to be integrated with each others, and among other functionalities, it give simple access to the request data, to handle content negotiation, url dispatcher, integrate with openid system, and so on. 
-
-There is a growing ecosystem around EWF, that provides useful components:
-* OpenID and OAuth consumer library
-* Various hypermedia format such as HAL, Collection+json, …
-* Websocket server and client
-* Template engine
-* API Auto-documentation with swagger
-* A simple experimental CMS.
-* ...
-
-So if you want to build a website, a web api, RESTful service, …or even if you want to consume other web api, EWF is a solution.
-
-EWF brings with it all the advantages of the Eiffel technology and tools with its powerful features such as Design by Contract, debugging, testing tools which enable to build efficient systems expected to be repeatedly refined, extended, and improved in a predictable and controllable way so as to become with time bugfree systems. Enjoy the full power of debugging your web server application from the IDE.
-
-## Project
-
 Official project site for Eiffel Web Framework:
 
 * http://eiffelwebframework.github.com/EWF/
@@ -35,21 +14,26 @@ For more information please have a look at the related wiki:
 For download, check
 * https://github.com/EiffelWebFramework/EWF/downloads
 
-Tasks and issues are managed with github issue system
-* See https://github.com/EiffelWebFramework/EWF/issues
-* And visual dashboard: https://waffle.io/eiffelwebframework/ewf
-* Forum/group post: https://groups.google.com/forum/#!forum/eiffel-web-framework
-
 ## Requirements
-* Compiling from EiffelStudio 13.11 to 15.05 and more recent version of the compiler.
-* Currently being developped using EiffelStudio 15.01 (on Windows, Linux)
-* Tested using EiffelStudio 15.01 with "jenkins" CI server (not anymore compatible with 6.8 due to use of `TABLE_ITERABLE')
+* Compiling from EiffelStudio 7.0
+* Developped using EiffelStudio 7.1 (on Windows, Linux)
+* Tested using EiffelStudio 7.1 with "jenkins" CI server (not anymore compatible with 6.8 due to use of `TABLE_ITERABLE')
 * The code have to allow __void-safe__ compilation and non void-safe system (see [more about void-safety](http://docs.eiffel.com/book/method/void-safe-programming-eiffel) )
 
 ## How to get the source code?
 
-Using git 
+Using git version >= 1.6.5
+* git clone --recursive https://github.com/EiffelWebFramework/EWF.git
+
+Otherwise, try
 * git clone https://github.com/EiffelWebFramework/EWF.git
+* cd Eiffel-Web-Framework
+* git submodule update --init
+* git submodule foreach --recursive git checkout master
+
+An alternative to the last 2 instructions is to use the script from tools folder:
+* cd tools
+* update_git_working_copy
 
 * And to build the required and related Clibs
   * cd contrib/ise_library/cURL
@@ -67,7 +51,7 @@ Using git
 ### protocol
 * __http__: HTTP related classes, constants for status code, content types, ... [read more](library/protocol/http)
 * __uri_template__: URI Template library (parsing and expander) [read more](library/protocol/uri_template)
-* __CONNEG__: Content negotiation library (Content-type Negociation) [read more](library/protocol/content_negotiation)
+* __CONNEG__: CONNEG library (Content-type Negociation) [read more](library/protocol/CONNEG)
 
 ### client
 * __http_client__: simple HTTP client based on cURL [read more](library/client/http_client)
@@ -75,6 +59,10 @@ Using git
 ### text
 * __encoder__: Various simpler encoders: base64, url-encoder, xml entities, html entities [read more](library/text/encoder)
 
+### crypto
+* eel
+* eapml
+
 ### Others
 * error: very simple/basic library to handle error
 
@@ -87,24 +75,6 @@ Using git
 ## Examples
 ..
 
-## Contributing to this project
-
-Anyone and everyone is welcome to contribute. Please take a moment to
-review the [guidelines for contributing](CONTRIBUTING.md).
-
-* [Bug reports](CONTRIBUTING.md#bugs)
-* [Feature requests](CONTRIBUTING.md#features)
-* [Pull requests](CONTRIBUTING.md#pull-requests)
-
-## Community
-
-Keep track of development and community news.
-
-* Follow [@EiffelWeb](https://twitter.com/EiffelWeb) on Twitter
-* [Forum](https://groups.google.com/forum/#!forum/eiffel-web-framework) on Google groups.
-* Follow our [page](https://plus.google.com/u/0/110650349519032194479) and [community](https://plus.google.com/communities/110457383244374256721) on Google+
-* Have a question that's not a feature request or bug report? [Ask on the mailing list](http://groups.google.com/group/eiffel-web-framework)
-
 
 For more information please have a look at the related wiki:
 * https://github.com/EiffelWebFramework/EWF/wiki

contrib/ise_library/build.eant

@@ -29,6 +29,7 @@
 
 	<target name="_build_tpl_" >
 		<argument name="_target_name" />
+		<geant target="${_target_name}" dir="cURL" file="build.eant" reuse_variables="true" />
 	</target>
 	
 </project>

contrib/library/network/server/nino/example/SimpleWebServer/application.e

@@ -1,44 +1,44 @@
-note
-	description : "nino application root class"
-	date        : "$Date$"
-	revision    : "$Revision$"
-
-class
-	APPLICATION
-
-inherit
-	ARGUMENTS
-
-	HTTP_SERVER_SHARED_CONFIGURATION
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	make
-			-- Run application.
-		local
-			l_server : HTTP_SERVER
-			l_cfg: HTTP_SERVER_CONFIGURATION
-			l_http_handler : HTTP_HANDLER
-		do
-			create l_cfg.make
-			l_cfg.http_server_port := 9_000
-			l_cfg.document_root := default_document_root
-			set_server_configuration (l_cfg)
-			debug ("nino")
-				l_cfg.set_is_verbose (True)
-			end
-
-			create l_server.make (l_cfg)
-			create {APPLICATION_CONNECTION_HANDLER} l_http_handler.make (l_server)
-			l_server.setup (l_http_handler)
-		end
-
-feature -- Access
-
-	default_document_root: STRING = "webroot"
-
-end
-
+note
+	description : "nino application root class"
+	date        : "$Date$"
+	revision    : "$Revision$"
+
+class
+	APPLICATION
+
+inherit
+	ARGUMENTS
+
+	HTTP_SERVER_SHARED_CONFIGURATION
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make
+			-- Run application.
+		local
+			l_server : HTTP_SERVER
+			l_cfg: HTTP_SERVER_CONFIGURATION
+			l_http_handler : HTTP_HANDLER
+		do
+			create l_cfg.make
+			l_cfg.http_server_port := 9_000
+			l_cfg.document_root := default_document_root
+			set_server_configuration (l_cfg)
+			debug ("nino")
+				l_cfg.set_is_verbose (True)
+			end
+
+			create l_server.make (l_cfg)
+			create {APPLICATION_CONNECTION_HANDLER} l_http_handler.make (l_server)
+			l_server.setup (l_http_handler)
+		end
+
+feature -- Access
+
+	default_document_root: STRING = "webroot"
+
+end
+

contrib/library/network/server/nino/example/SimpleWebServer/request/head_request_handler.e

@@ -1,115 +1,115 @@
-note
-	description: "Summary description for {HEAD_REQUEST_HANDLER}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	HEAD_REQUEST_HANDLER
-
-inherit
-
-	SHARED_DOCUMENT_ROOT
-
-	SHARED_URI_CONTENTS_TYPES
-
-	HTTP_REQUEST_HANDLER
-
-	HTTP_CONSTANTS
-
-feature
-
-
-	process
-			-- process the request and create an answer
-		local
-			fname: STRING
-			f: RAW_FILE
-			ctype, extension: STRING
-		do
-			fname := document_root_cell.item.twin
-			fname.append (request_uri)
-			debug
-				print ("URI name: " + fname )
-			end
-			create f.make (fname)
-			create answer.make
-			if f.exists then
-				extension := ct_table.extension (request_uri)
-				ctype := ct_table.content_types.item (extension)
-				-- TODO: This code could be improved to avoid string
-				-- comparisons
-				if ctype = Void then
-					process_default
-					answer.set_content_type ("text/html")
-				else
-					if ctype.is_equal ("text/html") then
-						process_text_file (f)
-					else
-						process_raw_file (f)
-					end
-					answer.set_content_type (ctype)
-				end
-			else
-				answer.set_status_code (not_found)
-				answer.set_reason_phrase (not_found_message)
-				answer.set_reply_text ("Not found on this server%N%R")
-			end
-		end
-
-	process_default
-			--
-			local
-				html : STRING
-			do
-  			 answer.set_reply_text ("")
-			 html := " <html> <head> <title> Micro HTTPD </title> " +
-				"	    </head>   " +
-				"       <body>    " +
-				" 		<h1> Welcome to Micro HTTPD! </h1> "+
-				" <p>  Default page  " +
-
-				" </p> " +
-				" </body> " +
-				" </html> "
-				answer.append_reply_text (html)
-			end
-
-
-	process_text_file (f: FILE)
-			-- send a text file reply
-		require
-			valid_f: f /= Void
-		do
-			f.open_read
-			from
-				answer.set_reply_text ("")
-				f.read_line
-			until f.end_of_file
-			loop
-				answer.append_reply_text (f.last_string)
-				answer.append_reply_text (crlf)
-				f.read_line
-			end
-			f.close
-		end
-
-	process_raw_file (f: FILE)
-			-- send a raw file reply
-		require
-			valid_f: f /= Void
-		do
-			-- this is not quite right....
-			f.open_read
-			from
-				answer.set_reply_text ("")
-			until f.end_of_file
-			loop
-				f.read_stream (1024)
-				answer.append_reply_text (f.last_string)
-			end
-			f.close
-		end
-
-
-end
+note
+	description: "Summary description for {HEAD_REQUEST_HANDLER}."
+	author: ""
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	HEAD_REQUEST_HANDLER
+
+inherit
+
+	SHARED_DOCUMENT_ROOT
+
+	SHARED_URI_CONTENTS_TYPES
+
+	HTTP_REQUEST_HANDLER
+
+	HTTP_CONSTANTS
+
+feature
+
+
+	process
+			-- process the request and create an answer
+		local
+			fname: STRING
+			f: RAW_FILE
+			ctype, extension: STRING
+		do
+			fname := document_root_cell.item.twin
+			fname.append (request_uri)
+			debug
+				print ("URI name: " + fname )
+			end
+			create f.make (fname)
+			create answer.make
+			if f.exists then
+				extension := ct_table.extension (request_uri)
+				ctype := ct_table.content_types.item (extension)
+				-- TODO: This code could be improved to avoid string
+				-- comparisons
+				if ctype = Void then
+					process_default
+					answer.set_content_type ("text/html")
+				else
+					if ctype.is_equal ("text/html") then
+						process_text_file (f)
+					else
+						process_raw_file (f)
+					end
+					answer.set_content_type (ctype)
+				end
+			else
+				answer.set_status_code (not_found)
+				answer.set_reason_phrase (not_found_message)
+				answer.set_reply_text ("Not found on this server%N%R")
+			end
+		end
+
+	process_default
+			--
+			local
+				html : STRING
+			do
+  			 answer.set_reply_text ("")
+			 html := " <html> <head> <title> Micro HTTPD </title> " +
+				"	    </head>   " +
+				"       <body>    " +
+				" 		<h1> Welcome to Micro HTTPD! </h1> "+
+				" <p>  Default page  " +
+
+				" </p> " +
+				" </body> " +
+				" </html> "
+				answer.append_reply_text (html)
+			end
+
+
+	process_text_file (f: FILE)
+			-- send a text file reply
+		require
+			valid_f: f /= Void
+		do
+			f.open_read
+			from
+				answer.set_reply_text ("")
+				f.read_line
+			until f.end_of_file
+			loop
+				answer.append_reply_text (f.last_string)
+				answer.append_reply_text (crlf)
+				f.read_line
+			end
+			f.close
+		end
+
+	process_raw_file (f: FILE)
+			-- send a raw file reply
+		require
+			valid_f: f /= Void
+		do
+			-- this is not quite right....
+			f.open_read
+			from
+				answer.set_reply_text ("")
+			until f.end_of_file
+			loop
+				f.read_stream (1024)
+				answer.append_reply_text (f.last_string)
+			end
+			f.close
+		end
+
+
+end

contrib/library/network/server/nino/example/SimpleWebServer/request/post_request_handler.e

@@ -1,53 +1,53 @@
-note
-	description: "Summary description for {POST_REQUEST_HANDLER}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	POST_REQUEST_HANDLER
-
-inherit
-	GET_REQUEST_HANDLER
-		redefine
-			process
-		end
-
-create
-	make
-
-feature -- Execution
-
-	process
-			-- process the request and create an answer
-		local
-			l_data: STRING
-			s: detachable STRING
-			n: INTEGER
-			sock: like socket
-		do
-			from
-				n := 1_024
-				sock := socket
-				if sock.socket_ok then
-					sock.read_stream_thread_aware (n)
-					s := sock.last_string
-				else
-					s := Void
-				end
-				create l_data.make_empty
-			until
-				s = Void or else s.count < n
-			loop
-				l_data.append_string (s)
-				if sock.socket_ok then
-					sock.read_stream_thread_aware (n)
-					s := sock.last_string
-				else
-					s := Void
-				end
-			end
-			Precursor
-		end
-
-end
+note
+	description: "Summary description for {POST_REQUEST_HANDLER}."
+	author: ""
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	POST_REQUEST_HANDLER
+
+inherit
+	GET_REQUEST_HANDLER
+		redefine
+			process
+		end
+
+create
+	make
+
+feature -- Execution
+
+	process
+			-- process the request and create an answer
+		local
+			l_data: STRING
+			s: detachable STRING
+			n: INTEGER
+			sock: like socket
+		do
+			from
+				n := 1_024
+				sock := socket
+				if sock.socket_ok then
+					sock.read_stream_thread_aware (n)
+					s := sock.last_string
+				else
+					s := Void
+				end
+				create l_data.make_empty
+			until
+				s = Void or else s.count < n
+			loop
+				l_data.append_string (s)
+				if sock.socket_ok then
+					sock.read_stream_thread_aware (n)
+					s := sock.last_string
+				else
+					s := Void
+				end
+			end
+			Precursor
+		end
+
+end

contrib/library/network/server/nino/example/SimpleWebServer/webroot/demo1/jquery.scrollTo-1.4.2/changes.txt

@@ -1,91 +1,91 @@
-1.4.2
-[Feature]
-- The plugin support percentages as target ('50%' or {top:'50%', left:'45%'})
-- Exposed the max() calculation as $.scrollTo.max
-[Enhancement]
-- Renamed $.fn.scrollable to $.fn._scrollable to avoid conflicts with other plugins
-[Fix]
-- Fixing max calculations for regular DOM elements
-
-1.4.1
-[Feature]
-- The target can be 'max' to scroll to the end while keeping it elegant.
-[Enhancement]
-- Default duration is 0 for jquery +1.3. Means sync animation
-- The plugin works on all major browsers, on compat & quirks modes, including iframes.
-- In addition to window/document, if html or body are received, the plugin will choose the right one.
-[Fix]
-- The plugin accepts floating numbers, Thanks Ramin
-- Using jQuery.nodeName where neccessary so that this works on xml+xhtml
-- The max() internal function wasn't completely accurrate, now it is 98% (except for IE on quirks mode and it's not too noticeable).
-
-1.4
-[Fix]
-- Fixed the problem when scrolling the window to absolute positioned elements on Safari.
-- Fixed the problem on Opera 9.5 when scrolling the window. That it always scrolls to 0.
-[Feature]
-- Added the settings object as 2nd argument to the onAfter callback.
-- The 3rd argument of scrollTo can be just a function and it's used as the onAfter.
-- Added full support for iframes (even max scroll calculation).
-- Instead of $.scrollTo, $(window).scrollTo() and $(document).scrollTo() can be used.
-- Added $().scrollable() that returns the real element to scroll, f.e: $(window).scrollable() == [body|html], works for iframes.
-[Enhancement]
-- Cleaned the code a bit, specially the comments
-
-1.3.3
-[Change]
-- Changed the licensing from GPL to GPL+MIT.
-
-1.3.2
-[Enhancement]
-- Small improvements to make the code shorter.
-[Change]
-- Removed the last argument received by onAfter as it was the same as the 'this' but jqueryfied.
-
-1.3.1
-[Feature]
-- Exposed $.scrollTo.window() to get the element that needs to be animated, to scroll the window.
-- Added option 'over'.
-[Enhancement]
-- Made the code as short as possible.
-[Change]
-- Changed the arguments received by onAfter
-
-1.3
-[Enhancement]
-- Added semicolon to the start, for safe file concatenation
-- Added a limit check, values below 0 or over the maximum are fixed.
-- Now it should work faster, only one of html or body go through all the processing, instead of both for all browsers.
-[Fix]
-- Fixed the behavior for Opera, which seemed to react to both changes on <html> and <body>.
-- The border is also reduced, when 'margin' is set to true.
-[Change]
-- The option speed has been renamed to duration.
-[Feature]
-- The duration can be specified with a number as 2nd argument, and the rest of the settings as the third ( like $().animate )
-- Remade the demo
-
-1.2.4
-[Enhancement]
-- The target can be in the form of { top:x, left:y } allowing different position for each axis.
-[Feature]
-- The option 'offset' has been added, to scroll behind or past the target. Can be a number(both axes) or { top:x, left:y }.
-
-1.2.3
-[Feature]
-- Exposed the defaults.
-[Enhancement]
-- Made the callback functions receive more parameters.
-
-1.2.2
-[Fix]
-- Fixed a bug, I didn't have to add the scrolled amount if it was body or html.
-
-1.2
-[Change]
-- The option 'onafter' is now called 'onAfter'.
-[Feature]
-- Two axes can be scrolled together, this is set with the option 'axis'.
-- In case 2 axes are chosen, the scrolling can be queued: one scrolls, and then the other.
-- There's an intermediary event, 'onAfterFirst' called in case the axes are queued, after the first ends.
+1.4.2
+[Feature]
+- The plugin support percentages as target ('50%' or {top:'50%', left:'45%'})
+- Exposed the max() calculation as $.scrollTo.max
+[Enhancement]
+- Renamed $.fn.scrollable to $.fn._scrollable to avoid conflicts with other plugins
+[Fix]
+- Fixing max calculations for regular DOM elements
+
+1.4.1
+[Feature]
+- The target can be 'max' to scroll to the end while keeping it elegant.
+[Enhancement]
+- Default duration is 0 for jquery +1.3. Means sync animation
+- The plugin works on all major browsers, on compat & quirks modes, including iframes.
+- In addition to window/document, if html or body are received, the plugin will choose the right one.
+[Fix]
+- The plugin accepts floating numbers, Thanks Ramin
+- Using jQuery.nodeName where neccessary so that this works on xml+xhtml
+- The max() internal function wasn't completely accurrate, now it is 98% (except for IE on quirks mode and it's not too noticeable).
+
+1.4
+[Fix]
+- Fixed the problem when scrolling the window to absolute positioned elements on Safari.
+- Fixed the problem on Opera 9.5 when scrolling the window. That it always scrolls to 0.
+[Feature]
+- Added the settings object as 2nd argument to the onAfter callback.
+- The 3rd argument of scrollTo can be just a function and it's used as the onAfter.
+- Added full support for iframes (even max scroll calculation).
+- Instead of $.scrollTo, $(window).scrollTo() and $(document).scrollTo() can be used.
+- Added $().scrollable() that returns the real element to scroll, f.e: $(window).scrollable() == [body|html], works for iframes.
+[Enhancement]
+- Cleaned the code a bit, specially the comments
+
+1.3.3
+[Change]
+- Changed the licensing from GPL to GPL+MIT.
+
+1.3.2
+[Enhancement]
+- Small improvements to make the code shorter.
+[Change]
+- Removed the last argument received by onAfter as it was the same as the 'this' but jqueryfied.
+
+1.3.1
+[Feature]
+- Exposed $.scrollTo.window() to get the element that needs to be animated, to scroll the window.
+- Added option 'over'.
+[Enhancement]
+- Made the code as short as possible.
+[Change]
+- Changed the arguments received by onAfter
+
+1.3
+[Enhancement]
+- Added semicolon to the start, for safe file concatenation
+- Added a limit check, values below 0 or over the maximum are fixed.
+- Now it should work faster, only one of html or body go through all the processing, instead of both for all browsers.
+[Fix]
+- Fixed the behavior for Opera, which seemed to react to both changes on <html> and <body>.
+- The border is also reduced, when 'margin' is set to true.
+[Change]
+- The option speed has been renamed to duration.
+[Feature]
+- The duration can be specified with a number as 2nd argument, and the rest of the settings as the third ( like $().animate )
+- Remade the demo
+
+1.2.4
+[Enhancement]
+- The target can be in the form of { top:x, left:y } allowing different position for each axis.
+[Feature]
+- The option 'offset' has been added, to scroll behind or past the target. Can be a number(both axes) or { top:x, left:y }.
+
+1.2.3
+[Feature]
+- Exposed the defaults.
+[Enhancement]
+- Made the callback functions receive more parameters.
+
+1.2.2
+[Fix]
+- Fixed a bug, I didn't have to add the scrolled amount if it was body or html.
+
+1.2
+[Change]
+- The option 'onafter' is now called 'onAfter'.
+[Feature]
+- Two axes can be scrolled together, this is set with the option 'axis'.
+- In case 2 axes are chosen, the scrolling can be queued: one scrolls, and then the other.
+- There's an intermediary event, 'onAfterFirst' called in case the axes are queued, after the first ends.
 - If the option 'margin' is set to true, the plugin will take in account, the margin of the target(no use if target is a value).

contrib/library/network/server/nino/example/SimpleWebServer/webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo-min.js

@@ -1,11 +1,11 @@
-/**
- * jQuery.ScrollTo - Easy element scrolling using jQuery.
- * Copyright (c) 2007-2009 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
- * Dual licensed under MIT and GPL.
- * Date: 5/25/2009
- * @author Ariel Flesler
- * @version 1.4.2
- *
- * http://flesler.blogspot.com/2007/10/jqueryscrollto.html
- */
+/**
+ * jQuery.ScrollTo - Easy element scrolling using jQuery.
+ * Copyright (c) 2007-2009 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Dual licensed under MIT and GPL.
+ * Date: 5/25/2009
+ * @author Ariel Flesler
+ * @version 1.4.2
+ *
+ * http://flesler.blogspot.com/2007/10/jqueryscrollto.html
+ */
 ;(function(d){var k=d.scrollTo=function(a,i,e){d(window).scrollTo(a,i,e)};k.defaults={axis:'xy',duration:parseFloat(d.fn.jquery)>=1.3?0:1};k.window=function(a){return d(window)._scrollable()};d.fn._scrollable=function(){return this.map(function(){var a=this,i=!a.nodeName||d.inArray(a.nodeName.toLowerCase(),['iframe','#document','html','body'])!=-1;if(!i)return a;var e=(a.contentWindow||a).document||a.ownerDocument||a;return d.browser.safari||e.compatMode=='BackCompat'?e.body:e.documentElement})};d.fn.scrollTo=function(n,j,b){if(typeof j=='object'){b=j;j=0}if(typeof b=='function')b={onAfter:b};if(n=='max')n=9e9;b=d.extend({},k.defaults,b);j=j||b.speed||b.duration;b.queue=b.queue&&b.axis.length>1;if(b.queue)j/=2;b.offset=p(b.offset);b.over=p(b.over);return this._scrollable().each(function(){var q=this,r=d(q),f=n,s,g={},u=r.is('html,body');switch(typeof f){case'number':case'string':if(/^([+-]=)?\d+(\.\d+)?(px|%)?$/.test(f)){f=p(f);break}f=d(f,this);case'object':if(f.is||f.style)s=(f=d(f)).offset()}d.each(b.axis.split(''),function(a,i){var e=i=='x'?'Left':'Top',h=e.toLowerCase(),c='scroll'+e,l=q[c],m=k.max(q,i);if(s){g[c]=s[h]+(u?0:l-r.offset()[h]);if(b.margin){g[c]-=parseInt(f.css('margin'+e))||0;g[c]-=parseInt(f.css('border'+e+'Width'))||0}g[c]+=b.offset[h]||0;if(b.over[h])g[c]+=f[i=='x'?'width':'height']()*b.over[h]}else{var o=f[h];g[c]=o.slice&&o.slice(-1)=='%'?parseFloat(o)/100*m:o}if(/^\d+$/.test(g[c]))g[c]=g[c]<=0?0:Math.min(g[c],m);if(!a&&b.queue){if(l!=g[c])t(b.onAfterFirst);delete g[c]}});t(b.onAfter);function t(a){r.animate(g,j,b.easing,a&&function(){a.call(this,n,b)})}}).end()};k.max=function(a,i){var e=i=='x'?'Width':'Height',h='scroll'+e;if(!d(a).is('html,body'))return a[h]-d(a)[e.toLowerCase()]();var c='client'+e,l=a.ownerDocument.documentElement,m=a.ownerDocument.body;return Math.max(l[h],m[h])-Math.min(l[c],m[c])};function p(a){return typeof a=='object'?a:{top:a,left:a}}})(jQuery);

contrib/library/network/server/nino/example/SimpleWebServer/webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo.js

@@ -1,215 +1,215 @@
-/**
- * jQuery.ScrollTo
- * Copyright (c) 2007-2009 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
- * Dual licensed under MIT and GPL.
- * Date: 5/25/2009
- *
- * @projectDescription Easy element scrolling using jQuery.
- * http://flesler.blogspot.com/2007/10/jqueryscrollto.html
- * Works with jQuery +1.2.6. Tested on FF 2/3, IE 6/7/8, Opera 9.5/6, Safari 3, Chrome 1 on WinXP.
- *
- * @author Ariel Flesler
- * @version 1.4.2
- *
- * @id jQuery.scrollTo
- * @id jQuery.fn.scrollTo
- * @param {String, Number, DOMElement, jQuery, Object} target Where to scroll the matched elements.
- *	  The different options for target are:
- *		- A number position (will be applied to all axes).
- *		- A string position ('44', '100px', '+=90', etc ) will be applied to all axes
- *		- A jQuery/DOM element ( logically, child of the element to scroll )
- *		- A string selector, that will be relative to the element to scroll ( 'li:eq(2)', etc )
- *		- A hash { top:x, left:y }, x and y can be any kind of number/string like above.
-*		- A percentage of the container's dimension/s, for example: 50% to go to the middle.
- *		- The string 'max' for go-to-end. 
- * @param {Number} duration The OVERALL length of the animation, this argument can be the settings object instead.
- * @param {Object,Function} settings Optional set of settings or the onAfter callback.
- *	 @option {String} axis Which axis must be scrolled, use 'x', 'y', 'xy' or 'yx'.
- *	 @option {Number} duration The OVERALL length of the animation.
- *	 @option {String} easing The easing method for the animation.
- *	 @option {Boolean} margin If true, the margin of the target element will be deducted from the final position.
- *	 @option {Object, Number} offset Add/deduct from the end position. One number for both axes or { top:x, left:y }.
- *	 @option {Object, Number} over Add/deduct the height/width multiplied by 'over', can be { top:x, left:y } when using both axes.
- *	 @option {Boolean} queue If true, and both axis are given, the 2nd axis will only be animated after the first one ends.
- *	 @option {Function} onAfter Function to be called after the scrolling ends. 
- *	 @option {Function} onAfterFirst If queuing is activated, this function will be called after the first scrolling ends.
- * @return {jQuery} Returns the same jQuery object, for chaining.
- *
- * @desc Scroll to a fixed position
- * @example $('div').scrollTo( 340 );
- *
- * @desc Scroll relatively to the actual position
- * @example $('div').scrollTo( '+=340px', { axis:'y' } );
- *
- * @dec Scroll using a selector (relative to the scrolled element)
- * @example $('div').scrollTo( 'p.paragraph:eq(2)', 500, { easing:'swing', queue:true, axis:'xy' } );
- *
- * @ Scroll to a DOM element (same for jQuery object)
- * @example var second_child = document.getElementById('container').firstChild.nextSibling;
- *			$('#container').scrollTo( second_child, { duration:500, axis:'x', onAfter:function(){
- *				alert('scrolled!!');																   
- *			}});
- *
- * @desc Scroll on both axes, to different values
- * @example $('div').scrollTo( { top: 300, left:'+=200' }, { axis:'xy', offset:-20 } );
- */
-;(function( $ ){
-	
-	var $scrollTo = $.scrollTo = function( target, duration, settings ){
-		$(window).scrollTo( target, duration, settings );
-	};
-
-	$scrollTo.defaults = {
-		axis:'xy',
-		duration: parseFloat($.fn.jquery) >= 1.3 ? 0 : 1
-	};
-
-	// Returns the element that needs to be animated to scroll the window.
-	// Kept for backwards compatibility (specially for localScroll & serialScroll)
-	$scrollTo.window = function( scope ){
-		return $(window)._scrollable();
-	};
-
-	// Hack, hack, hack :)
-	// Returns the real elements to scroll (supports window/iframes, documents and regular nodes)
-	$.fn._scrollable = function(){
-		return this.map(function(){
-			var elem = this,
-				isWin = !elem.nodeName || $.inArray( elem.nodeName.toLowerCase(), ['iframe','#document','html','body'] ) != -1;
-
-				if( !isWin )
-					return elem;
-
-			var doc = (elem.contentWindow || elem).document || elem.ownerDocument || elem;
-			
-			return $.browser.safari || doc.compatMode == 'BackCompat' ?
-				doc.body : 
-				doc.documentElement;
-		});
-	};
-
-	$.fn.scrollTo = function( target, duration, settings ){
-		if( typeof duration == 'object' ){
-			settings = duration;
-			duration = 0;
-		}
-		if( typeof settings == 'function' )
-			settings = { onAfter:settings };
-			
-		if( target == 'max' )
-			target = 9e9;
-			
-		settings = $.extend( {}, $scrollTo.defaults, settings );
-		// Speed is still recognized for backwards compatibility
-		duration = duration || settings.speed || settings.duration;
-		// Make sure the settings are given right
-		settings.queue = settings.queue && settings.axis.length > 1;
-		
-		if( settings.queue )
-			// Let's keep the overall duration
-			duration /= 2;
-		settings.offset = both( settings.offset );
-		settings.over = both( settings.over );
-
-		return this._scrollable().each(function(){
-			var elem = this,
-				$elem = $(elem),
-				targ = target, toff, attr = {},
-				win = $elem.is('html,body');
-
-			switch( typeof targ ){
-				// A number will pass the regex
-				case 'number':
-				case 'string':
-					if( /^([+-]=)?\d+(\.\d+)?(px|%)?$/.test(targ) ){
-						targ = both( targ );
-						// We are done
-						break;
-					}
-					// Relative selector, no break!
-					targ = $(targ,this);
-				case 'object':
-					// DOMElement / jQuery
-					if( targ.is || targ.style )
-						// Get the real position of the target 
-						toff = (targ = $(targ)).offset();
-			}
-			$.each( settings.axis.split(''), function( i, axis ){
-				var Pos	= axis == 'x' ? 'Left' : 'Top',
-					pos = Pos.toLowerCase(),
-					key = 'scroll' + Pos,
-					old = elem[key],
-					max = $scrollTo.max(elem, axis);
-
-				if( toff ){// jQuery / DOMElement
-					attr[key] = toff[pos] + ( win ? 0 : old - $elem.offset()[pos] );
-
-					// If it's a dom element, reduce the margin
-					if( settings.margin ){
-						attr[key] -= parseInt(targ.css('margin'+Pos)) || 0;
-						attr[key] -= parseInt(targ.css('border'+Pos+'Width')) || 0;
-					}
-					
-					attr[key] += settings.offset[pos] || 0;
-					
-					if( settings.over[pos] )
-						// Scroll to a fraction of its width/height
-						attr[key] += targ[axis=='x'?'width':'height']() * settings.over[pos];
-				}else{ 
-					var val = targ[pos];
-					// Handle percentage values
-					attr[key] = val.slice && val.slice(-1) == '%' ? 
-						parseFloat(val) / 100 * max
-						: val;
-				}
-
-				// Number or 'number'
-				if( /^\d+$/.test(attr[key]) )
-					// Check the limits
-					attr[key] = attr[key] <= 0 ? 0 : Math.min( attr[key], max );
-
-				// Queueing axes
-				if( !i && settings.queue ){
-					// Don't waste time animating, if there's no need.
-					if( old != attr[key] )
-						// Intermediate animation
-						animate( settings.onAfterFirst );
-					// Don't animate this axis again in the next iteration.
-					delete attr[key];
-				}
-			});
-
-			animate( settings.onAfter );			
-
-			function animate( callback ){
-				$elem.animate( attr, duration, settings.easing, callback && function(){
-					callback.call(this, target, settings);
-				});
-			};
-
-		}).end();
-	};
-	
-	// Max scrolling position, works on quirks mode
-	// It only fails (not too badly) on IE, quirks mode.
-	$scrollTo.max = function( elem, axis ){
-		var Dim = axis == 'x' ? 'Width' : 'Height',
-			scroll = 'scroll'+Dim;
-		
-		if( !$(elem).is('html,body') )
-			return elem[scroll] - $(elem)[Dim.toLowerCase()]();
-		
-		var size = 'client' + Dim,
-			html = elem.ownerDocument.documentElement,
-			body = elem.ownerDocument.body;
-
-		return Math.max( html[scroll], body[scroll] ) 
-			 - Math.min( html[size]  , body[size]   );
-			
-	};
-
-	function both( val ){
-		return typeof val == 'object' ? val : { top:val, left:val };
-	};
-
+/**
+ * jQuery.ScrollTo
+ * Copyright (c) 2007-2009 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Dual licensed under MIT and GPL.
+ * Date: 5/25/2009
+ *
+ * @projectDescription Easy element scrolling using jQuery.
+ * http://flesler.blogspot.com/2007/10/jqueryscrollto.html
+ * Works with jQuery +1.2.6. Tested on FF 2/3, IE 6/7/8, Opera 9.5/6, Safari 3, Chrome 1 on WinXP.
+ *
+ * @author Ariel Flesler
+ * @version 1.4.2
+ *
+ * @id jQuery.scrollTo
+ * @id jQuery.fn.scrollTo
+ * @param {String, Number, DOMElement, jQuery, Object} target Where to scroll the matched elements.
+ *	  The different options for target are:
+ *		- A number position (will be applied to all axes).
+ *		- A string position ('44', '100px', '+=90', etc ) will be applied to all axes
+ *		- A jQuery/DOM element ( logically, child of the element to scroll )
+ *		- A string selector, that will be relative to the element to scroll ( 'li:eq(2)', etc )
+ *		- A hash { top:x, left:y }, x and y can be any kind of number/string like above.
+*		- A percentage of the container's dimension/s, for example: 50% to go to the middle.
+ *		- The string 'max' for go-to-end. 
+ * @param {Number} duration The OVERALL length of the animation, this argument can be the settings object instead.
+ * @param {Object,Function} settings Optional set of settings or the onAfter callback.
+ *	 @option {String} axis Which axis must be scrolled, use 'x', 'y', 'xy' or 'yx'.
+ *	 @option {Number} duration The OVERALL length of the animation.
+ *	 @option {String} easing The easing method for the animation.
+ *	 @option {Boolean} margin If true, the margin of the target element will be deducted from the final position.
+ *	 @option {Object, Number} offset Add/deduct from the end position. One number for both axes or { top:x, left:y }.
+ *	 @option {Object, Number} over Add/deduct the height/width multiplied by 'over', can be { top:x, left:y } when using both axes.
+ *	 @option {Boolean} queue If true, and both axis are given, the 2nd axis will only be animated after the first one ends.
+ *	 @option {Function} onAfter Function to be called after the scrolling ends. 
+ *	 @option {Function} onAfterFirst If queuing is activated, this function will be called after the first scrolling ends.
+ * @return {jQuery} Returns the same jQuery object, for chaining.
+ *
+ * @desc Scroll to a fixed position
+ * @example $('div').scrollTo( 340 );
+ *
+ * @desc Scroll relatively to the actual position
+ * @example $('div').scrollTo( '+=340px', { axis:'y' } );
+ *
+ * @dec Scroll using a selector (relative to the scrolled element)
+ * @example $('div').scrollTo( 'p.paragraph:eq(2)', 500, { easing:'swing', queue:true, axis:'xy' } );
+ *
+ * @ Scroll to a DOM element (same for jQuery object)
+ * @example var second_child = document.getElementById('container').firstChild.nextSibling;
+ *			$('#container').scrollTo( second_child, { duration:500, axis:'x', onAfter:function(){
+ *				alert('scrolled!!');																   
+ *			}});
+ *
+ * @desc Scroll on both axes, to different values
+ * @example $('div').scrollTo( { top: 300, left:'+=200' }, { axis:'xy', offset:-20 } );
+ */
+;(function( $ ){
+	
+	var $scrollTo = $.scrollTo = function( target, duration, settings ){
+		$(window).scrollTo( target, duration, settings );
+	};
+
+	$scrollTo.defaults = {
+		axis:'xy',
+		duration: parseFloat($.fn.jquery) >= 1.3 ? 0 : 1
+	};
+
+	// Returns the element that needs to be animated to scroll the window.
+	// Kept for backwards compatibility (specially for localScroll & serialScroll)
+	$scrollTo.window = function( scope ){
+		return $(window)._scrollable();
+	};
+
+	// Hack, hack, hack :)
+	// Returns the real elements to scroll (supports window/iframes, documents and regular nodes)
+	$.fn._scrollable = function(){
+		return this.map(function(){
+			var elem = this,
+				isWin = !elem.nodeName || $.inArray( elem.nodeName.toLowerCase(), ['iframe','#document','html','body'] ) != -1;
+
+				if( !isWin )
+					return elem;
+
+			var doc = (elem.contentWindow || elem).document || elem.ownerDocument || elem;
+			
+			return $.browser.safari || doc.compatMode == 'BackCompat' ?
+				doc.body : 
+				doc.documentElement;
+		});
+	};
+
+	$.fn.scrollTo = function( target, duration, settings ){
+		if( typeof duration == 'object' ){
+			settings = duration;
+			duration = 0;
+		}
+		if( typeof settings == 'function' )
+			settings = { onAfter:settings };
+			
+		if( target == 'max' )
+			target = 9e9;
+			
+		settings = $.extend( {}, $scrollTo.defaults, settings );
+		// Speed is still recognized for backwards compatibility
+		duration = duration || settings.speed || settings.duration;
+		// Make sure the settings are given right
+		settings.queue = settings.queue && settings.axis.length > 1;
+		
+		if( settings.queue )
+			// Let's keep the overall duration
+			duration /= 2;
+		settings.offset = both( settings.offset );
+		settings.over = both( settings.over );
+
+		return this._scrollable().each(function(){
+			var elem = this,
+				$elem = $(elem),
+				targ = target, toff, attr = {},
+				win = $elem.is('html,body');
+
+			switch( typeof targ ){
+				// A number will pass the regex
+				case 'number':
+				case 'string':
+					if( /^([+-]=)?\d+(\.\d+)?(px|%)?$/.test(targ) ){
+						targ = both( targ );
+						// We are done
+						break;
+					}
+					// Relative selector, no break!
+					targ = $(targ,this);
+				case 'object':
+					// DOMElement / jQuery
+					if( targ.is || targ.style )
+						// Get the real position of the target 
+						toff = (targ = $(targ)).offset();
+			}
+			$.each( settings.axis.split(''), function( i, axis ){
+				var Pos	= axis == 'x' ? 'Left' : 'Top',
+					pos = Pos.toLowerCase(),
+					key = 'scroll' + Pos,
+					old = elem[key],
+					max = $scrollTo.max(elem, axis);
+
+				if( toff ){// jQuery / DOMElement
+					attr[key] = toff[pos] + ( win ? 0 : old - $elem.offset()[pos] );
+
+					// If it's a dom element, reduce the margin
+					if( settings.margin ){
+						attr[key] -= parseInt(targ.css('margin'+Pos)) || 0;
+						attr[key] -= parseInt(targ.css('border'+Pos+'Width')) || 0;
+					}
+					
+					attr[key] += settings.offset[pos] || 0;
+					
+					if( settings.over[pos] )
+						// Scroll to a fraction of its width/height
+						attr[key] += targ[axis=='x'?'width':'height']() * settings.over[pos];
+				}else{ 
+					var val = targ[pos];
+					// Handle percentage values
+					attr[key] = val.slice && val.slice(-1) == '%' ? 
+						parseFloat(val) / 100 * max
+						: val;
+				}
+
+				// Number or 'number'
+				if( /^\d+$/.test(attr[key]) )
+					// Check the limits
+					attr[key] = attr[key] <= 0 ? 0 : Math.min( attr[key], max );
+
+				// Queueing axes
+				if( !i && settings.queue ){
+					// Don't waste time animating, if there's no need.
+					if( old != attr[key] )
+						// Intermediate animation
+						animate( settings.onAfterFirst );
+					// Don't animate this axis again in the next iteration.
+					delete attr[key];
+				}
+			});
+
+			animate( settings.onAfter );			
+
+			function animate( callback ){
+				$elem.animate( attr, duration, settings.easing, callback && function(){
+					callback.call(this, target, settings);
+				});
+			};
+
+		}).end();
+	};
+	
+	// Max scrolling position, works on quirks mode
+	// It only fails (not too badly) on IE, quirks mode.
+	$scrollTo.max = function( elem, axis ){
+		var Dim = axis == 'x' ? 'Width' : 'Height',
+			scroll = 'scroll'+Dim;
+		
+		if( !$(elem).is('html,body') )
+			return elem[scroll] - $(elem)[Dim.toLowerCase()]();
+		
+		var size = 'client' + Dim,
+			html = elem.ownerDocument.documentElement,
+			body = elem.ownerDocument.body;
+
+		return Math.max( html[scroll], body[scroll] ) 
+			 - Math.min( html[size]  , body[size]   );
+			
+	};
+
+	function both( val ){
+		return typeof val == 'object' ? val : { top:val, left:val };
+	};
+
 })( jQuery );

contrib/library/network/server/nino/example/SimpleWebServer/webroot/demo1/script.js

@@ -1,12 +1,12 @@
-$(document).ready(function(){
-	/* This code is executed after the DOM has been completely loaded */
-	
-	$('nav a,footer a.up').click(function(e){
-										  
-		// If a link has been clicked, scroll the page to the link's hash target:
-		
-		$.scrollTo( this.hash || 0, 1500);
-		e.preventDefault();
-	});
-
+$(document).ready(function(){
+	/* This code is executed after the DOM has been completely loaded */
+	
+	$('nav a,footer a.up').click(function(e){
+										  
+		// If a link has been clicked, scroll the page to the link's hash target:
+		
+		$.scrollTo( this.hash || 0, 1500);
+		e.preventDefault();
+	});
+
 });

contrib/library/network/server/nino/example/SimpleWebServer/webroot/demo1/styles.css

@@ -1,219 +1,219 @@
-*{
-	/* Universal reset: */
-	margin:0;
-	padding:0;
-}
-
-header,footer,
-article,section,
-hgroup,nav,
-figure{
-	/* Giving a display value to the HTML5 rendered elements: */
-	display:block;
-}
-
-body{
-	/* Setting the default text color, size, page background and a font stack: */
-	font-size:0.825em;
-	color:#fcfcfc;
-	background-color:#355664;
-	font-family:Arial, Helvetica, sans-serif;
-}
-
-/* Hyperlink Styles: */
-
-a, a:visited {
-	color:#0196e3;
-	text-decoration:none;
-	outline:none;
-}
-
-a:hover{
-	text-decoration:underline;
-}
-
-a img{
-	border:none;
-}
-
-/* Headings: */
-
-h1,h2,h3{
-	font-family:"Myriad Pro","Helvetica Neue",Helvetica,Arial,Sans-Serif;
-	text-shadow:0 1px 1px black;
-}
-
-h1{
-	/* The logo text */
-	font-size:3.5em;
-	padding:0.5em 0 0;
-	text-transform:uppercase;
-}
-
-h3{
-	/* The slogan text */
-	font-family:forte,"Myriad Pro","Helvetica Neue",Helvetica,Arial,Sans-Serif;
-	font-size:2em;
-	font-weight:normal;
-	margin:0 0 1em;
-}
-
-
-h2{
-	font-size:2.2em;
-	font-weight:normal;
-	letter-spacing:0.01em;
-	text-transform:uppercase;
-}
-
-p{
-	line-height:1.5em;
-	padding-bottom:1em;
-}
-
-.line{
-	/* The dividing line: */
-	height:1px;
-	background-color:#24404c;
-	border-bottom:1px solid #416371;
-	margin:1em 0;
-	overflow:hidden;
-}
-
-article .line{
-	/* The dividing line inside of the article is darker: */
-	background-color:#15242a;
-	border-bottom-color:#204656;
-	margin:1.3em 0;
-}
-
-footer .line{
-	margin:2em 0;
-}
-
-nav{
-	background:url(img/gradient_light.jpg) repeat-x 50% 50% #f8f8f8;
-	padding:0 5px;
-	position:absolute;
-	right:0;
-	top:4em;
-	
-	border:1px solid #FCFCFC;
-
-	-moz-box-shadow:0 1px 1px #333333;
-	-webkit-box-shadow:0 1px 1px #333333;
-	box-shadow:0 1px 1px #333333;
-}
-
-/* The clearfix hack to clear the floats: */
-
-.clear:after{
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
-}
-
-/* The navigation styling: */
-
-nav ul li{
-	display:inline;
-}
-
-nav ul li a,
-nav ul li a:visited{
-	color:#565656;
-	display:block;
-	float:left;
-	font-size:1.25em;
-	font-weight:bold;
-	margin:5px 2px;
-	padding:7px 10px 4px;
-	text-shadow:0 1px 1px white;
-	text-transform:uppercase;
-}
-
-nav ul li a:hover{
-	text-decoration:none;
-	background-color:#f0f0f0;
-}
-
-nav, article, nav ul li a,figure{
-	/* Applying CSS3 rounded corners: */
-	-moz-border-radius:10px;
-	-webkit-border-radius:10px;
-	border-radius:10px;
-}
-
-/* Article styles: */
-
-#page{
-	width:960px;
-	margin:0 auto;
-	position:relative;
-}
-
-article{
-	background-color:#213E4A;
-	margin:3em 0;
-	padding:20px;
-	
-	text-shadow:0 2px 0 black;
-}
-
-figure{
-	border:3px solid #142830;
-	float:right;
-	height:300px;
-	margin-left:15px;
-	overflow:hidden;
-	width:500px;
-}
-
-figure:hover{
-	-moz-box-shadow:0 0 2px #4D7788;
-	-webkit-box-shadow:0 0 2px #4D7788;
-	box-shadow:0 0 2px #4D7788;
-}
-
-figure img{
-	margin-left:-60px;
-}
-
-/* Footer styling: */
-
-footer{
-	margin-bottom:30px;
-	text-align:center;
-	font-size:0.825em;
-}
-
-
-footer p{
-	margin-bottom:-2.5em;
-	position:relative;
-}
-
-footer a,footer a:visited{
-	color:#cccccc;
-	background-color:#213e4a;
-	display:block;
-	padding:2px 4px;
-	z-index:100;
-	position:relative;
-}
-
-footer a:hover{
-	text-decoration:none;
-	background-color:#142830;
-}
-
-footer a.by{
-	float:left;
-
-}
-
-footer a.up{
-	float:right;
-}
+*{
+	/* Universal reset: */
+	margin:0;
+	padding:0;
+}
+
+header,footer,
+article,section,
+hgroup,nav,
+figure{
+	/* Giving a display value to the HTML5 rendered elements: */
+	display:block;
+}
+
+body{
+	/* Setting the default text color, size, page background and a font stack: */
+	font-size:0.825em;
+	color:#fcfcfc;
+	background-color:#355664;
+	font-family:Arial, Helvetica, sans-serif;
+}
+
+/* Hyperlink Styles: */
+
+a, a:visited {
+	color:#0196e3;
+	text-decoration:none;
+	outline:none;
+}
+
+a:hover{
+	text-decoration:underline;
+}
+
+a img{
+	border:none;
+}
+
+/* Headings: */
+
+h1,h2,h3{
+	font-family:"Myriad Pro","Helvetica Neue",Helvetica,Arial,Sans-Serif;
+	text-shadow:0 1px 1px black;
+}
+
+h1{
+	/* The logo text */
+	font-size:3.5em;
+	padding:0.5em 0 0;
+	text-transform:uppercase;
+}
+
+h3{
+	/* The slogan text */
+	font-family:forte,"Myriad Pro","Helvetica Neue",Helvetica,Arial,Sans-Serif;
+	font-size:2em;
+	font-weight:normal;
+	margin:0 0 1em;
+}
+
+
+h2{
+	font-size:2.2em;
+	font-weight:normal;
+	letter-spacing:0.01em;
+	text-transform:uppercase;
+}
+
+p{
+	line-height:1.5em;
+	padding-bottom:1em;
+}
+
+.line{
+	/* The dividing line: */
+	height:1px;
+	background-color:#24404c;
+	border-bottom:1px solid #416371;
+	margin:1em 0;
+	overflow:hidden;
+}
+
+article .line{
+	/* The dividing line inside of the article is darker: */
+	background-color:#15242a;
+	border-bottom-color:#204656;
+	margin:1.3em 0;
+}
+
+footer .line{
+	margin:2em 0;
+}
+
+nav{
+	background:url(img/gradient_light.jpg) repeat-x 50% 50% #f8f8f8;
+	padding:0 5px;
+	position:absolute;
+	right:0;
+	top:4em;
+	
+	border:1px solid #FCFCFC;
+
+	-moz-box-shadow:0 1px 1px #333333;
+	-webkit-box-shadow:0 1px 1px #333333;
+	box-shadow:0 1px 1px #333333;
+}
+
+/* The clearfix hack to clear the floats: */
+
+.clear:after{
+	content: ".";
+	display: block;
+	height: 0;
+	clear: both;
+	visibility: hidden;
+}
+
+/* The navigation styling: */
+
+nav ul li{
+	display:inline;
+}
+
+nav ul li a,
+nav ul li a:visited{
+	color:#565656;
+	display:block;
+	float:left;
+	font-size:1.25em;
+	font-weight:bold;
+	margin:5px 2px;
+	padding:7px 10px 4px;
+	text-shadow:0 1px 1px white;
+	text-transform:uppercase;
+}
+
+nav ul li a:hover{
+	text-decoration:none;
+	background-color:#f0f0f0;
+}
+
+nav, article, nav ul li a,figure{
+	/* Applying CSS3 rounded corners: */
+	-moz-border-radius:10px;
+	-webkit-border-radius:10px;
+	border-radius:10px;
+}
+
+/* Article styles: */
+
+#page{
+	width:960px;
+	margin:0 auto;
+	position:relative;
+}
+
+article{
+	background-color:#213E4A;
+	margin:3em 0;
+	padding:20px;
+	
+	text-shadow:0 2px 0 black;
+}
+
+figure{
+	border:3px solid #142830;
+	float:right;
+	height:300px;
+	margin-left:15px;
+	overflow:hidden;
+	width:500px;
+}
+
+figure:hover{
+	-moz-box-shadow:0 0 2px #4D7788;
+	-webkit-box-shadow:0 0 2px #4D7788;
+	box-shadow:0 0 2px #4D7788;
+}
+
+figure img{
+	margin-left:-60px;
+}
+
+/* Footer styling: */
+
+footer{
+	margin-bottom:30px;
+	text-align:center;
+	font-size:0.825em;
+}
+
+
+footer p{
+	margin-bottom:-2.5em;
+	position:relative;
+}
+
+footer a,footer a:visited{
+	color:#cccccc;
+	background-color:#213e4a;
+	display:block;
+	padding:2px 4px;
+	z-index:100;
+	position:relative;
+}
+
+footer a:hover{
+	text-decoration:none;
+	background-color:#142830;
+}
+
+footer a.by{
+	float:left;
+
+}
+
+footer a.up{
+	float:right;
+}

contrib/library/network/server/nino/example/SimpleWebServer/webroot/demo1/template.html

@@ -1,139 +1,139 @@
-<!DOCTYPE html> <!-- The new doctype -->
-<html>
-    <head>
-    
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-        
-        <title>Coding A CSS3 &amp; HTML5 One Page Template | Tutorialzine demo</title>
-        
-        <link rel="stylesheet" type="text/css" href="styles.css" />
-        
-        <!-- Internet Explorer HTML5 enabling code: -->
-        
-        <!--[if IE]>
-        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        
-        <style type="text/css">
-        .clear {
-          zoom: 1;
-          display: block;
-        }
-        </style>
-
-        
-        <![endif]-->
-        
-    </head>
-    
-    <body>
-    	
-    	<section id="page"> <!-- Defining the #page section with the section tag -->
-    
-            <header> <!-- Defining the header section of the page with the appropriate tag -->
-            
-                <hgroup>
-                    <h1>Your Logo</h1>
-                    <h3>and a fancy slogan</h3>
-                </hgroup>
-                                
-                <nav class="clear"> <!-- The nav link semantically marks your main site navigation -->
-                    <ul>
-                        <li><a href="#article1">Photoshoot</a></li>
-                        <li><a href="#article2">Sweet Tabs</a></li>
-                        <li><a href="#article3">Navigation Menu</a></li>
-                    </ul>
-                </nav>
-            
-            </header>
-            
-            <section id="articles"> <!-- A new section with the articles -->
-
-				<!-- Article 1 start -->
-
-                <div class="line"></div>  <!-- Dividing line -->
-                
-                <article id="article1"> <!-- The new article tag. The id is supplied so it can be scrolled into view. -->
-                    <h2>Photoshoot Effect</h2>
-                    
-                    <div class="line"></div>
-                    
-                    <div class="articleBody clear">
-                    
-                    	<figure> <!-- The figure tag marks data (usually an image) that is part of the article -->
-	                    	<a href="http://tutorialzine.com/2010/02/photo-shoot-css-jquery/"><img src="http://tutorialzine.com/img/featured/641.jpg" width="620" height="340" /></a>
-                        </figure>
-                        
-                        <p>In this tutorial, we are creating a photo shoot effect with our just-released PhotoShoot jQuery plug-in. With it you can convert a regular div on the page into a photo shooting stage simulating a camera-like feel.</p>
-                        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer luctus quam quis nibh fringilla sit amet consectetur lectus malesuada. Sed nec libero erat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc mi nisi, rhoncus ut vestibulum ac, sollicitudin quis lorem. Duis felis dui, vulputate nec adipiscing nec, interdum vel tortor. Sed gravida, erat nec rutrum tincidunt, metus mauris imperdiet nunc, et elementum tortor nunc at eros. Donec malesuada congue molestie. Suspendisse potenti. Vestibulum cursus congue sem et feugiat. Morbi quis elit odio. </p>
-                    </div>
-                </article>
-                
-				<!-- Article 1 end -->
-
-
-				<!-- Article 2 start -->
-
-                <div class="line"></div>
-                
-                <article id="article2">
-                    <h2>Sweet AJAX Tabs</h2>
-                    
-                    <div class="line"></div>
-                    
-                    <div class="articleBody clear">
-                    	<figure>
-	                    	<a href="http://tutorialzine.com/2010/01/sweet-tabs-jquery-ajax-css/"><img src="http://tutorialzine.com/img/featured/633.jpg" width="620" height="340" /></a>
-                        </figure>
-                        
-                        <p>Here we are making sweet AJAX-powered tabs with CSS3 and the newly released version 1.4 of jQuery.</p>
-                        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer luctus quam quis nibh fringilla sit amet consectetur lectus malesuada. Sed nec libero erat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc mi nisi, rhoncus ut vestibulum ac, sollicitudin quis lorem. Duis felis dui, vulputate nec adipiscing nec, interdum vel tortor. Sed gravida, erat nec rutrum tincidunt, metus mauris imperdiet nunc, et elementum tortor nunc at eros. Donec malesuada congue molestie. Suspendisse potenti. Vestibulum cursus congue sem et feugiat. Morbi quis elit odio. </p>
-                    </div>
-                </article>
-                
-				<!-- Article 2 end -->
-
-				<!-- Article 3 start -->
-
-                <div class="line"></div>
-                
-                <article id="article3">
-                    <h2>Halftone Navigation Menu</h2>
-                    
-                    <div class="line"></div>
-                    
-                    <div class="articleBody clear">
-                    	<figure>
-	                    	<a href="http://tutorialzine.com/2010/01/halftone-navigation-menu-jquery-css/"><img src="http://tutorialzine.com/img/featured/610.jpg" width="620" height="340" /></a>
-                        </figure>
-                        
-                        <p>Today we are making a CSS3 & jQuery halftone-style navigation menu, which will allow you to display animated halftone-style shapes in accordance with the navigation links, and will provide a simple editor for creating additional shapes as well.</p>
-                        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer luctus quam quis nibh fringilla sit amet consectetur lectus malesuada. Sed nec libero erat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc mi nisi, rhoncus ut vestibulum ac, sollicitudin quis lorem. Duis felis dui, vulputate nec adipiscing nec, interdum vel tortor. Sed gravida, erat nec rutrum tincidunt, metus mauris imperdiet nunc, et elementum tortor nunc at eros. Donec malesuada congue molestie. Suspendisse potenti. Vestibulum cursus congue sem et feugiat. Morbi quis elit odio. </p>
-                    </div>
-                </article>
-                
-				<!-- Article 3 end -->
-
-
-            </section>
-
-        <footer> <!-- Marking the footer section -->
-
-           <div class="line"></div>
-           
-           <p>Copyright 2010 - YourSite.com</p> <!-- Change the copyright notice -->
-           
-           <a href="#" class="up">Go UP</a>
-           <a href="http://tutorialzine.com/2010/02/html5-css3-website-template/" class="by">Template by Tutorialzine</a>
-           
-
-        </footer>
-            
-		</section> <!-- Closing the #page section -->
-        
-        <!-- JavaScript Includes -->
-        
-        <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
-        <script src="jquery.scrollTo-1.4.2/jquery.scrollTo-min.js"></script>
-        <script src="script.js"></script>
-    </body>
-</html>
+<!DOCTYPE html> <!-- The new doctype -->
+<html>
+    <head>
+    
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        
+        <title>Coding A CSS3 &amp; HTML5 One Page Template | Tutorialzine demo</title>
+        
+        <link rel="stylesheet" type="text/css" href="styles.css" />
+        
+        <!-- Internet Explorer HTML5 enabling code: -->
+        
+        <!--[if IE]>
+        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        
+        <style type="text/css">
+        .clear {
+          zoom: 1;
+          display: block;
+        }
+        </style>
+
+        
+        <![endif]-->
+        
+    </head>
+    
+    <body>
+    	
+    	<section id="page"> <!-- Defining the #page section with the section tag -->
+    
+            <header> <!-- Defining the header section of the page with the appropriate tag -->
+            
+                <hgroup>
+                    <h1>Your Logo</h1>
+                    <h3>and a fancy slogan</h3>
+                </hgroup>
+                                
+                <nav class="clear"> <!-- The nav link semantically marks your main site navigation -->
+                    <ul>
+                        <li><a href="#article1">Photoshoot</a></li>
+                        <li><a href="#article2">Sweet Tabs</a></li>
+                        <li><a href="#article3">Navigation Menu</a></li>
+                    </ul>
+                </nav>
+            
+            </header>
+            
+            <section id="articles"> <!-- A new section with the articles -->
+
+				<!-- Article 1 start -->
+
+                <div class="line"></div>  <!-- Dividing line -->
+                
+                <article id="article1"> <!-- The new article tag. The id is supplied so it can be scrolled into view. -->
+                    <h2>Photoshoot Effect</h2>
+                    
+                    <div class="line"></div>
+                    
+                    <div class="articleBody clear">
+                    
+                    	<figure> <!-- The figure tag marks data (usually an image) that is part of the article -->
+	                    	<a href="http://tutorialzine.com/2010/02/photo-shoot-css-jquery/"><img src="http://tutorialzine.com/img/featured/641.jpg" width="620" height="340" /></a>
+                        </figure>
+                        
+                        <p>In this tutorial, we are creating a photo shoot effect with our just-released PhotoShoot jQuery plug-in. With it you can convert a regular div on the page into a photo shooting stage simulating a camera-like feel.</p>
+                        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer luctus quam quis nibh fringilla sit amet consectetur lectus malesuada. Sed nec libero erat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc mi nisi, rhoncus ut vestibulum ac, sollicitudin quis lorem. Duis felis dui, vulputate nec adipiscing nec, interdum vel tortor. Sed gravida, erat nec rutrum tincidunt, metus mauris imperdiet nunc, et elementum tortor nunc at eros. Donec malesuada congue molestie. Suspendisse potenti. Vestibulum cursus congue sem et feugiat. Morbi quis elit odio. </p>
+                    </div>
+                </article>
+                
+				<!-- Article 1 end -->
+
+
+				<!-- Article 2 start -->
+
+                <div class="line"></div>
+                
+                <article id="article2">
+                    <h2>Sweet AJAX Tabs</h2>
+                    
+                    <div class="line"></div>
+                    
+                    <div class="articleBody clear">
+                    	<figure>
+	                    	<a href="http://tutorialzine.com/2010/01/sweet-tabs-jquery-ajax-css/"><img src="http://tutorialzine.com/img/featured/633.jpg" width="620" height="340" /></a>
+                        </figure>
+                        
+                        <p>Here we are making sweet AJAX-powered tabs with CSS3 and the newly released version 1.4 of jQuery.</p>
+                        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer luctus quam quis nibh fringilla sit amet consectetur lectus malesuada. Sed nec libero erat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc mi nisi, rhoncus ut vestibulum ac, sollicitudin quis lorem. Duis felis dui, vulputate nec adipiscing nec, interdum vel tortor. Sed gravida, erat nec rutrum tincidunt, metus mauris imperdiet nunc, et elementum tortor nunc at eros. Donec malesuada congue molestie. Suspendisse potenti. Vestibulum cursus congue sem et feugiat. Morbi quis elit odio. </p>
+                    </div>
+                </article>
+                
+				<!-- Article 2 end -->
+
+				<!-- Article 3 start -->
+
+                <div class="line"></div>
+                
+                <article id="article3">
+                    <h2>Halftone Navigation Menu</h2>
+                    
+                    <div class="line"></div>
+                    
+                    <div class="articleBody clear">
+                    	<figure>
+	                    	<a href="http://tutorialzine.com/2010/01/halftone-navigation-menu-jquery-css/"><img src="http://tutorialzine.com/img/featured/610.jpg" width="620" height="340" /></a>
+                        </figure>
+                        
+                        <p>Today we are making a CSS3 & jQuery halftone-style navigation menu, which will allow you to display animated halftone-style shapes in accordance with the navigation links, and will provide a simple editor for creating additional shapes as well.</p>
+                        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer luctus quam quis nibh fringilla sit amet consectetur lectus malesuada. Sed nec libero erat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc mi nisi, rhoncus ut vestibulum ac, sollicitudin quis lorem. Duis felis dui, vulputate nec adipiscing nec, interdum vel tortor. Sed gravida, erat nec rutrum tincidunt, metus mauris imperdiet nunc, et elementum tortor nunc at eros. Donec malesuada congue molestie. Suspendisse potenti. Vestibulum cursus congue sem et feugiat. Morbi quis elit odio. </p>
+                    </div>
+                </article>
+                
+				<!-- Article 3 end -->
+
+
+            </section>
+
+        <footer> <!-- Marking the footer section -->
+
+           <div class="line"></div>
+           
+           <p>Copyright 2010 - YourSite.com</p> <!-- Change the copyright notice -->
+           
+           <a href="#" class="up">Go UP</a>
+           <a href="http://tutorialzine.com/2010/02/html5-css3-website-template/" class="by">Template by Tutorialzine</a>
+           
+
+        </footer>
+            
+		</section> <!-- Closing the #page section -->
+        
+        <!-- JavaScript Includes -->
+        
+        <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
+        <script src="jquery.scrollTo-1.4.2/jquery.scrollTo-min.js"></script>
+        <script src="script.js"></script>
+    </body>
+</html>

contrib/library/network/server/nino/example/SimpleWebServer/webroot/demo2/demo.html

@@ -1,43 +1,43 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Halftone Navigation Menu With jQuery &amp; CSS3 | Tutorialzine demo</title>
-
-<link rel="stylesheet" type="text/css" href="styles.css" />
-
-<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
-
-<script type="text/javascript" src="script.js"></script>
-
-</head>
-
-<body>
-
-<h1>Halftone Navigation Menu With jQuery &amp; CSS3</h1>
-<h2>View the <a href="http://tutorialzine.com/2010/01/halftone-navigation-menu-jquery-css/">original tutorial &raquo;</a></h2>
-
-
-<div id="main">
-	
- <div id="navigation">
-     <ul class="menuUL">
-	     <!-- The class names that are assigned to the links correspond to name of the shape that is shown on hover: -->
-         <li><a href="#" class="house">Home</a></li>
-         <li><a href="#" class="wrench">Services</a></li>
-         <li><a href="#" class="envelope">Contact</a></li>
-         <li><a href="#" class="info">About</a></li>
-     </ul>
-     <div class="clear"></div>
- </div>
-
-    <div id="stage">
-    <!-- The dot divs are shown here -->
-    </div>
-</div>
-
-<p class="tutInfo">This is a tutorialzine demo. View the <a href="http://tutorialzine.com/2010/01/halftone-navigation-menu-jquery-css/">original tutorial</a>, or download the <a href="demo.zip">source files</a>.</p>
-
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>Halftone Navigation Menu With jQuery &amp; CSS3 | Tutorialzine demo</title>
+
+<link rel="stylesheet" type="text/css" href="styles.css" />
+
+<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
+
+<script type="text/javascript" src="script.js"></script>
+
+</head>
+
+<body>
+
+<h1>Halftone Navigation Menu With jQuery &amp; CSS3</h1>
+<h2>View the <a href="http://tutorialzine.com/2010/01/halftone-navigation-menu-jquery-css/">original tutorial &raquo;</a></h2>
+
+
+<div id="main">
+	
+ <div id="navigation">
+     <ul class="menuUL">
+	     <!-- The class names that are assigned to the links correspond to name of the shape that is shown on hover: -->
+         <li><a href="#" class="house">Home</a></li>
+         <li><a href="#" class="wrench">Services</a></li>
+         <li><a href="#" class="envelope">Contact</a></li>
+         <li><a href="#" class="info">About</a></li>
+     </ul>
+     <div class="clear"></div>
+ </div>
+
+    <div id="stage">
+    <!-- The dot divs are shown here -->
+    </div>
+</div>
+
+<p class="tutInfo">This is a tutorialzine demo. View the <a href="http://tutorialzine.com/2010/01/halftone-navigation-menu-jquery-css/">original tutorial</a>, or download the <a href="demo.zip">source files</a>.</p>
+
+
+</body>
+</html>

contrib/library/network/server/nino/example/SimpleWebServer/webroot/demo2/script.js

@@ -1,121 +1,121 @@
-/* Set serviceMode to true to create your own shapes: */
-var serviceMode = false;
-
-$(document).ready(function(){
-	/* This code is executed after the DOM has been completely loaded */
-
-	var str=[];
-	var perRow = 16;
-	
-	/* Generating the dot divs: */
-	
-	for(var i=0;i<192;i++)
-	{
-		str.push('<div class="dot" id="d-'+i+'" />');
-	}
-	
-	/* Joining the array into a string and adding it to the inner html of the stage div: */
-	
-	$('#stage').html(str.join(''));
-	
-	/* Using the hover method: */
-
-	$('#navigation li a').hover(function(e){
-	
-		/* serviceDraw is a cut-out version of the draw function, used for shape editing and composing: */
-		
-		if(serviceMode)
-			serviceDraw($(this).attr('class'));
-		else
-			draw($(this).attr('class'));
-	}, function(e){
-		
-	});
-	
-	/* Caching the dot divs into a variable for performance: */
-	dots = $('.dot');
-	
-	if(serviceMode)
-	{
-		/* If we are in service mode, show borders around the dot divs, add the export link, and listen for clicks: */
-		
-		dots.css({
-			border:'1px solid black',
-			width:dots.eq(0).width()-2,
-			height:dots.eq(0).height()-2,
-			cursor:'pointer'
-		})
-		
-		$('<div/>').css({
-			position:'absolute',
-			bottom:-20,
-			right:0
-		}).html('<a href="" onclick="outputString();return false;">[Export Shape]</a>').appendTo('#stage');
-		
-		dots.click(function(){
-			$(this).toggleClass('active');
-		});
-	}
-	
-});
-
-var shapes={
-	
-	/* Each shape is described by an array of points. You can add your own shapes here,
-	   just don't forget to add a coma after each array, except for the last one */
-	
-	house:[22,37,38,39,52,53,54,55,56,67,68,69,70,71,72,73,82,83,84,85,86,87,88,89,90,99,100,104,105,115,116,120,121,131,132,136,137,147,148,150,151,152,153,163,164,166,167,168,169],
-	wrench:[22,23,24,25,26,27,38,39,40,41,42,43,54,55,58,59,70,71,86,87,88,89,101,102,103,104,105,116,117,118,131,132,133,146,147,148,163],
-	envelope:[34,35,36,37,38,39,40,41,42,43,44,50,51,52,58,59,60,66,68,69,73,74,76,82,85,86,88,89,92,98,102,103,104,108,114,119,124,130,140,146,147,148,149,150,151,152,153,154,155,156],
-	info:[22,23,38,39,69,70,71,86,87,102,103,118,119,134,135,150,151,166,167,168]
-}
-
-var stopCounter = 0;
-var dots;
-
-function draw(shape)
-{
-	/* This function draws a shape from the shapes object */
-	
-	stopCounter++;
-	var currentCounter = stopCounter;
-
-	dots.removeClass('active').css('opacity',0);
-	
-	$.each(shapes[shape],function(i,j){
-		setTimeout(function(){
-							
-			/* If a different shape animaton has been started during the showing of the current one, exit the function  */
-			if(currentCounter!=stopCounter) return false;
-			
-			dots.eq(j).addClass('active').fadeTo('slow',0.4);
-			
-			/* The fade animation is scheduled for 10*i millisecond in the future: */
-		},10*i);
-
-	});
-}
-
-function serviceDraw(shape)
-{
-	/* A cut out version of the draw function, used in service mode */
-	
-	dots.removeClass('active');
-	
-	$.each(shapes[shape],function(i,j){
-		dots.eq(j).addClass('active');
-	});
-}
-
-function outputString()
-{
-	/* Outputs the positions of the active dot divs as a comma-separated string: */
-	
-	var str=[];
-	$('.dot.active').each(function(){
-		
-		str.push(this.id.replace('d-',''));
-	})
-	
-	prompt('Insert this string as an array in the shapes object',str.join(','));
+/* Set serviceMode to true to create your own shapes: */
+var serviceMode = false;
+
+$(document).ready(function(){
+	/* This code is executed after the DOM has been completely loaded */
+
+	var str=[];
+	var perRow = 16;
+	
+	/* Generating the dot divs: */
+	
+	for(var i=0;i<192;i++)
+	{
+		str.push('<div class="dot" id="d-'+i+'" />');
+	}
+	
+	/* Joining the array into a string and adding it to the inner html of the stage div: */
+	
+	$('#stage').html(str.join(''));
+	
+	/* Using the hover method: */
+
+	$('#navigation li a').hover(function(e){
+	
+		/* serviceDraw is a cut-out version of the draw function, used for shape editing and composing: */
+		
+		if(serviceMode)
+			serviceDraw($(this).attr('class'));
+		else
+			draw($(this).attr('class'));
+	}, function(e){
+		
+	});
+	
+	/* Caching the dot divs into a variable for performance: */
+	dots = $('.dot');
+	
+	if(serviceMode)
+	{
+		/* If we are in service mode, show borders around the dot divs, add the export link, and listen for clicks: */
+		
+		dots.css({
+			border:'1px solid black',
+			width:dots.eq(0).width()-2,
+			height:dots.eq(0).height()-2,
+			cursor:'pointer'
+		})
+		
+		$('<div/>').css({
+			position:'absolute',
+			bottom:-20,
+			right:0
+		}).html('<a href="" onclick="outputString();return false;">[Export Shape]</a>').appendTo('#stage');
+		
+		dots.click(function(){
+			$(this).toggleClass('active');
+		});
+	}
+	
+});
+
+var shapes={
+	
+	/* Each shape is described by an array of points. You can add your own shapes here,
+	   just don't forget to add a coma after each array, except for the last one */
+	
+	house:[22,37,38,39,52,53,54,55,56,67,68,69,70,71,72,73,82,83,84,85,86,87,88,89,90,99,100,104,105,115,116,120,121,131,132,136,137,147,148,150,151,152,153,163,164,166,167,168,169],
+	wrench:[22,23,24,25,26,27,38,39,40,41,42,43,54,55,58,59,70,71,86,87,88,89,101,102,103,104,105,116,117,118,131,132,133,146,147,148,163],
+	envelope:[34,35,36,37,38,39,40,41,42,43,44,50,51,52,58,59,60,66,68,69,73,74,76,82,85,86,88,89,92,98,102,103,104,108,114,119,124,130,140,146,147,148,149,150,151,152,153,154,155,156],
+	info:[22,23,38,39,69,70,71,86,87,102,103,118,119,134,135,150,151,166,167,168]
+}
+
+var stopCounter = 0;
+var dots;
+
+function draw(shape)
+{
+	/* This function draws a shape from the shapes object */
+	
+	stopCounter++;
+	var currentCounter = stopCounter;
+
+	dots.removeClass('active').css('opacity',0);
+	
+	$.each(shapes[shape],function(i,j){
+		setTimeout(function(){
+							
+			/* If a different shape animaton has been started during the showing of the current one, exit the function  */
+			if(currentCounter!=stopCounter) return false;
+			
+			dots.eq(j).addClass('active').fadeTo('slow',0.4);
+			
+			/* The fade animation is scheduled for 10*i millisecond in the future: */
+		},10*i);
+
+	});
+}
+
+function serviceDraw(shape)
+{
+	/* A cut out version of the draw function, used in service mode */
+	
+	dots.removeClass('active');
+	
+	$.each(shapes[shape],function(i,j){
+		dots.eq(j).addClass('active');
+	});
+}
+
+function outputString()
+{
+	/* Outputs the positions of the active dot divs as a comma-separated string: */
+	
+	var str=[];
+	$('.dot.active').each(function(){
+		
+		str.push(this.id.replace('d-',''));
+	})
+	
+	prompt('Insert this string as an array in the shapes object',str.join(','));
 }

contrib/library/network/server/nino/example/SimpleWebServer/webroot/demo2/styles.css

@@ -1,148 +1,148 @@
-body,h1,h2,h3,p,quote,small,form,input,ul,li,ol,label{
-	/* Simple page reset */
-	margin:0;
-	padding:0;
-}
-
-body{
-	/* Setting default text color, background and a font stack */
-	color:#cccccc;
-	font-size:0.825em;
-	background: url(img/background.jpg) no-repeat center top #252525;
-	font-family:Arial, Helvetica, sans-serif;
-}
-
-.menuUL li{
-	/* This will arrange the LI-s next to each other */
-	display:inline;
-}
-
-.menuUL li a,.menuUL li a:visited{
-	/* Styling the hyperlinks of the menu as buttons */
-	
-	float:left;
-	font-weight:bold;
-	background:url(img/button_bg.jpg) repeat-x center bottom #666666;
-	
-	/* display:block allows for additinal CSS rules to take effect, such as paddings: */
-	display:block;
-	border:1px solid #4D4D4D;
-	color:#CCCCCC;
-	border-top-color:#565656;
-	
-	padding:4px 6px;
-	margin:4px 5px;
-	height:16px;
-	
-	
-	/* Setting a CSS3 box shadow around the button */
-	
-	-moz-box-shadow:0 0 1px black;
-	-webkit-box-shadow:0 0 1px black;
-	box-shadow:0 0 1px black;
-	
-	/* CSS3 text shadow */
-	text-shadow:0 1px black;
-}
-
-.menuUL li a:hover{
-	/* On hover show the top, lighter, part of the background: */
-	background-position:center top;
-	text-decoration:none;
-}
-
-#navigation{
-	/* The navigation menu bar: */
-	background:#222222;
-	border:1px solid #111111;
-	float:left;
-	padding:5px 10px;
-}
-
-#navigation,.menuUL li a{
-	/* CSS3 rounded corners for both the navigation bar and the buttons: */
-	-moz-border-radius:4px;
-	-webkit-border-radius:4px;
-	-khtml-border-radius:4px;
-	border-radius:4px;
-}
-
-#stage{
-	/* The stage contains the individual divs that comprise the halftone icon: */
-	height:300px;
-	position:absolute;
-	right:50px;
-	top:20px;
-	width:400px;
-}
-
-.dot{
-	/* The stage contains 192 .dot divs: */
-	float:left;
-	height:25px;
-	width:25px;
-}
-
-.dot.active{
-	/* When assigned the active class, the div shows a background image of a dot: */
-	background:url(img/dot.png) no-repeat center center;
-}
-
-.clear{
-	/* Old-school clear fix hack to clear the floats: */
-	clear:both;
-}
-
-#main{
-	margin:0 auto;
-	position:relative;
-	width:900px;
-}
-
-/* The styles below are only necessary for the demo page */
-
-h1{
-	background:#222222;
-	border-bottom:1px solid black;
-	font-size:1.5em;
-	font-weight:normal;
-	margin-bottom:15px;
-	padding:15px;
-	text-align:center;
-}
-
-h2 {
-	font-size:0.9em;
-	font-weight:normal;
-	padding-right:40px;
-	position:relative;
-	right:0;
-	text-align:right;
-	text-transform:uppercase;
-	top:-48px;
-}
-
-a, a:visited {
-	color:#0196e3;
-	text-decoration:none;
-	outline:none;
-}
-
-a:hover{
-	text-decoration:underline;
-}
-
-p.tutInfo{
-	/* The tutorial info on the bottom of the page */
-	padding:10px 0;
-	text-align:center;
-	position:absolute;
-	bottom:0px;
-	background:#222222;
-	border-top:1px solid black;
-	width:100%;
-}
-
-h1,h2,p.tutInfo{
-	font-family:"Myriad Pro",Arial,Helvetica,sans-serif;
-}
+body,h1,h2,h3,p,quote,small,form,input,ul,li,ol,label{
+	/* Simple page reset */
+	margin:0;
+	padding:0;
+}
+
+body{
+	/* Setting default text color, background and a font stack */
+	color:#cccccc;
+	font-size:0.825em;
+	background: url(img/background.jpg) no-repeat center top #252525;
+	font-family:Arial, Helvetica, sans-serif;
+}
+
+.menuUL li{
+	/* This will arrange the LI-s next to each other */
+	display:inline;
+}
+
+.menuUL li a,.menuUL li a:visited{
+	/* Styling the hyperlinks of the menu as buttons */
+	
+	float:left;
+	font-weight:bold;
+	background:url(img/button_bg.jpg) repeat-x center bottom #666666;
+	
+	/* display:block allows for additinal CSS rules to take effect, such as paddings: */
+	display:block;
+	border:1px solid #4D4D4D;
+	color:#CCCCCC;
+	border-top-color:#565656;
+	
+	padding:4px 6px;
+	margin:4px 5px;
+	height:16px;
+	
+	
+	/* Setting a CSS3 box shadow around the button */
+	
+	-moz-box-shadow:0 0 1px black;
+	-webkit-box-shadow:0 0 1px black;
+	box-shadow:0 0 1px black;
+	
+	/* CSS3 text shadow */
+	text-shadow:0 1px black;
+}
+
+.menuUL li a:hover{
+	/* On hover show the top, lighter, part of the background: */
+	background-position:center top;
+	text-decoration:none;
+}
+
+#navigation{
+	/* The navigation menu bar: */
+	background:#222222;
+	border:1px solid #111111;
+	float:left;
+	padding:5px 10px;
+}
+
+#navigation,.menuUL li a{
+	/* CSS3 rounded corners for both the navigation bar and the buttons: */
+	-moz-border-radius:4px;
+	-webkit-border-radius:4px;
+	-khtml-border-radius:4px;
+	border-radius:4px;
+}
+
+#stage{
+	/* The stage contains the individual divs that comprise the halftone icon: */
+	height:300px;
+	position:absolute;
+	right:50px;
+	top:20px;
+	width:400px;
+}
+
+.dot{
+	/* The stage contains 192 .dot divs: */
+	float:left;
+	height:25px;
+	width:25px;
+}
+
+.dot.active{
+	/* When assigned the active class, the div shows a background image of a dot: */
+	background:url(img/dot.png) no-repeat center center;
+}
+
+.clear{
+	/* Old-school clear fix hack to clear the floats: */
+	clear:both;
+}
+
+#main{
+	margin:0 auto;
+	position:relative;
+	width:900px;
+}
+
+/* The styles below are only necessary for the demo page */
+
+h1{
+	background:#222222;
+	border-bottom:1px solid black;
+	font-size:1.5em;
+	font-weight:normal;
+	margin-bottom:15px;
+	padding:15px;
+	text-align:center;
+}
+
+h2 {
+	font-size:0.9em;
+	font-weight:normal;
+	padding-right:40px;
+	position:relative;
+	right:0;
+	text-align:right;
+	text-transform:uppercase;
+	top:-48px;
+}
+
+a, a:visited {
+	color:#0196e3;
+	text-decoration:none;
+	outline:none;
+}
+
+a:hover{
+	text-decoration:underline;
+}
+
+p.tutInfo{
+	/* The tutorial info on the bottom of the page */
+	padding:10px 0;
+	text-align:center;
+	position:absolute;
+	bottom:0px;
+	background:#222222;
+	border-top:1px solid black;
+	width:100%;
+}
+
+h1,h2,p.tutInfo{
+	font-family:"Myriad Pro",Arial,Helvetica,sans-serif;
+}

contrib/library/network/server/nino/example/SimpleWebServer/webroot/example/html/contentpage.html

@@ -1,153 +1,153 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Business Co.</title>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-
-<link href="css/styles.css" rel="stylesheet" type="text/css" />
-
-<script type="text/javascript">
-<!--
-function MM_preloadImages() { //v3.0
-  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
-    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
-    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
-}
-
-function MM_swapImgRestore() { //v3.0
-  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
-}
-
-function MM_findObj(n, d) { //v4.01
-  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
-    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
-  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
-  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
-  if(!x && d.getElementById) x=d.getElementById(n); return x;
-}
-
-function MM_swapImage() { //v3.0
-  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
-   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
-}
-//-->
-</script>
-</head>
-<body  onload="MM_preloadImages('images/btn_1_over.jpg','images/btn_2_over.jpg','images/btn_3_over.jpg','images/btn_4_over.jpg','images/btn_5_over.jpg', 'images/btn_6_over.jpg');">
-<!-- Save for Web Slices (index.psd) -->
-<table width="775" height="700" border="0" align="center" cellpadding="0" cellspacing="0" id="table_01">
-	<tr>
-		<td width="59" height="0" nowrap="nowrap"></td>
-		<td width="19" height="0" nowrap="nowrap"></td>
-		<td width="4" height="0" nowrap="nowrap"></td>
-		<td width="23" height="0" nowrap="nowrap"></td>
-		<td width="83" height="0" nowrap="nowrap"></td>
-		<td width="3" height="0" nowrap="nowrap"></td>
-		<td width="8" height="0" nowrap="nowrap"></td>
-		<td width="10" height="0" nowrap="nowrap"></td>
-		<td width="31" height="0" nowrap="nowrap"></td>
-		<td width="47" height="0" nowrap="nowrap"></td>
-		<td width="4" height="0" nowrap="nowrap"></td>
-		<td width="3" height="0" nowrap="nowrap"></td>
-		<td width="98" height="0" nowrap="nowrap"></td>
-		<td width="3" height="0" nowrap="nowrap"></td>
-		<td width="66" height="0" nowrap="nowrap"></td>
-		<td width="31" height="0" nowrap="nowrap"></td>
-		<td width="10" height="0" nowrap="nowrap"></td>
-		<td width="3" height="0" nowrap="nowrap"></td>
-		<td width="3" height="0" nowrap="nowrap"></td>
-		<td width="5" height="0" nowrap="nowrap"></td>
-		<td width="89" height="0" nowrap="nowrap"></td>
-		<td width="3" height="0" nowrap="nowrap"></td>
-		<td width="15" height="0" nowrap="nowrap"></td>
-		<td width="57" height="0" nowrap="nowrap"></td>
-		<td width="21" height="0" nowrap="nowrap"></td>
-		<td width="17" height="0" nowrap="nowrap"></td>
-		<td width="60" height="0" nowrap="nowrap"></td>
-		<td width="0" height="0"></td>
-	</tr>
-	<tr>
-		<td width="59" height="651" rowspan="15">
-			<img src="images/main.jpg" width="59" height="651" alt="" /></td>
-		<td width="561" height="33" colspan="22" align="left" valign="middle" bgcolor="#efefef" class="text3" style="padding-left:20px">SEPTEMBER 29, 2009 </td>
-		<td width="95" height="33" colspan="3" align="left" valign="top"><a href="#"><img src="images/client_login.jpg" alt="" width="95" height="33" border="0" /></a></td>
-		<td width="60" height="651" rowspan="15">
-			<img src="images/main-03.jpg" width="60" height="651" alt="" /></td>
-		<td width="0" height="33" nowrap="nowrap"></td>
-	</tr>
-	<tr>
-		<td width="656" height="21" colspan="25" align="left" valign="top" nowrap="nowrap" bgcolor="#a7a7a7"></td>
-		<td width="0" height="21" nowrap="nowrap"></td>
-	</tr>
-	<tr>
-		<td width="23" height="17" colspan="2" align="left" valign="top" nowrap="nowrap" bgcolor="#a7a7a7"></td>
-		<td width="106" height="17" colspan="2" align="left" valign="top" bgcolor="#a7a7a7"><a href="index.html"><img src="images/btn_1.jpg" alt="" name="btn_1" width="106" height="17" border="0" id="btn_1" onmouseover="MM_swapImage('btn_1','','images/btn_1_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
-		<td width="3" height="17" align="left" valign="top" bgcolor="#a7a7a7">
-			<img src="images/lines.jpg" width="3" height="17" alt="" /></td>
-		<td width="100" height="17" colspan="5" align="left" valign="top" bgcolor="#a7a7a7"><a href="contentpage.html"><img src="images/btn_2.jpg" alt="" name="btn_2" width="100" height="17" border="0" id="btn_2" onmouseover="MM_swapImage('btn_2','','images/btn_2_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
-		<td width="3" height="17" align="left" valign="top" bgcolor="#a7a7a7">
-			<img src="images/lines-07.jpg" width="3" height="17" alt="" /></td>
-		<td width="98" height="17" align="left" valign="top" bgcolor="#a7a7a7"><a href="contentpage.html"><img src="images/btn_3.jpg" alt="" name="btn_3" width="98" height="17" border="0" id="btn_3" onmouseover="MM_swapImage('btn_3','','images/btn_3_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
-		<td width="3" height="17" align="left" valign="top" bgcolor="#a7a7a7">
-			<img src="images/lines-09.jpg" width="3" height="17" alt="" /></td>
-		<td width="107" height="17" colspan="3" align="left" valign="top" bgcolor="#a7a7a7"><a href="contentpage.html"><img src="images/btn_4.jpg" alt="" name="btn_4" width="107" height="17" border="0" id="btn_4" onmouseover="MM_swapImage('btn_4','','images/btn_4_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
-		<td width="3" height="17" align="left" valign="top" bgcolor="#a7a7a7">
-			<img src="images/lines-11.jpg" width="3" height="17" alt="" /></td>
-		<td width="97" height="17" colspan="3" align="left" valign="top" bgcolor="#a7a7a7"><a href="contentpage.html"><img src="images/btn_5.jpg" alt="" name="btn_5" width="97" height="17" border="0" id="btn_5" onmouseover="MM_swapImage('btn_5','','images/btn_5_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
-		<td width="3" height="17" align="left" valign="top" bgcolor="#a7a7a7">
-			<img src="images/lines-13.jpg" width="3" height="17" alt="" /></td>
-		<td width="93" height="17" colspan="3" align="left" valign="top" bgcolor="#a7a7a7"><a href="contentpage.html"><img src="images/btn_6.jpg" alt="" name="btn_6" width="93" height="17" border="0" id="btn_6" onmouseover="MM_swapImage('btn_6','','images/btn_6_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
-		<td width="17" height="17" align="left" valign="top" nowrap="nowrap" bgcolor="#a7a7a7"></td>
-		<td width="0" height="17" nowrap="nowrap"></td>
-	</tr>
-	<tr>
-		<td width="656" height="19" colspan="25" align="left" valign="top" nowrap="nowrap" bgcolor="#a7a7a7"></td>
-		<td width="0" height="19" nowrap="nowrap"></td>
-	</tr>
-	<tr>
-		<td width="656" height="240" colspan="25" align="left" valign="top">
-			<img src="images/main-15.jpg" width="656" height="240" alt="" /></td>
-		<td width="0" height="240" nowrap="nowrap"></td>
-	</tr>
-	<tr>
-		<td width="656" height="321" colspan="25" rowspan="10" align="center" valign="middle" nowrap="nowrap" bgcolor="#efefef" class="text1">Content Page</td>
-		<td width="0" height="7" nowrap="nowrap"></td>
-	</tr>
-	<tr>
-		<td width="0" height="43" nowrap="nowrap"></td>
-	</tr>
-	<tr>
-		<td width="0" height="56" nowrap="nowrap"></td>
-	</tr>
-	<tr>
-		<td width="0" height="26" nowrap="nowrap"></td>
-	</tr>
-	<tr>
-		<td width="0" height="12" nowrap="nowrap"></td>
-	</tr>
-	<tr>
-		<td width="0" height="17" nowrap="nowrap"></td>
-	</tr>
-	<tr>
-		<td width="0" height="23" nowrap="nowrap"></td>
-	</tr>
-	<tr>
-		<td width="0" height="22" nowrap="nowrap"></td>
-	</tr>
-	<tr>
-		<td width="0" height="58" nowrap="nowrap"></td>
-	</tr>
-	<tr>
-		<td width="0" height="57" nowrap="nowrap"></td>
-	</tr>
-	<tr>
-		<td width="775" height="49" colspan="27" align="center" valign="middle" class="text2" style="background:url(images/b_footer.jpg)"><a href="index.html">HOME</a> | <a href="contentpage.html">ABOUT US</a> | <a href="contentpage.html">SERVICES</a> | <a href="contentpage.html">SOLUTIONS</a> | <a href="contentpage.html">SUPPORT</a> | <a href="contentpage.html">CONTACTS</a><br />
-      <span class="text3">Copyright &copy; Your Company Name</span><br/>
-      Design by <a href="http://www.templatesbox.com" target="_blank" class="adv">Templates</a> Box. Create a <a href="http://www.wix.com" target="_blank" class="adv">free website</a>.
-      </td>
-		<td width="0" height="49" nowrap="nowrap"></td>
-	</tr>
-</table>
-<!-- End Save for Web Slices -->
-</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Business Co.</title>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+
+<link href="css/styles.css" rel="stylesheet" type="text/css" />
+
+<script type="text/javascript">
+<!--
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_findObj(n, d) { //v4.01
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && d.getElementById) x=d.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</head>
+<body  onload="MM_preloadImages('images/btn_1_over.jpg','images/btn_2_over.jpg','images/btn_3_over.jpg','images/btn_4_over.jpg','images/btn_5_over.jpg', 'images/btn_6_over.jpg');">
+<!-- Save for Web Slices (index.psd) -->
+<table width="775" height="700" border="0" align="center" cellpadding="0" cellspacing="0" id="table_01">
+	<tr>
+		<td width="59" height="0" nowrap="nowrap"></td>
+		<td width="19" height="0" nowrap="nowrap"></td>
+		<td width="4" height="0" nowrap="nowrap"></td>
+		<td width="23" height="0" nowrap="nowrap"></td>
+		<td width="83" height="0" nowrap="nowrap"></td>
+		<td width="3" height="0" nowrap="nowrap"></td>
+		<td width="8" height="0" nowrap="nowrap"></td>
+		<td width="10" height="0" nowrap="nowrap"></td>
+		<td width="31" height="0" nowrap="nowrap"></td>
+		<td width="47" height="0" nowrap="nowrap"></td>
+		<td width="4" height="0" nowrap="nowrap"></td>
+		<td width="3" height="0" nowrap="nowrap"></td>
+		<td width="98" height="0" nowrap="nowrap"></td>
+		<td width="3" height="0" nowrap="nowrap"></td>
+		<td width="66" height="0" nowrap="nowrap"></td>
+		<td width="31" height="0" nowrap="nowrap"></td>
+		<td width="10" height="0" nowrap="nowrap"></td>
+		<td width="3" height="0" nowrap="nowrap"></td>
+		<td width="3" height="0" nowrap="nowrap"></td>
+		<td width="5" height="0" nowrap="nowrap"></td>
+		<td width="89" height="0" nowrap="nowrap"></td>
+		<td width="3" height="0" nowrap="nowrap"></td>
+		<td width="15" height="0" nowrap="nowrap"></td>
+		<td width="57" height="0" nowrap="nowrap"></td>
+		<td width="21" height="0" nowrap="nowrap"></td>
+		<td width="17" height="0" nowrap="nowrap"></td>
+		<td width="60" height="0" nowrap="nowrap"></td>
+		<td width="0" height="0"></td>
+	</tr>
+	<tr>
+		<td width="59" height="651" rowspan="15">
+			<img src="images/main.jpg" width="59" height="651" alt="" /></td>
+		<td width="561" height="33" colspan="22" align="left" valign="middle" bgcolor="#efefef" class="text3" style="padding-left:20px">SEPTEMBER 29, 2009 </td>
+		<td width="95" height="33" colspan="3" align="left" valign="top"><a href="#"><img src="images/client_login.jpg" alt="" width="95" height="33" border="0" /></a></td>
+		<td width="60" height="651" rowspan="15">
+			<img src="images/main-03.jpg" width="60" height="651" alt="" /></td>
+		<td width="0" height="33" nowrap="nowrap"></td>
+	</tr>
+	<tr>
+		<td width="656" height="21" colspan="25" align="left" valign="top" nowrap="nowrap" bgcolor="#a7a7a7"></td>
+		<td width="0" height="21" nowrap="nowrap"></td>
+	</tr>
+	<tr>
+		<td width="23" height="17" colspan="2" align="left" valign="top" nowrap="nowrap" bgcolor="#a7a7a7"></td>
+		<td width="106" height="17" colspan="2" align="left" valign="top" bgcolor="#a7a7a7"><a href="index.html"><img src="images/btn_1.jpg" alt="" name="btn_1" width="106" height="17" border="0" id="btn_1" onmouseover="MM_swapImage('btn_1','','images/btn_1_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
+		<td width="3" height="17" align="left" valign="top" bgcolor="#a7a7a7">
+			<img src="images/lines.jpg" width="3" height="17" alt="" /></td>
+		<td width="100" height="17" colspan="5" align="left" valign="top" bgcolor="#a7a7a7"><a href="contentpage.html"><img src="images/btn_2.jpg" alt="" name="btn_2" width="100" height="17" border="0" id="btn_2" onmouseover="MM_swapImage('btn_2','','images/btn_2_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
+		<td width="3" height="17" align="left" valign="top" bgcolor="#a7a7a7">
+			<img src="images/lines-07.jpg" width="3" height="17" alt="" /></td>
+		<td width="98" height="17" align="left" valign="top" bgcolor="#a7a7a7"><a href="contentpage.html"><img src="images/btn_3.jpg" alt="" name="btn_3" width="98" height="17" border="0" id="btn_3" onmouseover="MM_swapImage('btn_3','','images/btn_3_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
+		<td width="3" height="17" align="left" valign="top" bgcolor="#a7a7a7">
+			<img src="images/lines-09.jpg" width="3" height="17" alt="" /></td>
+		<td width="107" height="17" colspan="3" align="left" valign="top" bgcolor="#a7a7a7"><a href="contentpage.html"><img src="images/btn_4.jpg" alt="" name="btn_4" width="107" height="17" border="0" id="btn_4" onmouseover="MM_swapImage('btn_4','','images/btn_4_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
+		<td width="3" height="17" align="left" valign="top" bgcolor="#a7a7a7">
+			<img src="images/lines-11.jpg" width="3" height="17" alt="" /></td>
+		<td width="97" height="17" colspan="3" align="left" valign="top" bgcolor="#a7a7a7"><a href="contentpage.html"><img src="images/btn_5.jpg" alt="" name="btn_5" width="97" height="17" border="0" id="btn_5" onmouseover="MM_swapImage('btn_5','','images/btn_5_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
+		<td width="3" height="17" align="left" valign="top" bgcolor="#a7a7a7">
+			<img src="images/lines-13.jpg" width="3" height="17" alt="" /></td>
+		<td width="93" height="17" colspan="3" align="left" valign="top" bgcolor="#a7a7a7"><a href="contentpage.html"><img src="images/btn_6.jpg" alt="" name="btn_6" width="93" height="17" border="0" id="btn_6" onmouseover="MM_swapImage('btn_6','','images/btn_6_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
+		<td width="17" height="17" align="left" valign="top" nowrap="nowrap" bgcolor="#a7a7a7"></td>
+		<td width="0" height="17" nowrap="nowrap"></td>
+	</tr>
+	<tr>
+		<td width="656" height="19" colspan="25" align="left" valign="top" nowrap="nowrap" bgcolor="#a7a7a7"></td>
+		<td width="0" height="19" nowrap="nowrap"></td>
+	</tr>
+	<tr>
+		<td width="656" height="240" colspan="25" align="left" valign="top">
+			<img src="images/main-15.jpg" width="656" height="240" alt="" /></td>
+		<td width="0" height="240" nowrap="nowrap"></td>
+	</tr>
+	<tr>
+		<td width="656" height="321" colspan="25" rowspan="10" align="center" valign="middle" nowrap="nowrap" bgcolor="#efefef" class="text1">Content Page</td>
+		<td width="0" height="7" nowrap="nowrap"></td>
+	</tr>
+	<tr>
+		<td width="0" height="43" nowrap="nowrap"></td>
+	</tr>
+	<tr>
+		<td width="0" height="56" nowrap="nowrap"></td>
+	</tr>
+	<tr>
+		<td width="0" height="26" nowrap="nowrap"></td>
+	</tr>
+	<tr>
+		<td width="0" height="12" nowrap="nowrap"></td>
+	</tr>
+	<tr>
+		<td width="0" height="17" nowrap="nowrap"></td>
+	</tr>
+	<tr>
+		<td width="0" height="23" nowrap="nowrap"></td>
+	</tr>
+	<tr>
+		<td width="0" height="22" nowrap="nowrap"></td>
+	</tr>
+	<tr>
+		<td width="0" height="58" nowrap="nowrap"></td>
+	</tr>
+	<tr>
+		<td width="0" height="57" nowrap="nowrap"></td>
+	</tr>
+	<tr>
+		<td width="775" height="49" colspan="27" align="center" valign="middle" class="text2" style="background:url(images/b_footer.jpg)"><a href="index.html">HOME</a> | <a href="contentpage.html">ABOUT US</a> | <a href="contentpage.html">SERVICES</a> | <a href="contentpage.html">SOLUTIONS</a> | <a href="contentpage.html">SUPPORT</a> | <a href="contentpage.html">CONTACTS</a><br />
+      <span class="text3">Copyright &copy; Your Company Name</span><br/>
+      Design by <a href="http://www.templatesbox.com" target="_blank" class="adv">Templates</a> Box. Create a <a href="http://www.wix.com" target="_blank" class="adv">free website</a>.
+      </td>
+		<td width="0" height="49" nowrap="nowrap"></td>
+	</tr>
+</table>
+<!-- End Save for Web Slices -->
+</body>
 </html>

contrib/library/network/server/nino/example/SimpleWebServer/webroot/example/html/css/styles.css

@@ -1,160 +1,160 @@
-body{
-	padding:0px;
-	margin:0px;
-	background:#c7c7c7;
-	color:#848484;
-	font:10px/14px Tahoma, sans-serif;
-}
-
-div, p, ul, h2, h3, h4, img, form{padding:0px; margin:0px;}
-ul{list-style-type:none;}
-
-.clear{
-clear:both;
-}
-
-.frame {
-	border: 1px solid #D5E6E0;
-}
-
-.text1 {
-	font: 11px/14px "Trebuchet MS", Arial, Helvetica, sans-serif;
-	color:#000;
-	font-weight:bold;
-}
-.text2 {
-	font: 11px/14px Tahoma, Geneva, sans-serif;
-	color:#000;
-	font-weight:normal;
-}
-.text3 {
-	font: 10px/14px Tahoma, Geneva, sans-serif;
-	color:#000;
-	font-weight:normal;
-}
-
-.text4 {
-	font: 10px/12px Tahoma, Geneva, sans-serif;
-	color:#052578;
-	font-weight:bold;
-}
-.text5 {
-	font: 10px/12px Tahoma, Geneva, sans-serif;
-	color:#052578;
-	font-weight:bold;
-}
-
-
-a:link {
-	font: 11px/14px Tahoma, Geneva, sans-serif;
-	color:#000;
-	font-weight:normal;
-	text-decoration:none;
-}
-
-a:visited{
-	font: 11px/14px Tahoma, Geneva, sans-serif;
-	color:#000;
-	font-weight:normal;
-	text-decoration:none;
-}
-
-a:hover {
-	font: 11px/14px Tahoma, Geneva, sans-serif;
-	color:#000;
-	font-weight:normal;
-	text-decoration:underline;
-}
-
-a.a:link {
-	font: 10px/14px Tahoma, Geneva, sans-serif;
-	color:#19a1cb;
-	font-weight:normal;
-	text-decoration:underline;
-}
-
-a.a:visited{
-	font: 10px/14px Tahoma, Geneva, sans-serif;
-	color:#19a1cb;
-	font-weight:normal;
-	text-decoration:underline;
-}
-
-a.a:hover {
-	font: 10px/14px Tahoma, Geneva, sans-serif;
-	color:#000;
-	font-weight:normal;
-	text-decoration:none;
-}
-
-a.b:link {
-	font: 10px/18px Tahoma, Geneva, sans-serif;
-	color:#848484;
-	font-weight:normal;
-	text-decoration:underline;
-}
-
-a.b:visited{
-	font: 10px/18px Tahoma, Geneva, sans-serif;
-	color:#848484;
-	font-weight:normal;
-	text-decoration:underline;
-}
-
-a.b:hover {
-	font: 10px/18px Tahoma, Geneva, sans-serif;
-	color:#000;
-	font-weight:normal;
-	text-decoration:none;
-}
-
-a.c:link {
-	font: 10px/12px Tahoma, Geneva, sans-serif;
-	color:#FFF;
-	font-weight:normal;
-	text-decoration:none;
-}
-
-a.c:visited{
-	font: 10px/12px Tahoma, Geneva, sans-serif;
-	color:#FFF;
-	font-weight:normal;
-	text-decoration:none;
-}
-
-a.c:hover {
-	font: 10px/12px Tahoma, Geneva, sans-serif;
-	color:#FFF;
-	font-weight:normal;
-	text-decoration:underline;
-}
-
-a.d:link {
-	font: 10px/12px Tahoma, Geneva, sans-serif;
-	color:#FFF;
-	font-weight:normal;
-	text-decoration:none;
-}
-
-a.d:visited{
-	font: 10px/12px Tahoma, Geneva, sans-serif;
-	color:#FFF;
-	font-weight:normal;
-	text-decoration:none;
-}
-
-a.d:hover {
-	font: 10px/12px Tahoma, Geneva, sans-serif;
-	color:#FFF;
-	font-weight:normal;
-	text-decoration:underline;
-}
-
-input, textarea, select{
-border:#fff 1px solid;
-background-color:#d6e6e0;
-font:10px/12px Tahoma, sans-serif; color:#000; 
-}
-a.adv:link {text-decoration: none; font-weight:bold; color:#000;}
-a.adv:hover {text-decoration: none; font-weight:bold; color:#000;}
-a.adv:visited {text-decoration: none; font-weight:bold; color:#000;}
+body{
+	padding:0px;
+	margin:0px;
+	background:#c7c7c7;
+	color:#848484;
+	font:10px/14px Tahoma, sans-serif;
+}
+
+div, p, ul, h2, h3, h4, img, form{padding:0px; margin:0px;}
+ul{list-style-type:none;}
+
+.clear{
+clear:both;
+}
+
+.frame {
+	border: 1px solid #D5E6E0;
+}
+
+.text1 {
+	font: 11px/14px "Trebuchet MS", Arial, Helvetica, sans-serif;
+	color:#000;
+	font-weight:bold;
+}
+.text2 {
+	font: 11px/14px Tahoma, Geneva, sans-serif;
+	color:#000;
+	font-weight:normal;
+}
+.text3 {
+	font: 10px/14px Tahoma, Geneva, sans-serif;
+	color:#000;
+	font-weight:normal;
+}
+
+.text4 {
+	font: 10px/12px Tahoma, Geneva, sans-serif;
+	color:#052578;
+	font-weight:bold;
+}
+.text5 {
+	font: 10px/12px Tahoma, Geneva, sans-serif;
+	color:#052578;
+	font-weight:bold;
+}
+
+
+a:link {
+	font: 11px/14px Tahoma, Geneva, sans-serif;
+	color:#000;
+	font-weight:normal;
+	text-decoration:none;
+}
+
+a:visited{
+	font: 11px/14px Tahoma, Geneva, sans-serif;
+	color:#000;
+	font-weight:normal;
+	text-decoration:none;
+}
+
+a:hover {
+	font: 11px/14px Tahoma, Geneva, sans-serif;
+	color:#000;
+	font-weight:normal;
+	text-decoration:underline;
+}
+
+a.a:link {
+	font: 10px/14px Tahoma, Geneva, sans-serif;
+	color:#19a1cb;
+	font-weight:normal;
+	text-decoration:underline;
+}
+
+a.a:visited{
+	font: 10px/14px Tahoma, Geneva, sans-serif;
+	color:#19a1cb;
+	font-weight:normal;
+	text-decoration:underline;
+}
+
+a.a:hover {
+	font: 10px/14px Tahoma, Geneva, sans-serif;
+	color:#000;
+	font-weight:normal;
+	text-decoration:none;
+}
+
+a.b:link {
+	font: 10px/18px Tahoma, Geneva, sans-serif;
+	color:#848484;
+	font-weight:normal;
+	text-decoration:underline;
+}
+
+a.b:visited{
+	font: 10px/18px Tahoma, Geneva, sans-serif;
+	color:#848484;
+	font-weight:normal;
+	text-decoration:underline;
+}
+
+a.b:hover {
+	font: 10px/18px Tahoma, Geneva, sans-serif;
+	color:#000;
+	font-weight:normal;
+	text-decoration:none;
+}
+
+a.c:link {
+	font: 10px/12px Tahoma, Geneva, sans-serif;
+	color:#FFF;
+	font-weight:normal;
+	text-decoration:none;
+}
+
+a.c:visited{
+	font: 10px/12px Tahoma, Geneva, sans-serif;
+	color:#FFF;
+	font-weight:normal;
+	text-decoration:none;
+}
+
+a.c:hover {
+	font: 10px/12px Tahoma, Geneva, sans-serif;
+	color:#FFF;
+	font-weight:normal;
+	text-decoration:underline;
+}
+
+a.d:link {
+	font: 10px/12px Tahoma, Geneva, sans-serif;
+	color:#FFF;
+	font-weight:normal;
+	text-decoration:none;
+}
+
+a.d:visited{
+	font: 10px/12px Tahoma, Geneva, sans-serif;
+	color:#FFF;
+	font-weight:normal;
+	text-decoration:none;
+}
+
+a.d:hover {
+	font: 10px/12px Tahoma, Geneva, sans-serif;
+	color:#FFF;
+	font-weight:normal;
+	text-decoration:underline;
+}
+
+input, textarea, select{
+border:#fff 1px solid;
+background-color:#d6e6e0;
+font:10px/12px Tahoma, sans-serif; color:#000; 
+}
+a.adv:link {text-decoration: none; font-weight:bold; color:#000;}
+a.adv:hover {text-decoration: none; font-weight:bold; color:#000;}
+a.adv:visited {text-decoration: none; font-weight:bold; color:#000;}

contrib/library/network/server/nino/example/SimpleWebServer/webroot/example/html/index.html

@@ -1,197 +1,197 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Business Co.</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
-<link href="css/styles.css" rel="stylesheet" type="text/css" />
-
-<script type="text/javascript">
-<!--
-function MM_preloadImages() { //v3.0
-  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
-    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
-    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
-}
-
-function MM_swapImgRestore() { //v3.0
-  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
-}
-
-function MM_findObj(n, d) { //v4.01
-  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
-    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
-  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
-  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
-  if(!x && d.getElementById) x=d.getElementById(n); return x;
-}
-
-function MM_swapImage() { //v3.0
-  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
-   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
-}
-//-->
-</script>
-</head>
-<body  onload="MM_preloadImages('images/btn_1_over.jpg','images/btn_2_over.jpg','images/btn_3_over.jpg','images/btn_4_over.jpg','images/btn_5_over.jpg', 'images/btn_6_over.jpg')">
-<!-- Save for Web Slices (index.psd) -->
-<table width="775" height="700" border="0" align="center" cellpadding="0" cellspacing="0" id="Table_01">
-	<tr>
-		<td width="59" height="0" nowrap></td>
-		<td width="19" height="0" nowrap></td>
-		<td width="4" height="0" nowrap></td>
-		<td width="23" height="0" nowrap></td>
-		<td width="83" height="0" nowrap></td>
-		<td width="3" height="0" nowrap></td>
-		<td width="8" height="0" nowrap></td>
-		<td width="10" height="0" nowrap></td>
-		<td width="31" height="0" nowrap></td>
-		<td width="47" height="0" nowrap></td>
-		<td width="4" height="0" nowrap></td>
-		<td width="3" height="0" nowrap></td>
-		<td width="98" height="0" nowrap></td>
-		<td width="3" height="0" nowrap></td>
-		<td width="66" height="0" nowrap></td>
-		<td width="31" height="0" nowrap></td>
-		<td width="10" height="0" nowrap></td>
-		<td width="3" height="0" nowrap></td>
-		<td width="3" height="0" nowrap></td>
-		<td width="5" height="0" nowrap></td>
-		<td width="89" height="0" nowrap></td>
-		<td width="3" height="0" nowrap></td>
-		<td width="15" height="0" nowrap></td>
-		<td width="57" height="0" nowrap></td>
-		<td width="21" height="0" nowrap></td>
-		<td width="17" height="0" nowrap></td>
-		<td width="60" height="0" nowrap></td>
-		<td width="0" height="0"></td>
-	</tr>
-	<tr>
-		<td width="59" height="651" rowspan="15">
-			<img src="images/main.jpg" width="59" height="651" alt="" /></td>
-		<td width="561" height="33" colspan="22" align="left" valign="middle" bgcolor="#EFEFEF" class="text3" style="padding-left:20px">SEPTEMBER 29, 2009 </td>
-		<td width="95" height="33" colspan="3" align="left" valign="top"><a href="#"><img src="images/client_login.jpg" alt="" width="95" height="33" border="0" /></a></td>
-		<td width="60" height="651" rowspan="15">
-			<img src="images/main-03.jpg" width="60" height="651" alt="" /></td>
-		<td width="0" height="33" nowrap></td>
-	</tr>
-	<tr>
-		<td width="656" height="21" colspan="25" align="left" valign="top" nowrap bgcolor="#A7A7A7"></td>
-		<td width="0" height="21" nowrap></td>
-	</tr>
-	<tr>
-		<td width="23" height="17" colspan="2" align="left" valign="top" nowrap bgcolor="#A7A7A7"></td>
-		<td width="106" height="17" colspan="2" align="left" valign="top" bgcolor="#A7A7A7"><a href="index.html"><img src="images/btn_1.jpg" alt="" name="btn_1" width="106" height="17" border="0" id="btn_1" onmouseover="MM_swapImage('btn_1','','images/btn_1_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
-		<td width="3" height="17" align="left" valign="top" bgcolor="#A7A7A7">
-			<img src="images/lines.jpg" width="3" height="17" alt="" /></td>
-		<td width="100" height="17" colspan="5" align="left" valign="top" bgcolor="#A7A7A7"><a href="contentpage.html"><img src="images/btn_2.jpg" alt="" name="btn_2" width="100" height="17" border="0" id="btn_2" onmouseover="MM_swapImage('btn_2','','images/btn_2_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
-		<td width="3" height="17" align="left" valign="top" bgcolor="#A7A7A7">
-			<img src="images/lines-07.jpg" width="3" height="17" alt="" /></td>
-		<td width="98" height="17" align="left" valign="top" bgcolor="#A7A7A7"><a href="contentpage.html"><img src="images/btn_3.jpg" alt="" name="btn_3" width="98" height="17" border="0" id="btn_3" onmouseover="MM_swapImage('btn_3','','images/btn_3_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
-		<td width="3" height="17" align="left" valign="top" bgcolor="#A7A7A7">
-			<img src="images/lines-09.jpg" width="3" height="17" alt="" /></td>
-		<td width="107" height="17" colspan="3" align="left" valign="top" bgcolor="#A7A7A7"><a href="contentpage.html"><img src="images/btn_4.jpg" alt="" name="btn_4" width="107" height="17" border="0" id="btn_4" onmouseover="MM_swapImage('btn_4','','images/btn_4_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
-		<td width="3" height="17" align="left" valign="top" bgcolor="#A7A7A7">
-			<img src="images/lines-11.jpg" width="3" height="17" alt="" /></td>
-		<td width="97" height="17" colspan="3" align="left" valign="top" bgcolor="#A7A7A7"><a href="contentpage.html"><img src="images/btn_5.jpg" alt="" name="btn_5" width="97" height="17" border="0" id="btn_5" onmouseover="MM_swapImage('btn_5','','images/btn_5_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
-		<td width="3" height="17" align="left" valign="top" bgcolor="#A7A7A7">
-			<img src="images/lines-13.jpg" width="3" height="17" alt="" /></td>
-		<td width="93" height="17" colspan="3" align="left" valign="top" bgcolor="#A7A7A7"><a href="contentpage.html"><img src="images/btn_6.jpg" alt="" name="btn_6" width="93" height="17" border="0" id="btn_6" onmouseover="MM_swapImage('btn_6','','images/btn_6_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
-		<td width="17" height="17" align="left" valign="top" nowrap bgcolor="#A7A7A7"></td>
-		<td width="0" height="17" nowrap></td>
-	</tr>
-	<tr>
-		<td width="656" height="19" colspan="25" align="left" valign="top" nowrap bgcolor="#A7A7A7"></td>
-		<td width="0" height="19" nowrap></td>
-	</tr>
-	<tr>
-		<td width="656" height="240" colspan="25" align="left" valign="top">
-			<img src="images/main-15.jpg" width="656" height="240" alt="" /></td>
-		<td width="0" height="240" nowrap></td>
-	</tr>
-	<tr>
-		<td width="656" height="7" colspan="25" align="left" valign="top" nowrap bgcolor="#EFEFEF"></td>
-		<td width="0" height="7" nowrap></td>
-	</tr>
-	<tr>
-		<td width="19" height="314" rowspan="9" align="left" valign="top" nowrap bgcolor="#EFEFEF"></td>
-		<td width="209" height="43" colspan="8" align="left" valign="top" bgcolor="#EFEFEF">
-			<img src="images/welcome.jpg" width="209" height="43" alt="" /></td>
-		<td width="174" height="43" colspan="5" align="left" valign="top" nowrap bgcolor="#EFEFEF"></td>
-		<td width="31" height="314" rowspan="9" align="left" valign="top" nowrap bgcolor="#EFEFEF"></td>
-		<td width="185" height="43" colspan="8" align="left" valign="top" bgcolor="#EFEFEF">
-			<img src="images/news.jpg" width="185" height="43" alt="" /></td>
-		<td width="38" height="314" colspan="2" rowspan="9" align="left" valign="top" nowrap bgcolor="#EFEFEF"></td>
-		<td width="0" height="43" nowrap></td>
-	</tr>
-	<tr>
-		<td width="121" height="82" colspan="5" rowspan="2" align="left" valign="top" bgcolor="#EFEFEF">
-			<img src="images/welcome-18.jpg" width="121" height="82" alt="" /></td>
-		<td width="10" height="94" rowspan="3" align="left" valign="top" nowrap bgcolor="#EFEFEF"></td>
-		<td width="252" height="94" colspan="7" rowspan="3" align="left" valign="top" bgcolor="#EFEFEF"><span class="text1">Lorem ipsum dolor sit amet, consectetuer</span><br />
-Nam eu nulla. Donec lobortis purus vel urna. Nunc laoreet lacinia nunc. In volutpat sodales ipsum. Sed vestibulum. <a href="#" class="a">Integer in ante. Sed posuere ligula</a> rhoncus erat. Fusce urna dui, sollicitudin ac, pulvinar quis</td>
-		<td width="21" height="56" colspan="4" align="left" valign="top" bgcolor="#EFEFEF">
-			<img src="images/news-19.jpg" width="21" height="56" alt="" /></td>
-		<td width="164" height="56" colspan="4" align="left" valign="top" bgcolor="#EFEFEF" style="padding-top:5px"><p class="text1">September 29
-		  </p>
-	  <p><a href="#" class="a">Integer in ante. Sed posuere ligula </a>rhoncus erat. Fusce urna dui </p></td>
-		<td width="0" height="56" nowrap></td>
-	</tr>
-	<tr>
-		<td width="21" height="55" colspan="4" rowspan="3" align="left" valign="top" bgcolor="#EFEFEF"><img src="images/news-20.jpg" width="21" height="55" alt="" /></td>
-		<td width="164" height="55" colspan="4" rowspan="3" align="left" valign="top" bgcolor="#EFEFEF" style="padding-top:5px"><span class="text1">September 28
-          </span><br />
-      <a href="#" class="a">Integer in ante. Sed posuere ligula</a> rhoncus erat. Fusce urna dui</td>
-		<td width="0" height="26" nowrap></td>
-	</tr>
-	<tr>
-		<td width="121" height="12" colspan="5" align="left" valign="top" nowrap bgcolor="#EFEFEF"></td>
-		<td width="0" height="12" nowrap></td>
-	</tr>
-	<tr>
-		<td width="162" height="40" colspan="7" rowspan="2" align="left" valign="top" bgcolor="#EFEFEF">
-			<img src="images/services.jpg" width="162" height="40" alt="" /></td>
-		<td width="221" height="40" colspan="6" rowspan="2" align="left" valign="top" nowrap bgcolor="#EFEFEF"></td>
-		<td width="0" height="17" nowrap></td>
-	</tr>
-	<tr>
-		<td width="185" height="45" colspan="8" rowspan="2" align="left" valign="top" bgcolor="#EFEFEF">
-			<img src="images/spotlight.jpg" width="185" height="45" alt="" /></td>
-		<td width="0" height="23" nowrap></td>
-	</tr>
-	<tr>
-		<td width="121" height="80" colspan="5" rowspan="2" align="left" valign="top" bgcolor="#EFEFEF">
-			<img src="images/services-23.jpg" width="121" height="80" alt="" /></td>
-		<td width="10" height="80" rowspan="2" align="left" valign="top" nowrap bgcolor="#EFEFEF"></td>
-		<td width="252" height="80" colspan="7" rowspan="2" align="left" valign="top" bgcolor="#EFEFEF"><span class="text1">Lorem ipsum dolor sit amet, consectetuer</span><br />
-      <a href="#" class="a">Nam eu nulla. Donec lobortis purus vel urna. Nunc </a>laoreet lacinia nunc. In volutpat sodales ipsum. Sed vestibulum. rhoncus erat. Fusce urna dui, sollicitudin ac, pulvinar quis</td>
-		<td width="0" height="22" nowrap></td>
-	</tr>
-	<tr>
-		<td width="16" height="115" colspan="3" rowspan="2" align="left" valign="top" bgcolor="#EFEFEF">
-			<img src="images/spotlight-24.jpg" width="16" height="115" alt="" /></td>
-		<td width="169" height="115" colspan="5" rowspan="2" align="left" valign="top" bgcolor="#EFEFEF" style="line-height:18px; padding-top:3px"><a href="#" class="b">Morbi volutpat leo in ligula. Inter vel</a><br />
-          <a href="#" class="b">magna. sagittis. Fusce elit ligula, </a><br />
-          <a href="#" class="b">sodales sit amet, tincid unt in, Fusce </a><br />
-          <a href="#" class="b">interdum. Sed laoreet. Aenean. Sed </a><br />
-l<a href="#" class="b">aoreet. magna. sagittis. Fusce elit</a></td>
-		<td width="0" height="58" nowrap></td>
-	</tr>
-	<tr>
-		<td width="27" height="57" colspan="2" align="left" valign="top" bgcolor="#EFEFEF">
-			<img src="images/services-25.jpg" width="27" height="57" alt="" /></td>
-		<td width="356" height="57" colspan="11" align="left" valign="top" bgcolor="#EFEFEF" style="line-height:18px; padding-top:8px"><a href="#" class="b">Morbi volutpat leo in ligula. Inter vel magna. sagittis. Fusce elit ligula, sodales </a><br />
-        <a href="#" class="b">sit amet, tincid unt in, Fusce interdum. Sed laoreet. Aenean. Sed laoreet. </a></td>
-		<td width="0" height="57" nowrap></td>
-	</tr>
-	<tr>
-		<td width="775" height="49" colspan="27" align="center" valign="middle" class="text2" style="background:url(images/b_footer.jpg)"><a href="index.html">HOME</a> | <a href="contentpage.html">ABOUT US</a> | <a href="contentpage.html">SERVICES</a> | <a href="contentpage.html">SOLUTIONS</a> | <a href="contentpage.html">SUPPORT</a> | <a href="contentpage.html">CONTACTS</a><br />
-      <span class="text3">Copyright © Your Company Name</span><br />
-      Design by <a href="http://www.templatesbox.com" target="_blank" class="adv">Templates</a> Box. Create a <a href="http://www.wix.com" target="_blank" class="adv">free website</a>.
-      </td>
-		<td width="0" height="49" nowrap></td>
-	</tr>
-</table>
-<!-- End Save for Web Slices -->
-</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Business Co.</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+<link href="css/styles.css" rel="stylesheet" type="text/css" />
+
+<script type="text/javascript">
+<!--
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+
+function MM_findObj(n, d) { //v4.01
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && d.getElementById) x=d.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+//-->
+</script>
+</head>
+<body  onload="MM_preloadImages('images/btn_1_over.jpg','images/btn_2_over.jpg','images/btn_3_over.jpg','images/btn_4_over.jpg','images/btn_5_over.jpg', 'images/btn_6_over.jpg')">
+<!-- Save for Web Slices (index.psd) -->
+<table width="775" height="700" border="0" align="center" cellpadding="0" cellspacing="0" id="Table_01">
+	<tr>
+		<td width="59" height="0" nowrap></td>
+		<td width="19" height="0" nowrap></td>
+		<td width="4" height="0" nowrap></td>
+		<td width="23" height="0" nowrap></td>
+		<td width="83" height="0" nowrap></td>
+		<td width="3" height="0" nowrap></td>
+		<td width="8" height="0" nowrap></td>
+		<td width="10" height="0" nowrap></td>
+		<td width="31" height="0" nowrap></td>
+		<td width="47" height="0" nowrap></td>
+		<td width="4" height="0" nowrap></td>
+		<td width="3" height="0" nowrap></td>
+		<td width="98" height="0" nowrap></td>
+		<td width="3" height="0" nowrap></td>
+		<td width="66" height="0" nowrap></td>
+		<td width="31" height="0" nowrap></td>
+		<td width="10" height="0" nowrap></td>
+		<td width="3" height="0" nowrap></td>
+		<td width="3" height="0" nowrap></td>
+		<td width="5" height="0" nowrap></td>
+		<td width="89" height="0" nowrap></td>
+		<td width="3" height="0" nowrap></td>
+		<td width="15" height="0" nowrap></td>
+		<td width="57" height="0" nowrap></td>
+		<td width="21" height="0" nowrap></td>
+		<td width="17" height="0" nowrap></td>
+		<td width="60" height="0" nowrap></td>
+		<td width="0" height="0"></td>
+	</tr>
+	<tr>
+		<td width="59" height="651" rowspan="15">
+			<img src="images/main.jpg" width="59" height="651" alt="" /></td>
+		<td width="561" height="33" colspan="22" align="left" valign="middle" bgcolor="#EFEFEF" class="text3" style="padding-left:20px">SEPTEMBER 29, 2009 </td>
+		<td width="95" height="33" colspan="3" align="left" valign="top"><a href="#"><img src="images/client_login.jpg" alt="" width="95" height="33" border="0" /></a></td>
+		<td width="60" height="651" rowspan="15">
+			<img src="images/main-03.jpg" width="60" height="651" alt="" /></td>
+		<td width="0" height="33" nowrap></td>
+	</tr>
+	<tr>
+		<td width="656" height="21" colspan="25" align="left" valign="top" nowrap bgcolor="#A7A7A7"></td>
+		<td width="0" height="21" nowrap></td>
+	</tr>
+	<tr>
+		<td width="23" height="17" colspan="2" align="left" valign="top" nowrap bgcolor="#A7A7A7"></td>
+		<td width="106" height="17" colspan="2" align="left" valign="top" bgcolor="#A7A7A7"><a href="index.html"><img src="images/btn_1.jpg" alt="" name="btn_1" width="106" height="17" border="0" id="btn_1" onmouseover="MM_swapImage('btn_1','','images/btn_1_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
+		<td width="3" height="17" align="left" valign="top" bgcolor="#A7A7A7">
+			<img src="images/lines.jpg" width="3" height="17" alt="" /></td>
+		<td width="100" height="17" colspan="5" align="left" valign="top" bgcolor="#A7A7A7"><a href="contentpage.html"><img src="images/btn_2.jpg" alt="" name="btn_2" width="100" height="17" border="0" id="btn_2" onmouseover="MM_swapImage('btn_2','','images/btn_2_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
+		<td width="3" height="17" align="left" valign="top" bgcolor="#A7A7A7">
+			<img src="images/lines-07.jpg" width="3" height="17" alt="" /></td>
+		<td width="98" height="17" align="left" valign="top" bgcolor="#A7A7A7"><a href="contentpage.html"><img src="images/btn_3.jpg" alt="" name="btn_3" width="98" height="17" border="0" id="btn_3" onmouseover="MM_swapImage('btn_3','','images/btn_3_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
+		<td width="3" height="17" align="left" valign="top" bgcolor="#A7A7A7">
+			<img src="images/lines-09.jpg" width="3" height="17" alt="" /></td>
+		<td width="107" height="17" colspan="3" align="left" valign="top" bgcolor="#A7A7A7"><a href="contentpage.html"><img src="images/btn_4.jpg" alt="" name="btn_4" width="107" height="17" border="0" id="btn_4" onmouseover="MM_swapImage('btn_4','','images/btn_4_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
+		<td width="3" height="17" align="left" valign="top" bgcolor="#A7A7A7">
+			<img src="images/lines-11.jpg" width="3" height="17" alt="" /></td>
+		<td width="97" height="17" colspan="3" align="left" valign="top" bgcolor="#A7A7A7"><a href="contentpage.html"><img src="images/btn_5.jpg" alt="" name="btn_5" width="97" height="17" border="0" id="btn_5" onmouseover="MM_swapImage('btn_5','','images/btn_5_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
+		<td width="3" height="17" align="left" valign="top" bgcolor="#A7A7A7">
+			<img src="images/lines-13.jpg" width="3" height="17" alt="" /></td>
+		<td width="93" height="17" colspan="3" align="left" valign="top" bgcolor="#A7A7A7"><a href="contentpage.html"><img src="images/btn_6.jpg" alt="" name="btn_6" width="93" height="17" border="0" id="btn_6" onmouseover="MM_swapImage('btn_6','','images/btn_6_over.jpg',1)" onmouseout="MM_swapImgRestore()"/></a></td>
+		<td width="17" height="17" align="left" valign="top" nowrap bgcolor="#A7A7A7"></td>
+		<td width="0" height="17" nowrap></td>
+	</tr>
+	<tr>
+		<td width="656" height="19" colspan="25" align="left" valign="top" nowrap bgcolor="#A7A7A7"></td>
+		<td width="0" height="19" nowrap></td>
+	</tr>
+	<tr>
+		<td width="656" height="240" colspan="25" align="left" valign="top">
+			<img src="images/main-15.jpg" width="656" height="240" alt="" /></td>
+		<td width="0" height="240" nowrap></td>
+	</tr>
+	<tr>
+		<td width="656" height="7" colspan="25" align="left" valign="top" nowrap bgcolor="#EFEFEF"></td>
+		<td width="0" height="7" nowrap></td>
+	</tr>
+	<tr>
+		<td width="19" height="314" rowspan="9" align="left" valign="top" nowrap bgcolor="#EFEFEF"></td>
+		<td width="209" height="43" colspan="8" align="left" valign="top" bgcolor="#EFEFEF">
+			<img src="images/welcome.jpg" width="209" height="43" alt="" /></td>
+		<td width="174" height="43" colspan="5" align="left" valign="top" nowrap bgcolor="#EFEFEF"></td>
+		<td width="31" height="314" rowspan="9" align="left" valign="top" nowrap bgcolor="#EFEFEF"></td>
+		<td width="185" height="43" colspan="8" align="left" valign="top" bgcolor="#EFEFEF">
+			<img src="images/news.jpg" width="185" height="43" alt="" /></td>
+		<td width="38" height="314" colspan="2" rowspan="9" align="left" valign="top" nowrap bgcolor="#EFEFEF"></td>
+		<td width="0" height="43" nowrap></td>
+	</tr>
+	<tr>
+		<td width="121" height="82" colspan="5" rowspan="2" align="left" valign="top" bgcolor="#EFEFEF">
+			<img src="images/welcome-18.jpg" width="121" height="82" alt="" /></td>
+		<td width="10" height="94" rowspan="3" align="left" valign="top" nowrap bgcolor="#EFEFEF"></td>
+		<td width="252" height="94" colspan="7" rowspan="3" align="left" valign="top" bgcolor="#EFEFEF"><span class="text1">Lorem ipsum dolor sit amet, consectetuer</span><br />
+Nam eu nulla. Donec lobortis purus vel urna. Nunc laoreet lacinia nunc. In volutpat sodales ipsum. Sed vestibulum. <a href="#" class="a">Integer in ante. Sed posuere ligula</a> rhoncus erat. Fusce urna dui, sollicitudin ac, pulvinar quis</td>
+		<td width="21" height="56" colspan="4" align="left" valign="top" bgcolor="#EFEFEF">
+			<img src="images/news-19.jpg" width="21" height="56" alt="" /></td>
+		<td width="164" height="56" colspan="4" align="left" valign="top" bgcolor="#EFEFEF" style="padding-top:5px"><p class="text1">September 29
+		  </p>
+	  <p><a href="#" class="a">Integer in ante. Sed posuere ligula </a>rhoncus erat. Fusce urna dui </p></td>
+		<td width="0" height="56" nowrap></td>
+	</tr>
+	<tr>
+		<td width="21" height="55" colspan="4" rowspan="3" align="left" valign="top" bgcolor="#EFEFEF"><img src="images/news-20.jpg" width="21" height="55" alt="" /></td>
+		<td width="164" height="55" colspan="4" rowspan="3" align="left" valign="top" bgcolor="#EFEFEF" style="padding-top:5px"><span class="text1">September 28
+          </span><br />
+      <a href="#" class="a">Integer in ante. Sed posuere ligula</a> rhoncus erat. Fusce urna dui</td>
+		<td width="0" height="26" nowrap></td>
+	</tr>
+	<tr>
+		<td width="121" height="12" colspan="5" align="left" valign="top" nowrap bgcolor="#EFEFEF"></td>
+		<td width="0" height="12" nowrap></td>
+	</tr>
+	<tr>
+		<td width="162" height="40" colspan="7" rowspan="2" align="left" valign="top" bgcolor="#EFEFEF">
+			<img src="images/services.jpg" width="162" height="40" alt="" /></td>
+		<td width="221" height="40" colspan="6" rowspan="2" align="left" valign="top" nowrap bgcolor="#EFEFEF"></td>
+		<td width="0" height="17" nowrap></td>
+	</tr>
+	<tr>
+		<td width="185" height="45" colspan="8" rowspan="2" align="left" valign="top" bgcolor="#EFEFEF">
+			<img src="images/spotlight.jpg" width="185" height="45" alt="" /></td>
+		<td width="0" height="23" nowrap></td>
+	</tr>
+	<tr>
+		<td width="121" height="80" colspan="5" rowspan="2" align="left" valign="top" bgcolor="#EFEFEF">
+			<img src="images/services-23.jpg" width="121" height="80" alt="" /></td>
+		<td width="10" height="80" rowspan="2" align="left" valign="top" nowrap bgcolor="#EFEFEF"></td>
+		<td width="252" height="80" colspan="7" rowspan="2" align="left" valign="top" bgcolor="#EFEFEF"><span class="text1">Lorem ipsum dolor sit amet, consectetuer</span><br />
+      <a href="#" class="a">Nam eu nulla. Donec lobortis purus vel urna. Nunc </a>laoreet lacinia nunc. In volutpat sodales ipsum. Sed vestibulum. rhoncus erat. Fusce urna dui, sollicitudin ac, pulvinar quis</td>
+		<td width="0" height="22" nowrap></td>
+	</tr>
+	<tr>
+		<td width="16" height="115" colspan="3" rowspan="2" align="left" valign="top" bgcolor="#EFEFEF">
+			<img src="images/spotlight-24.jpg" width="16" height="115" alt="" /></td>
+		<td width="169" height="115" colspan="5" rowspan="2" align="left" valign="top" bgcolor="#EFEFEF" style="line-height:18px; padding-top:3px"><a href="#" class="b">Morbi volutpat leo in ligula. Inter vel</a><br />
+          <a href="#" class="b">magna. sagittis. Fusce elit ligula, </a><br />
+          <a href="#" class="b">sodales sit amet, tincid unt in, Fusce </a><br />
+          <a href="#" class="b">interdum. Sed laoreet. Aenean. Sed </a><br />
+l<a href="#" class="b">aoreet. magna. sagittis. Fusce elit</a></td>
+		<td width="0" height="58" nowrap></td>
+	</tr>
+	<tr>
+		<td width="27" height="57" colspan="2" align="left" valign="top" bgcolor="#EFEFEF">
+			<img src="images/services-25.jpg" width="27" height="57" alt="" /></td>
+		<td width="356" height="57" colspan="11" align="left" valign="top" bgcolor="#EFEFEF" style="line-height:18px; padding-top:8px"><a href="#" class="b">Morbi volutpat leo in ligula. Inter vel magna. sagittis. Fusce elit ligula, sodales </a><br />
+        <a href="#" class="b">sit amet, tincid unt in, Fusce interdum. Sed laoreet. Aenean. Sed laoreet. </a></td>
+		<td width="0" height="57" nowrap></td>
+	</tr>
+	<tr>
+		<td width="775" height="49" colspan="27" align="center" valign="middle" class="text2" style="background:url(images/b_footer.jpg)"><a href="index.html">HOME</a> | <a href="contentpage.html">ABOUT US</a> | <a href="contentpage.html">SERVICES</a> | <a href="contentpage.html">SOLUTIONS</a> | <a href="contentpage.html">SUPPORT</a> | <a href="contentpage.html">CONTACTS</a><br />
+      <span class="text3">Copyright © Your Company Name</span><br />
+      Design by <a href="http://www.templatesbox.com" target="_blank" class="adv">Templates</a> Box. Create a <a href="http://www.wix.com" target="_blank" class="adv">free website</a>.
+      </td>
+		<td width="0" height="49" nowrap></td>
+	</tr>
+</table>
+<!-- End Save for Web Slices -->
+</body>
 </html>

contrib/library/network/server/nino/example/SimpleWebServer/webroot/example/readme.html

@@ -1,86 +1,86 @@
-<!-- saved from url=(0022)http://internet.e-mail -->
-<html>
-<head>
-<title>TemplatesBox.com | Terms of Use</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#5E717F" text="#000000" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
-<table width="700" cellspacing="0" cellpadding="8" align="center" bgcolor="#BED5E2" style="border-collapse:collapse;">
-  <tr> 
-    <td bgcolor="#567280" style="border-top-width:1px; border-right-width:1px; border-left-width:1px; border-top-color:rgb(216,216,216); border-right-color:rgb(216,216,216); border-left-color:rgb(216,216,216); border-top-style:solid; border-right-style:solid; border-left-style:solid;"><font color="#C2DCEB" size="2" face="Verdana,Arial"><b>Templates</b></font><font color="#FF9900" size="2" face="Verdana,Arial"><b>Box</b></font><font color="#FF9B05" size="2" face="Verdana,Arial"><b> 
-            </b></font><font color="#E3E3E3" size="2" face="Verdana,Arial">|<b> Terms of Use</b></font></td>
-  </tr>
-  <tr> 
-    <td bgcolor="#A1BBCA" style="border-right-width:1px; border-left-width:1px; border-right-color:rgb(216,216,216); border-left-color:rgb(216,216,216); border-right-style:solid; border-left-style:solid;">
-            <table align="center" cellpadding="0" cellspacing="0" width="98%">
-                <tr>
-                    <td>
-                        <p style="line-height:115%; margin-top:0; margin-bottom:0;"><font face="Verdana,Arial" color="#354D59"><span style="font-size:8pt;">By 
-      downloading a template from TemplatesBox.com you agree to the following 
-      Terms of Use:  </span></font> 
-      <p style="line-height:115%; margin-top:0; margin-bottom:0;"><font face="Verdana,Arial" color="#354D59"><span style="font-size:8pt;">Our 
-        web templates may be used for your own and/or your clients' websites, 
-        but you may not sell/offer for free our templates in any sort of collection, 
-        such as distributing to a third party via CD, diskette, or letting others 
-        to download off your websites etc.<br>
-        <br>
-        Link back to www.templatesbox.com is required and always appreciated. 
-        Also, please visit the<br>
-        </span></font><a href="http://www.templatesbox.com/linkus.htm" target="_blank"><font face="Verdana,Arial" color="#354D59"><b><span style="font-size:8pt;">Link 
-        Us</span></b></font></a><font face="Verdana,Arial" color="#354D59"><span style="font-size:8pt;"> section.<br>
-        <br>
-        The templates are offered &quot;as is&quot; without warranty of any kind, 
-        either expressed or implied. TemplatesBox.com will not be liable for any 
-        damage or loss of data whatsoever due to downloading or using a template. 
-        In no event shall TemplatesBox.com be liable for any damages including, 
-        but not limited to, direct, indirect, special, incidental or consequential 
-        damages or other losses arising out of the use of or inability to use 
-        the templates and/or information from TemplatesBox.com.<br>
-        <br>
-        TemplatesBox.com team reserves the right to change or modify these terms 
-        with no prior notice.</span></font></p>
-                    </td>
-                </tr>
-            </table>
-    </td>
-  </tr>
-  <tr> 
-    <td bgcolor="#567280" style="border-right-width:1px; border-left-width:1px; border-right-color:rgb(216,216,216); border-left-color:rgb(216,216,216); border-right-style:solid; border-left-style:solid;"><font size="2" face="Verdana,Arial" color="#E3E3E3"><b>Featured 
-      Partners</b></font></td>
-  </tr>
-  <tr> 
-    <td bgcolor="#A1BBCA" style="border-right-width:1px; border-bottom-width:1px; border-left-width:1px; border-right-color:rgb(216,216,216); border-bottom-color:rgb(216,216,216); border-left-color:rgb(216,216,216); border-right-style:solid; border-bottom-style:solid; border-left-style:solid;" height="235"> 
-            <table align="center" cellpadding="0" cellspacing="0" width="98%">
-                <tr>
-                    <td>
-                        <p><a href="http://www.specialtemplates.com" target="_blank"><b><font size="2" face="Verdana, Arial, Helvetica, sans-serif" color="#2D444F">Premium Website 
-      Templates</font></b></a><font size="2" face="Verdana, Arial, Helvetica, sans-serif" color="#2D444F"><br>
-      Over 9000 High-end Website templates, Flash intros and Logo templates.<b><a href="http://www.freshtemplates.com" target="_blank"><br>
-      <br>
-      </a></b></font><a href="http://www.freephotosbank.com" target="_blank"><b><font size="2" face="Verdana, Arial, Helvetica, sans-serif" color="#2D444F">Free 
-                        Photos, Free Stock Photography</font></b></a><font size="2" face="Verdana, Arial, Helvetica, sans-serif" color="#2D444F"><b><br></b>
-      </font><FONT face=Verdana color=#2d444f size=2><FONT size=2><FONT 
-face=Verdana><FONT color=#2d444f>1000's of FREE high quality stock 
-Photos!</FONT></FONT></FONT></FONT><font size="2" face="Verdana, Arial, Helvetica, sans-serif" color="#2D444F"><br>
-      <br>
-       </font><A 
-href="http://www.webmasterschannel.com" target=_blank><FONT face=Verdana><FONT color=#2d444f><B><FONT size=2>Webmaster&nbsp;Resources &amp; 
-Directory</FONT></B></FONT></FONT></A><font size="2" face="Verdana, Arial, Helvetica, sans-serif" color="#2D444F"><br>
-      </font><FONT size=2><FONT face=Verdana><FONT color=#2d444f>A large web directory with webmaster 
-resources.</FONT></FONT></FONT><font size="2" face="Verdana, Arial, Helvetica, sans-serif" color="#2D444F"><br>
-      <br>
-      </font><A href="http://www.photovations.com" 
-target=_blank><FONT face=Verdana color=#000000 
-size=2><FONT face=Verdana color=#2d444f size=2><STRONG>Photovations.com</STRONG></FONT></FONT></A><font size="2" face="Verdana, Arial, Helvetica, sans-serif" color="#2D444F"><br>
-      </font><FONT face=Verdana color=#2d444f size=2><FONT size=2><FONT 
-face=Verdana><FONT color=#2d444f>Online Photo Sharing. Free Image 
-Hosting</FONT></FONT></FONT></FONT></p>
-                    </td>
-                </tr>
-            </table>
-</td>
-  </tr>
-</table>
-</body>
-</html>
+<!-- saved from url=(0022)http://internet.e-mail -->
+<html>
+<head>
+<title>TemplatesBox.com | Terms of Use</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body bgcolor="#5E717F" text="#000000" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+<table width="700" cellspacing="0" cellpadding="8" align="center" bgcolor="#BED5E2" style="border-collapse:collapse;">
+  <tr> 
+    <td bgcolor="#567280" style="border-top-width:1px; border-right-width:1px; border-left-width:1px; border-top-color:rgb(216,216,216); border-right-color:rgb(216,216,216); border-left-color:rgb(216,216,216); border-top-style:solid; border-right-style:solid; border-left-style:solid;"><font color="#C2DCEB" size="2" face="Verdana,Arial"><b>Templates</b></font><font color="#FF9900" size="2" face="Verdana,Arial"><b>Box</b></font><font color="#FF9B05" size="2" face="Verdana,Arial"><b> 
+            </b></font><font color="#E3E3E3" size="2" face="Verdana,Arial">|<b> Terms of Use</b></font></td>
+  </tr>
+  <tr> 
+    <td bgcolor="#A1BBCA" style="border-right-width:1px; border-left-width:1px; border-right-color:rgb(216,216,216); border-left-color:rgb(216,216,216); border-right-style:solid; border-left-style:solid;">
+            <table align="center" cellpadding="0" cellspacing="0" width="98%">
+                <tr>
+                    <td>
+                        <p style="line-height:115%; margin-top:0; margin-bottom:0;"><font face="Verdana,Arial" color="#354D59"><span style="font-size:8pt;">By 
+      downloading a template from TemplatesBox.com you agree to the following 
+      Terms of Use:  </span></font> 
+      <p style="line-height:115%; margin-top:0; margin-bottom:0;"><font face="Verdana,Arial" color="#354D59"><span style="font-size:8pt;">Our 
+        web templates may be used for your own and/or your clients' websites, 
+        but you may not sell/offer for free our templates in any sort of collection, 
+        such as distributing to a third party via CD, diskette, or letting others 
+        to download off your websites etc.<br>
+        <br>
+        Link back to www.templatesbox.com is required and always appreciated. 
+        Also, please visit the<br>
+        </span></font><a href="http://www.templatesbox.com/linkus.htm" target="_blank"><font face="Verdana,Arial" color="#354D59"><b><span style="font-size:8pt;">Link 
+        Us</span></b></font></a><font face="Verdana,Arial" color="#354D59"><span style="font-size:8pt;"> section.<br>
+        <br>
+        The templates are offered &quot;as is&quot; without warranty of any kind, 
+        either expressed or implied. TemplatesBox.com will not be liable for any 
+        damage or loss of data whatsoever due to downloading or using a template. 
+        In no event shall TemplatesBox.com be liable for any damages including, 
+        but not limited to, direct, indirect, special, incidental or consequential 
+        damages or other losses arising out of the use of or inability to use 
+        the templates and/or information from TemplatesBox.com.<br>
+        <br>
+        TemplatesBox.com team reserves the right to change or modify these terms 
+        with no prior notice.</span></font></p>
+                    </td>
+                </tr>
+            </table>
+    </td>
+  </tr>
+  <tr> 
+    <td bgcolor="#567280" style="border-right-width:1px; border-left-width:1px; border-right-color:rgb(216,216,216); border-left-color:rgb(216,216,216); border-right-style:solid; border-left-style:solid;"><font size="2" face="Verdana,Arial" color="#E3E3E3"><b>Featured 
+      Partners</b></font></td>
+  </tr>
+  <tr> 
+    <td bgcolor="#A1BBCA" style="border-right-width:1px; border-bottom-width:1px; border-left-width:1px; border-right-color:rgb(216,216,216); border-bottom-color:rgb(216,216,216); border-left-color:rgb(216,216,216); border-right-style:solid; border-bottom-style:solid; border-left-style:solid;" height="235"> 
+            <table align="center" cellpadding="0" cellspacing="0" width="98%">
+                <tr>
+                    <td>
+                        <p><a href="http://www.specialtemplates.com" target="_blank"><b><font size="2" face="Verdana, Arial, Helvetica, sans-serif" color="#2D444F">Premium Website 
+      Templates</font></b></a><font size="2" face="Verdana, Arial, Helvetica, sans-serif" color="#2D444F"><br>
+      Over 9000 High-end Website templates, Flash intros and Logo templates.<b><a href="http://www.freshtemplates.com" target="_blank"><br>
+      <br>
+      </a></b></font><a href="http://www.freephotosbank.com" target="_blank"><b><font size="2" face="Verdana, Arial, Helvetica, sans-serif" color="#2D444F">Free 
+                        Photos, Free Stock Photography</font></b></a><font size="2" face="Verdana, Arial, Helvetica, sans-serif" color="#2D444F"><b><br></b>
+      </font><FONT face=Verdana color=#2d444f size=2><FONT size=2><FONT 
+face=Verdana><FONT color=#2d444f>1000's of FREE high quality stock 
+Photos!</FONT></FONT></FONT></FONT><font size="2" face="Verdana, Arial, Helvetica, sans-serif" color="#2D444F"><br>
+      <br>
+       </font><A 
+href="http://www.webmasterschannel.com" target=_blank><FONT face=Verdana><FONT color=#2d444f><B><FONT size=2>Webmaster&nbsp;Resources &amp; 
+Directory</FONT></B></FONT></FONT></A><font size="2" face="Verdana, Arial, Helvetica, sans-serif" color="#2D444F"><br>
+      </font><FONT size=2><FONT face=Verdana><FONT color=#2d444f>A large web directory with webmaster 
+resources.</FONT></FONT></FONT><font size="2" face="Verdana, Arial, Helvetica, sans-serif" color="#2D444F"><br>
+      <br>
+      </font><A href="http://www.photovations.com" 
+target=_blank><FONT face=Verdana color=#000000 
+size=2><FONT face=Verdana color=#2d444f size=2><STRONG>Photovations.com</STRONG></FONT></FONT></A><font size="2" face="Verdana, Arial, Helvetica, sans-serif" color="#2D444F"><br>
+      </font><FONT face=Verdana color=#2d444f size=2><FONT size=2><FONT 
+face=Verdana><FONT color=#2d444f>Online Photo Sharing. Free Image 
+Hosting</FONT></FONT></FONT></FONT></p>
+                    </td>
+                </tr>
+            </table>
+</td>
+  </tr>
+</table>
+</body>
+</html>

contrib/library/network/server/nino/example/SimpleWebServer/webroot/html/images.html

@@ -1,9 +1,9 @@
-<html>
-<body>
-
-<h2>Norwegian Mountain Trip</h2>
-<img border="0" src="images/pulpit.jpg" alt="Pulpit rock" width="304" height="228" />
-
-</body>
-</html>
-
+<html>
+<body>
+
+<h2>Norwegian Mountain Trip</h2>
+<img border="0" src="images/pulpit.jpg" alt="Pulpit rock" width="304" height="228" />
+
+</body>
+</html>
+

contrib/library/network/server/nino/example/SimpleWebServer/webroot/html/simple.html

@@ -1,10 +1,10 @@
-<html>
-<body>
-
-<h1>My First Heading</h1>
-
-<p>My first paragraph.</p>
-
-</body>
-</html>
-
+<html>
+<body>
+
+<h1>My First Heading</h1>
+
+<p>My first paragraph.</p>
+
+</body>
+</html>
+

contrib/library/network/server/nino/example/SimpleWebServer/webroot/html5/dataset.html

@@ -1,99 +1,99 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset=utf-8 />
-<meta name="viewport" content="width=620" />
-<title>HTML5 Demo: data-*</title>
-<link rel="stylesheet" href="/css/html5demos.css" type="text/css" />
-<script src="/js/h5utils.js"></script></head>
-<body>
-<section id="wrapper">
-    <header>
-      <h1>data-*</h1>
-    </header><style>
-#test {
-  padding: 10px;
-  border: 1px solid #ccc;
-  margin: 20px 0;
-}
-pre {
-  overflow-x: auto;
-  padding: 10px;
-  border: 1px dashed #ccc;
-  background: #fff;
-  font-size: 12px;
-}
-</style>
-
-<article>
-  <section>
-    <p>The <code>data-[name]</code> attribute on elements can now be accessed directly via the DOM using <code>element.dataset.[attr]</code>.</p>
-    <p>Try openning the Web Console and editing <code>element.dataset</code> directly: <br /><code>element.dataset.foo = 'bar';</code></p>
-  </section>
-  <p id="status">Not connected</p>
-  <section>
-    <div id="test" data-name="rem" data-height="short">This element has data</div>
-    <input type="button" value="Show data" id="show" />
-    <input type="button" value="Change data via dataset" id="change1" />
-    <input type="button" value="change data via setAttribute" id="change2" />
-  </section>
-  <pre><code id="element">[click buttons above to show element html]</code></pre>
-</article>
-<script>
-(function () {
-
-function show() {
-  code.innerHTML = test.outerHTML.replace(/[<>]/g, function (m) {
-    return { '<': '<', '>': '>' }[m];
-  });
-
-  for (var prop in test.dataset) {
-    code.innerHTML += '\nel.dataset.' + prop + ' = "' + test.dataset[prop] + '"';
-  }
-}
-
-var state = document.getElementById('status'),
-    code = document.getElementById('element');
-
-var test = window.element = document.getElementById('test');
-
-if (test.dataset === undefined) {
-  state.innerHTML = 'dataset not supported';
-  state.className = 'fail';
-} else {
-  state.className = 'success';
-  state.innerHTML = 'element.dataset supported';
-}
-
-addEvent(document.getElementById('show'), 'click', function () {
-  show();
-});
-
-addEvent(document.getElementById('change1'), 'click', function () {
-  test.dataset.name = 'via el.dataset';
-  show();
-});
-
-addEvent(document.getElementById('change2'), 'click', function () {
-  test.setAttribute('data-name', 'via setAttribute');
-  show();
-});
-
-
-})();
-</script>
-    <footer><a href="/">HTML5 demos</a>/<a id="built" href="http://twitter.com/rem">@rem built this</a>/<a href="#view-source">view source</a></footer>
-</section>
-<a href="http://github.com/remy/html5demos"><img style="position: absolute; top: 0; left: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_left_darkblue_121621.png" alt="Fork me on GitHub" /></a>
-<script src="/js/prettify.packed.js"></script>
-<script>
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script>
-try {
-var pageTracker = _gat._getTracker("UA-1656750-18");
-pageTracker._trackPageview();
-} catch(err) {}</script>
-</body>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset=utf-8 />
+<meta name="viewport" content="width=620" />
+<title>HTML5 Demo: data-*</title>
+<link rel="stylesheet" href="/css/html5demos.css" type="text/css" />
+<script src="/js/h5utils.js"></script></head>
+<body>
+<section id="wrapper">
+    <header>
+      <h1>data-*</h1>
+    </header><style>
+#test {
+  padding: 10px;
+  border: 1px solid #ccc;
+  margin: 20px 0;
+}
+pre {
+  overflow-x: auto;
+  padding: 10px;
+  border: 1px dashed #ccc;
+  background: #fff;
+  font-size: 12px;
+}
+</style>
+
+<article>
+  <section>
+    <p>The <code>data-[name]</code> attribute on elements can now be accessed directly via the DOM using <code>element.dataset.[attr]</code>.</p>
+    <p>Try openning the Web Console and editing <code>element.dataset</code> directly: <br /><code>element.dataset.foo = 'bar';</code></p>
+  </section>
+  <p id="status">Not connected</p>
+  <section>
+    <div id="test" data-name="rem" data-height="short">This element has data</div>
+    <input type="button" value="Show data" id="show" />
+    <input type="button" value="Change data via dataset" id="change1" />
+    <input type="button" value="change data via setAttribute" id="change2" />
+  </section>
+  <pre><code id="element">[click buttons above to show element html]</code></pre>
+</article>
+<script>
+(function () {
+
+function show() {
+  code.innerHTML = test.outerHTML.replace(/[<>]/g, function (m) {
+    return { '<': '<', '>': '>' }[m];
+  });
+
+  for (var prop in test.dataset) {
+    code.innerHTML += '\nel.dataset.' + prop + ' = "' + test.dataset[prop] + '"';
+  }
+}
+
+var state = document.getElementById('status'),
+    code = document.getElementById('element');
+
+var test = window.element = document.getElementById('test');
+
+if (test.dataset === undefined) {
+  state.innerHTML = 'dataset not supported';
+  state.className = 'fail';
+} else {
+  state.className = 'success';
+  state.innerHTML = 'element.dataset supported';
+}
+
+addEvent(document.getElementById('show'), 'click', function () {
+  show();
+});
+
+addEvent(document.getElementById('change1'), 'click', function () {
+  test.dataset.name = 'via el.dataset';
+  show();
+});
+
+addEvent(document.getElementById('change2'), 'click', function () {
+  test.setAttribute('data-name', 'via setAttribute');
+  show();
+});
+
+
+})();
+</script>
+    <footer><a href="/">HTML5 demos</a>/<a id="built" href="http://twitter.com/rem">@rem built this</a>/<a href="#view-source">view source</a></footer>
+</section>
+<a href="http://github.com/remy/html5demos"><img style="position: absolute; top: 0; left: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_left_darkblue_121621.png" alt="Fork me on GitHub" /></a>
+<script src="/js/prettify.packed.js"></script>
+<script>
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script>
+try {
+var pageTracker = _gat._getTracker("UA-1656750-18");
+pageTracker._trackPageview();
+} catch(err) {}</script>
+</body>
 </html>

contrib/library/network/server/nino/library/http_constants.e

@@ -1,149 +1,149 @@
-note
-	description: "Summary description for {HTTP_CONSTANTS}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	HTTP_CONSTANTS
-
-feature
-
-	http_version_1_1: STRING = "HTTP/1.1"
-	http_version_1_0: STRING = "HTTP/1.0"
-	crlf: STRING = "%/13/%/10/"
-
-feature -- Status codes
-
-	-- 1xx Informational -Request received, continuing process
-	Continue : STRING = "100"
-	Switching_Protocols : STRING = "101"
-
-
-	-- 2xx Success - The action was successfully received, understood, and accepted
-	Ok: STRING = "200"
-	Created : STRING = "201"
-	Accepted : STRING = "202"
-	Non_Authoritative_Information : STRING = "203"
-	No_Content : STRING = "204"
-	Reset_Content : STRING = "205"
-	Parcial_Content : STRING = "206"
-
-
-	-- 3xx Redirection - Further Action must be taken in order to complete the request
-	Multiple_Choices : STRING = "300"
-	Moved_Permanently: STRING = "301"
-	Found : STRING = "302"
-	See_Other	: STRING = "303"
-	Not_Modified : STRING  = "304"
-	Use_Proxy	: STRING = "305"
-	Temporary_Redirect : STRING = "307"
-
-
-	--4xx Client Error - The request contains bad syntax or cannot be fulfilled
-	Bad_Request : STRING = "400"
-	Unauthorized : STRING = "401"
-	Payment_Required : STRING = "402"
-	Forbidden : STRING = "403"
-	Not_Found : STRING = "404"
-	Method_Not_Allowed : STRING = "405"
-	Not_Acceptable : STRING = "406"
-	Proxy_Authentication_Required : STRING = "407"
-	Request_Time_out	: STRING = "408"
-	Conflict : STRING = "409"
-	Gone : STRING = "410"
-	Length_Required : STRING = "411"
-	Precondition_Failed : STRING = "412"
-	Request_Entity_Too_Large : STRING = "413"
-	Request_URI_Too_Large : STRING = "414"
-	Unsupported_Media_Type : STRING = "415"
-	Requested_range_not_satisfiable : STRING = "416"
-	Expectation_Failed : STRING = "417"
-
-
-	--5xx Server Error - The server failed to fulfill an apparently valid request
-	server_error: STRING = "500"
-	Internal_Server_Error : STRING = "500"
-	Not_Implemented : STRING = "501"
-	Bad_Gateway : STRING = "502"
-	Service_Unavailable : STRING = "503"
-	Gateway_Time_out : STRING = "504"
-	HTTP_Version_not_supported : STRING = "505"
-
-
-	-- messages
-	ok_message: STRING = "OK"
-	continue_message : STRING = "Continue"
-	not_found_message: STRING = "URI not found"
-	not_implemented_message: STRING = "Not Implemented"
-
-feature -- content types
-
-	text_html: STRING = "text/html"
-
-feature -- General Header Fields
-
-	-- There are a few header fields which have general applicability for both request and response messages,
-	-- but which do not apply to the entity being transferred.
-	-- These header fields apply only to the message being transmitted.
-
-	Cache_control 		: STRING = "Cache-Control"
-	Connection    		: STRING = "Connection"
-	Date          		: STRING = "Date"
-	Pragma		  		: STRING = "PRAGMA"
-	Trailer       		: STRING = "Trailer"
-	Transfer_encoding 	: STRING = "Transfer-Encoding"
-	Upgrade           	: STRING = "Upgrade"
-	Via               	: STRING = "Via"
-	Warning           	: STRING = "Warning"
-
-
-feature -- Request Header
-	Accept	 			: STRING = "Accept"
-	Accept_charset 		: STRING = "Accept-Charset"
-	Accept_encoding 	: STRING = "Accept-Encoding"
-	Accept_language 	: STRING = "Accept-Language"
-	Authorization 		: STRING =  "Authorization"
-	Expect 		  		: STRING = "Expect"
-	From_header   		: STRING = "From"
-	Host				: STRING = "Host"
-	If_match			: STRING = "If-Match"
-	If_modified_since 	: STRING = "If-Modified-Since"
-	If_none_match		: STRING = "If-None-Match"
-	If_range			: STRING = "If-Range"
-	If_unmodified_since : STRING = "If-Unmodified-Since"
-	Max_forwards 		: STRING = "Max-Forwards"
-	Proxy_authorization	: STRING = "Proxy-Authorization"
-	Range				: STRING = "Range"
-    Referer             : STRING = "Referrer"
-    TE					: STRING = "TE"
-    User_agent 			: STRING = "User-Agent"
-
-
-feature -- Entity Header
-
-	Allow 				: STRING = "Allow"
-	Content_encoding 	: STRING = "Content-Encoding"
-	Content_language 	: STRING = "Content-Language"
-	Content_length	 	: STRING = "Content-Length"
-	Content_location 	: STRING = "Content-Location"
-	Content_MD5			: STRING = "Content-MD5"
-	Content_range 		: STRING = "Content-Range"
-	Content_type		: STRING = "Content-Type"
-	Expires				: STRING = "Expires"
-	Last_modified		: STRING = "Last-Modified"
-
-
-feature -- Http Method
-	Options : STRING = "OPTIONS"
-	Get : STRING = "GET"
-	Head : STRING = "HEAD"
-	Post : STRING = "POST"
-	Put  : STRING = "PUT"
-	Delete : STRING = "DELETE"
-	Trace : STRING = "TRACE"
-	Connect : STRING = "CONNECT"
-note
-	copyright: "2011-2011, Javier Velilla and others"
-	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-end
+note
+	description: "Summary description for {HTTP_CONSTANTS}."
+	author: ""
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	HTTP_CONSTANTS
+
+feature
+
+	http_version_1_1: STRING = "HTTP/1.1"
+	http_version_1_0: STRING = "HTTP/1.0"
+	crlf: STRING = "%/13/%/10/"
+
+feature -- Status codes
+
+	-- 1xx Informational -Request received, continuing process
+	Continue : STRING = "100"
+	Switching_Protocols : STRING = "101"
+
+
+	-- 2xx Success - The action was successfully received, understood, and accepted
+	Ok: STRING = "200"
+	Created : STRING = "201"
+	Accepted : STRING = "202"
+	Non_Authoritative_Information : STRING = "203"
+	No_Content : STRING = "204"
+	Reset_Content : STRING = "205"
+	Parcial_Content : STRING = "206"
+
+
+	-- 3xx Redirection - Further Action must be taken in order to complete the request
+	Multiple_Choices : STRING = "300"
+	Moved_Permanently: STRING = "301"
+	Found : STRING = "302"
+	See_Other	: STRING = "303"
+	Not_Modified : STRING  = "304"
+	Use_Proxy	: STRING = "305"
+	Temporary_Redirect : STRING = "307"
+
+
+	--4xx Client Error - The request contains bad syntax or cannot be fulfilled
+	Bad_Request : STRING = "400"
+	Unauthorized : STRING = "401"
+	Payment_Required : STRING = "402"
+	Forbidden : STRING = "403"
+	Not_Found : STRING = "404"
+	Method_Not_Allowed : STRING = "405"
+	Not_Acceptable : STRING = "406"
+	Proxy_Authentication_Required : STRING = "407"
+	Request_Time_out	: STRING = "408"
+	Conflict : STRING = "409"
+	Gone : STRING = "410"
+	Length_Required : STRING = "411"
+	Precondition_Failed : STRING = "412"
+	Request_Entity_Too_Large : STRING = "413"
+	Request_URI_Too_Large : STRING = "414"
+	Unsupported_Media_Type : STRING = "415"
+	Requested_range_not_satisfiable : STRING = "416"
+	Expectation_Failed : STRING = "417"
+
+
+	--5xx Server Error - The server failed to fulfill an apparently valid request
+	server_error: STRING = "500"
+	Internal_Server_Error : STRING = "500"
+	Not_Implemented : STRING = "501"
+	Bad_Gateway : STRING = "502"
+	Service_Unavailable : STRING = "503"
+	Gateway_Time_out : STRING = "504"
+	HTTP_Version_not_supported : STRING = "505"
+
+
+	-- messages
+	ok_message: STRING = "OK"
+	continue_message : STRING = "Continue"
+	not_found_message: STRING = "URI not found"
+	not_implemented_message: STRING = "Not Implemented"
+
+feature -- content types
+
+	text_html: STRING = "text/html"
+
+feature -- General Header Fields
+
+	-- There are a few header fields which have general applicability for both request and response messages,
+	-- but which do not apply to the entity being transferred.
+	-- These header fields apply only to the message being transmitted.
+
+	Cache_control 		: STRING = "Cache-Control"
+	Connection    		: STRING = "Connection"
+	Date          		: STRING = "Date"
+	Pragma		  		: STRING = "PRAGMA"
+	Trailer       		: STRING = "Trailer"
+	Transfer_encoding 	: STRING = "Transfer-Encoding"
+	Upgrade           	: STRING = "Upgrade"
+	Via               	: STRING = "Via"
+	Warning           	: STRING = "Warning"
+
+
+feature -- Request Header
+	Accept	 			: STRING = "Accept"
+	Accept_charset 		: STRING = "Accept-Charset"
+	Accept_encoding 	: STRING = "Accept-Encoding"
+	Accept_language 	: STRING = "Accept-Language"
+	Authorization 		: STRING =  "Authorization"
+	Expect 		  		: STRING = "Expect"
+	From_header   		: STRING = "From"
+	Host				: STRING = "Host"
+	If_match			: STRING = "If-Match"
+	If_modified_since 	: STRING = "If-Modified-Since"
+	If_none_match		: STRING = "If-None-Match"
+	If_range			: STRING = "If-Range"
+	If_unmodified_since : STRING = "If-Unmodified-Since"
+	Max_forwards 		: STRING = "Max-Forwards"
+	Proxy_authorization	: STRING = "Proxy-Authorization"
+	Range				: STRING = "Range"
+    Referer             : STRING = "Referrer"
+    TE					: STRING = "TE"
+    User_agent 			: STRING = "User-Agent"
+
+
+feature -- Entity Header
+
+	Allow 				: STRING = "Allow"
+	Content_encoding 	: STRING = "Content-Encoding"
+	Content_language 	: STRING = "Content-Language"
+	Content_length	 	: STRING = "Content-Length"
+	Content_location 	: STRING = "Content-Location"
+	Content_MD5			: STRING = "Content-MD5"
+	Content_range 		: STRING = "Content-Range"
+	Content_type		: STRING = "Content-Type"
+	Expires				: STRING = "Expires"
+	Last_modified		: STRING = "Last-Modified"
+
+
+feature -- Http Method
+	Options : STRING = "OPTIONS"
+	Get : STRING = "GET"
+	Head : STRING = "HEAD"
+	Post : STRING = "POST"
+	Put  : STRING = "PUT"
+	Delete : STRING = "DELETE"
+	Trace : STRING = "TRACE"
+	Connect : STRING = "CONNECT"
+note
+	copyright: "2011-2011, Javier Velilla and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end

contrib/library/network/server/nino/library/http_encoding_facilities.e

@@ -1,60 +1,60 @@
-note
-	description: "[
-		Provides features to encode and decode messages
-	]"
-	legal: "See notice at end of class."
-	status: "Community Preview 1.0"
-	date: "$Date: 2009-09-01 19:15:37 -0300 (mar 01 de sep de 2009) $"
-	revision: "$Revision: 80577 $"
-
-class
-	HTTP_ENCODING_FACILITIES
-
-create
-	make
-
-feature -- Initialization
-
-	make
-		do
-		end
-
-feature -- Conversion
-
-	encode_natural(a_i: NATURAL; a_is_fragmented: BOOLEAN): NATURAL
-			-- Leftshift of the natural (don't use numbers >= 2^31) and subsequent append of the flag bit.
-			-- Use decode_natural and decode_flag for decoding.
-		require
-			no_too_big: a_i < 2147483648
-		do
-			Result := (a_i |<< 1) + a_is_fragmented.to_integer.as_natural_32
-		end
-
-	change_flag(a_i: NATURAL; a_new_flag: BOOLEAN): NATURAL
-			-- Changes the flag to "new_flag" and doesn't change the encoded natural.
-		do
-			Result := (a_i & 0xFFFFFFFE) + a_new_flag.to_integer.as_natural_32
-		end
-
-	decode_natural_and_flag (a_i: NATURAL): TUPLE [NATURAL, BOOLEAN]
-			-- Convenience feature which combines both decodings (natural and flag)
-		do
-			Result := [decode_natural (a_i), decode_flag (a_i)]
-		end
-
-	decode_natural  (a_i: NATURAL): NATURAL
-			-- The natural that was encoded in {ENCODING_FACILITIES}.encode_natural.
-		do
-			Result := (a_i |>> 1)
-		end
-
-	decode_flag (a_i: NATURAL): BOOLEAN
-			--`Result': the flag that was encoded in encode_natural
-		do
-			Result := (a_i.bit_and (1) = 1)
-		end
-
-note
-	copyright: "2011-2011, Javier Velilla and others"
-	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-end
+note
+	description: "[
+		Provides features to encode and decode messages
+	]"
+	legal: "See notice at end of class."
+	status: "Community Preview 1.0"
+	date: "$Date: 2009-09-01 19:15:37 -0300 (mar 01 de sep de 2009) $"
+	revision: "$Revision: 80577 $"
+
+class
+	HTTP_ENCODING_FACILITIES
+
+create
+	make
+
+feature -- Initialization
+
+	make
+		do
+		end
+
+feature -- Conversion
+
+	encode_natural(a_i: NATURAL; a_is_fragmented: BOOLEAN): NATURAL
+			-- Leftshift of the natural (don't use numbers >= 2^31) and subsequent append of the flag bit.
+			-- Use decode_natural and decode_flag for decoding.
+		require
+			no_too_big: a_i < 2147483648
+		do
+			Result := (a_i |<< 1) + a_is_fragmented.to_integer.as_natural_32
+		end
+
+	change_flag(a_i: NATURAL; a_new_flag: BOOLEAN): NATURAL
+			-- Changes the flag to "new_flag" and doesn't change the encoded natural.
+		do
+			Result := (a_i & 0xFFFFFFFE) + a_new_flag.to_integer.as_natural_32
+		end
+
+	decode_natural_and_flag (a_i: NATURAL): TUPLE [NATURAL, BOOLEAN]
+			-- Convenience feature which combines both decodings (natural and flag)
+		do
+			Result := [decode_natural (a_i), decode_flag (a_i)]
+		end
+
+	decode_natural  (a_i: NATURAL): NATURAL
+			-- The natural that was encoded in {ENCODING_FACILITIES}.encode_natural.
+		do
+			Result := (a_i |>> 1)
+		end
+
+	decode_flag (a_i: NATURAL): BOOLEAN
+			--`Result': the flag that was encoded in encode_natural
+		do
+			Result := (a_i.bit_and (1) = 1)
+		end
+
+note
+	copyright: "2011-2011, Javier Velilla and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end

contrib/library/network/server/nino/library/http_server.e

@@ -1,56 +1,56 @@
-note
-	description: "Summary description for {HTTP_SERVER}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	HTTP_SERVER
-
-create
-	make
-
-feature -- Initialization
-
-	make (cfg: like configuration)
-		do
-			configuration := cfg
-		end
-
-	setup (a_http_handler: HTTP_HANDLER)
-		require
-			a_http_handler_valid: a_http_handler /= Void
-		do
-			if configuration.is_verbose then
-				log ("%N%N%N")
-				log ("Starting Web Application Server (port="+ configuration.http_server_port.out +"):%N")
-			end
-			stop_requested := False
-			a_http_handler.execute
-		end
-
-	shutdown_server
-		do
-			stop_requested := True
-		end
-
-feature	-- Access
-
-	configuration: HTTP_SERVER_CONFIGURATION
-			-- Configuration of the server
-
-	stop_requested: BOOLEAN
-			-- Stops the server
-
-feature -- Output
-
-	log (a_message: READABLE_STRING_8)
-			-- Log `a_message'
-		do
-			io.put_string (a_message)
-		end
-
-;note
-	copyright: "2011-2011, Javier Velilla and others"
-	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-end
+note
+	description: "Summary description for {HTTP_SERVER}."
+	author: ""
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	HTTP_SERVER
+
+create
+	make
+
+feature -- Initialization
+
+	make (cfg: like configuration)
+		do
+			configuration := cfg
+		end
+
+	setup (a_http_handler: HTTP_HANDLER)
+		require
+			a_http_handler_valid: a_http_handler /= Void
+		do
+			if configuration.is_verbose then
+				log ("%N%N%N")
+				log ("Starting Web Application Server (port="+ configuration.http_server_port.out +"):%N")
+			end
+			stop_requested := False
+			a_http_handler.execute
+		end
+
+	shutdown_server
+		do
+			stop_requested := True
+		end
+
+feature	-- Access
+
+	configuration: HTTP_SERVER_CONFIGURATION
+			-- Configuration of the server
+
+	stop_requested: BOOLEAN
+			-- Stops the server
+
+feature -- Output
+
+	log (a_message: READABLE_STRING_8)
+			-- Log `a_message'
+		do
+			io.put_string (a_message)
+		end
+
+;note
+	copyright: "2011-2011, Javier Velilla and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end

contrib/library/network/server/nino/library/request/http_request_handler.e

@@ -1,118 +1,118 @@
-deferred class HTTP_REQUEST_HANDLER
-
-inherit
-	ANY
-		redefine
-			default_create
-		end
-
-feature {NONE} -- Initialization
-
-	default_create
-		do
-			Precursor
-			create request_uri.make_empty
-			create script_name.make_empty
-			create query_string.make_empty
-			create answer
-			create headers.make (0)
-		end
-
-feature -- Access
-
-	request_uri: STRING
-			-- requested url
-
-	script_name: STRING
-			-- Script name
-
-	query_string: STRING
-			-- Query string	
-
-	data: detachable STRING
-			-- the entire request message
-
-	headers : HASH_TABLE [STRING, STRING]
-		-- Provides access to the request's HTTP headers, for example:
-		-- headers["Content-Type"] is "text/plain"
-
-	answer: HTTP_RESPONSE
-			-- reply to this request
-
-feature -- Execution
-
-	process
-			-- process the request and create an answer
-		require
-			valid_uri: request_uri /= Void
-		deferred
-		end
-
-feature -- Recycle
-
-	reset
-			-- reinit the fields
-		do
-			request_uri.wipe_out
-			script_name.wipe_out
-			query_string.wipe_out
-			data := Void
-			answer.reset
-		end
-
-feature -- Element change
-
-	set_uri (new_uri: STRING)
-			-- set new URI
-		require
-			valid_uri: new_uri /= Void
-		local
-			p: INTEGER
-		do
-			request_uri := new_uri
-			p := new_uri.index_of ('?', 1)
-			if p > 0 then
-				script_name := new_uri.substring (1, p - 1)
-				query_string := new_uri.substring (p + 1, new_uri.count)
-			else
-				script_name := new_uri.string
-				query_string := ""
-			end
-		end
-
-	set_data (new_data: STRING)
-			-- set new data
-		do
-			data := new_data
-		end
-
-	set_headers ( a_header : HASH_TABLE [STRING, STRING] )
-		do
-			headers := a_header
-		end
-
-feature {NONE} -- Implementation
-
-	real_filename (fn: STRING): STRING
-			-- Real filename from url-path `fn'
-			--| Find a better design for this piece of code
-			--| Eventually in a spec/$ISE_PLATFORM/ specific cluster
-		do
-			if {PLATFORM}.is_windows then
-				create Result.make_from_string (fn)
-				Result.replace_substring_all ("/", "\")
-				if Result[Result.count] = '\' then
-					Result.remove_tail (1)
-				end
-			else
-				Result := fn
-				if Result[Result.count] = '/' then
-					Result := Result.substring (1, Result.count - 1)
-				end
-			end
-		end
-
-note
-	copyright: "2011-2011, Javier Velilla and others"
-	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-end
+deferred class HTTP_REQUEST_HANDLER
+
+inherit
+	ANY
+		redefine
+			default_create
+		end
+
+feature {NONE} -- Initialization
+
+	default_create
+		do
+			Precursor
+			create request_uri.make_empty
+			create script_name.make_empty
+			create query_string.make_empty
+			create answer
+			create headers.make (0)
+		end
+
+feature -- Access
+
+	request_uri: STRING
+			-- requested url
+
+	script_name: STRING
+			-- Script name
+
+	query_string: STRING
+			-- Query string	
+
+	data: detachable STRING
+			-- the entire request message
+
+	headers : HASH_TABLE [STRING, STRING]
+		-- Provides access to the request's HTTP headers, for example:
+		-- headers["Content-Type"] is "text/plain"
+
+	answer: HTTP_RESPONSE
+			-- reply to this request
+
+feature -- Execution
+
+	process
+			-- process the request and create an answer
+		require
+			valid_uri: request_uri /= Void
+		deferred
+		end
+
+feature -- Recycle
+
+	reset
+			-- reinit the fields
+		do
+			request_uri.wipe_out
+			script_name.wipe_out
+			query_string.wipe_out
+			data := Void
+			answer.reset
+		end
+
+feature -- Element change
+
+	set_uri (new_uri: STRING)
+			-- set new URI
+		require
+			valid_uri: new_uri /= Void
+		local
+			p: INTEGER
+		do
+			request_uri := new_uri
+			p := new_uri.index_of ('?', 1)
+			if p > 0 then
+				script_name := new_uri.substring (1, p - 1)
+				query_string := new_uri.substring (p + 1, new_uri.count)
+			else
+				script_name := new_uri.string
+				query_string := ""
+			end
+		end
+
+	set_data (new_data: STRING)
+			-- set new data
+		do
+			data := new_data
+		end
+
+	set_headers ( a_header : HASH_TABLE [STRING, STRING] )
+		do
+			headers := a_header
+		end
+
+feature {NONE} -- Implementation
+
+	real_filename (fn: STRING): STRING
+			-- Real filename from url-path `fn'
+			--| Find a better design for this piece of code
+			--| Eventually in a spec/$ISE_PLATFORM/ specific cluster
+		do
+			if {PLATFORM}.is_windows then
+				create Result.make_from_string (fn)
+				Result.replace_substring_all ("/", "\")
+				if Result[Result.count] = '\' then
+					Result.remove_tail (1)
+				end
+			else
+				Result := fn
+				if Result[Result.count] = '/' then
+					Result := Result.substring (1, Result.count - 1)
+				end
+			end
+		end
+
+note
+	copyright: "2011-2011, Javier Velilla and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end

contrib/library/network/server/nino/library/response/http_response.e

@@ -1,147 +1,147 @@
-
-class HTTP_RESPONSE
-
-inherit
-	HTTP_CONSTANTS
-		redefine
-			default_create
-		end
-
-create
-	default_create
-
-feature -- creation
-
-	default_create
-		do
-			Precursor
-			set_defaults
-		end
-
-	set_defaults
-			-- Set default values for the reply	
-		do
-			status_code := ok
-			create content_length_data.make_empty
-			reason_phrase := ok_message
-			content_type_data := text_html
-			set_reply_text (Void)
-		end
-
-feature -- Recycle
-
-	reset
-		do
-			set_defaults
-		end
-
-feature -- response header fields
-
-	status_code: STRING
-			-- status
-
-	content_length_data : STRING
-			-- length		
-
-	reason_phrase: STRING
-			-- message, if any
-
-	content_type_data: STRING
-			-- type of content in this reply (eg. text/html)
-
-feature -- Element change
-
-	set_content_length (new_content_length: INTEGER)
-		require
-			positive_or_zero: new_content_length >= 0
-		do
-			content_length_data := new_content_length.out
-		end
-
-	set_status_code (new_status_code: STRING)
-		require
-			not_void: new_status_code /= Void
-		do
-			status_code := new_status_code
-		end
-
-	set_reason_phrase (new_reason_phrase: STRING)
-		require
-			not_void: new_reason_phrase /= Void
-		do
-			reason_phrase := new_reason_phrase
-		end
-
-	set_content_type (new_content_type: STRING)
-		require
-			not_void: new_content_type /= Void
-		do
-			content_type_data := new_content_type
-		end
-
-feature -- Access: send reply
-
-	reply_header: STRING
-			-- header
-		do
-			Result := http_version_1_1.twin
-			Result.extend (' ')
-			Result.append (status_code)
-			Result.extend (' ')
-			Result.append (reason_phrase)
-			Result.append (crlf)
-			Result.append ({HTTP_SERVER_CONFIGURATION}.Server_details)
-			Result.append (crlf)
-			Result.append (Content_type + ": ")
-			Result.append (content_type_data)
-			Result.append (crlf)
-			Result.append (Content_length + ": ")
-			Result.append (content_length_data)
-			Result.append (crlf)
-			Result.append (crlf)
-			-- TODO: could add the size of data being sent here and
-			-- then keep the connection alive
-		end
-
-	reply_header_continue: STRING
-			-- header
-		do
-			Result := http_version_1_1.twin
-			Result.extend (' ')
-			Result.append (status_code)
-			Result.extend (' ')
-			Result.append (continue_message)
-			Result.append (crlf)
-			Result.append (crlf)
-			-- TODO: could add the size of data being sent here and
-			-- then keep the connection alive
-		end
-
-	reply_text: STRING
-			-- reply text
-
-feature -- Change element: send reply
-
-	set_reply_text (new_text: detachable STRING)
-			-- text could be Void
-		do
-			if new_text = Void then
-				create reply_text.make_empty
-			else
-				reply_text := new_text
-			end
-		end
-
-	append_reply_text (more_text: STRING)
-			-- add more text to the reply
-		require
-			reply_text /= Void
-			more_text /= Void
-		do
-			reply_text.append (more_text)
-		end
-
-note
-	copyright: "2011-2011, Javier Velilla and others"
-	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-end
+
+class HTTP_RESPONSE
+
+inherit
+	HTTP_CONSTANTS
+		redefine
+			default_create
+		end
+
+create
+	default_create
+
+feature -- creation
+
+	default_create
+		do
+			Precursor
+			set_defaults
+		end
+
+	set_defaults
+			-- Set default values for the reply	
+		do
+			status_code := ok
+			create content_length_data.make_empty
+			reason_phrase := ok_message
+			content_type_data := text_html
+			set_reply_text (Void)
+		end
+
+feature -- Recycle
+
+	reset
+		do
+			set_defaults
+		end
+
+feature -- response header fields
+
+	status_code: STRING
+			-- status
+
+	content_length_data : STRING
+			-- length		
+
+	reason_phrase: STRING
+			-- message, if any
+
+	content_type_data: STRING
+			-- type of content in this reply (eg. text/html)
+
+feature -- Element change
+
+	set_content_length (new_content_length: INTEGER)
+		require
+			positive_or_zero: new_content_length >= 0
+		do
+			content_length_data := new_content_length.out
+		end
+
+	set_status_code (new_status_code: STRING)
+		require
+			not_void: new_status_code /= Void
+		do
+			status_code := new_status_code
+		end
+
+	set_reason_phrase (new_reason_phrase: STRING)
+		require
+			not_void: new_reason_phrase /= Void
+		do
+			reason_phrase := new_reason_phrase
+		end
+
+	set_content_type (new_content_type: STRING)
+		require
+			not_void: new_content_type /= Void
+		do
+			content_type_data := new_content_type
+		end
+
+feature -- Access: send reply
+
+	reply_header: STRING
+			-- header
+		do
+			Result := http_version_1_1.twin
+			Result.extend (' ')
+			Result.append (status_code)
+			Result.extend (' ')
+			Result.append (reason_phrase)
+			Result.append (crlf)
+			Result.append ({HTTP_SERVER_CONFIGURATION}.Server_details)
+			Result.append (crlf)
+			Result.append (Content_type + ": ")
+			Result.append (content_type_data)
+			Result.append (crlf)
+			Result.append (Content_length + ": ")
+			Result.append (content_length_data)
+			Result.append (crlf)
+			Result.append (crlf)
+			-- TODO: could add the size of data being sent here and
+			-- then keep the connection alive
+		end
+
+	reply_header_continue: STRING
+			-- header
+		do
+			Result := http_version_1_1.twin
+			Result.extend (' ')
+			Result.append (status_code)
+			Result.extend (' ')
+			Result.append (continue_message)
+			Result.append (crlf)
+			Result.append (crlf)
+			-- TODO: could add the size of data being sent here and
+			-- then keep the connection alive
+		end
+
+	reply_text: STRING
+			-- reply text
+
+feature -- Change element: send reply
+
+	set_reply_text (new_text: detachable STRING)
+			-- text could be Void
+		do
+			if new_text = Void then
+				create reply_text.make_empty
+			else
+				reply_text := new_text
+			end
+		end
+
+	append_reply_text (more_text: STRING)
+			-- add more text to the reply
+		require
+			reply_text /= Void
+			more_text /= Void
+		do
+			reply_text.append (more_text)
+		end
+
+note
+	copyright: "2011-2011, Javier Velilla and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end

contrib/library/network/server/nino/library/shared_uri_contents_types.e

@@ -1,18 +1,18 @@
-note
-	description: "Summary description for {SHARED_URI_CONTENTS_TYPES}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	SHARED_URI_CONTENTS_TYPES
-feature
-
-	ct_table: URI_CONTENTS_TYPES
-		once
-			create Result.make
-		end
-note
-	copyright: "2011-2011, Javier Velilla and others"
-	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-end
+note
+	description: "Summary description for {SHARED_URI_CONTENTS_TYPES}."
+	author: ""
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	SHARED_URI_CONTENTS_TYPES
+feature
+
+	ct_table: URI_CONTENTS_TYPES
+		once
+			create Result.make
+		end
+note
+	copyright: "2011-2011, Javier Velilla and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end

contrib/library/network/server/nino/library/spec/before_15_01/tcp_stream_socket.e

@@ -1,82 +0,0 @@
-note
-	description: "Summary description for {TCP_STREAM_SOCKET}."
-	date: "$Date: 2015-02-16 19:53:13 +0100 (lun., 16 févr. 2015) $"
-	revision: "$Revision: 96642 $"
-
-class
-	TCP_STREAM_SOCKET
-
-inherit
-	NETWORK_STREAM_SOCKET
-		redefine
-			make
-		end
-
-create
-	make_server_by_address_and_port,
-	make_server_by_port
-
-create {NETWORK_STREAM_SOCKET}
-	make_from_descriptor_and_address
-
-feature {NONE} -- Initialization
-
-	make
-			-- Create a network stream socket.
-		do
-			Precursor
-			set_reuse_address
-		end
-
-	make_server_by_address_and_port (an_address: INET_ADDRESS; a_port: INTEGER)
-			-- Create server socket on `an_address' and `a_port'.
-		require
-			valid_port: a_port >= 0
-		do
-			make
-			create address.make_from_address_and_port (an_address, a_port)
-			bind
-		end
-
-feature -- Basic operation
-
-	send_message (a_msg: STRING)
-		local
-			a_package : PACKET
-			a_data : MANAGED_POINTER
-			c_string : C_STRING
-		do
-			create c_string.make (a_msg)
-			create a_data.make_from_pointer (c_string.item, a_msg.count + 1)
-			create a_package.make_from_managed_pointer (a_data)
-			send (a_package, 1)
-		end
-
-feature -- Output
-
-	put_readable_string_8 (s: READABLE_STRING_8)
-			-- Write readable string `s' to socket.
-		local
-			ext: C_STRING
-		do
-			create ext.make (s)
-			put_managed_pointer (ext.managed_data, 0, s.count)
-		end
-
-feature -- Status report
-
-	try_ready_for_reading: BOOLEAN
-			-- Is data available for reading from the socket right now?
-		require
-			socket_exists: exists
-		local
-			retval: INTEGER
-		do
-			retval := c_select_poll_with_timeout (descriptor, True, 0)
-			Result := (retval > 0)
-		end
-
-note
-	copyright: "2011-2015, Javier Velilla and others"
-	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-end

contrib/library/network/server/nino/library/tcp_stream_socket.e

@@ -1,83 +1,82 @@
-note
-	description: "Summary description for {TCP_STREAM_SOCKET}."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	TCP_STREAM_SOCKET
-
-inherit
-	NETWORK_STREAM_SOCKET
-		redefine
-			make
-		end
-
-create
-	make_server_by_address_and_port,
-	make_server_by_port
-
-create {NETWORK_STREAM_SOCKET}
-	make_from_descriptor_and_address,
-	make_empty
-
-feature {NONE} -- Initialization
-
-	make
-			-- Create a network stream socket.
-		do
-			Precursor
-			set_reuse_address
-		end
-
-	make_server_by_address_and_port (an_address: INET_ADDRESS; a_port: INTEGER)
-			-- Create server socket on `an_address' and `a_port'.
-		require
-			valid_port: a_port >= 0
-		do
-			make
-			create address.make_from_address_and_port (an_address, a_port)
-			bind
-		end
-
-feature -- Basic operation
-
-	send_message (a_msg: STRING)
-		local
-			a_package : PACKET
-			a_data : MANAGED_POINTER
-			c_string : C_STRING
-		do
-			create c_string.make (a_msg)
-			create a_data.make_from_pointer (c_string.item, a_msg.count + 1)
-			create a_package.make_from_managed_pointer (a_data)
-			send (a_package, 1)
-		end
-
-feature -- Output
-
-	put_readable_string_8 (s: READABLE_STRING_8)
-			-- Write readable string `s' to socket.
-		local
-			ext: C_STRING
-		do
-			create ext.make (s)
-			put_managed_pointer (ext.managed_data, 0, s.count)
-		end
-
-feature -- Status report
-
-	try_ready_for_reading: BOOLEAN
-			-- Is data available for reading from the socket right now?
-		require
-			socket_exists: exists
-		local
-			retval: INTEGER
-		do
-			retval := c_select_poll_with_timeout (descriptor, True, 0)
-			Result := (retval > 0)
-		end
-
-note
-	copyright: "2011-2015, Javier Velilla and others"
-	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-end
+note
+	description: "Summary description for {TCP_STREAM_SOCKET}."
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	TCP_STREAM_SOCKET
+
+inherit
+	NETWORK_STREAM_SOCKET
+		redefine
+			make
+		end
+
+create
+	make_server_by_address_and_port,
+	make_server_by_port
+
+create {NETWORK_STREAM_SOCKET}
+	make_from_descriptor_and_address
+
+feature {NONE} -- Initialization
+
+	make
+			-- Create a network stream socket.
+		do
+			Precursor
+			set_reuse_address
+		end
+
+	make_server_by_address_and_port (an_address: INET_ADDRESS; a_port: INTEGER)
+			-- Create server socket on `an_address' and `a_port'.
+		require
+			valid_port: a_port >= 0
+		do
+			make
+			create address.make_from_address_and_port (an_address, a_port)
+			bind
+		end
+
+feature -- Basic operation
+
+	send_message (a_msg: STRING)
+		local
+			a_package : PACKET
+			a_data : MANAGED_POINTER
+			c_string : C_STRING
+		do
+			create c_string.make (a_msg)
+			create a_data.make_from_pointer (c_string.item, a_msg.count + 1)
+			create a_package.make_from_managed_pointer (a_data)
+			send (a_package, 1)
+		end
+
+feature -- Output
+
+	put_readable_string_8 (s: READABLE_STRING_8)
+			-- Write readable string `s' to socket.
+		local
+			ext: C_STRING
+		do
+			create ext.make (s)
+			put_managed_pointer (ext.managed_data, 0, s.count)
+		end
+
+feature -- Status report
+
+	try_ready_for_reading: BOOLEAN
+			-- Is data available for reading from the socket right now?
+		require
+			socket_exists: exists
+		local
+			retval: INTEGER
+		do
+			retval := c_select_poll_with_timeout (descriptor, True, 0)
+			Result := (retval > 0)
+		end
+	
+note
+	copyright: "2011-2011, Javier Velilla and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end

contrib/library/network/server/nino/library/uri_contents_types.e

@@ -1,91 +1,91 @@
-class URI_CONTENTS_TYPES
-
-create
-
-	make
-
-
-feature
-
-	content_types: HASH_TABLE [STRING, STRING]
-
-	extension (uri: STRING): STRING
-			-- extract extendion from a URI
-		local
-			i: INTEGER
-		do
-			-- going from the end find the position of the "."
-			from
-				i := uri.count
-			until
-				i = 0 or else uri.item (i) = '.'
-			loop
-				i := i - 1
-			end
-			Result := uri.substring (i+1, uri.count)
-		end
-
-feature {NONE}
-
-	make
-		do
-			create content_types.make (30)
-			content_types.put ("text/html", "html")
-			content_types.put ("text/html", "htm")
-			content_types.put ("image/gif", "gif")
-			content_types.put ("image/jpeg", "jpeg")
-			content_types.put ("image/png", "jpg")
-			content_types.put ("image/png", "png")
-		end
-
-
-
-feature -- Access: Encoding
-
-	urlencode (s: STRING): STRING
-			-- URL encode `s'
-		do
-			Result := s.string
-			Result.replace_substring_all ("#", "%%23")
-			Result.replace_substring_all (" ", "%%20")
-			Result.replace_substring_all ("%T", "%%09")
-			Result.replace_substring_all ("%N", "%%0A")
-			Result.replace_substring_all ("/", "%%2F")
-			Result.replace_substring_all ("&", "%%26")
-			Result.replace_substring_all ("<", "%%3C")
-			Result.replace_substring_all ("=", "%%3D")
-			Result.replace_substring_all (">", "%%3E")
-			Result.replace_substring_all ("%"", "%%22")
-			Result.replace_substring_all ("%'", "%%27")
-		end
-
-	urldecode (s: STRING): STRING
-			-- URL decode `s'
-		do
-			Result := s.string
-			Result.replace_substring_all ("%%23", "#")
-			Result.replace_substring_all ("%%20", " ")
-			Result.replace_substring_all ("%%09", "%T")
-			Result.replace_substring_all ("%%0A", "%N")
-			Result.replace_substring_all ("%%2F", "/")
-			Result.replace_substring_all ("%%26", "&")
-			Result.replace_substring_all ("%%3C", "<")
-			Result.replace_substring_all ("%%3D", "=")
-			Result.replace_substring_all ("%%3E", ">")
-			Result.replace_substring_all ("%%22", "%"")
-			Result.replace_substring_all ("%%27", "%'")
-		end
-
-	stripslashes (s: STRING): STRING
-		do
-			Result := s.string
-			Result.replace_substring_all ("\%"", "%"")
-			Result.replace_substring_all ("\'", "'")
-			Result.replace_substring_all ("\/", "/")
-			Result.replace_substring_all ("\\", "\")
-		end
-
-note
-	copyright: "2011-2011, Javier Velilla and others"
-	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-end
+class URI_CONTENTS_TYPES
+
+create
+
+	make
+
+
+feature
+
+	content_types: HASH_TABLE [STRING, STRING]
+
+	extension (uri: STRING): STRING
+			-- extract extendion from a URI
+		local
+			i: INTEGER
+		do
+			-- going from the end find the position of the "."
+			from
+				i := uri.count
+			until
+				i = 0 or else uri.item (i) = '.'
+			loop
+				i := i - 1
+			end
+			Result := uri.substring (i+1, uri.count)
+		end
+
+feature {NONE}
+
+	make
+		do
+			create content_types.make (30)
+			content_types.put ("text/html", "html")
+			content_types.put ("text/html", "htm")
+			content_types.put ("image/gif", "gif")
+			content_types.put ("image/jpeg", "jpeg")
+			content_types.put ("image/png", "jpg")
+			content_types.put ("image/png", "png")
+		end
+
+
+
+feature -- Access: Encoding
+
+	urlencode (s: STRING): STRING
+			-- URL encode `s'
+		do
+			Result := s.string
+			Result.replace_substring_all ("#", "%%23")
+			Result.replace_substring_all (" ", "%%20")
+			Result.replace_substring_all ("%T", "%%09")
+			Result.replace_substring_all ("%N", "%%0A")
+			Result.replace_substring_all ("/", "%%2F")
+			Result.replace_substring_all ("&", "%%26")
+			Result.replace_substring_all ("<", "%%3C")
+			Result.replace_substring_all ("=", "%%3D")
+			Result.replace_substring_all (">", "%%3E")
+			Result.replace_substring_all ("%"", "%%22")
+			Result.replace_substring_all ("%'", "%%27")
+		end
+
+	urldecode (s: STRING): STRING
+			-- URL decode `s'
+		do
+			Result := s.string
+			Result.replace_substring_all ("%%23", "#")
+			Result.replace_substring_all ("%%20", " ")
+			Result.replace_substring_all ("%%09", "%T")
+			Result.replace_substring_all ("%%0A", "%N")
+			Result.replace_substring_all ("%%2F", "/")
+			Result.replace_substring_all ("%%26", "&")
+			Result.replace_substring_all ("%%3C", "<")
+			Result.replace_substring_all ("%%3D", "=")
+			Result.replace_substring_all ("%%3E", ">")
+			Result.replace_substring_all ("%%22", "%"")
+			Result.replace_substring_all ("%%27", "%'")
+		end
+
+	stripslashes (s: STRING): STRING
+		do
+			Result := s.string
+			Result.replace_substring_all ("\%"", "%"")
+			Result.replace_substring_all ("\'", "'")
+			Result.replace_substring_all ("\/", "/")
+			Result.replace_substring_all ("\\", "\")
+		end
+
+note
+	copyright: "2011-2011, Javier Velilla and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end

contrib/library/network/server/nino/nino-safe.ecf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="nino" uuid="32C1D67D-33DE-4F1E-864B-D45388F2E3E6" library_target="nino">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="nino" uuid="32C1D67D-33DE-4F1E-864B-D45388F2E3E6" library_target="nino">
 	<target name="nino">
 		<root all_classes="true"/>
 		<file_rule>
@@ -8,28 +8,13 @@
 			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" is_attached_by_default="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf"/>
 		<library name="thread" location="$ISE_LIBRARY\library\thread\thread-safe.ecf"/>
-		<cluster name="nino" location=".\library\" recursive="true">
-			<file_rule>
-				<exclude>spec</exclude>
-			</file_rule>
-			<file_rule>
-				<exclude>tcp_stream_socket.e</exclude>
-				<condition>
-					<version type="compiler" max="15.01.9.6506"/>
-				</condition>
-			</file_rule>
-		</cluster>
-		<cluster name="spec_before_15_01" location=".\library\spec\before_15_01\" recursive="true">
-			<condition>
-				<version type="compiler" max="15.01.9.6506"/>
-			</condition>
-		</cluster>
+		<cluster name="nino" location=".\library\" recursive="true"/>
 	</target>
 </system>

contrib/library/network/server/nino/nino.ecf

@@ -15,21 +15,6 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
 		<library name="thread" location="$ISE_LIBRARY\library\thread\thread.ecf"/>
-		<cluster name="nino" location=".\library\" recursive="true">
-			<file_rule>
-				<exclude>spec</exclude>
-			</file_rule>
-			<file_rule>
-				<exclude>tcp_stream_socket.e</exclude>
-				<condition>
-					<version type="compiler" max="15.01.9.6506"/>
-				</condition>
-			</file_rule>
-		</cluster>
-		<cluster name="spec_before_15_01" location=".\library\spec\before_15_01\" recursive="true">
-			<condition>
-				<version type="compiler" max="15.01.9.6506"/>
-			</condition>
-		</cluster>
+		<cluster name="nino" location=".\library\" recursive="true"/>
 	</target>
 </system>

contrib/library/network/server/nino/nino.rc

@@ -0,0 +1 @@
+

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

@@ -1,14 +0,0 @@
-package nino
-
-project
-	nino = "nino-safe.ecf"
-	nino = "nino.ecf"
-
-note
-	title: Eiffel Nino Web Server
-	description: Simple HTTPd server written in Eiffel
-	tags: web, httpd, server
-	license: Eiffel Forum v2
-	copyright: Javier Velilla, Jocelyn Fiat.
-
-end

contrib/library/network/server/nino/readme.txt

@@ -1,38 +1,38 @@
-Eiffel Nino HTTPD
-=================
-Eiffel Nino is and HTTPD server. It's a work in progress, so maybe it will be refactored.
-The goal of is to provide a simple web server for development (like Java, Python and Ruby provide)
-The code is based on Xebra and Emu Web Server.
-
-
-Goal
-========
-HTTPD server for development, support for HTTP 1.1.
-
-
-
-
-Testing
-=======
-To test the HTTPD server, you could run the [example https://github.com/jvelilla/EiffelWebNino/tree/master/example/SimpleWebServer] 
-The server work fine in Windows and Linux.
-
-Run the server and point your browser to one of the following URIs
-
-1) http://localhost:9000/post/index.html 
-2) http://localhost:9000/demo1/template.html
-3) http://localhost:9000/demo2/demo.html
-4) http://localhost:9000/example/html/index.html
-5) http://localhost:9000/html/simple.html
-6) http://localhost:9000/html/images.html
-7) http://localhost:9000/html/images.html
-8) http://localhost:9000/html5/dataset.html 
-
-Known Issues
-============
-
-
-
-
-
-
+Eiffel Nino HTTPD
+=================
+Eiffel Nino is and HTTPD server. It's a work in progress, so maybe it will be refactored.
+The goal of is to provide a simple web server for development (like Java, Python and Ruby provide)
+The code is based on Xebra and Emu Web Server.
+
+
+Goal
+========
+HTTPD server for development, support for HTTP 1.1.
+
+
+
+
+Testing
+=======
+To test the HTTPD server, you could run the [example https://github.com/jvelilla/EiffelWebNino/tree/master/example/SimpleWebServer] 
+The server work fine in Windows and Linux.
+
+Run the server and point your browser to one of the following URIs
+
+1) http://localhost:9000/post/index.html 
+2) http://localhost:9000/demo1/template.html
+3) http://localhost:9000/demo2/demo.html
+4) http://localhost:9000/example/html/index.html
+5) http://localhost:9000/html/simple.html
+6) http://localhost:9000/html/images.html
+7) http://localhost:9000/html/images.html
+8) http://localhost:9000/html5/dataset.html 
+
+Known Issues
+============
+
+
+
+
+
+

contrib/library/text/parser/json/.gitattributes

@@ -1,10 +0,0 @@
-# Set default behaviour, in case users don't have core.autocrlf set.
-# * text=auto
-
-# Explicitly declare text files we want to always be normalized and converted 
-# to native line endings on checkout.
-*.e text
-*.ecf text
-*.bat text
-*.json text
-*.txt text

contrib/library/text/parser/json/.gitignore

@@ -1,2 +1,2 @@
 *.swp
-EIFGENs/
+EIFGENs

contrib/library/text/parser/json/History.txt

@@ -1,28 +1,26 @@
-History file for EJSON
-======================
-
-team: ""
-date: "2011-07-06"
-revision: "0.3.0"
-
-WARNING: THIS FILE IS NOT UP TO DATE
-
-
-+++++++++++++++++++++Important Changes since 0.2.0 version++++++++++++++++++++++++++++++++++++++++++++++
-
-*Updated skip_white_spaces, now check  %U and %T  codes
-
-*Undo changes to is_a_valid_number, because it's doesn't follow the
-JSON spec. Tests : fail13.json, fail29.json and fail30.json are valid
-with this implementation, so we go back to the previous
-implementation.
-
-*Added autotest test suite
-
-*Added getest based test program
-
-*Updated Eiffel configuration file, updated to the new clusters
-
-*Added converters and factory classes 
-
-*Added new top level directories; library, test, build and example
+History file for EJSON
+======================
+
+team: ""
+date: "2011-07-06"
+revision: "0.3.0"
+
+
++++++++++++++++++++++Important Changes since 0.2.0 version++++++++++++++++++++++++++++++++++++++++++++++
+
+*Updated skip_white_spaces, now check  %U and %T  codes
+
+*Undo changes to is_a_valid_number, because it's doesn't follow the
+JSON spec. Tests : fail13.json, fail29.json and fail30.json are valid
+with this implementation, so we go back to the previous
+implementation.
+
+*Added autotest test suite
+
+*Added getest based test program
+
+*Updated Eiffel configuration file, updated to the new clusters
+
+*Added converters and factory classes 
+
+*Added new top level directories; library, test, build and example

contrib/library/text/parser/json/License.txt

@@ -1,21 +1,20 @@
-Copyright (c)  2010-2014 Javier Velilla, Jocelyn Fiat and others,
-https://github.com/eiffelhub/json .
-
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Copyright (c)  2010 Javier Velilla and others, http://ejson.origo.ethz.ch
+
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions: 
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software. 
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

contrib/library/text/parser/json/Readme.txt

@@ -1,112 +1,97 @@
-Readme file for eJSON
-=====================
-
-team: "Javier Velilla, Jocelyn Fiat"
-previous contributors: "Paul Cohen"
-date: "2014-nov-17"
-
-1. Introduction
----------------
-
-eJSON stands for Eiffel JSON library and is a small Eiffel library for dealing
-with the JSON format. This library provides a JSON parser and visitors,
-including a pretty printer.
-
-The converters part is now obsolete and not recommended (remember: the
-objective of converters were to provide two basic features Eiffel2JSON and
-JSON2Eiffel). There will be a new design for converters as a standalone
-library on top of Current json library.
-
-2. Legal stuff
---------------
-
-eJSON is copyrighted by the author Javier Velilla, Jocelyn Fiat and others. It is licensed
-under the MIT License. See the file license.txt in the same directory as this
-readme file.
-
-3. Versioning scheme
---------------------
-
-eJSON version numbers has the form:
-
-   «major number».«minor number».«patch level»
-
-eJSON will retain the major number 0 as long as it has beta status. A change in
-major number indicates that a release is not backward compatible. A change in
-minor number indicates that a release is backward compatible (within that major
-number) but that new useful features may have been added. A change in patch
-level simply indicates that the release contains bug fixes for the previous
-release. Note that as long as eJSON is in beta status (0.Y.Z) backward 
-compatibility is not guranteed for changes in minor numbers!
-
-4. Documentation
----------------
-
-Currently the only documentation on eJSON is available at:
-
-  https://github.com/eiffelhub/json/wiki/User-guide
-
-5. Requirements and installation
---------------------------------
-
-EJSON requires that you have:
-
-1. One of the following compiler combinations installed:
-   * ISE Eiffel 13.11 or later.
-   * gec [try to test]
-
-eJSON probably works fine with other versions of the above compilers.
-There are no known platform dependencies (Windows, Linux).
-
-To install eJSON simply extract the ejson-X.Y.Z.zip file to some appropriate
-place on your hard disk. There are no requirements on environment variables or
-registry variables. 
-Note eJSON is also delivered within EiffelStudio release, under
-$ISE_LIBRARY/contrib/library/text/parser/json
-
-To verify that everything works you should compile the example programs and/or
-the test program.
-
-6. Contents of eJSON
---------------------
-
-All directory names below are relative to the root directory of your ejson
-installation. 
-
-Directory   Description
----------   -----------
-doc         Contains documentation file.
-examples    Contains example codes.
-library     Contains the actual eJSON library classes.
-test        Contains test suite for eJSON.
-
-7. Contacting the Team
-----------------------
-
-Contact the team: 
-
- https://github.com/eiffelhub/json/issues
- Javier Velilla «javier.hector@gmail.com»
- Jocelyn Fiat «jfiat@eiffel.com»
-
-8. Releases
------------
-
-For more information on what was changed in each release look in the file
-history.txt.
-
-Version Date            Description
-------- ----            -----------
-0.6.0   2014-11-17      Fixed various issue with parsing string (such as \t and related),
-						Implemented escaping of slash '/' only in case of '</' to avoid 
-						  potential issue with javascript and </script>
-						Many feature renaming to match Eiffel style and naming convention, 
-						  kept previous feature as obsolete.
-				        Restructured the library to make easy extraction of "converter" 
-						  classes if needed in the future.
-				        Marked converters classes as obsolete.
-0.5.0   2013-11-dd      Added JSON_ITERATOR, simplified JSON_OBJECT
-0.4.0   2012-12-12      Updated documentation URI
-0.3.0   2011-07-06      JSON Factory Converters
-0.2.0   2010-02-07      Adapted to EiffelStudio 6.4 or later, supports void-safety
-0.1.0   2010-02-07      First release, Adapted to SmartEiffel 1.2r7 and EiffelStudio 6.2 or previous
+Readme file for eJSON
+=====================
+
+team: "Javier Velilla,Jocelyn Fiat, Paul Cohen"
+date: "$Date$"
+revision: "$Revision$"
+
+1. Introduction
+---------------
+
+eJSON stands for Eiffel JSON library and is a small Eiffel library for dealing
+with the JSON format. The objective of the library is to provide two basic
+features Eiffel2JSON and JSON2Eiffel.
+
+2. Legal stuff
+--------------
+
+eJSON is copyrighted by the author Javier Velilla and others. It is licensed
+under the MIT License. See the file license.txt in the same directory as this
+readme file.
+
+3. Versioning scheme
+--------------------
+
+eJSON version numbers has the form:
+
+   «major number».«minor number».«patch level»
+
+eJSON will retain the major number 0 as long as it has beta status. A change in
+major number indicates that a release is not backward compatible. A change in
+minor number indicates that a release is backward compatible (within that major
+number) but that new useful features may have been added. A change in patch
+level simply indicates that the release contains bug fixes for the previous
+release. Note that as long as eJSON is in beta status (0.Y.Z) backward 
+compatibility is not guranteed for changes in minor numbers!
+
+4. Documentation
+---------------
+
+Currently the only documentation on eJSON is available at:
+
+  https://github.com/eiffelhub/json/wiki/User-guide
+
+5. Requirements and installation
+--------------------------------
+
+EJSON requires that you have:
+
+1. Gobo 3.9 installed or later
+2. One of the following compiler combinations installed:
+   * ISE Eiffel 6.5 or later.
+   * gec [try to test]
+   * tecomp [try to test]
+
+eJSON probably works fine with other versions of the above compilers.
+There are no known platform dependencies (Windows, Linux).
+
+To install eJSON simply extract the ejson-X.Y.Z.zip file to some appropriate
+place on your hard disk. There are no requirements on environment variables or
+registry variables.
+
+To verify that everything works you should compile the example programs and/or
+the test program.
+
+6. Contents of eJSON
+--------------------
+
+All directory names below are relative to the root directory of your ejson
+installation. 
+
+Directory   Description
+---------   -----------
+doc         Contains the eJSON.pdf documentation file.
+examples    Contains the two example programs.
+ejson       Contains the actual eJSON library classes.
+test        Contains a test program for eJSON.
+
+7. Contacting the Team
+----------------------
+
+Contact the team: 
+
+ Javier Velilla «javier.hector@gmail.com»
+ Paul Cohen «paco@seibostudios.se»
+ Jocelyn Fiat «jfiat@eiffel.com»
+
+8. Releases
+-----------
+
+For more information on what was changed in each release look in the file
+history.txt.
+
+Version Date            Description
+------- ----            -----------
+0.3.0   2011-07-06      JSON Factory Converters
+0.2.0   2010-02-07      Adapted to EiffelStudio 6.4 or later, supports void-safety
+0.1.0   2010-02-07      First release, Adapted to SmartEiffel 1.2r7 and EiffelStudio 6.2 or previous

contrib/library/text/parser/json/doc/user_guide.mediawiki

@@ -1,295 +0,0 @@
-== Preface ==
-
-This document is a living document! As always read and try out the code to understand what's really going on.
-
-=== About the project ===
-
-The eJSON project was started by Javier Velilla in 2008. The aim was simply to
-provide JSON support to Eiffel programmers. A couple of other people have been
-involved to various extent since the start; Berend de Boer, Jocelyn Fiat and
-Manu Stapf. In 2009 Paul Cohen joined the project as an active developer and
-later Jocelyn Fiat.
-
-The current active maintainers:
-- Javier Velilla
-- Jocelyn Fiat
-
-The formal name of the project is “eJSON”.
-
-For questions regarding eJSON please contact
-- <javier.hector at gmail.com> 
-- <jfiat at eiffel.com>
-- or directly on [https://github.com/eiffelhub/json/issues]
-
-=== Current version and status ===
-
-The latest release is 0.6.0. eJSON has been improved and cleaned.
-The converters are not obsolete.
-
-
-== Introduction ==
-
-=== What is JSON? ===
-
-JSON (JavaScript Object Notation) is a lightweight computer data interchange format. It is a text-based, human-readable format for representing simple data structures and associative arrays (called objects). See the [http://en.wikipedia.org/wiki/JSON Wikipedia article on JSON], [http://www.json.org www.json.org] and [http://www.json.com www.json.com] for more information.
-
-The JSON format is specified in [http://www.ietf.org/rfc/rfc4627.txt IETF RFC 4627] by Douglas Crockford. The official [http://www.iana.org/assignments/media-types Internet MIME media type] for JSON is "application/json". The recommended file name extension for JSON files is ".json".
-
-=== Advantages ===
-
-1. Lightweight data-interchange format.
-2. Easy for humans to read and write.
-3. Enables easy integration with AJAX/JavaScript web applications. See the article [http://www.developer.com/lang/jscript/article.php/3596836 Speeding Up AJAX with JSON] for a good short discussion on this subject.
-4. JSON data structures translate with ease into the native data structures universal to almost all programming languages used today.
-
-=== Use in Eiffel applications ===
-
-JSON can be used as a general serialization format for Eiffel objects. As such it could be used as a:
-
-* Data representation format in REST-based web service applications written in Eiffel.
-* Serialization format for Eiffel objects in persistence solutions.
-* File format for configuration files in Eiffel systems.
-
-=== Prerequisites ===
-
-eJSON works today with EiffelStudio 13.11
-There is an optional extension that requires the latest snapshot of the Gobo Eiffel libraries (a working snapshot is distributed with EiffelStudio). The depencencies on Gobo are on Gobo's unicode
-and regex libraries and for some of the extra features in eJSON, on Gobos structure classes DS_HASH_TABLE and DS_LINKED_LIST.
-
-eJSON is intended to work with all ECMA compliant Eiffel compilers.
-
-=== Installation ===
-
-You can either download a given release and install on your machine or you can get the latest snapshot of the code.
-To download go to the [http://ejson.origo.ethz.ch/download download page]. 
-To get the latest snapshot of the code do:
-
-:   $ git clone https://github.com/eiffelhub/json.git json
-
-*[https://github.com/eiffelhub/json/releases download page]
-*[https://github.com/eiffelhub/json github project]
-
-Note that the latest json release is also delivered with EiffelStudio installation under <code>$ISE_LIBRARY/contrib/library/text/parser/json</code>.
-
-
-=== Cluster and directory layout ===
-
- 	json/
- 	  library/ (Root directory for eJSON library classes)
- 		kernel/ (All classes in this cluster should eventually only depend on ECMA Eiffel and FreeELKS).
- 		  json_array.e
- 		  json_boolean.e
- 		  json_null.e
- 		  json_number.e
- 		  json_object.e
- 		  json_string.e
- 		  json_value.e
-		parser/
-		  json_parser.e
-		  json_parser_access.e
-		  json_reader.e
-		  json_tokens.e
-		utility/
-		  file/
-		     json_file_reader.e
-		  visitor/
-			json_visitor.e
-			json_iterator.e
-			json_pretty_string_visitor.e
-			print_json_visitor.e
-	    converters/ (JSON core converter classes !OBSOLETE!)
- 		  json_converter.e
- 		  json_hash_table_converter.e
- 		  json_list_converter.e
- 		  json_linked_list_converter.e
- 		  json_arrayed_list_converter.e
-		  support/
-		    ejson.e
-			shared_ejson.e
-	    gobo_converters/ (JSON core converter classes support for GOBO !OBSOLETE!)
-		  converters/
- 			json_ds_hash_table_converter.e
- 			json_ds_linked_list_converter.e
-		  shared_gobo_ejson.e
- 	  test/ (Contains autotest suite)
- 		autotest/ (AutoTest based unit test).
- 	  examples/ (Example code)
-
-=== Future development ===
-
-Here is a list of suggestions for future development of eJSON.
-* Ongoing: Provide a JSON_FACTORY class for easy conversion between arbitrary JSON and Eiffel values.
-* Ongoing: Provide a mechanism for users to add custom converters between JSON values and user space Eiffel classes.
-* Ongoing: Implement a full test framework for eJSON.
-* Suggestion: Investigate performance and improve it if neccessary.
-* Suggestion: Support JSON references. See [http://www.json.com/2007/10/19/json-referencing-proposal-and-library JSON Referencing Proposal and Library] and [http://www.sitepen.com/blog/2008/06/17/json-referencing-in-dojo JSON referencing in Dojo] for more information.
-* Suggestion: Support JSON path. See [http://goessner.net/articles/JsonPath JSONPath - XPath for JSON] for more information.
-* Suggestion: Support JSON schema validation. See [http://json-schema.org JSON Schema Proposal] for more information.
-* Suggestion: Support RDF JSON serialization. See [http://n2.talis.com/wiki/RDF_JSON_Specification RDF JSON Specification] for more information.
-* Suggestion: Add support to JSON classes for conversion from Eiffel manifest values. So one can write things like:
-
-== A simple example ==
-
-There are two basic approaches to using eJSON; either you use the basic JSON_VALUE classes, converting to and from JSON values to corresponding Eiffel instances or you use the high level eJSON interface class SHARED_EJSON. Of course you can use a mix of both approaches if you find it appropriate!
-
-Here is an example of how to create a JSON number value from an INTEGER and then obtain the JSON representation for that value.
-
- 	simple_example is
- 		local
- 			i: INTEGER
- 			jn: JSON_NUMBER
- 			s: STRING
- 		do
- 			i := 42
- 			create jn.make_integer (i)
- 			s := jn.representation -- s.is_equal ("42")
- 		end
-
-== Mapping of JSON values to Eiffel values == 
-
-=== JSON number ===
-
-JSON numbers are represented by the class JSON_NUMBER. JSON number values can be converted to/from NATURAL_*, INTEGER_* and REAL_64 values. For floating point values REAL_* is used. The complete mapping is as follows:
-
-JSON number ->  Eiffel:
-* -128 <= n <= +127 -> INTEGER_8
-* n can't be represented by INTEGER_8 and -32768 <= n <= +32767 -> INTEGER_16
-* n can't be represented by INTEGER_16 and -2147483648 <= n <= +2147483647 -> INTEGER_32
-* n can't be represented by INTEGER_32 and -9223372036854775808 <= n <= +9223372036854775807 -> INTEGER_64 
-* n can't be represented by INTEGER_64 and 9223372036854775808 <= n <= 18446744073709551615 -> NATURAL_64
-* n has fractional dot '.' -> REAL_64.
-* n -> eJSON exception if number can't be represented by a INTEGER_64, NATURAL_64 or REAL_64.
-
-Eiffel -> JSON number:
-* NATURAL_8, NATURAL_16, NATURAL_32, NATURAL_64, NATURAL -> JSON number
-* INTEGER_8, INTEGER_16, INTEGER_32, INTEGER_64, INTEGER -> JSON number
-* REAL_32, REAL_64, REAL -> JSON number
-
-You can use the following creation routines to create JSON_NUMBER instances:
-
-* JSON_NUMBER.make_integer 
-* JSON_NUMBER.make_real
-* JSON_NUMBER.make_natural
-
- 	eiffel_to_json_number_representation is
- 		local
- 			i: INTEGER
- 			r: REAL 
- 			jn: JSON_NUMBER
- 		do
- 			print ("JSON representation of Eiffel INTEGER: '")
- 			i := 123
- 			create jn.make_integer (i)
- 			print (jn.representation)
- 			print ("'%N")
- 			print ("JSON representation of Eiffel REAL: '")
- 			r := 12.3
- 			create jn.make_real (r)
- 			print (jn.representation)
- 			print ("'%N")
- 		end
-
-The output of the above code will be: 
-
- 	JSON representation of Eiffel INTEGER: '123'
- 	JSON representation of Eiffel REAL: '12.300000190734863'
-
-=== JSON boolean ===
-
-JSON boolean values are represented by the class JSON_BOOLEAN. The JSON boolean value "true" is converted to/from the BOOLEAN value "True" and the JSON boolean value "false is converted to/from the BOOLEAN value "False".
-
- 	eiffel_to_json_boolean_representation is
- 		local
- 			b: BOOLEAN
- 			jb: JSON_BOOLEAN
- 		do
- 			print ("JSON representation of Eiffel BOOLEAN: '")
- 			b := True
- 			create jb.make (b)
- 			print (jb.representation)
- 			print ("'%N")
- 			print("JSON representation of Eiffel BOOLEAN: '")
- 			b := False
- 			create jb.make (b)
- 			print (jb.representation)
- 			print ("'%N")
- 		end
-
-The output of the above code will be: 
-
- 	JSON representation of Eiffel BOOLEAN: 'true'
- 	JSON representation of Eiffel BOOLEAN: 'false'
-
-=== JSON string ===
-
-JSON strings are represented by the class JSON_STRING. JSON string values can be converted to/from STRING_32, STRING and CHARACTER values. The complete mapping is as follows:
-
-JSON string ->  Eiffel:
-* All JSON strings -> STRING or STRING_32
-
-Eiffel -> JSON string:
-* STRING_32 -> JSON string
-* STRING -> JSON string
-* CHARACTER -> JSON string
-
- 	eiffel_to_json_string_representation is
- 		local
- 			s: STRING
- 			js: JSON_STRING
- 		do
- 			print ("JSON representation of Eiffel STRING: '")
- 			s := "JSON rocks!"
- 			create js.make_from_string (s)
- 			print (js.representation)
- 			print ("'%N")
- 		end
-
-The output of the above code will be: 
-
- 	JSON representation of Eiffel STRING: '"JSON rocks!"'
-
-Note: JSON escape unicode characters, as well a other specific characters, to get the unescaped string value, use either 'unescaped_string_8' or 'unescaped_string_32'.
-
-=== JSON null ===
-
-The JSON null value is represented by the class JSON_NULL. The JSON null value can be converted to/from Void.
-
- 	eiffel_to_json_null_representation is
- 		local
- 			a: ANY
- 			jn: JSON_NULL
- 		do
- 			create jn
- 			print ("JSON representation for JSON null value: '")
- 			print (jn.representation)
- 			print ("'%N")
- 			a := Void
- 			if attached {JSON_NULL} json.value (a) as l_jn then -- json from SHARED_EJSON!
- 				print ("JSON representation of Eiffel Void reference: '")
- 				print (l_jn.representation)
- 				print ("'%N")
- 			end
- 		end
-
-The output of the above code will be: 
-
- 	JSON representation for JSON null value: 'null'
- 	JSON representation of Eiffel Void reference: 'null'
-
-=== JSON array ===
-
-JSON array is represented by the class JSON_ARRAY. 
-
-=== JSON object ===
-
-JSON object is represented by the class JSON_OBJECT. 
-
-
-== The eJSON visitor pattern ==
-
-TBD. See examples.
-
-== The eJSON file reader class ==
-
-TBD.
-

contrib/library/text/parser/json/examples/basic/basic.e

@@ -1,83 +0,0 @@
-class
-	BASIC
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	make
-			-- Initialize `Current'.
-		local
-			parser: JSON_PARSER
-			printer: JSON_PRETTY_STRING_VISITOR
-			s: STRING_32
-		do
-				-- Create parser for content `json_content'
-			create parser.make_with_string (json_content)
-				-- Parse the content
-			parser.parse_content
-			if
-				parser.is_valid and then
-				attached parser.parsed_json_value as jv
-			then
-					-- Json content is valid, and well parser.
-					-- and the parsed json value is `jv'
-
-					-- Let's access the glossary/title value
-				if
-					attached {JSON_OBJECT} jv as j_object and then
-					attached {JSON_OBJECT} j_object.item ("glossary") as j_glossary and then
-					attached {JSON_STRING} j_glossary.item ("title") as j_title
-				then
-					print ("The glossary title is %"" + j_title.unescaped_string_8 + "%".%N")
-				else
-					print ("The glossary title was not found!%N")
-				end
-
-					-- Pretty print the parsed JSON
-				create s.make_empty
-				create printer.make (s)
-				jv.accept (printer)
-				print ("The JSON formatted using a pretty printer:%N")
-				print (s)
-			end
-		end
-
-feature -- Status
-
-feature -- Access
-
-	json_content: STRING = "[
-{
-    "glossary": {
-        "title": "example glossary",
-		"GlossDiv": {
-            "title": "S",
-			"GlossList": {
-                "GlossEntry": {
-                    "ID": "SGML",
-					"SortAs": "SGML",
-					"GlossTerm": "Standard Generalized Markup Language",
-					"Acronym": "SGML",
-					"Abbrev": "ISO 8879:1986",
-					"GlossDef": {
-                        "para": "A meta-markup language, used to create markup languages such as DocBook.",
-						"GlossSeeAlso": ["GML", "XML"]
-                    },
-					"GlossSee": "markup"
-                }
-            }
-        }
-    }
-}
-	]"
-
-feature -- Change
-
-feature {NONE} -- Implementation
-
-invariant
---	invariant_clause: True
-
-end

contrib/library/text/parser/json/examples/basic/basic.ecf

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<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="basic" uuid="5156B9EE-0436-42A3-BDA1-74710DF05A35">
-	<target name="basic">
-		<root class="BASIC" feature="make"/>
-		<setting name="console_application" value="true"/>
-		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="json" location="..\..\library\json-safe.ecf" readonly="false"/>
-		<cluster name="basic" location=".\"/>
-	</target>
-</system>

contrib/library/text/parser/json/library/converter/json_converter.e

@@ -1,44 +0,0 @@
-note
-	description: "A JSON converter"
-	author: "Paul Cohen"
-	date: "$Date$"
-	revision: "$Revision$"
-	file: "$HeadURL: $"
-
-deferred class
-	JSON_CONVERTER
-
-obsolete
-	"This JSON converter design has issues [Sept/2014]."
-
-inherit
-
-	SHARED_EJSON
-
-feature -- Access
-
-	object: ANY
-			-- Eiffel object
-		deferred
-		end
-
-feature -- Conversion
-
-	from_json (j: attached like to_json): detachable like object
-			-- Convert from JSON value.
-			-- Returns Void if unable to convert
-		deferred
-		end
-
-	to_json (o: like object): detachable JSON_VALUE
-			-- Convert to JSON value
-		deferred
-		end
-
-invariant
-	has_eiffel_object: object /= Void -- An empty object must be created at creation time!
-
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
-end

contrib/library/text/parser/json/library/converter/json_hash_table_converter.e

@@ -1,88 +0,0 @@
-note
-	description: "A JSON converter for HASH_TABLE [ANY, HASHABLE]"
-	author: "Paul Cohen"
-	date: "$Date: 2014-01-30 15:27:41 +0100 (jeu., 30 janv. 2014) $"
-	revision: "$Revision: 94128 $"
-	file: "$HeadURL: $"
-
-class
-	JSON_HASH_TABLE_CONVERTER
-
-obsolete
-	"This JSON converter design has issues [Sept/2014]."
-
-inherit
-
-	JSON_CONVERTER
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	make
-		do
-			create object.make (0)
-		end
-
-feature -- Access
-
-	object: HASH_TABLE [ANY, HASHABLE]
-
-feature -- Conversion
-
-	from_json (j: attached like to_json): like object
-		do
-			create Result.make (j.count)
-			across
-				j as ic
-			loop
-				if attached json.object (ic.item, Void) as l_object then
-					if attached {HASHABLE} json.object (ic.key, Void) as h then
-						Result.put (l_object, h)
-					else
-						check
-							key_is_hashable: False
-						end
-					end
-				else
-					check
-						object_attached: False
-					end
-				end
-			end
-		end
-
-	to_json (o: like object): detachable JSON_OBJECT
-		local
-			js: JSON_STRING
-			failed: BOOLEAN
-		do
-			create Result.make
-			across
-				o as c
-			loop
-				if attached {JSON_STRING} json.value (c.key) as l_key then
-					js := l_key
-				else
-					if attached {READABLE_STRING_GENERAL} c.key as s_key then
-						create js.make_from_string_general (s_key)
-					else
-						create js.make_from_string (c.key.out)
-					end
-				end
-				if attached json.value (c.item) as jv then
-					Result.put (jv, js)
-				else
-					failed := True
-				end
-			end
-			if failed then
-				Result := Void
-			end
-		end
-
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
-end -- class JSON_HASH_TABLE_CONVERTER

contrib/library/text/parser/json/library/converter/json_list_converter.e

@@ -1,80 +0,0 @@
-note
-	description: "A JSON converter for LIST [ANY]"
-	author: "Paul Cohen"
-	date: "$Date$"
-	revision: "$Revision$"
-	file: "$HeadURL: $"
-
-deferred class
-	JSON_LIST_CONVERTER
-
-obsolete
-	"This JSON converter design has issues [Sept/2014]."
-
-inherit
-
-	JSON_CONVERTER
-
-feature {NONE} -- Initialization
-
-	make
-		do
-			object := new_object (0)
-		end
-
-feature -- Access
-
-	object: LIST [detachable ANY]
-
-feature {NONE} -- Factory
-
-	new_object (nb: INTEGER): like object
-		deferred
-		ensure
-			Result /= Void
-		end
-
-feature -- Conversion
-
-	from_json (j: attached like to_json): detachable like object
-		local
-			i: INTEGER
-		do
-			Result := new_object (j.count)
-			from
-				i := 1
-			until
-				i > j.count
-			loop
-				Result.extend (json.object (j [i], Void))
-				i := i + 1
-			end
-		end
-
-	to_json (o: like object): detachable JSON_ARRAY
-		local
-			c: ITERATION_CURSOR [detachable ANY]
-			failed: BOOLEAN
-		do
-			create Result.make (o.count)
-			from
-				c := o.new_cursor
-			until
-				c.after
-			loop
-				if attached json.value (c.item) as jv then
-					Result.add (jv)
-				else
-					failed := True
-				end
-				c.forth
-			end
-			if failed then
-				Result := Void
-			end
-		end
-
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
-end -- class JSON_ARRAYED_LIST_CONVERTER

contrib/library/text/parser/json/library/converter/support/shared_ejson.e

@@ -1,43 +0,0 @@
-note
-	description: "[
-		Shared factory class for creating JSON objects. Maps JSON
-		objects to ELKS HASH_TABLEs and JSON arrays to ELKS
-		LINKED_LISTs. Use non-conforming inheritance from this 
-		class to ensure that your classes share the same 
-		JSON_FACTORY instance.
-	]"
-	author: "Paul Cohen"
-	date: "$Date$"
-	revision: "$Revision: 89185 $"
-	file: "$HeadURL: $"
-
-class
-	SHARED_EJSON
-
-obsolete
-	"This JSON converter design has issues [Sept/2014]."
-
-feature -- Access
-
-	json: EJSON
-			-- A shared EJSON instance with default converters for
-			--LINKED_LIST [ANY] and HASH_TABLE [ANY, HASHABLE]
-		local
-			jalc: JSON_ARRAYED_LIST_CONVERTER
-			jllc: JSON_LINKED_LIST_CONVERTER
-			jhtc: JSON_HASH_TABLE_CONVERTER
-		once
-			create Result
-			create jalc.make
-			Result.add_converter (jalc)
-			create jllc.make
-			Result.add_converter (jllc)
-			create jhtc.make
-			Result.add_converter (jhtc)
-		end
-
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
-
-end -- class SHARED_EJSON

contrib/library/text/parser/json/library/extras/file/json_file_reader.e

@@ -0,0 +1,38 @@
+note
+	description: "Objects that ..."
+	author: ""
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	JSON_FILE_READER
+
+feature -- Access
+
+	read_json_from (a_path: STRING): detachable STRING
+		local
+			l_file: PLAIN_TEXT_FILE
+			template_content: STRING
+			l_last_string: detachable STRING
+		do
+			create l_file.make (a_path)
+				-- We perform several checks until we make a real attempt to open the file.
+			if not l_file.exists then
+				print ("error: '" + a_path + "' does not exist%N")
+			else
+				if not l_file.is_readable then
+					print ("error: '" + a_path + "' is not readable.%N")
+				else
+					l_file.open_read
+					create template_content.make_empty
+					l_file.read_stream (l_file.count)
+					l_last_string := l_file.last_string
+					check l_last_string /= Void end -- implied by postcondition of `l_file.read_stream'
+					template_content.append (l_last_string.string)
+					Result := template_content
+					l_file.close
+				end
+			end
+		end
+
+end

contrib/library/text/parser/json/library/extras/visitor/json_pretty_string_visitor.e

@@ -6,7 +6,6 @@ class
 	JSON_PRETTY_STRING_VISITOR
 
 inherit
-
 	JSON_VISITOR
 
 create
@@ -27,58 +26,21 @@ feature -- Initialization
 			output := a_output
 			create indentation.make_empty
 			indentation_step := "%T"
+
 			object_count_inlining := a_object_count_inlining
 			array_count_inlining := a_array_count_inlining
 		end
 
 feature -- Access
 
-	output: STRING_GENERAL
-			-- JSON representation
+	output: STRING_32
+		-- JSON representation
 
-feature -- Settings
+	indentation: like output
 
-	indentation_step: STRING
-			-- Text used for indentation.
-			--| by default a tabulation "%T"
+	indentation_step: like indentation
 
-	object_count_inlining: INTEGER
-			-- Inline where object item count is under `object_count_inlining'.
-			--| ex 3:
-			--| { "a", "b", "c" }
-			--| ex 2:
-			--| {
-			--|		"a",
-			--|		"b",
-			--|		"c"
-			--|	}
-
-	array_count_inlining: INTEGER
-			-- Inline where array item count is under `object_count_inlining'.
-
-feature -- Element change
-
-	set_indentation_step (a_step: STRING)
-			-- Set `indentation_step' to `a_step'.
-		do
-			indentation_step := a_step
-		end
-
-	set_object_count_inlining (a_nb: INTEGER)
-			-- Set `object_count_inlining' to `a_nb'.
-		do
-			object_count_inlining := a_nb
-		end
-
-	set_array_count_inlining (a_nb: INTEGER)
-			-- Set `array_count_inlining' to `a_nb'.
-		do
-			array_count_inlining := a_nb
-		end
-
-feature {NONE} -- Implementation			
-
-	indentation: STRING
+	line_number: INTEGER
 
 	indent
 		do
@@ -97,7 +59,8 @@ feature {NONE} -- Implementation
 			line_number := line_number + 1
 		end
 
-	line_number: INTEGER
+	object_count_inlining: INTEGER
+	array_count_inlining: INTEGER
 
 feature -- Visitor Pattern
 
@@ -108,14 +71,10 @@ feature -- Visitor Pattern
 			l_json_array: ARRAYED_LIST [JSON_VALUE]
 			l_line: like line_number
 			l_multiple_lines: BOOLEAN
-			l_output: like output
 		do
-			l_output := output
 			l_json_array := a_json_array.array_representation
-			l_multiple_lines := l_json_array.count >= array_count_inlining
-									or across l_json_array as p some attached {JSON_OBJECT} p.item or attached {JSON_ARRAY} p.item end
-			l_output.append_code (91) -- '[' : 91
-
+			l_multiple_lines := l_json_array.count >= array_count_inlining or across l_json_array as p some attached {JSON_OBJECT} p.item or attached {JSON_ARRAY} p.item end
+			output.append ("[")
 			l_line := line_number
 			indent
 			from
@@ -123,21 +82,27 @@ feature -- Visitor Pattern
 			until
 				l_json_array.off
 			loop
-				if line_number > l_line or l_multiple_lines then
+				if
+					line_number > l_line or
+					l_multiple_lines
+				then
 					new_line
 				end
 				value := l_json_array.item
 				value.accept (Current)
 				l_json_array.forth
 				if not l_json_array.after then
-					l_output.append (", ")
+					output.append (", ")
 				end
 			end
 			exdent
-			if line_number > l_line or l_json_array.count >= array_count_inlining then
+			if 
+				line_number > l_line or
+				l_json_array.count >= array_count_inlining 
+			then
 				new_line
 			end
-			l_output.append_code (93) -- ']' : 93
+			output.append ("]")
 		end
 
 	visit_json_boolean (a_json_boolean: JSON_BOOLEAN)
@@ -164,12 +129,10 @@ feature -- Visitor Pattern
 			l_pairs: HASH_TABLE [JSON_VALUE, JSON_STRING]
 			l_line: like line_number
 			l_multiple_lines: BOOLEAN
-			l_output: like output
 		do
-			l_output := output
 			l_pairs := a_json_object.map_representation
 			l_multiple_lines := l_pairs.count >= object_count_inlining or across l_pairs as p some attached {JSON_OBJECT} p.item or attached {JSON_ARRAY} p.item end
-			l_output.append_code (123) -- '{' : 123
+			output.append ("{")
 			l_line := line_number
 			indent
 			from
@@ -177,36 +140,36 @@ feature -- Visitor Pattern
 			until
 				l_pairs.off
 			loop
-				if line_number > l_line or l_multiple_lines then
+				if 
+					line_number > l_line or
+					l_multiple_lines
+				then
 					new_line
 				end
 				l_pairs.key_for_iteration.accept (Current)
-				l_output.append (": ")
+				output.append (": ")
 				l_pairs.item_for_iteration.accept (Current)
 				l_pairs.forth
 				if not l_pairs.after then
-					l_output.append (", ")
+					output.append (", ")
 				end
 			end
 			exdent
-			if line_number > l_line or l_pairs.count >= object_count_inlining then
+			if 
+				line_number > l_line or
+				l_pairs.count >= object_count_inlining 
+			then
 				new_line
 			end
-			l_output.append_code (125) -- '}' : 125
+			output.append ("}")
 		end
 
-	visit_json_string (a_json_string: JSON_STRING)
+    visit_json_string (a_json_string: JSON_STRING)
 			-- Visit `a_json_string'.
-		local
-			l_output: like output
 		do
-			l_output := output
-			l_output.append_code (34) -- '%"' : 34
-			l_output.append (a_json_string.item)
-			l_output.append_code (34) -- '%"' : 34
+			output.append ("%"")
+			output.append (a_json_string.item)
+			output.append ("%"")
 		end
 
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end

contrib/library/text/parser/json/library/extras/visitor/json_visitor.e

@@ -1,59 +1,59 @@
-note
-	description: "JSON Visitor"
-	pattern: "Visitor"
-	author: "Javier Velilla"
-	license: "MIT (see http://www.opensource.org/licenses/mit-license.php)"
-	date: "2008/08/24"
-	revision: "Revision 0.1"
-
-deferred class
-	JSON_VISITOR
-
-feature -- Visitor Pattern
-
-	visit_json_array (a_json_array: JSON_ARRAY)
-			-- Visit `a_json_array'.
-		require
-			a_json_array_not_void: a_json_array /= Void
-		deferred
-		end
-
-	visit_json_boolean (a_json_boolean: JSON_BOOLEAN)
-			-- Visit `a_json_boolean'.
-		require
-			a_json_boolean_not_void: a_json_boolean /= Void
-		deferred
-		end
-
-	visit_json_null (a_json_null: JSON_NULL)
-			-- Visit `a_json_null'.
-		require
-			a_json_null_not_void: a_json_null /= Void
-		deferred
-		end
-
-	visit_json_number (a_json_number: JSON_NUMBER)
-			-- Visit `a_json_number'.
-		require
-			a_json_number_not_void: a_json_number /= Void
-		deferred
-		end
-
-	visit_json_object (a_json_object: JSON_OBJECT)
-			-- Visit `a_json_object'.
-		require
-			a_json_object_not_void: a_json_object /= Void
-		deferred
-		end
-
-	visit_json_string (a_json_string: JSON_STRING)
-			-- Visit `a_json_string'.
-		require
-			a_json_string_not_void: a_json_string /= Void
-		deferred
-		end
-
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
-end
+note
+	description:
+
+		"JSON Visitor"
+
+	pattern: "Visitor"
+	author: "Javier Velilla"
+	license:"MIT (see http://www.opensource.org/licenses/mit-license.php)"
+	date: "2008/08/24"
+	revision: "Revision 0.1"
+
+deferred class
+	JSON_VISITOR
+
+feature -- Visitor Pattern
+
+	visit_json_array (a_json_array: JSON_ARRAY)
+			-- Visit `a_json_array'.
+		require
+			a_json_array_not_void: a_json_array /= Void
+		deferred
+		end
+
+	visit_json_boolean (a_json_boolean: JSON_BOOLEAN)
+			-- Visit `a_json_boolean'.
+		require
+			a_json_boolean_not_void: a_json_boolean /= Void
+		deferred
+		end
+
+	visit_json_null (a_json_null: JSON_NULL)
+			-- Visit `a_json_null'.
+		require
+			a_json_null_not_void: a_json_null /= Void
+		deferred
+		end
+
+	visit_json_number (a_json_number: JSON_NUMBER)
+			-- Visit `a_json_number'.
+		require
+			a_json_number_not_void: a_json_number /= Void
+		deferred
+		end
+
+	visit_json_object (a_json_object: JSON_OBJECT)
+			-- Visit `a_json_object'.
+		require
+			a_json_object_not_void: a_json_object /= Void
+		deferred
+		end
+
+    visit_json_string (a_json_string: JSON_STRING)
+			-- Visit `a_json_string'.
+		require
+			a_json_string_not_void: a_json_string /= Void
+		deferred
+		end
+
+end

contrib/library/text/parser/json/library/extras/visitor/print_json_visitor.e

@@ -1,107 +1,102 @@
-note
-	description: "PRINT_JSON_VISITOR Generates the JSON-String for a JSON_VALUE"
-	author: "jvelilla"
-	date: "2008/08/24"
-	revision: "0.1"
-
-class
-	PRINT_JSON_VISITOR
-
-inherit
-
-	JSON_VISITOR
-
-create
-	make
-
-feature -- Initialization
-
-	make
-			-- Create a new instance
-		do
-			create to_json.make_empty
-		end
-
-feature -- Access
-
-	to_json: STRING
-			-- JSON representation
-
-feature -- Visitor Pattern
-
-	visit_json_array (a_json_array: JSON_ARRAY)
-			-- Visit `a_json_array'.
-		local
-			value: JSON_VALUE
-			l_json_array: ARRAYED_LIST [JSON_VALUE]
-		do
-			l_json_array := a_json_array.array_representation
-			to_json.append ("[")
-			from
-				l_json_array.start
-			until
-				l_json_array.off
-			loop
-				value := l_json_array.item
-				value.accept (Current)
-				l_json_array.forth
-				if not l_json_array.after then
-					to_json.append (",")
-				end
-			end
-			to_json.append ("]")
-		end
-
-	visit_json_boolean (a_json_boolean: JSON_BOOLEAN)
-			-- Visit `a_json_boolean'.
-		do
-			to_json.append (a_json_boolean.item.out)
-		end
-
-	visit_json_null (a_json_null: JSON_NULL)
-			-- Visit `a_json_null'.
-		do
-			to_json.append ("null")
-		end
-
-	visit_json_number (a_json_number: JSON_NUMBER)
-			-- Visit `a_json_number'.
-		do
-			to_json.append (a_json_number.item)
-		end
-
-	visit_json_object (a_json_object: JSON_OBJECT)
-			-- Visit `a_json_object'.
-		local
-			l_pairs: HASH_TABLE [JSON_VALUE, JSON_STRING]
-		do
-			l_pairs := a_json_object.map_representation
-			to_json.append ("{")
-			from
-				l_pairs.start
-			until
-				l_pairs.off
-			loop
-				l_pairs.key_for_iteration.accept (Current)
-				to_json.append (":")
-				l_pairs.item_for_iteration.accept (Current)
-				l_pairs.forth
-				if not l_pairs.after then
-					to_json.append (",")
-				end
-			end
-			to_json.append ("}")
-		end
-
-	visit_json_string (a_json_string: JSON_STRING)
-			-- Visit `a_json_string'.
-		do
-			to_json.append ("%"")
-			to_json.append (a_json_string.item)
-			to_json.append ("%"")
-		end
-
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
-end
+note
+	description: "PRINT_JSON_VISITOR Generates the JSON-String for a JSON_VALUE"
+	author: "jvelilla"
+	date: "2008/08/24"
+	revision: "0.1"
+
+class
+	PRINT_JSON_VISITOR
+
+inherit
+	JSON_VISITOR
+
+create make
+
+feature -- Initialization
+
+	make
+			-- Create a new instance
+		do
+			create to_json.make_empty
+		end
+
+feature -- Access
+
+	to_json: STRING
+		-- JSON representation
+
+feature -- Visitor Pattern
+
+	visit_json_array (a_json_array: JSON_ARRAY)
+			-- Visit `a_json_array'.
+		local
+			value: JSON_VALUE
+			l_json_array: ARRAYED_LIST [JSON_VALUE]
+		do
+			l_json_array:=a_json_array.array_representation
+			to_json.append ("[")
+			from
+				l_json_array.start
+			until
+				l_json_array.off
+			loop
+				value := l_json_array.item
+				value.accept (Current)
+				l_json_array.forth
+				if not l_json_array.after then
+					to_json.append(",")
+				end
+			end
+			to_json.append ("]")
+		end
+
+	visit_json_boolean (a_json_boolean: JSON_BOOLEAN)
+			-- Visit `a_json_boolean'.
+		do
+			to_json.append (a_json_boolean.item.out)
+		end
+
+	visit_json_null (a_json_null: JSON_NULL)
+			-- Visit `a_json_null'.
+		do
+			to_json.append ("null")
+		end
+
+	visit_json_number (a_json_number: JSON_NUMBER)
+			-- Visit `a_json_number'.
+		do
+			to_json.append (a_json_number.item)
+		end
+
+	visit_json_object (a_json_object: JSON_OBJECT)
+			-- Visit `a_json_object'.
+		local
+			l_pairs: HASH_TABLE[JSON_VALUE,JSON_STRING]
+		do
+			l_pairs := a_json_object.map_representation
+			to_json.append ("{")
+			from
+				l_pairs.start
+			until
+				l_pairs.off
+			loop
+				l_pairs.key_for_iteration.accept (Current)
+				to_json.append (":")
+				l_pairs.item_for_iteration.accept (Current)
+				l_pairs.forth
+				if not l_pairs.after then
+					to_json.append (",")
+				end
+			end
+			to_json.append ("}")
+		end
+
+    visit_json_string (a_json_string: JSON_STRING)
+			-- Visit `a_json_string'.
+		do
+			to_json.append ("%"")
+			to_json.append (a_json_string.item)
+			to_json.append ("%"")
+		end
+
+end

contrib/library/text/parser/json/library/gobo/converters/json_ds_hash_table_converter.e

@@ -1,85 +1,85 @@
-note
-    description: "A JSON converter for DS_HASH_TABLE [ANY, HASHABLE]"
-    author: "Paul Cohen"
-    date: "$Date: $"
-    revision: "$Revision: $"
-    file: "$HeadURL: $"
-
-class JSON_DS_HASH_TABLE_CONVERTER
-
-inherit
-    JSON_CONVERTER
-
-create
-    make
-
-feature {NONE} -- Initialization
-
-    make
-        do
-            create object.make (0)
-        end
-
-feature -- Access
-
-    value: JSON_OBJECT
-
-    object: DS_HASH_TABLE [ANY, HASHABLE]
-
-feature -- Conversion
-
-    from_json (j: like value): detachable like object
-        local
-            keys: ARRAY [JSON_STRING]
-            i: INTEGER
-            h: HASHABLE
-            a: ANY
-        do
-            keys := j.current_keys
-            create Result.make (keys.count)
-            from
-                i := 1
-            until
-                i > keys.count
-            loop
-                h ?= json.object (keys [i], void)
-                check h /= Void end
-                a := json.object (j.item (keys [i]), Void)
-                Result.put (a, h)
-                i := i + 1
-            end
-        end
-
-    to_json (o: like object): like value
-        local
-            c: DS_HASH_TABLE_CURSOR [ANY, HASHABLE]
-            js: JSON_STRING
-            jv: JSON_VALUE
-            failed: BOOLEAN
-        do
-            create Result.make
-            from
-                c := o.new_cursor
-                c.start
-            until
-                c.after
-            loop
-                if attached {JSON_STRING} json.value (c.key) as l_key then
-                    js := l_key
-                else
-                    create js.make_json (c.key.out)
-                end
-                jv := json.value (c.item)
-                if jv /= Void then
-                    Result.put (jv, js)
-                else
-                    failed := True
-                end
-                c.forth
-            end
-            if failed then
-                Result := Void
-            end
-        end
-
-end -- class JSON_DS_HASH_TABLE_CONVERTER
+note
+    description: "A JSON converter for DS_HASH_TABLE [ANY, HASHABLE]"
+    author: "Paul Cohen"
+    date: "$Date: $"
+    revision: "$Revision: $"
+    file: "$HeadURL: $"
+
+class JSON_DS_HASH_TABLE_CONVERTER
+
+inherit
+    JSON_CONVERTER
+
+create
+    make
+
+feature {NONE} -- Initialization
+
+    make
+        do
+            create object.make (0)
+        end
+
+feature -- Access
+
+    value: JSON_OBJECT
+
+    object: DS_HASH_TABLE [ANY, HASHABLE]
+
+feature -- Conversion
+
+    from_json (j: like value): detachable like object
+        local
+            keys: ARRAY [JSON_STRING]
+            i: INTEGER
+            h: HASHABLE
+            a: ANY
+        do
+            keys := j.current_keys
+            create Result.make (keys.count)
+            from
+                i := 1
+            until
+                i > keys.count
+            loop
+                h ?= json.object (keys [i], void)
+                check h /= Void end
+                a := json.object (j.item (keys [i]), Void)
+                Result.put (a, h)
+                i := i + 1
+            end
+        end
+
+    to_json (o: like object): like value
+        local
+            c: DS_HASH_TABLE_CURSOR [ANY, HASHABLE]
+            js: JSON_STRING
+            jv: JSON_VALUE
+            failed: BOOLEAN
+        do
+            create Result.make
+            from
+                c := o.new_cursor
+                c.start
+            until
+                c.after
+            loop
+                if attached {JSON_STRING} json.value (c.key) as l_key then
+                    js := l_key
+                else
+                    create js.make_json (c.key.out)
+                end
+                jv := json.value (c.item)
+                if jv /= Void then
+                    Result.put (jv, js)
+                else
+                    failed := True
+                end
+                c.forth
+            end
+            if failed then
+                Result := Void
+            end
+        end
+
+end -- class JSON_DS_HASH_TABLE_CONVERTER

contrib/library/text/parser/json/library/gobo/converters/json_ds_linked_list_converter.e

@@ -1,62 +1,62 @@
-note
-    description: "A JSON converter for DS_LINKED_LIST [ANY]"
-    author: "Paul Cohen"
-    date: "$Date: $"
-    revision: "$Revision: $"
-    file: "$HeadURL: $"
-
-class JSON_DS_LINKED_LIST_CONVERTER
-
-inherit
-    JSON_CONVERTER
-
-create
-    make
-
-feature {NONE} -- Initialization
-
-    make
-        do
-            create object.make
-        end
-
-feature -- Access
-
-    value: JSON_ARRAY
-
-    object: DS_LINKED_LIST [ANY]
-
-feature -- Conversion
-
-    from_json (j: like value): detachable like object
-        local
-            i: INTEGER
-        do
-            create Result.make
-            from
-                i := 1
-            until
-                i > j.count
-            loop
-                Result.put_last (json.object (j [i], Void))
-                i := i + 1
-            end
-        end
-
-    to_json (o: like object): like value
-        local
-            c: DS_LIST_CURSOR [ANY]
-        do
-            create Result.make_array
-            from
-                c := o.new_cursor
-                c.start
-            until
-                c.after
-            loop
-                Result.add (json.value (c.item))
-                c.forth
-            end
-        end
-
-end -- class JSON_DS_LINKED_LIST_CONVERTER
+note
+    description: "A JSON converter for DS_LINKED_LIST [ANY]"
+    author: "Paul Cohen"
+    date: "$Date: $"
+    revision: "$Revision: $"
+    file: "$HeadURL: $"
+
+class JSON_DS_LINKED_LIST_CONVERTER
+
+inherit
+    JSON_CONVERTER
+
+create
+    make
+
+feature {NONE} -- Initialization
+
+    make
+        do
+            create object.make
+        end
+
+feature -- Access
+
+    value: JSON_ARRAY
+
+    object: DS_LINKED_LIST [ANY]
+
+feature -- Conversion
+
+    from_json (j: like value): detachable like object
+        local
+            i: INTEGER
+        do
+            create Result.make
+            from
+                i := 1
+            until
+                i > j.count
+            loop
+                Result.put_last (json.object (j [i], Void))
+                i := i + 1
+            end
+        end
+
+    to_json (o: like object): like value
+        local
+            c: DS_LIST_CURSOR [ANY]
+        do
+            create Result.make_array
+            from
+                c := o.new_cursor
+                c.start
+            until
+                c.after
+            loop
+                Result.add (json.value (c.item))
+                c.forth
+            end
+        end
+
+end -- class JSON_DS_LINKED_LIST_CONVERTER

contrib/library/text/parser/json/library/json-safe.ecf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="json" uuid="4E21C3BD-7951-4C6E-A673-431E762D7414" library_target="json">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="json" uuid="4E21C3BD-7951-4C6E-A673-431E762D7414" library_target="json">
 	<target name="json">
 		<root all_classes="true"/>
 		<file_rule>
@@ -9,13 +9,20 @@
 		</file_rule>
 		<option trace="false" profile="false" debug="false" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard" namespace="EJSON.Library">
 			<assertions/>
+			<warning name="export_class_missing" enabled="false"/>
+			<warning name="old_verbatim_strings" enabled="false"/>
+			<warning name="syntax" enabled="false"/>
+			<warning name="vjrv" enabled="false"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf" readonly="true"/>
-		<cluster name="json" location=".\">
-			<cluster name="json_kernel" location=".\kernel\" recursive="true"/>
-			<cluster name="json_parser" location=".\parser\" recursive="true"/>
-			<cluster name="json_utility" location=".\utility\" recursive="true"/>
+		<cluster name="json" location=".\" recursive="true">
+			<file_rule>
+				<exclude>^/gobo$</exclude>
+				<exclude>^/kernel$</exclude>
+				<exclude>^/extras$</exclude>
+			</file_rule>
+			<cluster name="kernel" location=".\kernel\" recursive="true"/>
+			<cluster name="extras" location=".\extras\" recursive="true"/>
 		</cluster>
-		<cluster name="json_converter" location=".\converter\" recursive="true"/>
 	</target>
 </system>

contrib/library/text/parser/json/library/json.ecf

@@ -1,21 +1,28 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="json" uuid="4E21C3BD-7951-4C6E-A673-431E762D7414" library_target="json">
-	<target name="json">
-		<root all_classes="true"/>
-		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
-			<exclude>/.svn$</exclude>
-		</file_rule>
-		<option trace="false" profile="false" debug="false" warning="true" full_class_checking="true" void_safety="none" syntax="standard" namespace="EJSON.Library">
-			<assertions/>
-		</option>
-		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf" readonly="true"/>
-		<cluster name="json" location=".\" >
-			<cluster name="json_kernel" location=".\kernel" recursive="true"/>
-			<cluster name="json_parser" location=".\parser" recursive="true"/>
-			<cluster name="json_utility" location=".\utility" recursive="true"/>
-		</cluster>
-		<cluster name="json_converter" location=".\converter" recursive="true"/>
-	</target>
-</system>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="json" uuid="4E21C3BD-7951-4C6E-A673-431E762D7414" library_target="json">
+	<target name="json">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option trace="false" profile="false" debug="false" warning="true" full_class_checking="true" void_safety="none" syntax="standard" namespace="EJSON.Library">
+			<assertions/>
+			<warning name="export_class_missing" enabled="false"/>
+			<warning name="old_verbatim_strings" enabled="false"/>
+			<warning name="syntax" enabled="false"/>
+			<warning name="vjrv" enabled="false"/>
+		</option>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf" readonly="true"/>
+		<cluster name="json" location=".\" recursive="true">
+			<file_rule>
+				<exclude>^/gobo$</exclude>
+				<exclude>^/kernel$</exclude>
+				<exclude>^/extras$</exclude>
+			</file_rule>
+			<cluster name="kernel" location=".\kernel\" recursive="true"/>
+			<cluster name="extras" location=".\extras\" recursive="true"/>
+		</cluster>
+	</target>
+</system>

contrib/library/text/parser/json/library/json.rc

@@ -0,0 +1 @@
+

contrib/library/text/parser/json/library/json_gobo_extension.ecf

@@ -12,6 +12,6 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf" readonly="true"/>
 		<library name="json" location="json.ecf" readonly="true"/>
 		<library name="gobo_structure" location="$ISE_LIBRARY\library\gobo\gobo_structure.ecf"/>
-		<cluster name="json_gobo_converter" location=".\gobo_converter" recursive="true" />
+		<cluster name="json_gobo" location=".\gobo" recursive="true" />
 	</target>
 </system>

contrib/library/text/parser/json/library/kernel/converters/json_arrayed_list_converter.e

@@ -5,25 +5,20 @@ note
 	revision: "$Revision$"
 	file: "$HeadURL: $"
 
-class
-	JSON_ARRAYED_LIST_CONVERTER
-
-obsolete
-	"This JSON converter design has issues [Sept/2014]."
+class JSON_ARRAYED_LIST_CONVERTER
 
 inherit
-
-	JSON_LIST_CONVERTER
+    JSON_LIST_CONVERTER
 		redefine
 			object
 		end
 
 create
-	make
+    make
 
 feature -- Access
 
-	object: ARRAYED_LIST [detachable ANY]
+    object: ARRAYED_LIST [detachable ANY]
 
 feature {NONE} -- Factory
 
@@ -32,7 +27,4 @@ feature {NONE} -- Factory
 			create Result.make (nb)
 		end
 
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end -- class JSON_ARRAYED_LIST_CONVERTER

contrib/library/text/parser/json/library/kernel/converters/json_converter.e

@@ -0,0 +1,36 @@
+note
+	description: "A JSON converter"
+	author: "Paul Cohen"
+	date: "$Date$"
+	revision: "$Revision$"
+	file: "$HeadURL: $"
+
+deferred class JSON_CONVERTER
+
+inherit
+    SHARED_EJSON
+
+feature -- Access
+
+    object: ANY
+            -- Eiffel object
+        deferred
+        end
+
+feature -- Conversion
+
+    from_json (j: attached like to_json): detachable like object
+            -- Convert from JSON value. 
+			-- Returns Void if unable to convert
+        deferred
+        end
+
+    to_json (o: like object): detachable JSON_VALUE
+            -- Convert to JSON value
+        deferred
+        end
+
+invariant
+    has_eiffel_object: object /= Void -- An empty object must be created at creation time!
+
+end

contrib/library/text/parser/json/library/kernel/converters/json_hash_table_converter.e

@@ -0,0 +1,92 @@
+note
+    description: "A JSON converter for HASH_TABLE [ANY, HASHABLE]"
+    author: "Paul Cohen"
+	date: "$Date$"
+	revision: "$Revision$"
+    file: "$HeadURL: $"
+
+class JSON_HASH_TABLE_CONVERTER
+
+inherit
+    JSON_CONVERTER
+
+create
+    make
+
+feature {NONE} -- Initialization
+
+    make
+        do
+            create object.make (0)
+        end
+
+feature -- Access
+
+    object: HASH_TABLE [ANY, HASHABLE]
+
+feature -- Conversion
+
+    from_json (j: attached like to_json): like object
+        local
+            keys: ARRAY [JSON_STRING]
+            i: INTEGER
+            h: detachable HASHABLE
+            jv: detachable JSON_VALUE
+            a: detachable ANY
+        do
+            keys := j.current_keys
+            create Result.make (keys.count)
+            from
+                i := 1
+            until
+                i > keys.count
+            loop
+                h ?= json.object (keys [i], Void)
+                check h /= Void end
+                jv := j.item (keys [i])
+                if jv /= Void then
+	                a := json.object (jv, Void)
+	                if a /= Void then
+	                	Result.put (a, h)
+	                else
+	                	check a_attached: a /= Void end
+	                end
+				else
+					check j_has_item: False end
+                end
+                i := i + 1
+            end
+        end
+
+    to_json (o: like object): detachable JSON_OBJECT
+        local
+        	c: HASH_TABLE_ITERATION_CURSOR [ANY, HASHABLE]
+            js: JSON_STRING
+            jv: detachable JSON_VALUE
+            failed: BOOLEAN
+        do
+            create Result.make
+            from
+            	c := o.new_cursor
+            until
+                c.after
+            loop
+                if attached {JSON_STRING} json.value (c.key) as l_key then
+                    js := l_key
+                else
+                    create js.make_json (c.key.out)
+                end
+                jv := json.value (c.item)
+                if jv /= Void then
+                    Result.put (jv, js)
+                else
+                    failed := True
+                end
+                c.forth
+            end
+            if failed then
+                Result := Void
+            end
+        end
+
+end -- class JSON_HASH_TABLE_CONVERTER

contrib/library/text/parser/json/library/kernel/converters/json_linked_list_converter.e

@@ -5,25 +5,20 @@ note
 	revision: "$Revision$"
 	file: "$HeadURL: $"
 
-class
-	JSON_LINKED_LIST_CONVERTER
-
-obsolete
-	"This JSON converter design has issues [Sept/2014]."
+class JSON_LINKED_LIST_CONVERTER
 
 inherit
-
-	JSON_LIST_CONVERTER
+    JSON_LIST_CONVERTER
 		redefine
 			object
 		end
 
 create
-	make
+    make
 
 feature -- Access
 
-	object: LINKED_LIST [detachable ANY]
+    object: LINKED_LIST [detachable ANY]
 
 feature {NONE} -- Factory
 
@@ -32,7 +27,4 @@ feature {NONE} -- Factory
 			create Result.make
 		end
 
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end -- class JSON_LINKED_LIST_CONVERTER

contrib/library/text/parser/json/library/kernel/converters/json_list_converter.e

@@ -0,0 +1,74 @@
+note
+    description: "A JSON converter for LIST [ANY]"
+    author: "Paul Cohen"
+    date: "$Date$"
+    revision: "$Revision$"
+    file: "$HeadURL: $"
+
+deferred class JSON_LIST_CONVERTER
+
+inherit
+    JSON_CONVERTER
+
+feature {NONE} -- Initialization
+
+    make
+		do
+			object := new_object (0)
+        end
+
+feature -- Access
+
+    object: LIST [detachable ANY]
+
+feature {NONE} -- Factory
+
+	new_object (nb: INTEGER): like object
+		deferred
+		ensure
+			Result /= Void
+		end
+
+feature -- Conversion
+
+    from_json (j: attached like to_json): detachable like object
+        local
+            i: INTEGER
+        do
+           	Result := new_object (j.count)
+            from
+                i := 1
+            until
+                i > j.count
+            loop
+                Result.extend (json.object (j [i], Void))
+                i := i + 1
+            end
+        end
+
+    to_json (o: like object): detachable JSON_ARRAY
+        local
+            c: ITERATION_CURSOR [detachable ANY]
+            jv: detachable JSON_VALUE
+			failed: BOOLEAN
+        do
+            create Result.make_array
+            from
+            	c := o.new_cursor
+            until
+                c.after
+            loop
+                jv := json.value (c.item)
+            	if jv /= Void then
+            		Result.add (jv)
+            	else
+					failed := True
+            	end
+				c.forth
+            end
+			if failed then
+				Result := Void
+			end
+        end
+
+end -- class JSON_ARRAYED_LIST_CONVERTER

contrib/library/text/parser/json/library/kernel/ejson.e

@@ -1,274 +1,268 @@
-note
-	description: "Core factory class for creating JSON objects and corresponding Eiffel objects."
-	author: "Paul Cohen"
-	date: "$Date$"
-	revision: "$Revision$"
-	file: "$HeadURL: $"
-
-class
-	EJSON
-
-obsolete
-	"This JSON converter design has issues [Sept/2014]."
-
-inherit
-
-	EXCEPTIONS
-
-feature -- Access
-
-	value (an_object: detachable ANY): detachable JSON_VALUE
-			-- JSON value from Eiffel object. Raises an "eJSON exception" if
-			-- unable to convert value.
-		local
-			i: INTEGER
-			ja: JSON_ARRAY
-		do
-				-- Try to convert from basic Eiffel types. Note that we check with
-				-- `conforms_to' since the client may have subclassed the base class
-				-- that these basic types are derived from.
-			if an_object = Void then
-				create {JSON_NULL} Result
-			elseif attached {BOOLEAN} an_object as b then
-				create {JSON_BOOLEAN} Result.make (b)
-			elseif attached {INTEGER_8} an_object as i8 then
-				create {JSON_NUMBER} Result.make_integer (i8)
-			elseif attached {INTEGER_16} an_object as i16 then
-				create {JSON_NUMBER} Result.make_integer (i16)
-			elseif attached {INTEGER_32} an_object as i32 then
-				create {JSON_NUMBER} Result.make_integer (i32)
-			elseif attached {INTEGER_64} an_object as i64 then
-				create {JSON_NUMBER} Result.make_integer (i64)
-			elseif attached {NATURAL_8} an_object as n8 then
-				create {JSON_NUMBER} Result.make_natural (n8)
-			elseif attached {NATURAL_16} an_object as n16 then
-				create {JSON_NUMBER} Result.make_natural (n16)
-			elseif attached {NATURAL_32} an_object as n32 then
-				create {JSON_NUMBER} Result.make_natural (n32)
-			elseif attached {NATURAL_64} an_object as n64 then
-				create {JSON_NUMBER} Result.make_natural (n64)
-			elseif attached {REAL_32} an_object as r32 then
-				create {JSON_NUMBER} Result.make_real (r32)
-			elseif attached {REAL_64} an_object as r64 then
-				create {JSON_NUMBER} Result.make_real (r64)
-			elseif attached {ARRAY [detachable ANY]} an_object as a then
-				create ja.make (a.count)
-				from
-					i := a.lower
-				until
-					i > a.upper
-				loop
-					if attached value (a @ i) as v then
-						ja.add (v)
-					else
-						check
-							value_attached: False
-						end
-					end
-					i := i + 1
-				end
-				Result := ja
-			elseif attached {CHARACTER_8} an_object as c8 then
-				create {JSON_STRING} Result.make_from_string (c8.out)
-			elseif attached {CHARACTER_32} an_object as c32 then
-				create {JSON_STRING} Result.make_from_string_32 (create {STRING_32}.make_filled (c32, 1))
-			elseif attached {STRING_8} an_object as s8 then
-				create {JSON_STRING} Result.make_from_string (s8)
-			elseif attached {STRING_32} an_object as s32 then
-				create {JSON_STRING} Result.make_from_string_32 (s32)
-			end
-			if Result = Void then
-					-- Now check the converters
-				if an_object /= Void and then attached converter_for (an_object) as jc then
-					Result := jc.to_json (an_object)
-				else
-					raise (exception_failed_to_convert_to_json (an_object))
-				end
-			end
-		end
-
-	object (a_value: detachable JSON_VALUE; base_class: detachable STRING): detachable ANY
-			-- Eiffel object from JSON value. If `base_class' /= Void an eiffel
-			-- object based on `base_class' will be returned. Raises an "eJSON
-			-- exception" if unable to convert value.
-		local
-			i: INTEGER
-			ll: LINKED_LIST [detachable ANY]
-			t: HASH_TABLE [detachable ANY, STRING_GENERAL]
-			keys: ARRAY [JSON_STRING]
-		do
-			if a_value = Void then
-				Result := Void
-			else
-				if base_class = Void then
-					if a_value = Void then
-						Result := Void
-					elseif attached {JSON_NULL} a_value then
-						Result := Void
-					elseif attached {JSON_BOOLEAN} a_value as jb then
-						Result := jb.item
-					elseif attached {JSON_NUMBER} a_value as jn then
-						if jn.item.is_integer_8 then
-							Result := jn.item.to_integer_8
-						elseif jn.item.is_integer_16 then
-							Result := jn.item.to_integer_16
-						elseif jn.item.is_integer_32 then
-							Result := jn.item.to_integer_32
-						elseif jn.item.is_integer_64 then
-							Result := jn.item.to_integer_64
-						elseif jn.item.is_natural_64 then
-							Result := jn.item.to_natural_64
-						elseif jn.item.is_double then
-							Result := jn.item.to_double
-						end
-					elseif attached {JSON_STRING} a_value as js then
-						create {STRING_32} Result.make_from_string (js.unescaped_string_32)
-					elseif attached {JSON_ARRAY} a_value as ja then
-						from
-							create ll.make
-							i := 1
-						until
-							i > ja.count
-						loop
-							ll.extend (object (ja [i], Void))
-							i := i + 1
-						end
-						Result := ll
-					elseif attached {JSON_OBJECT} a_value as jo then
-						keys := jo.current_keys
-						create t.make (keys.count)
-						from
-							i := keys.lower
-						until
-							i > keys.upper
-						loop
-							if attached {STRING_GENERAL} object (keys [i], Void) as s then
-								t.put (object (jo.item (keys [i]), Void), s)
-							end
-							i := i + 1
-						end
-						Result := t
-					end
-				else
-					if converters.has_key (base_class) and then attached converters.found_item as jc then
-						Result := jc.from_json (a_value)
-					else
-						raise (exception_failed_to_convert_to_eiffel (a_value, base_class))
-					end
-				end
-			end
-		end
-
-	object_from_json (json: STRING; base_class: detachable STRING): detachable ANY
-			-- Eiffel object from JSON representation. If `base_class' /= Void an
-			-- Eiffel object based on `base_class' will be returned. Raises an
-			-- "eJSON exception" if unable to convert value.
-		require
-			json_not_void: json /= Void
-		do
-			json_parser.set_representation (json)
-			json_parser.parse_content
-			if json_parser.is_valid and then attached json_parser.parsed_json_value as jv then
-				Result := object (jv, base_class)
-			end
-		end
-
-	converter_for (an_object: ANY): detachable JSON_CONVERTER
-			-- Converter for objects. Returns Void if none found.
-		require
-			an_object_not_void: an_object /= Void
-		do
-			if converters.has_key (an_object.generator) then
-				Result := converters.found_item
-			end
-		end
-
-	json_reference (s: STRING): JSON_OBJECT
-			-- A JSON (Dojo style) reference object using `s' as the
-			-- reference value. The caller is responsable for ensuring
-			-- the validity of `s' as a json reference.
-		require
-			s_not_void: s /= Void
-		local
-			js_key, js_value: JSON_STRING
-		do
-			create Result.make
-			create js_key.make_from_string ("$ref")
-			create js_value.make_from_string (s)
-			Result.put (js_value, js_key)
-		end
-
-	json_references (l: LIST [STRING]): JSON_ARRAY
-			-- A JSON array of JSON (Dojo style) reference objects using the
-			-- strings in `l' as reference values. The caller is responsable
-			-- for ensuring the validity of all strings in `l' as json
-			-- references.
-		require
-			l_not_void: l /= Void
-		local
-			c: ITERATION_CURSOR [STRING]
-		do
-			create Result.make (l.count)
-			from
-				c := l.new_cursor
-			until
-				c.after
-			loop
-				Result.add (json_reference (c.item))
-				c.forth
-			end
-		end
-
-feature -- Change
-
-	add_converter (jc: JSON_CONVERTER)
-			-- Add the converter `jc'.
-		require
-			jc_not_void: jc /= Void
-		do
-			converters.force (jc, jc.object.generator)
-		ensure
-			has_converter: converter_for (jc.object) /= Void
-		end
-
-feature {NONE} -- Implementation
-
-	converters: HASH_TABLE [JSON_CONVERTER, STRING]
-			-- Converters hashed by generator (base class)
-		once
-			create Result.make (10)
-		end
-
-feature {NONE} -- Implementation (Exceptions)
-
-	exception_prefix: STRING = "eJSON exception: "
-
-	exception_failed_to_convert_to_eiffel (a_value: JSON_VALUE; base_class: detachable STRING): STRING
-			-- Exception message for failing to convert a JSON_VALUE to an instance of `a'.
-		do
-			Result := exception_prefix + "Failed to convert JSON_VALUE to an Eiffel object: " + a_value.generator
-			if base_class /= Void then
-				Result.append (" -> {" + base_class + "}")
-			end
-		end
-
-	exception_failed_to_convert_to_json (an_object: detachable ANY): STRING
-			-- Exception message for failing to convert `a' to a JSON_VALUE.
-		do
-			Result := exception_prefix + "Failed to convert Eiffel object to a JSON_VALUE"
-			if an_object /= Void then
-				Result.append (" : {" + an_object.generator + "}")
-			end
-		end
-
-feature {NONE} -- Implementation (JSON parser)
-
-	json_parser: JSON_PARSER
-		once
-			create Result.make_with_string ("{}")
-		end
-
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
-end -- class EJSON
+note
+	description: "Core factory class for creating JSON objects and corresponding Eiffel objects."
+	author: "Paul Cohen"
+	date: "$Date$"
+	revision: "$Revision$"
+	file: "$HeadURL: $"
+
+class EJSON
+
+inherit
+	EXCEPTIONS
+
+feature -- Access
+
+	value (an_object: detachable ANY): detachable JSON_VALUE
+			-- JSON value from Eiffel object. Raises an "eJSON exception" if
+			-- unable to convert value.
+		local
+			i: INTEGER
+			ja: JSON_ARRAY
+		do
+			-- Try to convert from basic Eiffel types. Note that we check with
+			-- `conforms_to' since the client may have subclassed the base class
+			-- that these basic types are derived from.
+			if an_object = Void then
+				create {JSON_NULL} Result
+			elseif attached {BOOLEAN} an_object as b then
+				create {JSON_BOOLEAN} Result.make_boolean (b)
+			elseif attached {INTEGER_8} an_object as i8 then
+				create {JSON_NUMBER} Result.make_integer (i8)
+			elseif attached {INTEGER_16} an_object as i16 then
+				create {JSON_NUMBER} Result.make_integer (i16)
+			elseif attached {INTEGER_32} an_object as i32 then
+				create {JSON_NUMBER} Result.make_integer (i32)
+			elseif attached {INTEGER_64} an_object as i64 then
+				create {JSON_NUMBER} Result.make_integer (i64)
+			elseif attached {NATURAL_8} an_object as n8 then
+				create {JSON_NUMBER} Result.make_natural (n8)
+			elseif attached {NATURAL_16} an_object as n16 then
+				create {JSON_NUMBER} Result.make_natural (n16)
+			elseif attached {NATURAL_32} an_object as n32 then
+				create {JSON_NUMBER} Result.make_natural (n32)
+			elseif attached {NATURAL_64} an_object as n64 then
+				create {JSON_NUMBER} Result.make_natural (n64)
+			elseif attached {REAL_32} an_object as r32 then
+				create {JSON_NUMBER} Result.make_real (r32)
+			elseif attached {REAL_64} an_object as r64 then
+				create {JSON_NUMBER} Result.make_real (r64)
+			elseif attached {ARRAY [detachable ANY]} an_object as a then
+				create ja.make_array
+				from
+					i := a.lower
+				until
+					i > a.upper
+				loop
+					if attached value (a @ i) as v then
+						ja.add (v)
+					else
+						check value_attached: False end
+					end
+					i := i + 1
+				end
+				Result := ja
+			elseif attached {CHARACTER_8} an_object as c8 then
+				create {JSON_STRING} Result.make_json (c8.out)
+			elseif attached {CHARACTER_32} an_object as c32 then
+				create {JSON_STRING} Result.make_json (c32.out)
+
+			elseif attached {STRING_8} an_object as s8 then
+				create {JSON_STRING} Result.make_json (s8)
+			elseif attached {STRING_32} an_object as s32 then
+				create {JSON_STRING} Result.make_json_from_string_32 (s32)
+			end
+
+			if Result = Void then
+				-- Now check the converters
+				if an_object /= Void and then attached converter_for (an_object) as jc then
+					Result := jc.to_json (an_object)
+				else
+					raise (exception_failed_to_convert_to_json (an_object))
+				end
+			end
+		end
+
+	object (a_value: detachable JSON_VALUE; base_class: detachable STRING): detachable ANY
+			-- Eiffel object from JSON value. If `base_class' /= Void an eiffel
+			-- object based on `base_class' will be returned. Raises an "eJSON 
+			-- exception" if unable to convert value.
+		local
+			i: INTEGER
+			ll: LINKED_LIST [detachable ANY]
+			t: HASH_TABLE [detachable ANY, STRING_GENERAL]
+			keys: ARRAY [JSON_STRING]
+		do
+			if a_value = Void then
+				Result := Void
+			else
+				if base_class = Void then
+					if a_value = Void then
+						Result := Void
+					elseif attached {JSON_NULL} a_value then
+						Result := Void
+					elseif attached {JSON_BOOLEAN} a_value as jb then
+						Result := jb.item
+					elseif attached {JSON_NUMBER} a_value as jn then
+						if jn.item.is_integer_8 then
+							Result := jn.item.to_integer_8
+						elseif jn.item.is_integer_16 then
+							Result := jn.item.to_integer_16
+						elseif jn.item.is_integer_32 then
+							Result := jn.item.to_integer_32
+						elseif jn.item.is_integer_64 then
+							Result := jn.item.to_integer_64
+						elseif jn.item.is_natural_64 then
+							Result := jn.item.to_natural_64
+						elseif jn.item.is_double then
+							Result := jn.item.to_double
+						end
+					elseif attached {JSON_STRING} a_value as js then
+						create {STRING_32} Result.make_from_string (js.unescaped_string_32)
+					elseif attached {JSON_ARRAY} a_value as ja then
+						from
+							create ll.make
+							i := 1
+						until
+							i > ja.count
+						loop
+							ll.extend (object (ja [i], Void))
+							i := i + 1
+						end
+						Result := ll
+					elseif attached {JSON_OBJECT} a_value as jo then
+						keys := jo.current_keys
+						create t.make (keys.count)
+						from
+							i := keys.lower
+						until
+							i > keys.upper
+						loop
+							if attached {STRING_GENERAL} object (keys [i], Void) as s then
+								t.put (object (jo.item (keys [i]), Void), s)
+							end
+							i := i + 1
+						end
+						Result := t
+					end
+				else
+					if converters.has_key (base_class) and then attached converters.found_item as jc then
+						Result := jc.from_json (a_value)
+					else
+						raise (exception_failed_to_convert_to_eiffel (a_value, base_class))
+					end
+				end
+			end
+		end
+
+	object_from_json (json: STRING; base_class: detachable STRING): detachable ANY
+			-- Eiffel object from JSON representation. If `base_class' /= Void an
+			-- Eiffel object based on `base_class' will be returned. Raises an
+			-- "eJSON exception" if unable to convert value.
+		require
+			json_not_void: json /= Void
+		local
+			jv: detachable JSON_VALUE
+		do
+			json_parser.set_representation (json)
+			jv := json_parser.parse
+			if jv /= Void then
+				Result := object (jv, base_class)
+			end
+		end
+
+	converter_for (an_object: ANY): detachable JSON_CONVERTER
+			-- Converter for objects. Returns Void if none found.
+		require
+			an_object_not_void: an_object /= Void
+		do
+			if converters.has_key (an_object.generator) then
+				Result := converters.found_item
+			end
+		end
+
+	json_reference (s: STRING): JSON_OBJECT
+			-- A JSON (Dojo style) reference object using `s' as the
+			-- reference value. The caller is responsable for ensuring
+			-- the validity of `s' as a json reference.
+		require
+			s_not_void: s /= Void
+		local
+			js_key, js_value: JSON_STRING
+		do
+			create Result.make
+			create js_key.make_json ("$ref")
+			create js_value.make_json (s)
+			Result.put (js_value, js_key)
+		end
+
+	json_references (l: LIST [STRING]): JSON_ARRAY
+			-- A JSON array of JSON (Dojo style) reference objects using the
+			-- strings in `l' as reference values. The caller is responsable
+			-- for ensuring the validity of all strings in `l' as json
+			-- references.
+		require
+			l_not_void: l /= Void
+		local
+			c: ITERATION_CURSOR [STRING]
+		do
+			create Result.make_array
+			from
+				c := l.new_cursor
+			until
+				c.after
+			loop
+				Result.add (json_reference (c.item))
+				c.forth
+			end
+		end
+
+feature -- Change
+
+	add_converter (jc: JSON_CONVERTER)
+			-- Add the converter `jc'.
+		require
+			jc_not_void: jc /= Void
+		do
+			converters.force (jc, jc.object.generator)
+		ensure
+			has_converter: converter_for (jc.object) /= Void
+		end
+
+feature {NONE} -- Implementation
+
+	converters: HASH_TABLE [JSON_CONVERTER, STRING]
+			-- Converters hashed by generator (base class)
+		once
+			create Result.make (10)
+		end
+
+feature {NONE} -- Implementation (Exceptions)
+
+	exception_prefix: STRING = "eJSON exception: "
+
+	exception_failed_to_convert_to_eiffel (a_value: JSON_VALUE; base_class: detachable STRING): STRING
+			-- Exception message for failing to convert a JSON_VALUE to an instance of `a'.
+		do
+			Result := exception_prefix + "Failed to convert JSON_VALUE to an Eiffel object: " + a_value.generator
+			if base_class /= Void then
+				Result.append (" -> {" + base_class + "}")
+			end
+		end
+
+	exception_failed_to_convert_to_json (an_object: detachable ANY): STRING
+			-- Exception message for failing to convert `a' to a JSON_VALUE.
+		do
+			Result := exception_prefix + "Failed to convert Eiffel object to a JSON_VALUE"
+			if an_object /= Void then
+				Result.append (" : {" + an_object.generator + "}")
+			end
+		end
+
+feature {NONE} -- Implementation (JSON parser)
+
+	json_parser: JSON_PARSER
+		once
+			create Result.make_parser ("")
+		end
+
+end -- class EJSON

contrib/library/text/parser/json/library/kernel/json_array.e

@@ -1,192 +1,141 @@
-note
-	description: "[
-		JSON_ARRAY represent an array in JSON.
-		An array in JSON is an ordered set of names.
-		Examples
-		array
-		    []
-		    [elements]
-	]"
-	author: "$Author$"
-	date: "$date$"
-	revision: "$Revision$"
-
-class
-	JSON_ARRAY
-
-inherit
-
-	JSON_VALUE
-
-	ITERABLE [JSON_VALUE]
-
-	DEBUG_OUTPUT
-
-create
-	make, make_empty,
-	make_array
-
-feature {NONE} -- Initialization
-
-	make (nb: INTEGER)
-			-- Initialize JSON array with capacity of `nb' items.
-		do
-			create items.make (nb)
-		end
-
-	make_empty
-			-- Initialize empty JSON array.
-		do
-			make (0)
-		end
-
-	make_array
-			-- Initialize JSON Array
-		obsolete
-			"Use `make' Sept/2014"
-		do
-			make (10)
-		end
-
-feature -- Access
-
-	i_th alias "[]" (i: INTEGER): JSON_VALUE
-			-- Item at `i'-th position
-		require
-			is_valid_index: valid_index (i)
-		do
-			Result := items.i_th (i)
-		end
-
-	representation: STRING
-		do
-			Result := "["
-			across
-				items as ic
-			loop
-				if Result.count > 1 then
-					Result.append_character (',')
-				end
-				Result.append (ic.item.representation)
-			end
-			Result.append_character (']')
-		end
-
-feature -- Visitor pattern
-
-	accept (a_visitor: JSON_VISITOR)
-			-- Accept `a_visitor'.
-			-- (Call `visit_json_array' procedure on `a_visitor'.)
-		do
-			a_visitor.visit_json_array (Current)
-		end
-
-feature -- Access
-
-	new_cursor: ITERATION_CURSOR [JSON_VALUE]
-			-- Fresh cursor associated with current structure
-		do
-			Result := items.new_cursor
-		end
-
-feature -- Mesurement
-
-	count: INTEGER
-			-- Number of items.
-		do
-			Result := items.count
-		end
-
-feature -- Status report
-
-	valid_index (i: INTEGER): BOOLEAN
-			-- Is `i' a valid index?
-		do
-			Result := (1 <= i) and (i <= count)
-		end
-
-feature -- Change Element
-
-	put_front (v: JSON_VALUE)
-		require
-			v_not_void: v /= Void
-		do
-			items.put_front (v)
-		ensure
-			has_new_value: old items.count + 1 = items.count and items.first = v
-		end
-
-	add, extend (v: JSON_VALUE)
-		require
-			v_not_void: v /= Void
-		do
-			items.extend (v)
-		ensure
-			has_new_value: old items.count + 1 = items.count and items.has (v)
-		end
-
-	prune_all (v: JSON_VALUE)
-			-- Remove all occurrences of `v'.
-		require
-			v_not_void: v /= Void
-		do
-			items.prune_all (v)
-		ensure
-			not_has_new_value: not items.has (v)
-		end
-
-	wipe_out
-			-- Remove all items.
-		do
-			items.wipe_out
- 		end
-
-feature -- Report
-
-	hash_code: INTEGER
-			-- Hash code value
-		local
-			l_started: BOOLEAN
-		do
-			across
-				items as ic
-			loop
-				if l_started then
-					Result := ((Result \\ 8388593) |<< 8) + ic.item.hash_code
-				else
-					Result := ic.item.hash_code
-					l_started := True
-				end
-			end
-			Result := Result \\ items.count
-		end
-
-feature -- Conversion
-
-	array_representation: ARRAYED_LIST [JSON_VALUE]
-			-- Representation as a sequences of values.
-			-- be careful, modifying the return object may have impact on the original JSON_ARRAY object.		
-		do
-			Result := items
-		end
-
-feature -- Status report
-
-	debug_output: STRING
-			-- String that should be displayed in debugger to represent `Current'.
-		do
-			Result := count.out + " item(s)"
-		end
-
-feature {NONE} -- Implementation
-
-	items: ARRAYED_LIST [JSON_VALUE]
-			-- Value container
-
-invariant
-	items_not_void: items /= Void
-
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
-end
+note
+    description: "[
+            JSON_ARRAY represent an array in JSON.
+            An array in JSON is an ordered set of names.
+            Examples
+            array
+                []
+                [elements]
+            ]"
+
+    author: "Javier Velilla"
+    date: "2008/08/24"
+    revision: "Revision 0.1"
+
+class
+    JSON_ARRAY
+
+inherit
+    JSON_VALUE
+
+    DEBUG_OUTPUT
+
+create
+    make_array
+
+feature {NONE} -- Initialization
+
+    make_array
+            -- Initialize JSON Array
+        do
+            create values.make (10)
+        end
+
+feature -- Access
+
+    i_th alias "[]" (i: INTEGER): JSON_VALUE
+            -- Item at `i'-th position
+        require
+            is_valid_index: valid_index (i)
+        do
+            Result := values.i_th (i)
+        end
+
+    representation: STRING
+        local
+            i: INTEGER
+        do
+            Result := "["
+            from
+                i := 1
+            until
+                i > count
+            loop
+                Result.append (i_th (i).representation)
+                i := i + 1
+                if i <= count then
+                    Result.append_character (',')
+                end
+            end
+            Result.append_character (']')
+        end
+
+feature -- Visitor pattern
+
+    accept (a_visitor: JSON_VISITOR)
+            -- Accept `a_visitor'.
+            -- (Call `visit_json_array' procedure on `a_visitor'.)
+        do
+            a_visitor.visit_json_array (Current)
+        end
+
+feature -- Mesurement
+
+    count: INTEGER
+            -- Number of items.
+        do
+            Result := values.count
+        end
+
+feature -- Status report
+
+    valid_index (i: INTEGER): BOOLEAN
+            -- Is `i' a valid index?
+        do
+            Result := (1 <= i) and (i <= count)
+        end
+
+feature -- Change Element
+
+    add (value: JSON_VALUE)
+        require
+            value_not_null: value /= void
+        do
+            values.extend (value)
+        ensure
+            has_new_value: old values.count + 1 = values.count and
+                              values.has (value)
+        end
+
+feature -- Report
+
+    hash_code: INTEGER
+            -- Hash code value
+        do
+            from
+                values.start
+                Result := values.item.hash_code
+            until
+                values.off
+            loop
+                Result:= ((Result \\ 8388593) |<< 8) + values.item.hash_code
+                values.forth
+            end
+            Result := Result \\ values.count
+        end
+
+feature -- Conversion
+
+    array_representation: ARRAYED_LIST [JSON_VALUE]
+            -- Representation as a sequences of values
+        do
+            Result := values
+        end
+
+feature -- Status report
+
+    debug_output: STRING
+            -- String that should be displayed in debugger to represent `Current'.
+        do
+            Result := count.out
+        end
+
+feature {NONE} -- Implementation
+
+    values: ARRAYED_LIST [JSON_VALUE]
+            -- Value container
+
+invariant
+     value_not_void: values /= Void
+
+end

contrib/library/text/parser/json/library/kernel/json_boolean.e

@@ -1,87 +1,61 @@
-note
-	description: "JSON Boolean values"
-	author: "$Author$"
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	JSON_BOOLEAN
-
-inherit
-
-	JSON_VALUE
-
-create
-	make,
-	make_true, make_false,
-	make_boolean
-
-feature {NONE} -- Initialization
-
-	make (a_value: BOOLEAN)
-			-- Initialize Current JSON boolean with `a_boolean'.
-		do
-			item := a_value
-		end
-
-	make_true
-			-- Initialize Current JSON boolean with True.
-		do
-			make (True)
-		end
-
-	make_false
-			-- Initialize Current JSON boolean with False.
-		do
-			make (False)
-		end
-
-	make_boolean (a_item: BOOLEAN)
-			-- Initialize.
-		obsolete
-			"Use `make' Sept/2014"
-		do
-			make (a_item)
-		end
-
-feature -- Access
-
-	item: BOOLEAN
-			-- Content
-
-	hash_code: INTEGER
-			-- Hash code value
-		do
-			Result := item.hash_code
-		end
-
-	representation: STRING
-		do
-			if item then
-				Result := "true"
-			else
-				Result := "false"
-			end
-		end
-
-feature -- Visitor pattern
-
-	accept (a_visitor: JSON_VISITOR)
-			-- Accept `a_visitor'.
-			-- (Call `visit_json_boolean' procedure on `a_visitor'.)
-		do
-			a_visitor.visit_json_boolean (Current)
-		end
-
-feature -- Status report
-
-	debug_output: STRING
-			-- String that should be displayed in debugger to represent `Current'.
-		do
-			Result := item.out
-		end
-
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
-end
+note
+    description: "JSON Truth values"
+    author: "Javier Velilla"
+    date: "2008/08/24"
+    revision: "Revision 0.1"
+
+class
+    JSON_BOOLEAN
+
+inherit
+    JSON_VALUE
+
+create
+    make_boolean
+
+feature {NONE} -- Initialization
+
+    make_boolean (an_item: BOOLEAN)
+            --Initialize.
+        do
+            item := an_item
+        end
+
+feature -- Access
+
+    item: BOOLEAN
+        -- Content
+
+    hash_code: INTEGER
+            -- Hash code value
+        do
+            Result := item.hash_code
+        end
+
+    representation: STRING
+        do
+            if item then
+                Result := "true"
+            else
+                Result := "false"
+            end
+        end
+        
+feature -- Visitor pattern
+
+    accept (a_visitor: JSON_VISITOR)
+            -- Accept `a_visitor'.
+            -- (Call `visit_json_boolean' procedure on `a_visitor'.)
+        do
+            a_visitor.visit_json_boolean (Current)
+        end
+
+feature -- Status report
+
+    debug_output: STRING
+            -- String that should be displayed in debugger to represent `Current'.
+        do
+            Result := item.out
+        end
+
+end

contrib/library/text/parser/json/library/kernel/json_null.e

@@ -1,51 +1,47 @@
-note
-	description: "JSON Null Values"
-	author: "Javier Velilla"
-	date: "2008/08/24"
-	revision: "Revision 0.1"
-
-class
-	JSON_NULL
-
-inherit
-
-	JSON_VALUE
-
-feature --Access
-
-	hash_code: INTEGER
-			-- Hash code value
-		do
-			Result := null_value.hash_code
-		end
-
-	representation: STRING
-		do
-			Result := "null"
-		end
-
-feature -- Visitor pattern
-
-	accept (a_visitor: JSON_VISITOR)
-			-- Accept `a_visitor'.
-			-- (Call `visit_element_a' procedure on `a_visitor'.)
-		do
-			a_visitor.visit_json_null (Current)
-		end
-
-feature -- Status report
-
-	debug_output: STRING
-			-- String that should be displayed in debugger to represent `Current'.
-		do
-			Result := null_value
-		end
-
-feature {NONE} -- Implementation
-
-	null_value: STRING = "null"
-
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
-end
+note
+    description: "JSON Null Values"
+    author: "Javier Velilla"
+    date: "2008/08/24"
+    revision: "Revision 0.1"
+
+class
+    JSON_NULL
+
+inherit
+    JSON_VALUE
+
+feature --Access
+
+    hash_code: INTEGER
+            -- Hash code value
+        do
+            Result := null_value.hash_code
+        end
+
+    representation: STRING
+        do
+            Result := "null"
+        end
+        
+feature -- Visitor pattern
+
+    accept (a_visitor: JSON_VISITOR)
+            -- Accept `a_visitor'.
+            -- (Call `visit_element_a' procedure on `a_visitor'.)
+        do
+            a_visitor.visit_json_null (Current)
+        end
+
+feature -- Status report
+
+    debug_output: STRING
+            -- String that should be displayed in debugger to represent `Current'.
+        do
+            Result := null_value
+        end
+
+feature {NONE}-- Implementation        
+
+    null_value: STRING = "null"
+
+end

contrib/library/text/parser/json/library/kernel/json_number.e

@@ -1,149 +1,99 @@
-note
-	description: "JSON Numbers, octal and hexadecimal formats are not used."
-	author: "$Author$"
-	date: "$Date$"
-	revision: "$Revision$"
-	license: "MIT (see http://www.opensource.org/licenses/mit-license.php)"
-
-class
-	JSON_NUMBER
-
-inherit
-
-	JSON_VALUE
-		redefine
-			is_equal
-		end
-
-create
-	make_integer, make_natural, make_real
-
-feature {NONE} -- initialization
-
-	make_integer (an_argument: INTEGER_64)
-			-- Initialize an instance of JSON_NUMBER from the integer value of `an_argument'.
-		do
-			item := an_argument.out
-			numeric_type := integer_type
-		end
-
-	make_natural (an_argument: NATURAL_64)
-			-- Initialize an instance of JSON_NUMBER from the unsigned integer value of `an_argument'.
-		do
-			item := an_argument.out
-			numeric_type := natural_type
-		end
-
-	make_real (an_argument: REAL_64)
-			-- Initialize an instance of JSON_NUMBER from the floating point value of `an_argument'.
-		do
-			item := an_argument.out
-			numeric_type := double_type
-		end
-
-feature -- Access
-
-	item: STRING
-			-- Content
-
-	numeric_type: INTEGER
-			-- Type of number (integer, natural or real).
-
-	hash_code: INTEGER
-			--Hash code value
-		do
-			Result := item.hash_code
-		end
-
-	representation: STRING
-		do
-			Result := item
-		end
-
-feature -- Conversion
-
-	integer_64_item: INTEGER_64
-			-- Associated integer value.
-		require
-			is_integer: is_integer
-		do
-			Result := item.to_integer_64
-		end
-
-	natural_64_item: NATURAL_64
-			-- Associated natural value.
-		require
-			is_natural: is_natural
-		do
-			Result := item.to_natural_64
-		end
-
-	double_item, real_64_item: REAL_64
-			-- Associated real value.
-		require
-			is_real: is_real
-		do
-			Result := item.to_real_64
-		end
-
-feature -- Status report
-
-	is_integer: BOOLEAN
-			-- Is Current an integer number?
-		do
-			Result := numeric_type = integer_type
-		end
-
-	is_natural: BOOLEAN
-			-- Is Current a natural number?
-		do
-			Result := numeric_type = natural_type
-		end
-
-	is_double, is_real: BOOLEAN
-			-- Is Current a real number?
-		do
-			Result := numeric_type = real_type
-		end
-
-feature -- Visitor pattern
-
-	accept (a_visitor: JSON_VISITOR)
-			-- Accept `a_visitor'.
-			-- (Call `visit_json_number' procedure on `a_visitor'.)
-		do
-			a_visitor.visit_json_number (Current)
-		end
-
-feature -- Status
-
-	is_equal (other: like Current): BOOLEAN
-			-- Is `other' attached to an object of the same type
-			-- as current object and identical to it?
-		do
-			Result := item.is_equal (other.item)
-		end
-
-feature -- Status report
-
-	debug_output: STRING
-			-- String that should be displayed in debugger to represent `Current'.
-		do
-			Result := item
-		end
-
-feature -- Implementation
-
-	integer_type: INTEGER = 1
-
-	double_type, real_type: INTEGER = 2
-
-	natural_type: INTEGER = 3
-
-invariant
-	item_not_void: item /= Void
-
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
-end
+note
+
+    description: "JSON Numbers, octal and hexadecimal formats are not used."
+    author: "Javier Velilla"
+    date: "2008/08/24"
+    revision: "Revision 0.1"
+    license:"MIT (see http://www.opensource.org/licenses/mit-license.php)"
+
+class
+    JSON_NUMBER
+
+inherit
+    JSON_VALUE
+        redefine
+            is_equal
+        end
+
+create
+    make_integer,
+    make_natural,
+    make_real
+
+feature {NONE} -- initialization
+
+    make_integer (an_argument: INTEGER_64)
+            -- Initialize an instance of JSON_NUMBER from the integer value of `an_argument'.
+        do
+            item := an_argument.out
+            numeric_type := INTEGER_TYPE
+        end
+
+    make_natural (an_argument: NATURAL_64)
+            -- Initialize an instance of JSON_NUMBER from the unsigned integer value of `an_argument'.
+        do
+            item := an_argument.out
+            numeric_type := NATURAL_TYPE
+        end
+
+    make_real (an_argument: DOUBLE)
+            -- Initialize an instance of JSON_NUMBER from the floating point value of `an_argument'.
+        do
+            item := an_argument.out
+            numeric_type := DOUBLE_TYPE
+        end
+
+feature -- Access
+
+    item: STRING
+            -- Content
+
+    hash_code: INTEGER
+            --Hash code value
+        do
+            Result := item.hash_code
+        end
+
+    representation: STRING
+        do
+            Result := item
+        end
+        
+feature -- Visitor pattern
+
+    accept (a_visitor: JSON_VISITOR)
+            -- Accept `a_visitor'.
+            -- (Call `visit_json_number' procedure on `a_visitor'.)
+        do
+            a_visitor.visit_json_number (Current)
+        end
+
+feature -- Status
+
+    is_equal (other: like Current): BOOLEAN
+            -- Is `other' attached to an object of the same type
+            -- as current object and identical to it?
+        do
+            Result := item.is_equal (other.item)
+        end
+
+feature -- Status report
+
+    debug_output: STRING
+            -- String that should be displayed in debugger to represent `Current'.
+        do
+            Result := item
+        end
+
+feature -- Implementation
+
+    INTEGER_TYPE: INTEGER = 1
+    DOUBLE_TYPE: INTEGER = 2
+    NATURAL_TYPE: INTEGER = 3
+
+    numeric_type: INTEGER
+
+invariant
+    item_not_void: item /= Void
+
+end

contrib/library/text/parser/json/library/kernel/json_object.e

@@ -1,261 +1,124 @@
 note
-	description: "[
-		            An JSON_OBJECT represent an object in JSON.
-		            An object is an unordered set of name/value pairs
-		
-					Examples:
-						object
-						{}
-						{"key": value}
-						{"key": "value"}
-	]"
-	author: "$Author$"
-	date: "$Date$"
-	revision: "$Revision$"
-	license: "MIT (see http://www.opensource.org/licenses/mit-license.php)"
+
+    description: "[
+            An JSON_OBJECT represent an object in JSON.
+            An object is an unordered set of name/value pairs
+
+                        Examples:
+
+                        object
+                        {}
+                        {"key","value"}
+
+            ]"
+    author: "Javier Velilla"
+    date: "2008/08/24"
+    revision: "Revision 0.1"
+    license:"MIT (see http://www.opensource.org/licenses/mit-license.php)"
 
 class
-	JSON_OBJECT
+    JSON_OBJECT
 
 inherit
-
-	JSON_VALUE
+    JSON_VALUE
 
 	TABLE_ITERABLE [JSON_VALUE, JSON_STRING]
 
-	DEBUG_OUTPUT
-
 create
-	make_empty, make_with_capacity, make
+    make
 
 feature {NONE} -- Initialization
 
-	make_with_capacity (nb: INTEGER)
-			-- Initialize with a capacity of `nb' items.
-		do
-			create items.make (nb)
-		end
-
-	make_empty
-			-- Initialize as empty object.
-		do
-			make_with_capacity (0)
-		end
-
-	make
-			-- Initialize with default capacity.
-		do
-			make_with_capacity (3)
-		end
+    make
+            -- Initialize
+        do
+            create object.make (10)
+        end
 
 feature -- Change Element
 
-	put (a_value: detachable JSON_VALUE; a_key: JSON_STRING)
-			-- Assuming there is no item of key `a_key',
-			-- insert `a_value' with `a_key'.
-		require
-			a_key_not_present: not has_key (a_key)
-		do
-			if a_value = Void then
-				items.extend (create {JSON_NULL}, a_key)
-			else
-				items.extend (a_value, a_key)
-			end
-		end
+    put (value: detachable JSON_VALUE; key: JSON_STRING)
+            -- Assuming there is no item of key `key',
+            -- insert `value' with `key'.
+        require
+            key_not_present: not has_key (key)
+        local
+            l_value: like value
+        do
+            l_value := value
+            if l_value = Void then
+                create {JSON_NULL} l_value
+            end
+            object.extend (l_value, key)
+        end
 
-	put_string (a_value: READABLE_STRING_GENERAL; a_key: JSON_STRING)
-			-- Assuming there is no item of key `a_key',
-			-- insert `a_value' with `a_key'.
-		require
-			key_not_present: not has_key (a_key)
-		local
-			l_value: JSON_STRING
-		do
-			if attached {READABLE_STRING_8} a_value as s then
-				create l_value.make_from_string (s)
-			else
-				create l_value.make_from_string_32 (a_value.as_string_32)
-			end
-			put (l_value, a_key)
-		end
-
-	put_integer (a_value: INTEGER_64; a_key: JSON_STRING)
-			-- Assuming there is no item of key `a_key',
-			-- insert `a_value' with `a_key'.
-		require
-			key_not_present: not has_key (a_key)
-		local
-			l_value: JSON_NUMBER
-		do
-			create l_value.make_integer (a_value)
-			put (l_value, a_key)
-		end
-
-	put_natural (a_value: NATURAL_64; a_key: JSON_STRING)
-			-- Assuming there is no item of key `a_key',
-			-- insert `a_value' with `a_key'.
-		require
-			key_not_present: not has_key (a_key)
-		local
-			l_value: JSON_NUMBER
-		do
-			create l_value.make_natural (a_value)
-			put (l_value, a_key)
-		end
-
-	put_real (a_value: DOUBLE; a_key: JSON_STRING)
-			-- Assuming there is no item of key `a_key',
-			-- insert `a_value' with `a_key'.
-		require
-			key_not_present: not has_key (a_key)
-		local
-			l_value: JSON_NUMBER
-		do
-			create l_value.make_real (a_value)
-			put (l_value, a_key)
-		end
-
-	put_boolean (a_value: BOOLEAN; a_key: JSON_STRING)
-			-- Assuming there is no item of key `a_key',
-			-- insert `a_value' with `a_key'.
-		require
-			key_not_present: not has_key (a_key)
-		local
-			l_value: JSON_BOOLEAN
-		do
-			create l_value.make (a_value)
-			put (l_value, a_key)
-		end
-
-	replace (a_value: detachable JSON_VALUE; a_key: JSON_STRING)
-			-- Assuming there is no item of key `a_key',
-			-- insert `a_value' with `a_key'.
-		do
-			if a_value = Void then
-				items.force (create {JSON_NULL}, a_key)
-			else
-				items.force (a_value, a_key)
-			end
-		end
-
-	replace_with_string (a_value: READABLE_STRING_GENERAL; a_key: JSON_STRING)
-			-- Assuming there is no item of key `a_key',
-			-- insert `a_value' with `a_key'.
-		local
-			l_value: JSON_STRING
-		do
-			if attached {READABLE_STRING_8} a_value as s then
-				create l_value.make_from_string (s)
-			else
-				create l_value.make_from_string_32 (a_value.as_string_32)
-			end
-			replace (l_value, a_key)
-		end
-
-	replace_with_integer (a_value: INTEGER_64; a_key: JSON_STRING)
-			-- Assuming there is no item of key `a_key',
-			-- insert `a_value' with `a_key'.
-		local
-			l_value: JSON_NUMBER
-		do
-			create l_value.make_integer (a_value)
-			replace (l_value, a_key)
-		end
-
-	replace_with_with_natural (a_value: NATURAL_64; a_key: JSON_STRING)
-			-- Assuming there is no item of key `a_key',
-			-- insert `a_value' with `a_key'.
-		local
-			l_value: JSON_NUMBER
-		do
-			create l_value.make_natural (a_value)
-			replace (l_value, a_key)
-		end
-
-	replace_with_real (a_value: DOUBLE; a_key: JSON_STRING)
-			-- Assuming there is no item of key `a_key',
-			-- insert `a_value' with `a_key'.
-		local
-			l_value: JSON_NUMBER
-		do
-			create l_value.make_real (a_value)
-			replace (l_value, a_key)
-		end
-
-	replace_with_boolean (a_value: BOOLEAN; a_key: JSON_STRING)
-			-- Assuming there is no item of key `a_key',
-			-- insert `a_value' with `a_key'.
-		local
-			l_value: JSON_BOOLEAN
-		do
-			create l_value.make (a_value)
-			replace (l_value, a_key)
-		end
-
-	remove (a_key: JSON_STRING)
-			-- Remove item indexed by `a_key' if any.
-		do
-			items.remove (a_key)
-		end
-
-	wipe_out
-			-- Reset all items to default values; reset status.
-		do
-			items.wipe_out
-		end
-
-feature -- Status report
-
-	has_key (a_key: JSON_STRING): BOOLEAN
-			-- has the JSON_OBJECT contains a specific key `a_key'.
-		do
-			Result := items.has (a_key)
-		end
-
-	has_item (a_value: JSON_VALUE): BOOLEAN
-			-- has the JSON_OBJECT contain a specfic item `a_value'
-		do
-			Result := items.has_item (a_value)
-		end
+    replace (value: detachable JSON_VALUE; key: JSON_STRING)
+            -- Assuming there is no item of key `key',
+            -- insert `value' with `key'.
+        local
+            l_value: like value
+        do
+            l_value := value
+            if l_value = Void then
+                create {JSON_NULL} l_value
+            end
+            object.force (l_value, key)
+        end
 
 feature -- Access
 
-	item (a_key: JSON_STRING): detachable JSON_VALUE
-			-- the json_value associated with a key `a_key'.
-		do
-			Result := items.item (a_key)
-		end
+    has_key (key: JSON_STRING): BOOLEAN
+            -- has the JSON_OBJECT contains a specific key 'key'.
+        do
+            Result := object.has (key)
+        end
 
-	current_keys: ARRAY [JSON_STRING]
-			-- Array containing actually used keys.
-		do
-			Result := items.current_keys
-		end
+    has_item (value: JSON_VALUE): BOOLEAN
+            -- has the JSON_OBJECT contain a specfic item 'value'
+        do
+            Result := object.has_item (value)
+        end
 
-	representation: STRING
-			-- <Precursor>
-		do
-			create Result.make (2)
-			Result.append_character ('{')
-			across
-				items as ic
-			loop
-				if Result.count > 1 then
-					Result.append_character (',')
-				end
-				Result.append (ic.key.representation)
-				Result.append_character (':')
-				Result.append (ic.item.representation)
-			end
-			Result.append_character ('}')
-		end
+    item (key: JSON_STRING): detachable JSON_VALUE
+            -- the json_value associated with a key.
+        do
+            Result := object.item (key)
+        end
+
+    current_keys: ARRAY [JSON_STRING]
+            -- array containing actually used keys
+        do
+            Result := object.current_keys
+        end
+
+    representation: STRING
+        local
+            t: HASH_TABLE [JSON_VALUE, JSON_STRING]
+        do
+            Result := "{"
+            from
+                t := map_representation
+                t.start
+            until
+                t.after
+            loop
+                Result.append (t.key_for_iteration.representation)
+                Result.append (":")
+                Result.append (t.item_for_iteration.representation)
+                t.forth
+                if not t.after then
+                    Result.append_character (',')
+                end
+            end
+            Result.append_character ('}')
+        end
 
 feature -- Mesurement
 
 	count: INTEGER
-			-- Number of field.
+			-- Number of field
 		do
-			Result := items.count
+			Result := object.count
 		end
 
 feature -- Access
@@ -263,7 +126,7 @@ feature -- Access
 	new_cursor: TABLE_ITERATION_CURSOR [JSON_VALUE, JSON_STRING]
 			-- Fresh cursor associated with current structure
 		do
-			Result := items.new_cursor
+			Result := object.new_cursor
 		end
 
 feature -- Status report
@@ -271,61 +134,58 @@ feature -- Status report
 	is_empty: BOOLEAN
 			-- Is empty object?
 		do
-			Result := items.is_empty
+			Result := object.is_empty
 		end
 
 feature -- Visitor pattern
 
-	accept (a_visitor: JSON_VISITOR)
-			-- Accept `a_visitor'.
-			-- (Call `visit_json_object' procedure on `a_visitor'.)
-		do
-			a_visitor.visit_json_object (Current)
-		end
+    accept (a_visitor: JSON_VISITOR)
+            -- Accept `a_visitor'.
+            -- (Call `visit_json_object' procedure on `a_visitor'.)
+        do
+            a_visitor.visit_json_object (Current)
+        end
 
 feature -- Conversion
 
-	map_representation: HASH_TABLE [JSON_VALUE, JSON_STRING]
-			-- A representation that maps keys to values
-		do
-			Result := items
-		end
+    map_representation: HASH_TABLE [JSON_VALUE, JSON_STRING]
+            --A representation that maps keys to values
+        do
+            Result := object
+        end
 
 feature -- Report
 
-	hash_code: INTEGER
-			-- Hash code value
-		do
-			from
-				items.start
-				Result := items.out.hash_code
-			until
-				items.off
-			loop
-				Result := ((Result \\ 8388593) |<< 8) + items.item_for_iteration.hash_code
-				items.forth
-			end
-				-- Ensure it is a positive value.
-			Result := Result.hash_code
-		end
+    hash_code: INTEGER
+            -- Hash code value
+        do
+            from
+                object.start
+                Result := object.out.hash_code
+            until
+                object.off
+            loop
+                Result := ((Result \\ 8388593) |<< 8)  + object.item_for_iteration.hash_code
+                object.forth
+            end
+            -- Ensure it is a positive value.
+            Result := Result.hash_code
+        end
 
 feature -- Status report
 
-	debug_output: STRING
-			-- String that should be displayed in debugger to represent `Current'.
-		do
-			Result := count.out + "item(s)"
-		end
+    debug_output: STRING
+            -- String that should be displayed in debugger to represent `Current'.
+        do
+            Result := object.count.out
+        end
 
 feature {NONE} -- Implementation
 
-	items: HASH_TABLE [JSON_VALUE, JSON_STRING]
-			-- Value container
+    object: HASH_TABLE [JSON_VALUE, JSON_STRING]
+            -- Value container
 
 invariant
-	items_not_void: items /= Void
+    object_not_null: object /= Void
 
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end

contrib/library/text/parser/json/library/kernel/json_string.e

@@ -1,506 +1,329 @@
-note
-	description: "[
-		A JSON_STRING represent a string in JSON.
-		A string is a collection of zero or more Unicodes characters, wrapped in double
-		quotes, using blackslash espaces.
-	]"
-	author: "$Author$"
-	date: "$Date$"
-	revision: "$Revision$"
-	license: "MIT (see http://www.opensource.org/licenses/mit-license.php)"
-
-class
-	JSON_STRING
-
-inherit
-
-	JSON_VALUE
-		redefine
-			is_equal
-		end
-
-create
-	make_from_string, make_from_string_32, make_from_string_general,
-	make_from_escaped_json_string,
-	make_with_escaped_json, make_json, make_json_from_string_32
-
-convert
-	make_from_string ({READABLE_STRING_8, STRING_8, IMMUTABLE_STRING_8}),
-	make_from_string_32 ({READABLE_STRING_32, STRING_32, IMMUTABLE_STRING_32}),
-	make_from_string_general ({READABLE_STRING_GENERAL, STRING_GENERAL, IMMUTABLE_STRING_GENERAL})
-
-feature {NONE} -- Initialization
-
-	make_from_string (s: READABLE_STRING_8)
-			-- Initialize from ascii string `s'.
-		require
-			s_not_void: s /= Void
-		do
-			make_from_escaped_json_string (escaped_json_string (s))
-		end
-
-	make_from_string_32 (s: READABLE_STRING_32)
-			-- Initialize from unicode string `s'.
-		require
-			s_not_void: s /= Void
-		do
-			make_from_escaped_json_string (escaped_json_string (s))
-		end
-
-	make_from_string_general (s: READABLE_STRING_GENERAL)
-			-- Initialize from string `s'.
-		require
-			s_not_void: s /= Void
-		do
-			if attached {READABLE_STRING_8} s as s8 then
-				make_from_string (s8)
-			else
-				make_from_string_32 (s.as_string_32)
-			end
-		end
-
-	make_from_escaped_json_string (a_escaped_string: READABLE_STRING_8)
-			-- Initialize with `a_escaped_string' already JSON escaped.
-		require
-			a_escaped_string_not_void: a_escaped_string /= Void
-		do
-			item := a_escaped_string
-		end
-
-	make_with_escaped_json (a_escaped_string: READABLE_STRING_8)
-			-- Initialize with `a_escaped_string' already JSON escaped.
-		obsolete
-			"Use `make_from_escaped_json_string' Sept/2014"
-		require
-			a_escaped_string_not_void: a_escaped_string /= Void
-		do
-			make_from_escaped_json_string (a_escaped_string)
-		end
-
-	make_from_json_string (a_json: JSON_STRING)
-			-- Initialize with `a_json' string value.
-		do
-			make_from_escaped_json_string (a_json.item)
-		end
-
-	make_json (s: READABLE_STRING_8)
-			-- Initialize.
-		obsolete
-			"Use `make_from_string' Sept/2014"
-		require
-			item_not_void: s /= Void
-		do
-			make_with_escaped_json (escaped_json_string (s))
-		end
-
-	make_json_from_string_32 (s: READABLE_STRING_32)
-			-- Initialize from STRING_32 `s'.
-		obsolete
-			"Use `make_from_string_32' Sept/2014"
-		require
-			item_not_void: s /= Void
-		do
-			make_with_escaped_json (escaped_json_string (s))
-		end
-
-feature -- Access
-
-	item: STRING
-			-- Contents with escaped entities if any
-
-feature -- Conversion
-
-	unescaped_string_8: STRING_8
-			-- Unescaped ascii string from `item'.
-			--| note: valid only if `item' does not encode any unicode character.
-		local
-			s: like item
-		do
-			s := item
-			create Result.make (s.count)
-			unescape_to_string_8 (Result)
-		end
-
-	unescaped_string_32: STRING_32
-			-- Unescaped uncode string from `item'
-			--| some encoders uses UTF-8 , and not the recommended pure json encoding
-			--| thus, let's support the UTF-8 encoding during decoding.
-		local
-			s: READABLE_STRING_8
-		do
-			s := item
-			create Result.make (s.count)
-			unescape_to_string_32 (Result)
-		end
-
-	representation: STRING
-			-- String representation of `item' with escaped entities if any.
-		do
-			create Result.make (item.count + 2)
-			Result.append_character ('%"')
-			Result.append (item)
-			Result.append_character ('%"')
-		end
-
-	unescape_to_string_8 (a_output: STRING_8)
-			-- Unescape string `item' into `a_output'.
-			--| note: valid only if `item' does not encode any unicode character.
-		local
-			s: like item
-			i, n: INTEGER
-			c: CHARACTER
-		do
-			s := item
-			n := s.count
-			from
-				i := 1
-			until
-				i > n
-			loop
-				c := s [i]
-				if c = '\' then
-					if i < n then
-						inspect s [i + 1]
-						when '%"' then
-							a_output.append_character ('%"')
-							i := i + 2
-						when '\' then
-							a_output.append_character ('\')
-							i := i + 2
-						when '/' then
-							a_output.append_character ('/')
-							i := i + 2
-						when 'b' then
-							a_output.append_character ('%B')
-							i := i + 2
-						when 'f' then
-							a_output.append_character ('%F')
-							i := i + 2
-						when 'n' then
-							a_output.append_character ('%N')
-							i := i + 2
-						when 'r' then
-							a_output.append_character ('%R')
-							i := i + 2
-						when 't' then
-							a_output.append_character ('%T')
-							i := i + 2
-						when 'u' then
-								--| Leave unicode \uXXXX unescaped
-							a_output.append_character (c) -- '\'
-							i := i + 1
-						else
-							a_output.append_character (c) -- '\'
-							i := i + 1
-						end
-					else
-						a_output.append_character (c) -- '\'
-						i := i + 1
-					end
-				else
-					a_output.append_character (c)
-					i := i + 1
-				end
-			end
-		end
-
-	unescape_to_string_32 (a_output: STRING_32)
-			-- Unescape string `item' into `a_output' string 32.
-			--| some encoders uses UTF-8 , and not the recommended pure json encoding
-			--| thus, let's support the UTF-8 encoding during decoding.	
-		local
-			s: READABLE_STRING_8
-			i, n: INTEGER
-			c: NATURAL_32
-			ch: CHARACTER_8
-			hex: READABLE_STRING_8
-		do
-			s := item
-			n := s.count
-			from
-				i := 1
-			until
-				i > n
-			loop
-				ch := s.item (i)
-				if ch = '\' then
-					if i < n then
-						inspect s [i + 1]
-						when '%"' then
-							a_output.append_character ('%"')
-							i := i + 2
-						when '\' then
-							a_output.append_character ('\')
-							i := i + 2
-						when '/' then
-							a_output.append_character ('/')
-							i := i + 2
-						when 'b' then
-							a_output.append_character ('%B')
-							i := i + 2
-						when 'f' then
-							a_output.append_character ('%F')
-							i := i + 2
-						when 'n' then
-							a_output.append_character ('%N')
-							i := i + 2
-						when 'r' then
-							a_output.append_character ('%R')
-							i := i + 2
-						when 't' then
-							a_output.append_character ('%T')
-							i := i + 2
-						when 'u' then
-							hex := s.substring (i + 2, i + 5) -- i+2 , i+2+4-1
-							if hex.count = 4 then
-								a_output.append_code (hexadecimal_to_natural_32 (hex))
-							end
-							i := i + 6 -- i+2+4
-						else
-							a_output.append_character (ch) -- '\'
-							i := i + 1
-						end
-					else
-						a_output.append_character (ch) -- '\'
-						i := i + 1
-					end
-				else
-					c := ch.natural_32_code
-					if c <= 0x7F then
-							-- 0xxxxxxx
-						check
-							ch = c.to_character_32
-						end
-						a_output.append_character (ch)
-					elseif c <= 0xDF then
-							-- 110xxxxx 10xxxxxx
-						i := i + 1
-						if i <= n then
-							a_output.append_code (((c & 0x1F) |<< 6) | (s.code (i) & 0x3F))
-						end
-					elseif c <= 0xEF then
-							-- 1110xxxx 10xxxxxx 10xxxxxx
-						i := i + 2
-						if i <= n then
-							a_output.append_code (((c & 0xF) |<< 12) | ((s.code (i - 1) & 0x3F) |<< 6) | (s.code (i) & 0x3F))
-						end
-					elseif c <= 0xF7 then
-							-- 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-						i := i + 3
-						if i <= n then
-							a_output.append_code (((c & 0x7) |<< 18) | ((s.code (i - 2) & 0x3F) |<< 12) | ((s.code (i - 1) & 0x3F) |<< 6) | (s.code (i) & 0x3F))
-						end
-					end
-					i := i + 1
-				end
-			end
-		end
-
-feature -- Visitor pattern
-
-	accept (a_visitor: JSON_VISITOR)
-			-- Accept `a_visitor'.
-			-- (Call `visit_json_string' procedure on `a_visitor'.)
-		do
-			a_visitor.visit_json_string (Current)
-		end
-
-feature -- Comparison
-
-	is_equal (other: like Current): BOOLEAN
-			-- Is JSON_STRING  made of same character sequence as `other'
-			-- (possibly with a different capacity)?
-		do
-			Result := item.same_string (other.item)
-		end
-
-feature -- Change Element
-
-	append (a_escaped_string: READABLE_STRING_8)
-			-- Add JSON escaped string `a_escaped_string'
-		require
-			a_escaped_string_not_void: a_escaped_string /= Void
-		do
-			item.append_string (a_escaped_string)
-		end
-
-	append_json_string (a_json_string: JSON_STRING)
-			-- Add JSON string `a_json_string'
-		require
-			a_json_string_not_void: a_json_string /= Void
-		do
-			append (a_json_string.item)
-		end
-
-	append_string (s: READABLE_STRING_8)
-			-- Add ascii string `s'
-		require
-			s_not_void: s /= Void
-		do
-			append (escaped_json_string (s))
-		end
-
-	append_string_32 (s: READABLE_STRING_32)
-			-- Add unicode string `s'
-		require
-			s_not_void: s /= Void
-		do
-			append (escaped_json_string (s))
-		end
-
-	append_string_general (s: READABLE_STRING_GENERAL)
-			-- Add unicode string `s'
-		require
-			s_not_void: s /= Void
-		do
-			if attached {READABLE_STRING_8} s as s8 then
-				append_string (s.as_string_8)
-			else
-				append_string_32 (s.as_string_32)
-			end
-		end
-
-feature -- Status report
-
-	hash_code: INTEGER
-			-- Hash code value
-		do
-			Result := item.hash_code
-		end
-
-feature -- Status report
-
-	debug_output: STRING
-			-- String that should be displayed in debugger to represent `Current'.
-		do
-			Result := item
-		end
-
-feature {NONE} -- Implementation
-
- 	is_hexadecimal (s: READABLE_STRING_8): BOOLEAN
- 			-- Is `s' an hexadecimal value?
-		local
-			i: INTEGER
- 		do
-			from
-				Result := True
-				i := 1
-			until
-				i > s.count or not Result
-			loop
-				Result := s [i].is_hexa_digit
-				i := i + 1
-			end
- 		end
-
-	hexadecimal_to_natural_32 (s: READABLE_STRING_8): NATURAL_32
-			-- Hexadecimal string `s' converted to NATURAL_32 value
-		require
-			s_not_void: s /= Void
-			is_hexadecimal: is_hexadecimal (s)
-		local
-			i, nb: INTEGER
-			char: CHARACTER
-		do
-			nb := s.count
-			if nb >= 2 and then s.item (2) = 'x' then
-				i := 3
-			else
-				i := 1
-			end
-			from
-			until
-				i > nb
-			loop
-				Result := Result * 16
-				char := s.item (i)
-				if char >= '0' and then char <= '9' then
-					Result := Result + (char |-| '0').to_natural_32
-				else
-					Result := Result + (char.lower |-| 'a' + 10).to_natural_32
-				end
-				i := i + 1
-			end
-		end
-
-	escaped_json_string (s: READABLE_STRING_GENERAL): STRING_8
-			-- JSON string with '"' and '\' characters and unicode escaped
-		require
-			s_not_void: s /= Void
-		local
-			i, j, n: INTEGER
-			uc: CHARACTER_32
-			c: CHARACTER_8
-			h: STRING_8
-		do
-			n := s.count
-			create Result.make (n + n // 10)
-			from
-				i := 1
-			until
-				i > n
-			loop
-				uc := s.item (i)
-				if uc.is_character_8 then
-					c := uc.to_character_8
-					inspect c
-					when '%"' then
-						Result.append_string ("\%"")
-					when '\' then
-						Result.append_string ("\\")
-					when '/' then
-							-- To avoid issue with Javascript  </script> ...
-							-- escape only  </  to <\/
-						if s.valid_index (i - 1) and then s.item (i - 1) = '<' then
-							Result.append_string ("\/")
-						else
-							Result.append_string ("/")
-						end
-					when '%B' then
-						Result.append_string ("\b")
-					when '%F' then
-						Result.append_string ("\f")
-					when '%N' then
-						Result.append_string ("\n")
-					when '%R' then
-						Result.append_string ("\r")
-					when '%T' then
-						Result.append_string ("\t")
-					else
-						Result.extend (c)
-					end
-				else
-					Result.append ("\u")
-					h := uc.code.to_hex_string
-						-- Remove first 0 and keep 4 hexa digit
-					from
-						j := 1
-					until
-						h.count = 4 or (j <= h.count and then h.item (j) /= '0')
-					loop
-						j := j + 1
-					end
-					h := h.substring (j, h.count)
-					from
-					until
-						h.count >= 4
-					loop
-						h.prepend_integer (0)
-					end
-					check
-						hexastring_has_4_chars: h.count = 4
-					end
-					Result.append (h)
-				end
-				i := i + 1
-			end
-		end
-
-invariant
-	item_not_void: item /= Void
-
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
-end
+note
+
+    description: "[
+        A JSON_STRING represent a string in JSON.
+        A string is a collection of zero or more Unicodes characters, wrapped in double
+        quotes, using blackslash espaces.
+        ]"
+
+    author: "Javier Velilla"
+    date: "2008/08/24"
+    revision: "Revision 0.1"
+    license:"MIT (see http://www.opensource.org/licenses/mit-license.php)"
+
+
+class
+    JSON_STRING
+
+inherit
+    JSON_VALUE
+        redefine
+            is_equal
+        end
+
+create
+    make_json,
+	make_json_from_string_32,
+	make_with_escaped_json
+
+convert
+	make_json ({READABLE_STRING_8, STRING_8, IMMUTABLE_STRING_8}),
+	make_json_from_string_32 ({READABLE_STRING_32, STRING_32, IMMUTABLE_STRING_32})
+
+feature {NONE} -- Initialization
+
+    make_json (s: READABLE_STRING_8)
+            -- Initialize.
+        require
+            item_not_void: s /= Void
+        do
+            make_with_escaped_json (escaped_json_string (s))
+        end
+
+    make_json_from_string_32 (s: READABLE_STRING_32)
+            -- Initialize from STRING_32 `s'.
+        require
+            item_not_void: s /= Void
+        do
+            make_with_escaped_json (escaped_json_string_32 (s))
+        end
+
+    make_with_escaped_json (s: READABLE_STRING_8)
+            -- Initialize with an_item already escaped
+        require
+            item_not_void: s /= Void
+        do
+            item := s
+        end
+
+feature -- Access
+
+    item: STRING
+            -- Contents with escaped entities if any
+
+	unescaped_string_8: STRING_8
+			-- Unescaped string from `item'
+		local
+			s: like item
+			i, n: INTEGER
+			c: CHARACTER
+		do
+			s := item
+			n := s.count
+			create Result.make (n)
+			from i := 1 until i > n loop
+				c := s[i]
+				if c = '\' then
+					if i < n then
+						inspect s[i+1]
+						when '\' then
+							Result.append_character ('\')
+							i := i + 2
+						when '%"' then
+							Result.append_character ('%"')
+							i := i + 2
+						when 'n' then
+							Result.append_character ('%N')
+							i := i + 2
+						when 'r' then
+							Result.append_character ('%R')
+							i := i + 2
+						when 'u' then
+							--| Leave unicode \uXXXX unescaped
+							Result.append_character ('\')
+							i := i + 1
+						else
+							Result.append_character ('\')
+							i := i + 1
+						end
+					else
+						Result.append_character ('\')
+						i := i + 1
+					end
+				else
+					Result.append_character (c)
+					i := i + 1
+				end
+			end
+		end
+
+	unescaped_string_32: STRING_32
+			-- Unescaped string 32 from `item'
+		local
+			s: like item
+			i, n: INTEGER
+			c: CHARACTER
+			hex: STRING
+		do
+			s := item
+			n := s.count
+			create Result.make (n)
+			from i := 1 until i > n loop
+				c := s[i]
+				if c = '\' then
+					if i < n then
+						inspect s[i+1]
+						when '\' then
+							Result.append_character ('\')
+							i := i + 2
+						when '%"' then
+							Result.append_character ('%"')
+							i := i + 2
+						when 'n' then
+							Result.append_character ('%N')
+							i := i + 2
+						when 'r' then
+							Result.append_character ('%R')
+							i := i + 2
+						when 'u' then
+							hex := s.substring (i+2, i+2+4 - 1)
+							if hex.count = 4 then
+								Result.append_code (hexadecimal_to_natural_32 (hex))
+							end
+							i := i + 2 + 4
+						else
+							Result.append_character ('\')
+							i := i + 1
+						end
+					else
+						Result.append_character ('\')
+						i := i + 1
+					end
+				else
+					Result.append_character (c.to_character_32)
+					i := i + 1
+				end
+			end
+		end
+
+    representation: STRING
+			-- String representation of `item' with escaped entities if any
+        do
+            create Result.make (item.count + 2)
+            Result.append_character ('%"')
+            Result.append (item)
+            Result.append_character ('%"')
+        end
+
+feature -- Visitor pattern
+
+    accept (a_visitor: JSON_VISITOR)
+            -- Accept `a_visitor'.
+            -- (Call `visit_json_string' procedure on `a_visitor'.)
+        do
+            a_visitor.visit_json_string (Current)
+        end
+
+feature -- Comparison
+
+    is_equal (other: like Current): BOOLEAN
+            -- Is JSON_STRING  made of same character sequence as `other'
+            -- (possibly with a different capacity)?
+        do
+            Result := item.same_string (other.item)
+        end
+
+feature -- Change Element
+
+    append (a_string: STRING)
+            -- Add a_string
+        require
+            a_string_not_void: a_string /= Void
+        do
+            item.append_string (a_string)
+        end
+
+feature -- Status report
+
+    hash_code: INTEGER
+            -- Hash code value
+        do
+            Result := item.hash_code
+        end
+
+feature -- Status report
+
+    debug_output: STRING
+            -- String that should be displayed in debugger to represent `Current'.
+        do
+            Result := item
+        end
+
+feature {NONE} -- Implementation
+
+	is_hexadecimal (s: READABLE_STRING_8): BOOLEAN
+			-- Is `s' an hexadecimal value?	
+		do
+			Result := across s as scur all scur.item.is_hexa_digit end
+		end
+
+	hexadecimal_to_natural_32 (s: READABLE_STRING_8): NATURAL_32
+			-- Hexadecimal string `s' converted to NATURAL_32 value
+		require
+			s_not_void: s /= Void
+			is_hexadecimal: is_hexadecimal (s)
+		local
+			i, nb: INTEGER
+			char: CHARACTER
+		do
+			nb := s.count
+
+			if nb >= 2 and then s.item (2) = 'x' then
+				i := 3
+			else
+				i := 1
+			end
+
+			from
+			until
+				i > nb
+			loop
+				Result := Result * 16
+				char := s.item (i)
+				if char >= '0' and then char <= '9' then
+					Result := Result + (char |-| '0').to_natural_32
+				else
+					Result := Result + (char.lower |-| 'a' + 10).to_natural_32
+				end
+				i := i + 1
+			end
+		end
+
+    escaped_json_string (s: READABLE_STRING_8): STRING_8
+            -- JSON string with '"' and '\' characters escaped
+        require
+            s_not_void: s /= Void
+		local
+			i, n: INTEGER
+			c: CHARACTER_8
+		do
+			n := s.count
+			create Result.make (n + n // 10)
+			from i := 1 until i > n loop
+				c := s.item (i)
+				inspect c
+				when '%"' then Result.append_string ("\%"")
+				when '\' then Result.append_string ("\\")
+				when '%R' then Result.append_string ("\r")
+				when '%N' then Result.append_string ("\n")
+				else
+					Result.extend (c)
+				end
+				i := i + 1
+			end
+		end
+
+    escaped_json_string_32 (s: READABLE_STRING_32): STRING_8
+            -- JSON string with '"' and '\' characters and unicode escaped
+        require
+            s_not_void: s /= Void
+		local
+			i, j, n: INTEGER
+			uc: CHARACTER_32
+			c: CHARACTER_8
+			h: STRING_8
+		do
+			n := s.count
+			create Result.make (n + n // 10)
+			from i := 1 until i > n loop
+				uc := s.item (i)
+				if uc.is_character_8 then
+					c := uc.to_character_8
+					inspect c
+					when '%"' then Result.append_string ("\%"")
+					when '\' then Result.append_string ("\\")
+					when '%R' then Result.append_string ("\r")
+					when '%N' then Result.append_string ("\n")
+					else
+						Result.extend (c)
+					end
+				else
+					Result.append ("\u")
+					h := uc.code.to_hex_string
+					-- Remove first 0 and keep 4 hexa digit
+					from
+						j := 1
+					until
+						h.count = 4 or (j <= h.count and then h.item (j) /= '0')
+					loop
+						j := j + 1
+					end
+					h := h.substring (j, h.count)
+
+					from
+					until
+						h.count >= 4
+					loop
+						h.prepend_integer (0)
+					end
+					check h.count = 4 end
+					Result.append (h)
+				end
+				i := i + 1
+			end
+		end
+
+invariant
+    item_not_void: item /= Void
+
+end

contrib/library/text/parser/json/library/kernel/json_value.e

@@ -1,46 +1,43 @@
 note
-	description: "[
-		JSON_VALUE represent a value in JSON. 
-		        A value can be
-		            * a string in double quotes
-		            * a number
-		            * boolean value(true, false )
-		            * null
-		            * an object
-		            * an array
-	]"
-	author: "Javier Velilla"
-	date: "2008/05/19"
-	revision: "Revision 0.1"
-	license: "MIT (see http://www.opensource.org/licenses/mit-license.php)"
+    description:"[
+            JSON_VALUE represent a value in JSON. 
+                    A value can be
+                        * a string in double quotes
+                        * a number
+                        * boolean value(true, false )
+                        * null
+                        * an object
+                        * an array
+        ]"
+    author: "Javier Velilla"
+    date: "2008/05/19"
+    revision: "Revision 0.1"
+    license:"MIT (see http://www.opensource.org/licenses/mit-license.php)"
+
 
 deferred class
-	JSON_VALUE
+    JSON_VALUE
 
 inherit
+    HASHABLE
 
-	HASHABLE
-
-	DEBUG_OUTPUT
-
+    DEBUG_OUTPUT
+    
 feature -- Access
 
-	representation: STRING
-			-- UTF-8 encoded Unicode string representation of Current
-		deferred
-		end
+    representation: STRING
+            -- UTF-8 encoded Unicode string representation of Current
+        deferred
+        end
 
 feature -- Visitor pattern
 
-	accept (a_visitor: JSON_VISITOR)
-			-- Accept `a_visitor'.
-			-- (Call `visit_*' procedure on `a_visitor'.)
-		require
-			a_visitor_not_void: a_visitor /= Void
-		deferred
-		end
+    accept (a_visitor: JSON_VISITOR)
+            -- Accept `a_visitor'.
+            -- (Call `visit_*' procedure on `a_visitor'.)
+        require
+            a_visitor_not_void: a_visitor /= Void
+        deferred
+        end
 
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end

contrib/library/text/parser/json/library/kernel/scanner/json_parser.e

@@ -0,0 +1,513 @@
+note
+
+	description: "Parse serialized JSON data"
+	author: "jvelilla"
+	date: "2008/08/24"
+	revision: "Revision 0.1"
+
+class
+	JSON_PARSER
+
+inherit
+	JSON_READER
+	JSON_TOKENS
+
+create
+	make_parser
+
+feature {NONE} -- Initialize
+
+	make_parser (a_json: STRING)
+			-- Initialize.
+		require
+			json_not_empty: a_json /= Void and then not a_json.is_empty
+		do
+			make (a_json)
+			is_parsed := True
+			create errors.make
+		end
+
+feature -- Status report
+
+	is_parsed: BOOLEAN
+			-- Is parsed?
+
+	errors: LINKED_LIST [STRING]
+			-- Current errors
+
+	current_errors: STRING
+			-- Current errors as string
+		do
+			create Result.make_empty
+			from
+				errors.start
+			until
+				errors.after
+			loop
+				Result.append_string (errors.item + "%N")
+				errors.forth
+			end
+		end
+
+feature -- Element change
+
+	report_error (e: STRING)
+			-- Report error `e'
+		require
+			e_not_void: e /= Void
+		do
+			errors.force (e)
+		end
+
+feature -- Commands
+
+	parse_json: detachable JSON_VALUE
+		    -- Parse JSON data `representation'
+		    -- start ::= object | array
+		do
+		   	if is_valid_start_symbol then
+		   	    Result := parse
+		        if extra_elements then
+		            is_parsed := False
+		        end
+		    else
+		        is_parsed := False
+		        report_error ("Syntax error unexpected token, expecting `{' or `['")
+		    end
+		end
+
+	parse: detachable JSON_VALUE
+			-- Parse JSON data `representation'
+		local
+			c: CHARACTER
+		do
+			if is_parsed then
+				skip_white_spaces
+				c := actual
+				inspect c
+				when j_OBJECT_OPEN then
+					Result := parse_object
+				when j_STRING then
+					Result := parse_string
+				when j_ARRAY_OPEN then
+					Result := parse_array
+				else
+					if c.is_digit or c = j_MINUS  then
+						Result := parse_number
+					elseif is_null then
+						Result := create {JSON_NULL}
+						next
+						next
+						next
+					elseif is_true then
+						Result := create {JSON_BOOLEAN}.make_boolean (True)
+						next
+						next
+						next
+					elseif is_false then
+						Result := create {JSON_BOOLEAN}.make_boolean (False)
+						next
+						next
+						next
+						next
+					else
+						is_parsed := False
+						report_error ("JSON is not well formed in parse")
+						Result := Void
+					end
+				end
+			end
+		ensure
+			is_parsed_implies_result_not_void: is_parsed implies Result /= Void
+		end
+
+	parse_object: JSON_OBJECT
+			-- object
+			-- {}
+			-- {"key" : "value" [,]}
+		local
+			has_more: BOOLEAN
+			l_json_string: detachable JSON_STRING
+			l_value: detachable JSON_VALUE
+		do
+			create Result.make
+			-- check if is an empty object {}
+			next
+			skip_white_spaces
+			if actual = j_OBJECT_CLOSE then
+				--is an empty object
+			else
+				-- a complex object {"key" : "value"}
+				previous
+				from has_more := True until not has_more loop
+					next
+					skip_white_spaces
+					l_json_string := parse_string
+					next
+					skip_white_spaces
+					if actual = ':' then
+						next
+						skip_white_spaces
+					else
+						is_parsed := False
+						report_error ("%N Input string is a not well formed JSON, expected: : found: " + actual.out)
+						has_more := False
+					end
+
+					l_value := parse
+					if is_parsed and then (l_value /= Void and l_json_string /= Void) then
+						Result.put (l_value, l_json_string)
+						next
+						skip_white_spaces
+						if actual = j_OBJECT_CLOSE then
+							has_more := False
+						elseif actual /= ',' then
+							has_more := False
+							is_parsed := False
+							report_error ("JSON Object syntactically malformed expected , found: [" + actual.out + "]")
+						end
+					else
+						has_more := False
+						-- explain the error
+					end
+				end
+			end
+		end
+
+	parse_string: detachable JSON_STRING
+			-- Parsed string
+		local
+			has_more: BOOLEAN
+			l_json_string: STRING
+			l_unicode: STRING
+			c: like actual
+		do
+			create l_json_string.make_empty
+			if actual = j_STRING then
+				from
+					has_more := True
+				until
+					not has_more
+				loop
+					next
+					c := actual
+					if c = j_STRING then
+						has_more := False
+					elseif c = '%H' then
+						next
+						c := actual
+						if c = 'u' then
+							create l_unicode.make_from_string ("\u")
+							l_unicode.append (read_unicode)
+							c := actual
+							if is_valid_unicode (l_unicode) then
+								l_json_string.append (l_unicode)
+							else
+								has_more := False
+								is_parsed := False
+								report_error ("Input String is not well formed JSON, expected a Unicode value, found [" + c.out + " ]")
+							end
+						elseif (not is_special_character (c) and not is_special_control (c)) or c = '%N' then
+							has_more := False
+							is_parsed := False
+							report_error ("Input String is not well formed JSON, found [" + c.out + " ]")
+						else
+							l_json_string.append_character ('\')
+							l_json_string.append_character (c)
+						end
+					else
+						if is_special_character (c) and c /= '/' then
+							has_more := False
+							is_parsed := False
+							report_error ("Input String is not well formed JSON, found [" + c.out + " ]")
+						else
+							l_json_string.append_character (c)
+						end
+					end
+				end
+				create Result.make_with_escaped_json (l_json_string)
+			else
+				Result := Void
+			end
+		end
+
+	parse_array: JSON_ARRAY
+			-- array
+			-- []
+			-- [elements [,]]
+		local
+			flag: BOOLEAN
+			l_value: detachable JSON_VALUE
+			c: like actual
+		do
+			create Result.make_array
+			--check if is an empty array []
+			next
+			skip_white_spaces
+			if actual = j_array_close then
+				--is an empty array
+			else
+				previous
+				from
+					flag := True
+				until
+					not flag
+				loop
+					next
+					skip_white_spaces
+					l_value := parse
+					if is_parsed and then l_value /= Void then
+						Result.add (l_value)
+						next
+						skip_white_spaces
+						c := actual
+						if c = j_ARRAY_CLOSE then
+							flag := False
+ 						elseif c /= ',' then
+							flag := False
+							is_parsed := False
+							report_error ("Array is not well formed JSON,  found [" + c.out + " ]")
+						end
+					else
+						flag := False
+						report_error ("Array is not well formed JSON,  found [" + actual.out + " ]")
+					end
+				end
+			end
+		end
+
+	parse_number: detachable JSON_NUMBER
+			-- Parsed number
+		local
+			sb: STRING
+			flag: BOOLEAN
+			is_integer: BOOLEAN
+			c: like actual
+		do
+			create sb.make_empty
+			sb.append_character (actual)
+
+			from
+				flag := True
+			until
+				not flag
+			loop
+				next
+				c := actual
+				if not has_next or is_close_token (c)
+					or c = ',' or c = '%N' or c = '%R'
+				then
+					flag := False
+					previous
+				else
+					sb.append_character (c)
+				end
+			end
+
+			if is_valid_number (sb) then
+				if sb.is_integer then
+					create Result.make_integer (sb.to_integer)
+					is_integer := True
+				elseif sb.is_double and not is_integer then
+					create Result.make_real (sb.to_double)
+				end
+			else
+				is_parsed := False
+				report_error ("Expected a number, found: [ " + sb  + " ]")
+			end
+		end
+
+	is_null: BOOLEAN
+			-- Word at index represents null?
+		local
+			l_null: STRING
+			l_string: STRING
+		do
+			l_null := null_id
+			l_string := json_substring (index,index + l_null.count - 1)
+			if l_string.is_equal (l_null) then
+				Result := True
+			end
+		end
+
+	is_false: BOOLEAN
+			-- Word at index represents false?
+		local
+			l_false: STRING
+			l_string: STRING
+		do
+			l_false := false_id
+			l_string := json_substring (index, index + l_false.count - 1)
+			if l_string.is_equal (l_false) then
+				Result := True
+			end
+		end
+
+	is_true: BOOLEAN
+			-- Word at index represents true?
+		local
+			l_true: STRING
+			l_string: STRING
+		do
+			l_true := true_id
+			l_string := json_substring (index,index + l_true.count - 1)
+			if l_string.is_equal (l_true) then
+				Result := True
+			end
+		end
+
+	read_unicode: STRING
+			-- Read unicode and return value
+		local
+			i: INTEGER
+		do
+			create Result.make_empty
+			from
+				i := 1
+			until
+				i > 4 or not has_next
+			loop
+				next
+				Result.append_character (actual)
+				i := i + 1
+			end
+		end
+
+feature {NONE} -- Implementation
+
+	is_valid_number (a_number: STRING): BOOLEAN
+            -- is 'a_number' a valid number based on this regular expression
+            -- "-?(?: 0|[1-9]\d+)(?: \.\d+)?(?: [eE][+-]?\d+)?\b"?
+		local
+			s: detachable STRING
+			c: CHARACTER
+			i,n: INTEGER
+		do
+			create s.make_empty
+			n := a_number.count
+			if n = 0 then
+				Result := False
+			else
+				Result := True
+				i := 1
+				--| "-?"
+				c := a_number[i]
+				if c = '-' then
+					s.extend (c); i := i + 1; c := a_number[i]
+				end
+				--| "0|[1-9]\d*
+				if c.is_digit then
+					if c = '0' then
+						--| "0"
+						s.extend (c); i := i + 1; c := a_number[i]
+					else
+						--| "[1-9]"
+						s.extend (c); i := i + 1; c := a_number[i]
+						--| "\d*"
+						from until i > n or not c.is_digit loop
+							s.extend (c); i := i + 1; c := a_number[i]
+						end
+					end
+				end
+			end
+			if Result then
+					--| "(\.\d+)?"			
+				if c = '.' then
+					--| "\.\d+"  =  "\.\d\d*"
+					s.extend (c); i := i + 1; c := a_number[i]
+					if c.is_digit then
+						from until i > n or not c.is_digit loop
+							s.extend (c); i := i + 1; c := a_number[i]
+						end
+					else
+						Result := False --| expecting digit
+					end
+				end
+			end
+			if Result then --| "(?:[eE][+-]?\d+)?\b"
+				if c = 'e' or c = 'E' then
+					--| "[eE][+-]?\d+"
+					s.extend (c); i := i + 1; c := a_number[i]
+					if c = '+' or c = '-' then
+ 							s.extend (c); i := i + 1; c := a_number[i]
+					end
+					if c.is_digit then
+						from until i > n or not c.is_digit loop
+							s.extend (c); i := i + 1; c := a_number[i]
+						end
+					else
+						Result := False --| expecting digit							
+					end
+				end
+			end
+			if Result then --| "\b"
+				from until i > n or not c.is_space loop
+					s.extend (c); i := i + 1; c := a_number[i]
+				end
+				Result := i > n and then s.same_string (a_number)
+			end
+		end
+
+	is_valid_unicode (a_unicode: STRING): BOOLEAN
+			-- is 'a_unicode' a valid unicode based on this regular expression
+			-- "\\u[0-9a-fA-F]{4}"
+		local
+			i: INTEGER
+		do
+			if
+				a_unicode.count = 6 and then
+				a_unicode[1] = '\' and then
+				a_unicode[2] = 'u'
+			then
+				from
+					Result := True
+					i := 3
+				until
+					i > 6 or Result = False
+				loop
+					inspect a_unicode[i]
+					when '0'..'9', 'a'..'f', 'A'..'F'  then
+					else
+						Result := False
+					end
+					i := i + 1
+				end
+			end
+		end
+
+	extra_elements: BOOLEAN
+			-- has more elements?
+		local
+			c: like actual
+		do
+			if has_next then
+				next
+			end
+			from
+				c := actual
+			until
+				c /= ' ' or c /= '%R' or c /= '%U' or c /= '%T' or c /= '%N' or not has_next
+			loop
+				next
+			end
+			Result := has_next
+		end
+
+	is_valid_start_symbol : BOOLEAN
+			-- expecting `{' or `[' as start symbol
+		do
+			if attached representation as s and then s.count > 0 then
+				Result := s[1] = '{' or s[1] = '['
+			end
+		end
+
+feature {NONE} -- Constants
+
+	false_id: STRING = "false"
+
+	true_id: STRING = "true"
+
+	null_id: STRING = "null"
+
+
+end

contrib/library/text/parser/json/library/kernel/scanner/json_reader.e

@@ -1,127 +1,118 @@
-note
-	description: "Objects that ..."
-	author: "jvelilla"
-	date: "2008/08/24"
-	revision: "0.1"
-
-class
-	JSON_READER
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	make (a_json: STRING)
-			-- Initialize Reader
-		do
-			set_representation (a_json)
-		end
-
-feature -- Commands
-
-	reset
-			-- Reset reader
-		do
-			index := 1
-		end
-
-	set_representation (a_json: STRING)
-			-- Set `representation'.
-		do
-			a_json.left_adjust
-			a_json.right_adjust
-			representation := a_json
-			reset
-		end
-
-	read: CHARACTER
-			-- Read character
-		do
-			if not representation.is_empty then
-				Result := representation.item (index)
-			end
-		end
-
-	next
-			-- Move to next index
-		require
-			has_more_elements: has_next
-		do
-			index := index + 1
-		ensure
-			incremented: old index + 1 = index
-		end
-
-	previous
-			-- Move to previous index
-		require
-			not_is_first: has_previous
-		do
-			index := index - 1
-		ensure
-			incremented: old index - 1 = index
-		end
-
-	skip_white_spaces
-			-- Remove white spaces
-		local
-			c: like actual
-		do
-			from
-				c := actual
-			until
-				(c /= ' ' and c /= '%N' and c /= '%R' and c /= '%U' and c /= '%T') or not has_next
-			loop
-				next
-				c := actual
-			end
-		end
-
-	json_substring (start_index, end_index: INTEGER_32): STRING
-			-- JSON representation between `start_index' and `end_index'
-		do
-			Result := representation.substring (start_index, end_index)
-		end
-
-feature -- Status report
-
-	has_next: BOOLEAN
-			-- Has a next character?
-		do
-			Result := index <= representation.count
-		end
-
-	has_previous: BOOLEAN
-			-- Has a previous character?
-		do
-			Result := index >= 1
-		end
-
-feature -- Access
-
-	representation: STRING
-			-- Serialized representation of the original JSON string
-
-feature {NONE} -- Implementation
-
-	actual: CHARACTER
-			-- Current character or '%U' if none
-		do
-			if index > representation.count then
-				Result := '%U'
-			else
-				Result := representation.item (index)
-			end
-		end
-
-	index: INTEGER
-			-- Actual index
-
-invariant
-	representation_not_void: representation /= Void
-
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
-end
+note
+	description: "Objects that ..."
+	author: "jvelilla"
+	date: "2008/08/24"
+	revision: "0.1"
+
+class
+	JSON_READER
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+    make (a_json: STRING)
+            -- Initialize Reader
+        do
+            set_representation (a_json)
+        end
+
+feature -- Commands
+
+	 set_representation (a_json: STRING)
+            -- Set `representation'.
+        do
+        	a_json.left_adjust
+        	a_json.right_adjust
+			representation := a_json
+            index := 1
+        end
+
+	read: CHARACTER
+			-- Read character
+		do
+			if not representation.is_empty then
+				Result := representation.item (index)
+			end
+		end
+
+	next
+			-- Move to next index
+		require
+			has_more_elements: has_next
+		do
+			index := index + 1
+		ensure
+			incremented: old index + 1 = index
+		end
+
+	previous
+			-- Move to previous index
+		require
+			not_is_first: has_previous
+		do
+			index := index - 1
+		ensure
+			incremented: old index - 1 = index
+		end
+
+	skip_white_spaces
+			-- Remove white spaces
+		local
+			c: like actual
+		do
+			from
+				c := actual
+			until
+				(c /= ' ' and c /= '%N' and c /= '%R' and c /= '%U' and c /= '%T' ) or not has_next
+			loop
+				next
+				c := actual
+			end
+		end
+
+	json_substring (start_index, end_index: INTEGER_32): STRING
+			-- JSON representation between `start_index' and `end_index'
+		do
+			Result := representation.substring (start_index, end_index)
+		end
+
+feature -- Status report
+
+	has_next: BOOLEAN
+			-- Has a next character?
+		do
+			Result := index <= representation.count
+		end
+
+	has_previous: BOOLEAN
+			-- Has a previous character?
+		do
+			Result := index >= 1
+		end
+
+feature -- Access
+
+	representation: STRING
+			-- Serialized representation of the original JSON string
+
+feature {NONE} -- Implementation
+
+	actual: CHARACTER
+			-- Current character or '%U' if none
+		do
+			if index > representation.count then
+				Result := '%U'
+			else
+				Result := representation.item (index)
+			end
+		end
+
+	index: INTEGER
+			-- Actual index
+
+invariant
+	representation_not_void: representation /= Void
+
+end

contrib/library/text/parser/json/library/kernel/scanner/json_tokens.e

@@ -0,0 +1,77 @@
+note
+	description: ""
+	author: "jvelilla"
+	date: "2008/08/24"
+	revision: "0.1"
+
+class
+	JSON_TOKENS
+
+feature -- Access
+
+	j_OBJECT_OPEN: CHARACTER = '{'
+	j_ARRAY_OPEN: CHARACTER = '['
+	j_OBJECT_CLOSE: CHARACTER = '}'
+	j_ARRAY_CLOSE: CHARACTER = ']'
+
+	j_STRING: CHARACTER = '"'
+	j_PLUS: CHARACTER = '+'
+	j_MINUS: CHARACTER = '-'
+	j_DOT: CHARACTER = '.'
+
+feature -- Status report
+
+	is_open_token (c: CHARACTER): BOOLEAN
+			-- Characters which open a type	
+		do
+			inspect c
+			when j_OBJECT_OPEN, j_ARRAY_OPEN, j_STRING, j_PLUS, j_MINUS, j_DOT then
+				Result := True
+			else
+
+			end
+		end
+
+	is_close_token (c: CHARACTER): BOOLEAN
+			-- Characters which close a type	
+		do
+			inspect c
+			when j_OBJECT_CLOSE, j_ARRAY_CLOSE, j_STRING then
+				Result := True
+			else
+
+			end
+		end
+
+	is_special_character (c: CHARACTER): BOOLEAN
+			-- Control Characters
+			-- 	%F  	Form feed
+			-- 	%H  	backslasH
+			--  %N  	Newline
+			--  %R  	carriage Return
+			--  %T  	horizontal Tab
+			--  %B  	Backspace
+		    --  /       Solidus
+		    --  "       Quotation	
+		do
+			inspect c
+			when '%F', '%H', '%N', '%R', '%T', '%B', '/', '"' then
+				Result := True
+			else
+
+			end
+		end
+
+   is_special_control (c: CHARACTER): BOOLEAN
+           --Control Characters
+           -- \b\f\n\r\t
+		do
+			inspect c
+			when 'b', 'f', 'n', 'r', 't' then
+				Result := True
+			else
+
+			end
+		end
+
+end

contrib/library/text/parser/json/library/kernel/shared_ejson.e

@@ -0,0 +1,38 @@
+note
+    description: "[
+				Shared factory class for creating JSON objects. Maps JSON
+				objects to ELKS HASH_TABLEs and JSON arrays to ELKS
+				LINKED_LISTs. Use non-conforming inheritance from this 
+				class to ensure that your classes share the same 
+				JSON_FACTORY instance.
+		  ]"
+    author: "Paul Cohen"
+    date: "$Date$"
+    revision: "$Revision: 89185 $"
+    file: "$HeadURL: $"
+
+class SHARED_EJSON
+
+feature
+
+    json: EJSON
+            -- A shared EJSON instance with default converters for
+            --LINKED_LIST [ANY] and HASH_TABLE [ANY, HASHABLE]
+        local
+			jalc: JSON_ARRAYED_LIST_CONVERTER
+            jllc: JSON_LINKED_LIST_CONVERTER
+            jhtc: JSON_HASH_TABLE_CONVERTER
+        once
+            create Result
+
+            create jalc.make
+            Result.add_converter (jalc)
+
+            create jllc.make
+            Result.add_converter (jllc)
+
+            create jhtc.make
+            Result.add_converter (jhtc)
+        end
+        
+end -- class SHARED_EJSON

contrib/library/text/parser/json/library/license.lic

@@ -1,4 +0,0 @@
-${NOTE_KEYWORD}
-	copyright: "2010-${YEAR}, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
-

contrib/library/text/parser/json/library/parser/json_parser.e

@@ -1,679 +0,0 @@
-note
-	description: "Parse serialized JSON data"
-	author: "$Author$"
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	JSON_PARSER
-
-inherit
-	JSON_READER
-		rename
-			make as make_reader,
-			reset as reset_reader
-		end
-
-	JSON_TOKENS
-
-create
-	make_with_string,
-	make_parser
-
-feature {NONE} -- Initialize
-
-	make_with_string (a_content: STRING)
-			-- Initialize parser with JSON content `a_content'.
-		require
-			a_content_not_empty: a_content /= Void and then not a_content.is_empty
-		do
-			create errors.make
-			make_reader (a_content)
-			reset
-		end
-
-	make_parser (a_json: STRING)
-			-- Initialize.
-		obsolete
-			"Use `make_with_string' [sept/2014]."
-		do
-			make_with_string (a_json)
-		end
-
-feature -- Status report
-
-	is_parsed: BOOLEAN
-			-- Is parsed ?
-
-	is_valid: BOOLEAN
-			-- Is valid?
-		do
-			Result := not has_error
-		end
-
-	has_error: BOOLEAN
-			-- Has error?
-
-	errors: LINKED_LIST [STRING]
-			-- Current errors
-
-	errors_as_string: STRING
-			-- String representation of `errors'.
-		do
-			create Result.make_empty
-			across
-				errors as ic
-			loop
-				Result.append_string (ic.item)
-				Result.append_character ('%N')
-			end
-		end
-
-	current_errors: STRING
-			-- Current errors as string
-		obsolete
-			"USe errors_as_string [sept/2014]"
-		do
-			Result := errors_as_string
-		end
-
-feature -- Access
-
-	parsed_json_value: detachable JSON_VALUE
-			-- Parsed json value if any.
-		require
-			is_parsed: is_parsed
-		attribute
-		ensure
-			attached_result_if_valid: is_valid implies Result /= Void
-		end
-
-	parsed_json_object: detachable JSON_OBJECT
-			-- parsed json value as a JSON_OBJECT if it is an object.
-		require
-			is_parsed: is_parsed
-		do
-			if attached {JSON_OBJECT} parsed_json_value as j_object then
-				Result := j_object
-			end
-		end
-
-	parsed_json_array: detachable JSON_ARRAY
-			-- parsed json value as a JSON_OBJECT if it is an array.
-		require
-			is_parsed: is_parsed
-		do
-			if attached {JSON_ARRAY} parsed_json_value as j_array then
-				Result := j_array
-			end
-		end
-
-feature -- Commands
-
-	reset
-			-- Reset parsing values.
-		do
-			parsed_json_value := Void
-			errors.wipe_out
-			has_error := False
-			is_parsed := False
-		end
-
-	parse_content
-			-- Parse JSON content `representation'.
-			-- start ::= object | array
-		do
-			reset
-			reset_reader
-
-			if is_valid_start_symbol then
-				parsed_json_value := next_json_value
-				if extra_elements then
-					report_error ("Remaining element outside the main json value!")
-				end
-			else
-				report_error ("Syntax error unexpected token, expecting `{' or `['")
-			end
-			is_parsed := is_valid
-		end
-
-
-feature -- Element change
-
-	report_error (e: STRING)
-			-- Report error `e'
-		require
-			e_not_void: e /= Void
-		do
-			has_error := True
-			errors.force (e)
-		ensure
-			has_error: has_error
-			is_not_valid: not is_valid
-		end
-
-feature -- Obsolete commands		
-
-	parse_json: detachable JSON_VALUE
-			-- Parse JSON data `representation'
-			-- start ::= object | array
-		obsolete
-			"Use `parse_content' and `parsed_json_value'  [sept/2014]."
-		do
-			parse_content
-			if is_parsed then
-				Result := parsed_json_value
-			end
-		end
-
-	parse_object: detachable JSON_OBJECT
-			-- Parse JSON data `representation'
-			-- start ::= object | array
-		obsolete
-			"Use `parse_content' and `parsed_json_value'  [nov/2014]."
-		do
-			parse_content
-			if is_parsed and then attached {JSON_OBJECT} parsed_json_value as jo then
-				Result := jo
-			end
-		end
-
-	parse: detachable JSON_VALUE
-			-- Next JSON value from current position on `representation'.
-		obsolete
-			"Use restricted `next_parsed_json_value' [sept/2014]."
-		do
-			Result := next_parsed_json_value
-			is_parsed := is_valid
-		end
-
-feature {JSON_PARSER_ACCESS} -- Obsolete commands: restricted area		
-
-	next_parsed_json_value: detachable JSON_VALUE
-			-- Return next json value from current position.
-			--| this does not call `reset_reader'.
-		do
-			reset
-			Result := next_json_value
-		end
-
-feature {NONE} -- Implementation: parsing
-
-	next_json_value: detachable JSON_VALUE
-			-- Next JSON value from current position on `representation'.
-		local
-			c: CHARACTER
-		do
-			if not has_error then
-				skip_white_spaces
-				c := actual
-				inspect c
-				when token_object_open then
-					Result := next_json_object
-				when token_double_quote then
-					Result := parse_string
-				when token_array_open then
-					Result := parse_array
-				else
-					if c.is_digit or c = token_minus then
-						Result := parse_number
-					elseif is_null then
-						Result := create {JSON_NULL}
-						next
-						next
-						next
-					elseif is_true then
-						Result := create {JSON_BOOLEAN}.make_true
-						next
-						next
-						next
-					elseif is_false then
-						Result := create {JSON_BOOLEAN}.make_false
-						next
-						next
-						next
-						next
-					else
-						report_error ("JSON is not well formed in parse")
-						Result := Void
-					end
-				end
-			end
-		ensure
-			is_parsed_implies_result_not_void: not has_error implies Result /= Void
-		end
-
-	next_json_object: JSON_OBJECT
-			-- object
-			-- {}
-			-- {"key" : "value" [,]}
-		local
-			has_more: BOOLEAN
-			l_json_string: detachable JSON_STRING
-			l_value: detachable JSON_VALUE
-		do
-			create Result.make
-				--| check if is an empty object {}
-			next
-			skip_white_spaces
-			if actual = token_object_close then
-					--| is an empty object
-			else
-					--| a complex object {"key" : "value"}
-				previous
-				from
-					has_more := True
-				until
-					not has_more
-				loop
-					next
-					skip_white_spaces
-					l_json_string := parse_string
-					next
-					skip_white_spaces
-					if actual = token_colon then --| token_colon = ':'
-						next
-						skip_white_spaces
-					else
-						report_error ("%N Input string is a not well formed JSON, expected: : found: " + actual.out)
-						has_more := False
-					end
-					l_value := next_json_value
-					if not has_error and then (l_value /= Void and l_json_string /= Void) then
-						Result.put (l_value, l_json_string)
-						next
-						skip_white_spaces
-						if actual = token_object_close then
-							has_more := False
-						elseif actual /= token_comma then
-							has_more := False
-							report_error ("JSON Object syntactically malformed expected , found: [" + actual.out + "]")
-						end
-					else
-						has_more := False
-							-- explain the error
-					end
-				end
-			end
-		end
-
-	parse_string: detachable JSON_STRING
-			-- Parsed string
-		local
-			has_more: BOOLEAN
-			l_json_string: STRING
-			l_unicode: STRING
-			c: like actual
-		do
-			create l_json_string.make_empty
-			if actual = token_double_quote then
-				from
-					has_more := True
-				until
-					not has_more
-				loop
-					next
-					c := actual
-					if c = token_double_quote then
-						has_more := False
-					elseif c = '%H' then -- '%H' = '\' = reverse solidus
-						next
-						c := actual
-						if c = 'u' then
-							create l_unicode.make_from_string ("\u")
-							l_unicode.append (read_unicode)
-							c := actual
-							if is_valid_unicode (l_unicode) then
-								l_json_string.append (l_unicode)
-							else
-								has_more := False
-								report_error ("Input String is not well formed JSON, expected a Unicode value, found [" + c.out + " ]")
-							end
-						elseif (not is_special_character (c) and not is_special_control (c)) or c = '%N' then
-							has_more := False
-							report_error ("Input String is not well formed JSON, found [" + c.out + " ]")
-						else
-							l_json_string.append_character ('\')
-							l_json_string.append_character (c)
-						end
-					else
-						if is_special_character (c) and c /= '/' then
-							has_more := False
-							report_error ("Input String is not well formed JSON, found [" + c.out + " ]")
-						else
-							l_json_string.append_character (c)
-						end
-					end
-				end
-				create Result.make_from_escaped_json_string (l_json_string)
-			else
-				Result := Void
-			end
-		end
-
-	parse_array: JSON_ARRAY
-			-- array
-			-- []
-			-- [elements [,]]
-		local
-			flag: BOOLEAN
-			l_value: detachable JSON_VALUE
-			c: like actual
-		do
-			create Result.make_empty
-				-- check if is an empty array []
-			next
-			skip_white_spaces
-			if actual = token_array_close then
-					-- is an empty array
-			else
-				previous
-				from
-					flag := True
-				until
-					not flag
-				loop
-					next
-					skip_white_spaces
-					l_value := next_json_value
-					if not has_error and then l_value /= Void then
-						Result.add (l_value)
-						next
-						skip_white_spaces
-						c := actual
-						if c = token_array_close then
-							flag := False
-						elseif c /= token_comma then
-							flag := False
-							report_error ("Array is not well formed JSON,  found [" + c.out + " ]")
-						end
-					else
-						flag := False
-						report_error ("Array is not well formed JSON,  found [" + actual.out + " ]")
-					end
-				end
-			end
-		end
-
-	parse_number: detachable JSON_NUMBER
-			-- Parsed number
-		local
-			sb: STRING
-			flag: BOOLEAN
-			is_integer: BOOLEAN
-			c: like actual
-		do
-			create sb.make_empty
-			sb.append_character (actual)
-			from
-				flag := True
-			until
-				not flag
-			loop
-				next
-				c := actual
-				if not has_next or is_close_token (c) or c = token_comma or c = '%N' or c = '%R' then
-					flag := False
-					previous
-				else
-					sb.append_character (c)
-				end
-			end
-			if is_valid_number (sb) then
-				if sb.is_integer then
-					create Result.make_integer (sb.to_integer)
-					is_integer := True
-				elseif sb.is_double and not is_integer then
-					create Result.make_real (sb.to_double)
-				end
-			else
-				report_error ("Expected a number, found: [ " + sb + " ]")
-			end
-		end
-
-	is_null: BOOLEAN
-			-- Word at index represents null?
-		local
-			l_null: STRING
-			l_string: STRING
-		do
-			l_null := null_id
-			l_string := json_substring (index, index + l_null.count - 1)
-			if l_string.is_equal (l_null) then
-				Result := True
-			end
-		end
-
-	is_false: BOOLEAN
-			-- Word at index represents false?
-		local
-			l_false: STRING
-			l_string: STRING
-		do
-			l_false := false_id
-			l_string := json_substring (index, index + l_false.count - 1)
-			if l_string.is_equal (l_false) then
-				Result := True
-			end
-		end
-
-	is_true: BOOLEAN
-			-- Word at index represents true?
-		local
-			l_true: STRING
-			l_string: STRING
-		do
-			l_true := true_id
-			l_string := json_substring (index, index + l_true.count - 1)
-			if l_string.is_equal (l_true) then
-				Result := True
-			end
-		end
-
-	read_unicode: STRING
-			-- Read unicode and return value.
-		local
-			i: INTEGER
-		do
-			create Result.make_empty
-			from
-				i := 1
-			until
-				i > 4 or not has_next
-			loop
-				next
-				Result.append_character (actual)
-				i := i + 1
-			end
-		end
-
-feature {NONE} -- Implementation
-
-	is_valid_number (a_number: STRING): BOOLEAN
-			-- is 'a_number' a valid number based on this regular expression
-			-- "-?(?: 0|[1-9]\d+)(?: \.\d+)?(?: [eE][+-]?\d+)?\b"?
-		local
-			s: detachable STRING
-			c: CHARACTER
-			i, n: INTEGER
-		do
-			create s.make_empty
-			n := a_number.count
-			if n = 0 then
-				Result := False
-			else
-				Result := True
-				i := 1
-					--| "-?"
-				c := a_number [i]
-				if c = token_minus then
-					s.extend (c)
-					i := i + 1
-					if i > n then
-						Result := False
-					else
-						c := a_number [i]
-					end
-				end
-					--| "0|[1-9]\d*
-				if Result and c.is_digit then
-					if c = '0' then
-							--| "0"
-						s.extend (c)
-						i := i + 1
-						if i <= n then
-							c := a_number [i]
-						end
-					else
-							--| "[1-9]"
-						s.extend (c)
-
-							--| "\d*"
-						i := i + 1
-						if i <= n then
-							c := a_number [i]
-							from
-							until
-								i > n or not c.is_digit
-							loop
-								s.extend (c)
-								i := i + 1
-								if i <= n then
-									c := a_number [i]
-								end
-							end
-						end
-					end
-				end
-			end
-			if i > n then
-					-- Exit
-			else
-				if Result then
-						--| "(\.\d+)?"
-					if c = token_dot then
-							--| "\.\d+"  =  "\.\d\d*"
-						s.extend (c)
-						i := i + 1
-						c := a_number [i]
-						if c.is_digit then
-							from
-							until
-								i > n or not c.is_digit
-							loop
-								s.extend (c)
-								i := i + 1
-								if i <= n then
-									c := a_number [i]
-								end
-							end
-						else
-							Result := False --| expecting digit
-						end
-					end
-				end
-				if Result then --| "(?:[eE][+-]?\d+)?\b"
-					if is_exp_token (c) then
-							--| "[eE][+-]?\d+"
-						s.extend (c)
-						i := i + 1
-						c := a_number [i]
-						if c = token_plus or c = token_minus then
-							s.extend (c)
-							i := i + 1
-							if i <= n then
-								c := a_number [i]
-							end
-						end
-						if c.is_digit then
-							from
-							until
-								i > n or not c.is_digit
-							loop
-								s.extend (c)
-								i := i + 1
-								if i <= n then
-									c := a_number [i]
-								end
-							end
-						else
-							Result := False --| expecting digit
-						end
-					end
-				end
-				if Result then --| "\b"
-					from
-					until
-						i > n or not c.is_space
-					loop
-						s.extend (c)
-						i := i + 1
-						if i <= n then
-							c := a_number [i]
-						end
-					end
-					Result := i > n and then s.same_string (a_number)
-				end
-			end
-		end
-
-	is_valid_unicode (a_unicode: STRING): BOOLEAN
-			-- is 'a_unicode' a valid unicode based on the regular expression "\\u[0-9a-fA-F]{4}" .
-		local
-			i: INTEGER
-		do
-			if a_unicode.count = 6 and then a_unicode [1] = '\' and then a_unicode [2] = 'u' then
-				from
-					Result := True
-					i := 3
-				until
-					i > 6 or Result = False
-				loop
-					inspect a_unicode [i]
-					when '0'..'9', 'a'..'f', 'A'..'F' then
-					else
-						Result := False
-					end
-					i := i + 1
-				end
-			end
-		end
-
-	extra_elements: BOOLEAN
-			-- has more elements?
-		local
-			c: like actual
-		do
-			if has_next then
-				next
-			end
-			from
-				c := actual
-			until
-				c /= ' ' or c /= '%R' or c /= '%U' or c /= '%T' or c /= '%N' or not has_next
-			loop
-				next
-			end
-			Result := has_next
-		end
-
-	is_valid_start_symbol: BOOLEAN
-			-- expecting `{' or `[' as start symbol
-		do
-			if attached representation as s and then s.count > 0 then
-				Result := s [1] = token_object_open or s [1] = token_array_open
-			end
-		end
-
-feature {NONE} -- Constants
-
-	false_id: STRING = "false"
-
-	true_id: STRING = "true"
-
-	null_id: STRING = "null"
-
-note
-	copyright: "2010-2015, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
-end

contrib/library/text/parser/json/library/parser/json_parser_access.e

@@ -1,12 +0,0 @@
-note
-	description: "Inherit to access restricted feature from {JSON_PARSER}."
-	date: "$Date$"
-	revision: "$Revision$"
-
-deferred class
-	JSON_PARSER_ACCESS
-
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
-end

contrib/library/text/parser/json/library/parser/json_tokens.e

@@ -1,90 +0,0 @@
-note
-	description: "Token used by the JSON_PARSER"
-	author: "$Author$"
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	JSON_TOKENS
-
-feature -- Access
-
-	token_object_open: CHARACTER = '{'
-	token_object_close: CHARACTER = '}'
-
-	token_array_open: CHARACTER = '['
-	token_array_close: CHARACTER = ']'
-
-	token_double_quote: CHARACTER = '"'
-	token_plus: CHARACTER = '+'
-	token_minus: CHARACTER = '-'
-	token_dot: CHARACTER = '.'
-	token_exp: CHARACTER = 'e'
-	token_comma: CHARACTER = ','
-	token_colon: CHARACTER = ':'
-
-feature -- Status report
-
-	is_open_token (c: CHARACTER): BOOLEAN
-			-- Characters which open a type	
-		do
-			inspect c
-			when token_object_open, token_array_open, token_double_quote, token_plus, token_minus, token_dot then
-				Result := True
-			else
-
-			end
-		end
-
-	is_close_token (c: CHARACTER): BOOLEAN
-			-- Characters which close a type	
-		do
-			inspect c
-			when token_object_close, token_array_close, token_double_quote then
-				Result := True
-			else
-
-			end
-		end
-
-	is_special_character (c: CHARACTER): BOOLEAN
-			-- Control Characters
-			-- 	%F  	Form feed
-			-- 	%H  	backslasH
-			--  %N  	Newline
-			--  %R  	carriage Return
-			--  %T  	horizontal Tab
-			--  %B  	Backspace
-		    --  /       Solidus
-		    --  "       Quotation	
-		do
-			inspect c
-			when '"', '%H' , '/', '%B', '%F', '%N', '%R', '%T' then -- '%H' = '\' =  reverse solidus
-				Result := True
-			else
-
-			end
-		end
-
-   is_special_control (c: CHARACTER): BOOLEAN
-           -- Control Characters
-           -- \b\f\n\r\t
-		do
-			inspect c
-			when 'b', 'f', 'n', 'r', 't' then
-				Result := True
-			else
-
-			end
-		end
-
-	is_exp_token (c: CHARACTER): BOOLEAN
-			-- Is number exposant token?
-		do
-			Result := c = token_exp or else c.as_lower = token_exp
-		end
-
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
-end

contrib/library/text/parser/json/library/utility/file/json_file_reader.e

@@ -1,49 +0,0 @@
-note
-	description: "Objects that ..."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	JSON_FILE_READER
-
-feature -- Access
-
-	read_json_from (a_path: READABLE_STRING_GENERAL): detachable STRING
-		local
-			l_file: PLAIN_TEXT_FILE
-			l_last_string: detachable STRING
-			l_file_count: INTEGER
-			l_fetch_done: BOOLEAN
-		do
-			create l_file.make_with_name (a_path)
-				-- We perform several checks until we make a real attempt to open the file.
-			if not l_file.exists then
-				print ("error: '" + a_path.out + "' does not exist%N") -- FIXME: unicode may be truncated
-			else
-				if not l_file.is_readable then
-					print ("error: '" + a_path.out + "' is not readable.%N") -- FIXME: unicode may be truncated
-				else
-					l_file_count := l_file.count
-					l_file.open_read
-					from
-						create Result.make (l_file_count)
-					until
-						l_fetch_done
-					loop
-						l_file.read_stream (1_024)
-						l_last_string := l_file.last_string
-						l_fetch_done := l_file.exhausted or l_file.end_of_file or l_last_string.count < 1_024
-						if not l_last_string.is_empty then
-							Result.append (l_last_string)
-						end
-					end
-					l_file.close
-				end
-			end
-		end
-
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
-end

contrib/library/text/parser/json/library/utility/visitor/json_iterator.e

@@ -1,61 +0,0 @@
-note
-	description: "JSON Iterator"
-	pattern: "Iterator visitor"
-	author: "Jocelyn Fiat"
-	license: "MIT (see http://www.opensource.org/licenses/mit-license.php)"
-	date: "2013/08/01"
-	revision: "Revision 0.1"
-
-deferred class
-	JSON_ITERATOR
-
-inherit
-
-	JSON_VISITOR
-
-feature -- Visitor Pattern
-
-	visit_json_array (a_json_array: JSON_ARRAY)
-			-- Visit `a_json_array'.
-		do
-			across
-				a_json_array as c
-			loop
-				c.item.accept (Current)
-			end
-		end
-
-	visit_json_boolean (a_json_boolean: JSON_BOOLEAN)
-			-- Visit `a_json_boolean'.
-		do
-		end
-
-	visit_json_null (a_json_null: JSON_NULL)
-			-- Visit `a_json_null'.
-		do
-		end
-
-	visit_json_number (a_json_number: JSON_NUMBER)
-			-- Visit `a_json_number'.
-		do
-		end
-
-	visit_json_object (a_json_object: JSON_OBJECT)
-			-- Visit `a_json_object'.
-		do
-			across
-				a_json_object as c
-			loop
-				c.item.accept (Current)
-			end
-		end
-
-	visit_json_string (a_json_string: JSON_STRING)
-			-- Visit `a_json_string'.
-		do
-		end
-
-note
-	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
-	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
-end

contrib/library/text/parser/json/package.iron

@@ -1,16 +0,0 @@
-package json
-
-project
-	json_safe = "library/json-safe.ecf"
-	json = "library/json.ecf"
-	json_gobo_extension = "library/json_gobo_extension.ecf"
-
-note
-	title: Eiffel JSON
-	description: Eiffel JSON parser and visitors
-	tags: json,parser,text
-	license: MIT
-	copyright: Copyright (c)  2010-2014 Javier Velilla, Jocelyn Fiat and others,
-	link[github]: "project" https://github.com/eiffelhub/json
-
-end

contrib/library/text/parser/json/test/autotest/test_suite/application.e

@@ -1,13 +1,12 @@
 note
-	description: "test_suite application root class"
-	date: "$Date$"
-	revision: "$Revision$"
+	description : "test_suite application root class"
+	date        : "$Date$"
+	revision    : "$Revision$"
 
 class
 	APPLICATION
 
 inherit
-
 	ARGUMENTS
 
 create
@@ -18,7 +17,7 @@ feature {NONE} -- Initialization
 	make
 			-- Run application.
 		do
-				--| Add your code here
+			--| Add your code here
 			print ("Hello Eiffel World!%N")
 		end
 

contrib/library/text/parser/json/test/autotest/test_suite/author.e

@@ -1,32 +1,24 @@
-class
-	AUTHOR
+class AUTHOR
 
 create
-	make
+    make
 
 feature {NONE} -- Initialization
 
-	make (a_name: STRING_32)
-			-- Create an author with `a_name' as `name'.
-		do
-			set_name (a_name)
-		ensure
-			name_set: name = a_name
-		end
+    make (a_name: STRING_32)
+        do
+            set_name (a_name)
+        end
 
 feature -- Access
 
-	name: STRING_32
-			-- Author name
+    name: STRING_32
 
-feature -- Change
+feature -- Status setting
 
-	set_name (a_name: STRING_32)
-			-- Set `name' with `a_name'.
-		do
-			name := a_name
-		ensure
-			name_set: name = a_name
-		end
+    set_name (a_name: STRING_32)
+        do
+            name := a_name
+        end
 
 end -- class AUTHOR

contrib/library/text/parser/json/test/autotest/test_suite/book.e

@@ -1,59 +1,40 @@
-class
-	BOOK
+class BOOK
 
 create
-	make
+    make
 
 feature {NONE} -- Initialization
 
-	make (a_title: STRING_32; a_author: AUTHOR; a_isbn: STRING_32)
-			-- Create a book with `a_title' as `title',
-			-- `a_author' as `author', and `a_isbn' as `isbn'.
-		do
-			set_title (a_title)
-			set_author (a_author)
-			set_isbn (a_isbn)
-		ensure
-			title_set: title = a_title
-			author_set: author = a_author
-			isbn_set: isbn = a_isbn
-		end
+    make (a_title: STRING_32; an_author: AUTHOR; an_isbn: STRING_32)
+        do
+            set_title (a_title)
+            set_author (an_author)
+            set_isbn (an_isbn)
+        end
 
 feature -- Access
 
-	title: STRING_32
-			-- Main title.
+    title: STRING_32
 
-	isbn: STRING_32
-			-- ISBN.
+    isbn: STRING_32
 
-	author: AUTHOR
-			-- Author.
+    author: AUTHOR
 
-feature -- Change
+feature -- Status setting
 
-	set_title (a_title: STRING_32)
-			-- Set `title' with `a_title'.
-		do
-			title := a_title
-		ensure
-			title_set: title = a_title
-		end
+    set_title (a_title: STRING_32)
+        do
+            title := a_title
+        end
 
-	set_author (a_author: AUTHOR)
-			-- Set `author' with `a_author'.
-		do
-			author := a_author
-		ensure
-			author_set: author = a_author
-		end
+    set_author (an_author: AUTHOR)
+        do
+            author := an_author
+        end
 
-	set_isbn (a_isbn: STRING_32)
-			-- Set `isbn' with `a_isbn'.
-		do
-			isbn := a_isbn
-		ensure
-			isbn_set: isbn = a_isbn
-		end
+    set_isbn (an_isbn: STRING_32)
+        do
+            isbn := an_isbn
+        end
 
 end -- class BOOK

contrib/library/text/parser/json/test/autotest/test_suite/book_collection.e

@@ -1,82 +1,80 @@
-class
-	BOOK_COLLECTION
+class BOOK_COLLECTION
 
 create
-	make
+    make
 
 feature {NONE} -- Initialization
 
-	make (a_name: STRING_32)
-			-- Create a book collection with `a_name' as `name'.
-		do
-			set_name (a_name)
-			create book_index.make (10)
-		ensure
-			name_set: name = a_name
-		end
+    make (a_name: STRING_32)
+        do
+            set_name (a_name)
+            create book_index.make (10)
+        end
 
 feature -- Access
 
-	name: STRING_32
-			-- Name.
+    name: STRING_32
 
-	books: LIST [BOOK]
-			-- collection of book.
-		do
-			create {LINKED_LIST [BOOK]} Result.make
-			across
-				book_index as it
-			loop
-				Result.append (it.item)
-			end
-		end
+    books: LIST [BOOK]
+        do
+            from
+                create {LINKED_LIST [BOOK]} Result.make
+				book_index.start
+            until
+                book_index.after
+            loop
+                Result.append (book_index.item_for_iteration)
+                book_index.forth
+            end
+        end
 
-	books_by_author (a_author: STRING_32): LIST [BOOK]
-			-- Books wrote by `a_author' in this collection.
-		do
-			if attached book_index [a_author] as l_result then
-				Result := l_result
-			else
-				create {LINKED_LIST [BOOK]} Result.make
-			end
-		end
+    books_by_author (an_author: STRING_32): detachable LIST [BOOK]
+        do
+            if book_index.has (an_author) then
+                Result := book_index @ an_author
+            else
+                create {LINKED_LIST [BOOK]} Result.make
+            end
+        end
 
-feature -- Change
+feature -- Status setting
 
-	set_name (a_name: STRING_32)
-			-- Set `name' with `a_name'.
-		do
-			name := a_name
-		ensure
-			name_set: name = a_name
-		end
+    set_name (a_name: STRING_32)
+        do
+            name := a_name
+        end
 
-	add_book (a_book: BOOK)
-			-- Extend collection with `a_book'.
-		local
-			l: detachable LIST [BOOK]
-		do
-			l := book_index.at (a_book.author.name)
-			if l = Void then
-				create {LINKED_LIST [BOOK]} l.make
-				book_index.put (l, a_book.author.name)
-			end
-			l.force (a_book)
-		end
+    add_book (a_book: BOOK)
+        local
+            l: detachable LIST [BOOK]
+        do
+            if book_index.has (a_book.author.name) then
+                l := book_index.at ( a_book.author.name )
+            else
+                create {LINKED_LIST [BOOK]} l.make
+                book_index.put (l, a_book.author.name)
+            end
+            if attached l as la then
+           	 	la.force (a_book)
+            end
 
-	add_books (book_list: like books)
-			-- Append collection with `book_list'.
-		do
-			across
-				book_list as it
-			loop
-				add_book (it.item)
-			end
-		end
+        end
+
+    add_books (book_list: like books)
+
+        do
+            from
+                book_list.start
+            until
+                book_list.after
+            loop
+                add_book (book_list.item)
+                book_list.forth
+            end
+        end
 
 feature {NONE} -- Implementation
 
-	book_index: HASH_TABLE [LIST [BOOK], STRING_32]
-			-- Association of author name and its books.
+    book_index: HASH_TABLE [LIST [BOOK], STRING_32]
 
 end -- class BOOK_COLLECTION

contrib/library/text/parser/json/test/autotest/test_suite/json_author_converter.e

@@ -1,54 +1,53 @@
 note
-	description: "A JSON converter for AUTHOR"
-	author: "Paul Cohen"
-	date: "$Date$"
-	revision: "$Revision$"
+    description: "A JSON converter for AUTHOR"
+    author: "Paul Cohen"
+    date: "$Date$"
+    revision: "$Revision$"
 
-class
-	JSON_AUTHOR_CONVERTER
+class JSON_AUTHOR_CONVERTER
 
 inherit
-
-	JSON_CONVERTER
+    JSON_CONVERTER
 
 create
-	make
+    make
 
 feature {NONE} -- Initialization
 
-	make
-		local
-			ucs: STRING_32
-		do
-			create ucs.make_from_string ("")
-			create object.make (ucs)
-		end
+    make
+        local
+            ucs: STRING_32
+        do
+            create ucs.make_from_string ("")
+            create object.make (ucs)
+        end
 
 feature -- Access
 
-	object: AUTHOR
+    object: AUTHOR
 
 feature -- Conversion
 
-	from_json (j: like to_json): detachable like object
-		do
-			if attached {STRING_32} json.object (j.item (name_key), Void) as l_name then
-				create Result.make (l_name)
-			end
-		end
+    from_json (j: like to_json): detachable like object
+        local
+            ucs: detachable STRING_32
+        do
+            ucs ?= json.object (j.item (name_key), Void)
+            check ucs /= Void end
+            create Result.make (ucs)
+        end
 
-	to_json (o: like object): JSON_OBJECT
-		do
-			create Result.make
-			Result.put (json.value (o.name), name_key)
-		end
+    to_json (o: like object): JSON_OBJECT
+        do
+            create Result.make
+            Result.put (json.value (o.name), name_key)
+        end
 
-feature {NONE} -- Implementation
+feature    {NONE} -- Implementation
 
-	name_key: JSON_STRING
-			-- Author's name label.
-		once
-			create Result.make_from_string ("name")
-		end
+    name_key: JSON_STRING
+        once
+            create Result.make_json ("name")
+        end
 
 end -- class JSON_AUTHOR_CONVERTER

contrib/library/text/parser/json/test/autotest/test_suite/json_book_collection_converter.e

@@ -1,82 +1,78 @@
 note
-	description: "A JSON converter for BOOK_COLLECTION"
-	author: "Paul Cohen"
-	date: "$Date$"
-	revision: "$Revision$"
+    description: "A JSON converter for BOOK_COLLECTION"
+    author: "Paul Cohen"
+    date: "$Date$"
+    revision: "$Revision$"
 
-class
-	JSON_BOOK_COLLECTION_CONVERTER
+class JSON_BOOK_COLLECTION_CONVERTER
 
 inherit
-
-	JSON_CONVERTER
+    JSON_CONVERTER
 
 create
-	make
+    make
 
 feature {NONE} -- Initialization
 
-	make
-		local
-			ucs: STRING_32
-		do
-			create ucs.make_from_string ("")
-			create object.make (ucs)
-		end
+    make
+        local
+            ucs: STRING_32
+        do
+            create ucs.make_from_string ("")
+            create object.make (ucs)
+        end
 
 feature -- Access
 
-	object: BOOK_COLLECTION
+    object: BOOK_COLLECTION
 
 feature -- Conversion
 
-	from_json (j: like to_json): detachable like object
-		local
-			l_books: LINKED_LIST [BOOK]
-		do
-			if
-				attached {STRING_32} json.object (j.item (name_key), Void) as l_name and
-				attached {JSON_ARRAY} j.item (books_key) as l_json_array
-			then
-				create Result.make (l_name)
-				create l_books.make
-				across
-					l_json_array as it
-				until
-					Result = Void
-				loop
-					if attached {BOOK} json.object (it.item, "BOOK") as l_book then
-						l_books.extend (l_book)
-					else
-						Result := Void
-							-- Failed
-					end
-				end
-				if Result /= Void then
-					Result.add_books (l_books)
-				end
-			end
-		end
+    from_json (j: like to_json): detachable like object
+        local
+            ucs: detachable STRING_32
+            ll: LINKED_LIST [BOOK]
+            b: detachable BOOK
+            ja: detachable JSON_ARRAY
+            i: INTEGER
+        do
+            ucs ?= json.object (j.item (name_key), Void)
+            check ucs /= Void end
+            create Result.make (ucs)
+            ja ?= j.item (books_key)
+            check ja /= Void end
+            from
+                i := 1
+                create ll.make
+            until
+                i > ja.count
+            loop
+                b ?= json.object (ja [i], "BOOK")
+                check b /= Void end
+                ll.force (b)
+                i := i + 1
+            end
+            check ll /= Void end
+            Result.add_books (ll)
+        end
 
-	to_json (o: like object): JSON_OBJECT
-		do
-			create Result.make_with_capacity (2)
-			Result.put (json.value (o.name), name_key)
-			Result.put (json.value (o.books), books_key)
-		end
+    to_json (o: like object): JSON_OBJECT
+        do
+            create Result.make
+            Result.put (json.value (o.name), name_key)
+            Result.put (json.value (o.books), books_key)
+        end
 
-feature {NONE} -- Implementation
+feature    {NONE} -- Implementation
 
-	name_key: JSON_STRING
-			-- Collection's name label.
-		once
-			create Result.make_from_string ("name")
-		end
+    name_key: JSON_STRING
+        once
+            create Result.make_json ("name")
+        end
 
-	books_key: JSON_STRING
-			-- Book list label.
-		once
-			create Result.make_from_string ("books")
-		end
+    books_key: JSON_STRING
+        once
+            create Result.make_json ("books")
+        end
 
 end -- class JSON_BOOK_COLLECTION_CONVERTER

contrib/library/text/parser/json/test/autotest/test_suite/json_book_converter.e

@@ -1,74 +1,72 @@
 note
-	description: "A JSON converter for BOOK"
-	author: "Paul Cohen"
-	date: "$Date$"
-	revision: "$Revision$"
+    description: "A JSON converter for BOOK"
+    author: "Paul Cohen"
+    date: "$Date$"
+    revision: "$Revision$"
 
-class
-	JSON_BOOK_CONVERTER
+class JSON_BOOK_CONVERTER
 
 inherit
-
-	JSON_CONVERTER
+    JSON_CONVERTER
 
 create
-	make
+    make
 
 feature {NONE} -- Initialization
 
-	make
-		local
-			ucs: STRING_32
-			a: AUTHOR
-		do
-			create ucs.make_from_string ("")
-			create a.make (ucs)
-			create object.make (ucs, a, ucs)
-		end
+    make
+        local
+            ucs: STRING_32
+            a: AUTHOR
+        do
+            create ucs.make_from_string ("")
+            create a.make (ucs)
+            create object.make (ucs, a, ucs)
+        end
 
 feature -- Access
 
-	object: BOOK
+    object: BOOK
 
 feature -- Conversion
 
-	from_json (j: like to_json): detachable like object
-		do
-			if
-				attached {STRING_32} json.object (j.item (title_key), Void) as l_title and
-				attached {STRING_32} json.object (j.item (isbn_key), Void) as l_isbn and
-				attached {AUTHOR} json.object (j.item (author_key), "AUTHOR") as l_author
-			then
-				create Result.make (l_title, l_author, l_isbn)
-			end
-		end
+    from_json (j: like to_json): detachable like object
+        local
+            ucs1, ucs2: detachable STRING_32
+            a: detachable AUTHOR
+        do
+            ucs1 ?= json.object (j.item (title_key), Void)
+            check ucs1 /= Void end
+            ucs2 ?= json.object (j.item (isbn_key), Void)
+            check ucs2 /= Void end
+            a ?= json.object (j.item (author_key), "AUTHOR")
+            check a /= Void end
+            create Result.make (ucs1, a, ucs2)
+        end
 
-	to_json (o: like object): JSON_OBJECT
-		do
-			create Result.make_with_capacity (3)
-			Result.put (json.value (o.title), title_key)
-			Result.put (json.value (o.isbn), isbn_key)
-			Result.put (json.value (o.author), author_key)
-		end
+    to_json (o: like object): JSON_OBJECT
+        do
+            create Result.make
+            Result.put (json.value (o.title), title_key)
+            Result.put (json.value (o.isbn), isbn_key)
+            Result.put (json.value (o.author), author_key)
+        end
 
-feature {NONE} -- Implementation
+feature    {NONE} -- Implementation
 
-	title_key: JSON_STRING
-			-- Book's title label.
-		once
-			create Result.make_from_string ("title")
-		end
+    title_key: JSON_STRING
+        once
+            create Result.make_json ("title")
+        end
 
-	isbn_key: JSON_STRING
-			-- Book ISBN label.
-		once
-			create Result.make_from_string ("isbn")
-		end
+    isbn_key: JSON_STRING
+        once
+            create Result.make_json ("isbn")
+        end
 
-	author_key: JSON_STRING
-			-- Author label.
-		once
-			create Result.make_from_string ("author")
-		end
+    author_key: JSON_STRING
+        once
+            create Result.make_json ("author")
+        end
 
 end -- class JSON_BOOK_CONVERTER

contrib/library/text/parser/json/test/autotest/test_suite/json_menu_example.txt

@@ -1,11 +1,11 @@
-{ "menu": {
-  "id": "file",
-  "value": "File",
-  "popup": {
-    "menuitem": [
-      {"value": "New", "onclick": "CreateNewDoc()"},
-      {"value": "Open", "onclick": "OpenDoc()"},
-      {"value": "Close", "onclick": "CloseDoc()"}
-    ]
-  }
+{"menu": {
+  "id": "file",
+  "value": "File",
+  "popup": {
+    "menuitem": [
+      {"value": "New", "onclick": "CreateNewDoc()"},
+      {"value": "Open", "onclick": "OpenDoc()"},
+      {"value": "Close", "onclick": "CloseDoc()"}
+    ]
+  }
 }}

contrib/library/text/parser/json/test/autotest/test_suite/test_ds.e

@@ -1,72 +1,74 @@
-note
-	description: "Linked list and hash table converters test."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	TEST_DS
+class TEST_DS
 
 inherit
-
-	SHARED_EJSON
-		undefine
-			default_create
-		end
-
+    SHARED_EJSON
+	  	rename default_create as shared_default_create end
 	EQA_TEST_SET
+		select default_create end
+
 
 feature -- Test
 
-	test_linked_list_converter
-			-- Convert a linked list to a json value and
-			-- convert this one to a linked list.
-		local
-			l: LINKED_LIST [STRING]
-			s: STRING
-		do
-			create l.make
-			l.force ("foo")
-			l.force ("bar")
-			if attached json.value (l) as l_value then
-				s := l_value.representation
-				assert ("JSON array converted to LINKED_LIST", attached {LINKED_LIST [detachable ANY]} json.object (l_value, "LINKED_LIST"))
-			else
-				assert ("LINKED_LIST converted to a JSON value", False)
-			end
-		end
+    test_linked_list_converter
+        local
+            jc: JSON_LINKED_LIST_CONVERTER
+            l: LINKED_LIST [STRING]
+            l2: detachable LINKED_LIST [detachable ANY]
+            s: STRING
+            jv: detachable JSON_VALUE
+        do
+            create jc.make
+            json.add_converter (jc)
+            create l.make
+            s := "foo"
+            l.force (s)
+            s := "bar"
+            l.force (s)
+            jv := json.value (l)
+            assert ("jv /= Void", jv /= Void)
+            if attached jv as l_jv then
+	            s := jv.representation
+	            l2 ?= json.object (jv, "LINKED_LIST")
+	            assert ("l2 /= Void", l2 /= Void)
+            end
+        end
 
-	test_hash_table_converter
-			-- Convert a hash table to a json value and
-			-- convert this one to a hash table.
-		local
-			t: HASH_TABLE [STRING, STRING]
-			s: STRING
-			l_ucs_key: detachable STRING_32
-		do
-			create t.make (2)
-			t.put ("foo", "1")
-			t.put ("bar", "2")
-			if attached json.value (t) as l_value then
-				s := l_value.representation
-				if attached {HASH_TABLE [ANY, HASHABLE]} json.object (l_value, "HASH_TABLE") as t2 then
-					create l_ucs_key.make_from_string ("1")
-					if attached {STRING_32} t2 [l_ucs_key] as l_ucs_value then
-						assert ("ucs_value.string.is_equal (%"foo%")", l_ucs_value.same_string_general ("foo"))
-					else
-						assert ("ucs_value /= Void", False)
-					end
-					create l_ucs_key.make_from_string ("2")
-					if attached {STRING_32} t2 [l_ucs_key] as l_ucs_value then
-						assert ("ucs_value.string.is_equal (%"bar%")", l_ucs_value.same_string_general ("bar"))
-					else
-						assert ("ucs_value /= Void", False)
-					end
-				else
-					assert ("JSON object converted to HASH_TABLE", False);
-				end
-			else
-				assert ("HASH_TABLE converted to a JSON value", False)
-			end
-		end
+    test_hash_table_converter
+        local
+            tc: JSON_HASH_TABLE_CONVERTER
+            t: HASH_TABLE [STRING, STRING]
+            t2: detachable HASH_TABLE [ANY, HASHABLE]
+            s: STRING
+            ucs_key, ucs_value: detachable STRING_32
+            jv: detachable JSON_VALUE
+        do
+            create tc.make
+            json.add_converter (tc)
+            create t.make (2)
+            t.put ("foo", "1")
+            t.put ("bar", "2")
+            jv := json.value (t)
+            assert ("jv /= Void", jv /= Void)
+            if attached jv as l_jv then
+	            s := l_jv.representation
+	            t2 ?= json.object (l_jv, "HASH_TABLE")
+	            assert ("t2 /= Void", t2 /= Void)
+	        end
+            create ucs_key.make_from_string ("1")
+            if attached t2 as l_t2 then
+	            ucs_value ?= t2 @ ucs_key
+	            assert ("ucs_value /= Void", ucs_value /= Void)
+	            if attached ucs_value as l_ucs_value then
+	            	assert ("ucs_value.string.is_equal (%"foo%")", l_ucs_value.string.is_equal ("foo"))
+	            end
+	            create ucs_key.make_from_string ("2")
+	            ucs_value ?= t2 @ ucs_key
+	            assert ("ucs_value /= Void", ucs_value /= Void)
+	            if attached ucs_value as l_ucs_value then
+	            	assert ("ucs_value.string.is_equal (%"bar%")", l_ucs_value.string.is_equal ("bar"))
+	            end
+
+        	end
+        end
 
 end -- class TEST_DS

contrib/library/text/parser/json/test/autotest/test_suite/test_json_custom_classes.e

@@ -1,52 +1,42 @@
-note
-	description: "Parsing and converter of book collection test."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	TEST_JSON_CUSTOM_CLASSES
+class TEST_JSON_CUSTOM_CLASSES
 
 inherit
-
-	SHARED_EJSON
-		undefine
-			default_create
-		end
-
+    SHARED_EJSON
+    	rename default_create as shared_default_create end
 	EQA_TEST_SET
-
+		select default_create end
 feature -- Test
 
-	test_custom_classes
-			-- Parse JSON representation to JSON_OBJECT and test book collection converter.
-		local
-			jbc: JSON_BOOK_CONVERTER
-			jbcc: JSON_BOOK_COLLECTION_CONVERTER
-			jac: JSON_AUTHOR_CONVERTER
-			parser: JSON_PARSER
-			jrep: STRING
-		do
-			create jbc.make
-			json.add_converter (jbc)
-			create jbcc.make
-			json.add_converter (jbcc)
-			create jac.make
-			json.add_converter (jac)
-			jrep := "{%"name%":%"Test collection%",%"books%":[{%"title%":%"eJSON: The Definitive Guide%",%"isbn%":%"123123-413243%",%"author%":{%"name%":%"Foo Bar%"}}]}"
-			create parser.make_parser (jrep)
-			if attached {JSON_OBJECT} parser.parse as l_json_object then
-				if attached {BOOK_COLLECTION} json.object (l_json_object, "BOOK_COLLECTION") as l_collection then
-					if attached {JSON_OBJECT} json.value (l_collection) as l_json_object_2 then
-						assert ("JSON representation is correct", l_json_object_2.representation.same_string (jrep))
-					else
-						assert ("BOOK_COLLECTION converted to JSON_OBJECT", False)
-					end
-				else
-					assert ("JSON_OBJECT converted to BOOK_COLLECTION", False)
-				end
-			else
-				assert ("JSON object representation to JSON_OBJECT", False)
-			end
-		end
+    test_custom_classes
+        local
+            bc: detachable BOOK_COLLECTION
+            jbc: JSON_BOOK_CONVERTER
+            jbcc: JSON_BOOK_COLLECTION_CONVERTER
+            jac: JSON_AUTHOR_CONVERTER
+            jo: detachable JSON_OBJECT
+            parser: JSON_PARSER
+            jrep: STRING
+        do
+            create jbc.make
+            json.add_converter (jbc)
+            create jbcc.make
+            json.add_converter (jbcc)
+            create jac.make
+            json.add_converter (jac)
+            jrep := "{%"name%":%"Test collection%",%"books%":[{%"title%":%"eJSON: The Definitive Guide%",%"isbn%":%"123123-413243%",%"author%":{%"name%":%"Foo Bar%"}}]}"
+            create parser.make_parser (jrep)
+            jo := Void
+            jo ?= parser.parse
+            assert ("jo /= Void", jo /= Void)
+            bc := Void
+            bc ?= json.object (jo, "BOOK_COLLECTION")
+            assert ("bc /= Void", bc /= Void)
+            jo ?= json.value (bc)
+            assert ("jo /= Void", jo /= Void)
+            if attached jo as l_jo then
+            	assert ("JSON representation is correct", l_jo.representation.same_string ("{%"name%":%"Test collection%",%"books%":[{%"title%":%"eJSON: The Definitive Guide%",%"isbn%":%"123123-413243%",%"author%":{%"name%":%"Foo Bar%"}}]}"))
+            end
+
+        end
 
 end -- class TEST_JSON_CUSTOM_CLASS

contrib/library/text/parser/json/test/autotest/test_suite/test_suite-safe.ecf

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<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="test_suite" uuid="EA141B17-6A21-4781-8B5F-E9939BAE968A">
-	<target name="test_suite">
-		<root cluster="test_suite" class="APPLICATION" feature="make"/>
-		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
-			<exclude>/.svn$</exclude>
-		</file_rule>
-		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="transitional" syntax="standard">
-			<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="json" location="..\..\..\library\json-safe.ecf" readonly="false"/>
-		<library name="testing" location="$ISE_LIBRARY\library\testing\testing-safe.ecf"/>
-		<cluster name="test_suite" location=".\" recursive="true"/>
-	</target>
-</system>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="test_suite" uuid="EA141B17-6A21-4781-8B5F-E9939BAE968A">
+	<target name="test_suite">
+		<root cluster="test_suite" class="APPLICATION" feature="make"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="standard">
+			<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="json" location="..\..\..\library\json-safe.ecf"/>
+		<library name="testing" location="$ISE_LIBRARY\library\testing\testing-safe.ecf"/>
+		<cluster name="test_suite" location=".\" recursive="true"/>
+	</target>
+</system>

doc/wiki/Community-collaboration.md

@@ -1,13 +1,13 @@
 This project is a community project
 
 ## Mailing list ##
-- Google group: [http://groups.google.com/group/eiffel-web-framework](http://groups.google.com/group/eiffel-web-framework)
+- Google group: http://groups.google.com/group/eiffel-web-framework
 
 ## Materials ##
-- wiki: github wiki at [https://github.com/Eiffel-World/Eiffel-Web-Framework/wiki](https://github.com/Eiffel-World/Eiffel-Web-Framework/wiki)
-- Shared documents:  on google docs at [http://goo.gl/M8WLP](http://goo.gl/M8WLP)
-- source code: git repository at [https://github.com/Eiffel-World/Eiffel-Web-Framework](https://github.com/Eiffel-World/Eiffel-Web-Framework)
-- Proposal from Paul Cohen for a EWSGI spec at [http://eiffel.seibostudios.se/wiki/EWSGI](http://eiffel.seibostudios.se/wiki/EWSGI)
+- wiki: github wiki at https://github.com/Eiffel-World/Eiffel-Web-Framework/wiki
+- Shared documents:  on google docs at http://goo.gl/M8WLP
+- source code: git repository at https://github.com/Eiffel-World/Eiffel-Web-Framework
+- Proposal from Paul Cohen for a EWSGI spec at http://eiffel.seibostudios.se/wiki/EWSGI
 
 ## Main contributors ##
 - **jfiat**: Jocelyn Fiat (Eiffel Software)

doc/wiki/Deployment.md

@@ -1,133 +0,0 @@
-EWF Deployment
-==============
-
-##Apache on Windows
-###Apache Install
- 
- - Check the correct version (Win 32 or Win64)
- - Apache Version:  Apache 2.4.4
- - Windows: http://www.apachelounge.com/download/
-
-###Deploying EWF CGI
-
-####CGI overview
-> A new process is started for each HTTP request. So if there are N request to the same CGI
-> program, the code of the CGI program is loaded into memory N times.
-> When a CGI program finished handling a request,  the program terminates
-
-1. Build EWF application.
-
-    ```
-    ec -config app.ecf -target app_cgi -finalize -c_compile -project_path .
-    Note: change app.ecf and target app_cgi  based on your own configuration.
-     ```
-2. Copy the generated exe file and the www content.
-
-    ```
-    Copy the app.exe and the folder www into a folder served by apache2, for example under
-    <APACHE_PATH>/htdocs
-    <APACHE_PATH> = path to your apache installation
-    Edit httpd.conf under c:/<APACHE_PATH>/conf
-    DocumentRoot "c:/<APACHE_PATH>/htdocs"
-    <Directory "c:/<APACHE_PATH>/htdocs">
-    AllowOverride All --
-    Require all granted -- this is required in Apache 2.4.4
-    </Directory>
-    ```
-
-3. Check that you have the following modules enabled.
-
-    ```
-    LoadModule cgi_module modules/mod_cgi.so
-    LoadModule rewrite_module modules/mod_rewrite.so
-    ```
-
-*Tip:*
-To check the syntax of your httpd.conf file. From command line run the following.
-    
-    ```
-    $>httpd - t
-    ```
-####.htaccess CGI
-http://perishablepress.com/stupid-htaccess-trics/
-
-```
-    Options +ExecCGI +Includes +FollowSymLinks -Indexes
-    AddHandler cgi-script exe
-    <IfModule mod_rewrite.c>
-       RewriteEngine on
-       RewriteRule ^$ $service [L]
-       RewriteCond %{REQUEST_FILENAME} !-f
-       RewriteCond %{REQUEST_FILENAME} !-d
-       RewriteCond %{REQUEST_URI} !$service
-       RewriteRule ^(.*)$ $service/$1
-       RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
-    </IfModule
-```
-Replace $service with the name of your executable service, for example app_service.exe
-
-
-##Deploying EWF FCGI
-
- - To deploy FCGI you will need to download the mod_fcgi module.
- - You can get it from here http://www.apachelounge.com/download/
-
-###FCGI overview
-> FastCGI allows a single, long-running process to handle more than one user request while keeping close to
-> the CGI programming model, retaining the simplicity while eliminating the overhead of creating a new
-> process for each request. Unlike converting an application to a web server plug-in, FastCGI applications
-> remain independent of the web server.
-
-1. Build EWF application
-
-    ```
-    ec -config app.ecf -target app_fcgi -finalize -c_compile -project_path .
-    Note: change app.ecf and target app_fcgi  based on your own configuration.
-    ```
-2. Copy the generated exe file and the www content
-
-    ```
-    Copy the app.exe and the folder "www"  into a folder served by apache2, for example under
-    <APACHE_PATH>/htdocs.
-    <APACHE_PATH> = path to your apache installation
-    Edit httpd.conf under c:/<APACHE_PATH>/conf
-    
-    DocumentRoot "c:/<APACHE_PATH>/htdocs"
-    <Directory "c:/<APACHE_PATH>/htdocs">
-       AllowOverride All --
-       Require all granted -- this is required in Apache 2.4.4
-    </Directory>
-    ```
-Check that you have the following modules enabled.
-
-    ```
-    LoadModule rewrite_module modules/mod_rewrite.so
-    LoadModule fcgid_module modules/mod_fcgid.so
-    ```
-
-By default Apache does not comes with fcgid module, so you will need to
-download it, and put the module under Apache2/modules
-
-####.htaccess FCGI
-http://perishablepress.com/stupid-htaccess-tricks/
-
-```
-    Options +ExecCGI +Includes +FollowSymLinks -Indexes
-    <IfModule mod_fcgid.c>
-      AddHandler fcgid-script .ews
-      FcgidWrapper $FULL_PATH/$service .ews
-    </IfModule>
-    <IfModule mod_rewrite.c>
-       RewriteEngine on
-       RewriteBase /
-       RewriteRule ^$ service.ews [L]
-       RewriteCond %{REQUEST_FILENAME} !-f
-       RewriteCond %{REQUEST_FILENAME} !-d
-       RewriteCond %{REQUEST_URI} !=/favicon.ico
-       RewriteCond %{REQUEST_URI} !service.ews
-       RewriteRule ^(.*)$ service.ews/$1  RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
-    </IfModule>
-```
-Replace $service with the name of your executable $service, for example app_service.exe
-You will need to create an service.ews file, this file will be located at the same place where you
-copy your app service executable.