Added JSON_PRETTY_STRING_VISITOR

Added converter for ARRAYED_LIST Fixed STRING_32 to JSON_VALUE issue in ejson.e Added missing new line character at the end of some files. Cosmetic
cosmetic
2012-08-08 08:51:00 +02:00 · 2012-06-28 18:07:18 +02:00 · 2012-06-28 16:52:11 +02:00 · 2012-02-21 10:07:58 +00:00 · 2012-01-13 17:57:49 +00:00 · 2012-01-13 17:26:23 +00:00
187 changed files with 6205 additions and 3456 deletions
@@ -1 +0,0 @@
-EIFGENs
@@ -0,0 +1,26 @@
+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
@@ -0,0 +1,20 @@
+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.
@@ -0,0 +1,97 @@
+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:
+
+  http://ejson.origo.ethz.ch/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
@@ -1,38 +0,0 @@
-note
-	description : "nino application root class"
-	date        : "$Date$"
-	revision    : "$Revision$"
-
-class
-	APPLICATION
-
-inherit
-	ARGUMENTS
-
-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
-
-			create l_server.make (l_cfg)
-			create {APPLICATION_CONNECTION_HANDLER} l_http_handler.make (l_server, "HTTP_HANDLER")
-			l_server.setup (l_http_handler)
-		end
-
-feature -- Access
-
-	default_document_root: STRING = "webroot"
-
-end
-
@@ -1,61 +0,0 @@
-note
-	description: "Summary description for {HTTP_CONNECTION_HANDLER}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	APPLICATION_CONNECTION_HANDLER
-
-inherit
-	HTTP_CONNECTION_HANDLER
-
-create
-	make
-
-feature -- Request processing
-
-	process_request (a_handler: HTTP_CONNECTION_HANDLER; a_input: HTTP_INPUT_STREAM; a_output: HTTP_OUTPUT_STREAM)
-			-- Process request ...
-		local
-			a_method: STRING
-		do
-			a_method := a_handler.method
-			
-			if a_method.is_equal (Get) then
-				execute_get_request (a_handler.uri, a_handler.request_header_map, a_handler.request_header, a_input, a_output)
-			elseif a_method.is_equal (Post) then
-				execute_post_request (a_handler.uri, a_handler.request_header_map, a_handler.request_header, a_input, a_output)
-			elseif a_method.is_equal (Put) then
-			elseif a_method.is_equal (Options) then
-			elseif a_method.is_equal (Head) then
-			elseif a_method.is_equal (Delete) then
-			elseif a_method.is_equal (Trace) then
-			elseif a_method.is_equal (Connect) then
-			else
-				debug
-					print ("Method [" + a_method + "] not supported")
-				end
-			end
-		end
-
-	execute_get_request (a_uri: STRING; a_headers_map: HASH_TABLE [STRING, STRING]; a_headers_text: STRING; a_input: HTTP_INPUT_STREAM; a_output: HTTP_OUTPUT_STREAM)
-		local
-			l_http_request : HTTP_REQUEST_HANDLER
-		do
-			create {GET_REQUEST_HANDLER} l_http_request.make (a_input, a_output)
-			l_http_request.set_uri (a_uri)
-			l_http_request.process
-		end
-
-	execute_post_request (a_uri: STRING; a_headers_map: HASH_TABLE [STRING, STRING]; a_headers_text: STRING; a_input: HTTP_INPUT_STREAM; a_output: HTTP_OUTPUT_STREAM)
-		local
-			l_http_request : HTTP_REQUEST_HANDLER
-		do
-			check not_yet_implemented: False end
-			create {POST_REQUEST_HANDLER} l_http_request.make (a_input, a_output)
-			l_http_request.set_uri (a_uri)
-			l_http_request.process
-		end
-
-end
@@ -1,175 +0,0 @@
-class
-	GET_REQUEST_HANDLER
-
-inherit
-	HTTP_REQUEST_HANDLER
-
-	HTTP_SERVER_SHARED_CONFIGURATION
-		undefine
-			default_create
-		end
-
-	SHARED_URI_CONTENTS_TYPES
-		undefine
-			default_create
-		end
-
-	HTTP_CONSTANTS
-		undefine
-			default_create
-		end
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	make (a_input: like input; a_output: like output)
-		do
-			default_create
-			input := a_input
-			output := a_output
-		end
-
-feature -- Access
-
-	input: HTTP_INPUT_STREAM
-
-	output: HTTP_OUTPUT_STREAM
-
-feature -- Execution
-
-	process
-			-- process the request and create an answer
-		local
-			fname: STRING_8
-			f: RAW_FILE
-			ctype, extension: detachable STRING_8
-		do
-			answer.reset
-			if script_name.is_equal ("/") then
-				process_default
-				answer.set_content_type ("text/html")
-			else
-				create fname.make_from_string (Document_root)
-				fname.append (script_name)
-				debug
-					print ("URI filename: " + fname)
-				end
-				create f.make (real_filename (fname))
-				if f.exists then
-					extension := Ct_table.extension (script_name)
-					ctype := Ct_table.content_types.item (extension)
-					if f.is_directory then
-						process_directory (f)
-					else
-						if ctype = Void then
-							process_raw_file (f)
-							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
-					end
-				else
-					answer.set_status_code (Not_found)
-					answer.set_reason_phrase (Not_found_message)
-					answer.set_reply_text ("Not found on this server")
-				end
-			end
-			if attached answer.reply_text as t then
-				answer.set_content_length (t.count)
-			else
-				answer.set_content_length (0)
-			end
-
-				--| Output the result
-			output.put_string (answer.reply_header + answer.reply_text)
-		end
-
-	process_default
-			-- Return a default response
-		local
-			html: STRING_8
-		do
-			answer.set_reply_text ("")
-			html := " <html> <head> <title> NINO HTTPD </title> " + "    </head>   " + "       <body>    " + " <h1> Welcome to NINO 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
-			f.open_read
-			from
-				answer.set_reply_text ("")
-			until
-				f.end_of_file
-			loop
-				f.read_stream_thread_aware (1024)
-				answer.append_reply_text (f.last_string)
-			end
-			f.close
-		end
-
-	process_directory (f: FILE)
-			--read the directory
-		require
-			is_directory: f.is_directory
-		local
-			l_dir: DIRECTORY
-			files: ARRAYED_LIST [STRING_8]
-			html1: STRING_8
-			html2: STRING_8
-			htmldir: STRING_8
-			path: STRING_8
-		do
-			answer.set_reply_text ("")
-			html1 := " <html> <head> <title> NINO HTTPD </title> " + "    </head>   " + "       <body>    " + " <h1> Welcome to NINO HTTPD! </h1> " + " <p>  Default page  "
-			html2 := " </p> " + " </body> " + " </html> "
-			path := script_name
-			if path[path.count] = '/' then
-				path.remove_tail (1)
-			end
-			create l_dir.make_open_read (f.name)
-			files := l_dir.linear_representation
-			from
-				files.start
-				htmldir := "<ul>"
-			until
-				files.after
-			loop
-				htmldir := htmldir + "<li><a href=%"" + path + "/" + files.item_for_iteration + "%">" + files.item_for_iteration + "</a> </li>%N"
-				files.forth
-			end
-			htmldir := htmldir + "</ul>"
-			answer.append_reply_text (html1 + htmldir + html2)
-		end
-
-end -- class GET_REQUEST_HANDLER
-
@@ -1,115 +0,0 @@
-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
@@ -1,42 +0,0 @@
-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: STRING
-			n: INTEGER
-		do
-			from
-				n := 1_024
-				input.read_stream (n)
-				s := input.last_string
-				create l_data.make_empty
-			until
-				s.count < n
-			loop
-				l_data.append_string (s)
-				input.read_stream (n)
-			end
-			Precursor
-		end
-
-end
@@ -1,21 +0,0 @@
-<?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="web_server" uuid="B1D3254D-A58E-4259-9796-8A2843A511A9">
-	<target name="web_server">
-		<root class="APPLICATION" feature="make"/>
-		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
-			<exclude>/.svn$</exclude>
-			<exclude>/.git$</exclude>
-		</file_rule>
-		<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"/>
-		<library name="nino" location="../../nino-safe.ecf"/>
-		<cluster name="src" location=".\" recursive="true"/>
-	</target>
-</system>
@@ -1,21 +0,0 @@
-<?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="web_server" uuid="B1D3254D-A58E-4259-9796-8A2843A511A9">
-	<target name="web_server">
-		<root class="APPLICATION" feature="make"/>
-		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
-			<exclude>/.svn$</exclude>
-		</file_rule>
-		<option warning="true" is_attached_by_default="true" void_safety="none">
-			<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.ecf"/>
-		<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
-		<library name="nino" location="..\..\nino.ecf"/>
-		<library name="thread" location="$ISE_LIBRARY\library\thread\thread.ecf"/>
-		<cluster name="src" location=".\" recursive="true"/>
-	</target>
-</system>
@@ -1,91 +0,0 @@
-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).
@@ -1,11 +0,0 @@
-/**
- * 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);
@@ -1,215 +0,0 @@
-/**
- * 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 );
@@ -1,12 +0,0 @@
-$(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();
-	});
-
-});
@@ -1,219 +0,0 @@
-*{
-	/* 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;
-}
@@ -1,139 +0,0 @@
-<!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>
@@ -1,43 +0,0 @@
-<!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>
@@ -1,121 +0,0 @@
-/* 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(','));
-}
@@ -1,148 +0,0 @@
-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;
-}
@@ -1,153 +0,0 @@
-<!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>
@@ -1,160 +0,0 @@
-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;}
@@ -1,197 +0,0 @@
-<!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>
@@ -1,86 +0,0 @@
-<!-- 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>
@@ -1,9 +0,0 @@
-<html>
-<body>
-
-<h2>Norwegian Mountain Trip</h2>
-<img border="0" src="images/pulpit.jpg" alt="Pulpit rock" width="304" height="228" />
-
-</body>
-</html>
-
@@ -1,10 +0,0 @@
-<html>
-<body>
-
-<h1>My First Heading</h1>
-
-<p>My first paragraph.</p>
-
-</body>
-</html>
-
@@ -1,99 +0,0 @@
-<!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>
@@ -1,19 +0,0 @@
-<html>
-	<head>
-		<title>POST example</title>
-	</head>
-	<body>
-		<h1> POST example </h1>
-		<form action="index.html" method="POST">
-			<input type="text" name="name" value="a simple name"/> <br/>
-			<input type="text" name="text" value="a tiny text"/>
-			<input type="submit" value="POST"/>
-		</form>
-
-		<form action="index.html" method="GET">
-			<input type="text" name="name" value="a simple name"/> <br/>
-			<input type="text" name="text" value="a tiny text"/>
-			<input type="submit" value="GET"/>
-		</form>
-	</body>
-</html>
@@ -1,5 +0,0 @@
-Eiffel Web 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)
-
-
-
@@ -1,68 +0,0 @@
-note
-	description: "Summary description for {HTTP_SERVER_CONFIGURATION}."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	HTTP_SERVER_CONFIGURATION
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	make
-		do
-			http_server_port := 80
-			max_tcp_clients := 100
-			socket_accept_timeout := 1_000
-			socket_connect_timeout := 5_000
-			document_root := "htdocs"
-			force_single_threaded := False
-		end
-
-feature -- Access
-
-	Server_details : STRING = "Server : NANO Eiffel Server"
-
-	document_root: STRING assign set_document_root
-	http_server_port: INTEGER assign set_http_server_port
-	max_tcp_clients: INTEGER assign set_max_tcp_clients
-	socket_accept_timeout: INTEGER assign set_socket_accept_timeout
-	socket_connect_timeout: INTEGER assign set_socket_connect_timeout
-	force_single_threaded: BOOLEAN assign set_force_single_threaded
-
-feature -- Element change
-
-	set_http_server_port (v: like http_server_port)
-		do
-			http_server_port := v
-		end
-
-	set_document_root (v: like document_root)
-		do
-			document_root := v
-		end
-
-	set_max_tcp_clients (v: like max_tcp_clients)
-		do
-			max_tcp_clients := v
-		end
-
-	set_socket_accept_timeout (v: like socket_accept_timeout)
-		do
-			socket_accept_timeout := v
-		end
-
-	set_socket_connect_timeout (v: like socket_connect_timeout)
-		do
-			socket_connect_timeout := v
-		end
-
-	set_force_single_threaded (v: like force_single_threaded)
-		do
-			force_single_threaded := v
-		end
-
-
-end
@@ -1,45 +0,0 @@
-note
-	description: "Summary description for {HTTP_SERVER_SHARED_CONFIGURATION}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	HTTP_SERVER_SHARED_CONFIGURATION
-
-feature -- Access
-
-	server_configuration: detachable HTTP_SERVER_CONFIGURATION
-			-- Shared configuration
-		do
-			if attached server_configuration_cell.item as l_cfg then
-				Result := l_cfg
-			end
-		end
-
-	document_root: STRING_8
-			-- Shared document root
-		do
-			if attached server_configuration as l_cfg then
-				Result := l_cfg.document_root
-			else
-				Result := ""
-			end
-		end
-
-feature -- Element change
-
-	set_server_configuration (a_cfg: like server_configuration)
-			-- Set `server_configuration' to `a_cfg'.
-		do
-			server_configuration_cell.replace (a_cfg)
-		end
-
-feature {NONE} -- Implementation
-
-	server_configuration_cell: CELL [detachable HTTP_SERVER_CONFIGURATION]
-		once ("PROCESS")
-			create Result.put (Void)
-		end
-
-end
@@ -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
@@ -0,0 +1,175 @@
+note
+	description: "JSON_PRETTY_STRING_VISITOR Generates the JSON-String for a JSON_VALUE"
+	revision: "0.1"
+
+class
+	JSON_PRETTY_STRING_VISITOR
+
+inherit
+	JSON_VISITOR
+
+create
+	make,
+	make_custom
+
+feature -- Initialization
+
+	make (a_output: like output)
+			-- Create a new instance
+		do
+			make_custom (a_output, 1, 1)
+		end
+
+	make_custom (a_output: like output; a_object_count_inlining, a_array_count_inlining: INTEGER)
+			-- Create a new instance
+		do
+			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_32
+		-- JSON representation
+
+	indentation: like output
+
+	indentation_step: like indentation
+
+	line_number: INTEGER
+
+	indent
+		do
+			indentation.append (indentation_step)
+		end
+
+	exdent
+		do
+			indentation.remove_tail (indentation_step.count)
+		end
+
+	new_line
+		do
+			output.append ("%N")
+			output.append (indentation)
+			line_number := line_number + 1
+		end
+
+	object_count_inlining: INTEGER
+	array_count_inlining: INTEGER
+
+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]
+			l_line: like line_number
+			l_multiple_lines: BOOLEAN
+		do
+			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
+			output.append ("[")
+			l_line := line_number
+			indent
+			from
+				l_json_array.start
+			until
+				l_json_array.off
+			loop
+				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
+					output.append (", ")
+				end
+			end
+			exdent
+			if 
+				line_number > l_line or
+				l_json_array.count >= array_count_inlining 
+			then
+				new_line
+			end
+			output.append ("]")
+		end
+
+	visit_json_boolean (a_json_boolean: JSON_BOOLEAN)
+			-- Visit `a_json_boolean'.
+		do
+			output.append (a_json_boolean.item.out)
+		end
+
+	visit_json_null (a_json_null: JSON_NULL)
+			-- Visit `a_json_null'.
+		do
+			output.append ("null")
+		end
+
+	visit_json_number (a_json_number: JSON_NUMBER)
+			-- Visit `a_json_number'.
+		do
+			output.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]
+			l_line: like line_number
+			l_multiple_lines: BOOLEAN
+		do
+			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
+			output.append ("{")
+			l_line := line_number
+			indent
+			from
+				l_pairs.start
+			until
+				l_pairs.off
+			loop
+				if 
+					line_number > l_line or
+					l_multiple_lines
+				then
+					new_line
+				end
+				l_pairs.key_for_iteration.accept (Current)
+				output.append (": ")
+				l_pairs.item_for_iteration.accept (Current)
+				l_pairs.forth
+				if not l_pairs.after then
+					output.append (", ")
+				end
+			end
+			exdent
+			if 
+				line_number > l_line or
+				l_pairs.count >= object_count_inlining 
+			then
+				new_line
+			end
+			output.append ("}")
+		end
+
+    visit_json_string (a_json_string: JSON_STRING)
+			-- Visit `a_json_string'.
+		do
+			output.append ("%"")
+			output.append (a_json_string.item)
+			output.append ("%"")
+		end
+
+end
@@ -0,0 +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
+
+end
@@ -0,0 +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
+
+end
@@ -0,0 +1,81 @@
+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
+                create js.make_json (c.key.out)
+                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
@@ -0,0 +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
@@ -0,0 +1,32 @@
+note
+    description: "[
+                   Shared factory class for creating JSON objects. Maps JSON
+                   objects to Gobo DS_HASH_TABLEs and JSON arrays to Gobo
+                   DS_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$"
+    file: "$HeadURL: $"
+
+class SHARED_GOBO_EJSON
+
+feature
+
+    json: EJSON
+            -- A shared EJSON instance with default converters for 
+	    -- DS_LINKED_LIST [ANY] and DS_HASH_TABLE [ANY, HASHABLE]
+        local
+            jllc: JSON_DS_LINKED_LIST_CONVERTER
+            jhtc: JSON_DS_HASH_TABLE_CONVERTER
+        once
+            create Result
+            create jllc.make
+            Result.add_converter (jllc)
+            create jhtc.make
+            Result.add_converter (jhtc)
+        end
+        
+end -- class SHARED_GOBO_EJSON
@@ -1,183 +0,0 @@
-note
-	description: "Summary description for {HTTP_CONNECTION_HANDLER}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-deferred class
-	HTTP_CONNECTION_HANDLER
-
-inherit
-	HTTP_HANDLER
-		redefine
-			make
-		end
-
-feature {NONE} -- Initialization
-
-	make (a_main_server: like main_server; a_name: STRING)
-			-- Creates a {HTTP_CONNECTION_HANDLER}, assigns the main_server and sets the current_request_message to empty.
-			--
-			-- `a_main_server': The main server object
-			-- `a_name': The name of this module
-		do
-			Precursor (a_main_server, a_name)
-			reset
-		end
-
-	reset
-		do
-			create method.make_empty
-			create uri.make_empty
-			create request_header.make_empty
-			create request_header_map.make (10)
-			remote_info := Void
-		end
-
-feature -- Execution
-
-	receive_message_and_send_reply (client_socket: TCP_STREAM_SOCKET)
-		local
-			l_input: HTTP_INPUT_STREAM
-			l_output: HTTP_OUTPUT_STREAM
-			l_remote_info: detachable like remote_info
-		do
-			create l_input.make (client_socket)
-			create l_output.make (client_socket)
-
-
-			create l_remote_info
-			if attached client_socket.peer_address as l_addr then
-				l_remote_info.addr := l_addr.host_address.host_address
-				l_remote_info.hostname := l_addr.host_address.host_name
-				l_remote_info.port := l_addr.port
-				remote_info := l_remote_info
-			end
-
-            analyze_request_message (l_input)
-			process_request (Current, l_input, l_output)
-			reset
-		end
-
-feature -- Request processing
-
-	process_request (a_handler: HTTP_CONNECTION_HANDLER; a_input: HTTP_INPUT_STREAM; a_output: HTTP_OUTPUT_STREAM)
-			-- Process request ...
-		require
-			a_handler_attached: a_handler /= Void
-			a_uri_attached: a_handler.uri /= Void
-			a_method_attached: a_handler.method /= Void
-			a_header_map_attached: a_handler.request_header_map /= Void
-			a_header_text_attached: a_handler.request_header /= Void
-			a_input_attached: a_input /= Void
-			a_output_attached: a_output /= Void
-		deferred
-		end
-
-feature -- Access
-
-	request_header: STRING
-			-- Header' source
-
-	request_header_map : HASH_TABLE [STRING,STRING]
-			-- Contains key:value of the header
-
-	method: STRING
-			-- http verb
-
-	uri: STRING
-			--  http endpoint		
-
-	version: detachable STRING
-			--  http_version
-			--| unused for now
-
-	remote_info: detachable TUPLE [addr: STRING; hostname: STRING; port: INTEGER]
-
-feature -- Parsing
-
-	parse_http_request_line (line: STRING)
-		require
-			line /= Void
-		local
-			pos, next_pos: INTEGER
-		do
-			print ("%N parse http request line:%N" + line)
-			-- parse (this should be done by a lexer)
-			pos := line.index_of (' ', 1)
-			method := line.substring (1, pos - 1)
-			next_pos := line.index_of (' ', pos+1)
-			uri := line.substring (pos+1, next_pos-1)
-		ensure
-			not_void_method: method /= Void
-		end
-
-
-	analyze_request_message (a_input: HTTP_INPUT_STREAM)
-        require
-            input_readable: a_input /= Void and then a_input.is_readable
-        local
-        	end_of_stream : BOOLEAN
-        	pos,n : INTEGER
-        	line : STRING
-		k, val: STRING
-        	txt: STRING
-        do
-            create txt.make (64)
-			a_input.read_line
-			line := a_input.last_string
-			analyze_request_line (line)
-			txt.append (line)
-			txt.append_character ('%N')
-
-			request_header := txt
-            from
-                a_input.read_line
-            until
-                end_of_stream
-            loop
-                line := a_input.last_string
-		n := line.count
-                print ("%N" +line+ "%N")
-                pos := line.index_of (':',1)
-				if pos > 0 then
-					k := line.substring(1, pos-1)
-					if line[pos+1].is_space then
-						pos := pos + 1
-					end
-					if line[n] = '%R' then
-						n := n - 1
-					end
-					val := line.substring (pos + 1, n)
-					request_header_map.put (val, k)
-				end
-                txt.append (line)
-                txt.append_character ('%N')
-                if line.is_empty or else line[1] = '%R' then
-        			end_of_stream := True
-        		else
-        			a_input.read_line
-                end
-        	end
-		end
-
-	analyze_request_line (line: STRING)
-		require
-			line /= Void
-		local
-			pos, next_pos: INTEGER
-		do
-			print ("%N parse request line:%N" + line)
-			pos := line.index_of (' ', 1)
-			method := line.substring (1, pos - 1)
-			next_pos := line.index_of (' ', pos+1)
-			uri := line.substring (pos+1, next_pos-1)
-			version := line.substring (next_pos + 1, line.count)
-		ensure
-			not_void_method: method /= Void
-		end
-
-invariant
-	request_header_attached: request_header /= Void
-
-end
@@ -1,146 +0,0 @@
-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"
-end
@@ -1,57 +0,0 @@
-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
-
-end
@@ -1,124 +0,0 @@
-note
-	description: "Summary description for {HTTP_CONNECTION_HANDLER}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-deferred class
-	HTTP_HANDLER
-
-inherit
-	THREAD
-
-	HTTP_CONSTANTS
-
-feature {NONE} -- Initialization
-
-	make (a_main_server: like main_server; a_name: STRING)
-			-- Creates a {HTTP_HANDLER}, assigns the main_server and initialize various values
-			--
-			-- `a_main_server': The main server object
-			-- `a_name': The name of this module
-		require
-			a_main_server_attached: a_main_server /= Void
-			a_name_attached: a_name /= Void
-		do
-			main_server := a_main_server
-			is_stop_requested := False
-		ensure
-			main_server_set: a_main_server ~ main_server
-		end
-
-feature -- Inherited Features
-
-	execute
-			-- <Precursor>
-			-- Creates a socket and connects to the http server.
-		local
-			l_http_socket: detachable TCP_STREAM_SOCKET
-			l_http_port: INTEGER
-		do
-			is_stop_requested := False
-			l_http_port := main_server_configuration.http_server_port
-			create l_http_socket.make_server_by_port (l_http_port)
-			if not l_http_socket.is_bound then
-				print ("Socket could not be bound on port " + l_http_port.out )
-			else
-				from
-					l_http_socket.listen (main_server_configuration.max_tcp_clients)
-					print ("%NHTTP Connection Server ready on port " + l_http_port.out +"%N")
-				until
-					is_stop_requested
-				loop
-					l_http_socket.accept
-					if not is_stop_requested then
-						if attached l_http_socket.accepted as l_thread_http_socket then
-							receive_message_and_send_reply (l_thread_http_socket)
-							l_thread_http_socket.cleanup
-							check
-								socket_closed: l_thread_http_socket.is_closed
-							end
-						end
-					end
-					is_stop_requested := main_server.stop_requested
-				end
-				l_http_socket.cleanup
-				check
-					socket_is_closed: l_http_socket.is_closed
-				end
-			end
-			print ("HTTP Connection Server ends.")
-		rescue
-			print ("HTTP Connection Server shutdown due to exception. Please relaunch manually.")
-
-			if attached l_http_socket as ll_http_socket then
-				ll_http_socket.cleanup
-				check
-					socket_is_closed: ll_http_socket.is_closed
-				end
-			end
-			is_stop_requested := True
-			retry
-		end
-
-feature -- Access
-
-	is_stop_requested: BOOLEAN
-			-- Set true to stop accept loop
-
-feature {NONE} -- Access
-
-	main_server: HTTP_SERVER
-			-- The main server object
-
-	main_server_configuration: HTTP_SERVER_CONFIGURATION
-			-- The main server's configuration
-		do
-			Result := main_server.configuration
-		end
-
-	Max_fragments: INTEGER = 1000
-			-- Defines the maximum number of fragments that can be received
-
-feature -- Status setting
-
-	shutdown
-			-- Stops the thread
-		do
-			is_stop_requested := True
-		end
-
-feature -- Execution
-
-	receive_message_and_send_reply (client_socket: TCP_STREAM_SOCKET)
-		require
-			socket_attached: client_socket /= Void
--			socket_valid: client_socket.is_open_read and then client_socket.is_open_write
-			a_http_socket:client_socket /= Void and then not client_socket.is_closed
-		deferred
-		end
-
-invariant
-	main_server_attached: main_server /= Void
-
-end
@@ -1,52 +0,0 @@
-note
-	description: "Summary description for {HTTP_SERVER}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	HTTP_SERVER
-
-inherit
-	HTTP_SERVER_SHARED_CONFIGURATION
-
-create
-	make
-
-feature -- Initialization
-
-	make (cfg: like configuration)
-		do
-			configuration := cfg
-			set_server_configuration (configuration)
-		end
-
-	setup (a_http_handler : HTTP_HANDLER)
-		require
-			a_http_handler_valid: a_http_handler /= Void
-		do
-			print("%N%N%N")
-			print ("Starting Web Application Server (port="+ configuration.http_server_port.out +"):%N")
-			stop_requested := False
-			if configuration.force_single_threaded then
-				a_http_handler.execute
-			else
-				a_http_handler.launch
-				a_http_handler.join
-			end
-		end
-
-	shutdown_server
-		do
-			stop_requested := True
-		end
-
-feature	-- Access
-
-	configuration: HTTP_SERVER_CONFIGURATION
-			-- Configuration of the server
-
-	stop_requested: BOOLEAN
-			-- Stops the server
-
-end
@@ -1,64 +0,0 @@
-note
-	description: "Summary description for {HTTP_INPUT_STREAM}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	HTTP_INPUT_STREAM
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	make (a_socket: like source)
-		do
-			source := a_socket
-			create last_string.make_empty
-		end
-
-	source: TCP_STREAM_SOCKET
-
-feature -- Status Report
-
-	is_readable: BOOLEAN
-			-- Is readable?
-		do
-			Result := source.is_open_read
-		end
-
-feature -- Basic operation
-
-	read_line
-		require
-            is_readable: is_readable
-		do
-			last_string.wipe_out
-			if source.socket_ok then
-				source.read_line_thread_aware
-				last_string.append_string (source.last_string)
-			end
-		end
-
-	read_stream (nb_char: INTEGER)
-			-- Read a string of at most `nb_char' bound characters
-			-- or until end of file.
-			-- Make result available in `last_string'.	
-		require
-			nb_char_positive: nb_char > 0
-            is_readable: is_readable
-		do
-			last_string.wipe_out
-			if source.socket_ok then
-				source.read_stream_thread_aware (nb_char)
-				last_string.append_string (source.last_string)
-			end
-		end
-
-feature -- Access		
-
-	last_string: STRING
-			-- Last string read
-
-end
@@ -1,30 +0,0 @@
-note
-	description: "Summary description for {HTTP_OUTPUT_STREAM}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	HTTP_OUTPUT_STREAM
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	make (a_socket: like target)
-		do
-			target := a_socket
-		end
-
-	target: TCP_STREAM_SOCKET
-
-feature -- Basic operation
-
-	put_string (s: STRING)
-			-- Write string `s' to `target'
-		do
-			target.put_string (s)
-		end
-		
-end
@@ -0,0 +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" 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=".\" 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>
@@ -0,0 +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/>
+			<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>
@@ -0,0 +1,17 @@
+<?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_gobo" uuid="437195AB-8B3C-4238-8998-A932A1423449" library_target="json_gobo">
+	<target name="json_gobo">
+		<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">
+		</option>
+		<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" location=".\gobo" recursive="true" />
+	</target>
+</system>
@@ -0,0 +1,30 @@
+note
+	description: "A JSON converter for ARRAYED_LIST [ANY]"
+	author: "Paul Cohen"
+	date: "$Date$"
+	revision: "$Revision$"
+	file: "$HeadURL: $"
+
+class JSON_ARRAYED_LIST_CONVERTER
+
+inherit
+    JSON_LIST_CONVERTER
+		redefine
+			object
+		end
+
+create
+    make
+
+feature -- Access
+
+    object: ARRAYED_LIST [detachable ANY]
+
+feature {NONE} -- Factory
+
+	new_object (nb: INTEGER): like object
+		do
+			create Result.make (nb)
+		end
+
+end -- class JSON_ARRAYED_LIST_CONVERTER
@@ -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
@@ -0,0 +1,88 @@
+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
+                create js.make_json (c.key.out)
+                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
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jocelyn Fiat	8b33c77008	Added JSON_PRETTY_STRING_VISITOR Added converter for ARRAYED_LIST Fixed STRING_32 to JSON_VALUE issue in ejson.e Added missing new line character at the end of some files. Cosmetic	2012-08-08 08:51:00 +02:00
Jocelyn Fiat	6fa0d56465	cosmetic	2012-06-28 18:07:18 +02:00
Jocelyn Fiat	873f877530	Added TABLE_ITERABLE interface to JSON_OBJECT Added JSON_OBJECT.replace (value, key)	2012-06-28 16:52:11 +02:00
jfiat	c873d62efa	added JSON_OBJECT.is_empty: BOOLEAN	2012-02-21 10:07:58 +00:00
jfiat	a6c52c0a7e	Renamed JSON_STRING.unescaped_string as unescaped_string_8 + code cleaning	2012-01-13 17:57:49 +00:00
jfiat	d67e01eea6	Better support for special character and unicode (\n \r \" ... and \uXXXX where XXXX is an hexadecimal value) Added features to JSON_STRING - make_json_from_string_32 (READABLE_STRING_32) - escaped_string_8: STRING_8 - escaped_string_32: STRING_32 Added associated autotests	2012-01-13 17:26:23 +00:00
jfiat	1b446caa27	Removing autotest dotnet target, since Autotest does not support .Net platform for now	2011-11-21 13:54:50 +00:00
jfiat	24b1be7482	Fixed code from autotest tests to remove warnings Fixed getest ejson_test.ecf configuration file Added script to allow using getest from Windows. Note: I did not fixed warning from getest tests, we should apply same change already made for autotest. it seems autotest and getests are doing the same checking, I would suggest to either remove getest files or find a way to share test code between getest and autotest tests.	2011-11-21 09:20:46 +00:00
jfiat	c836d75191	Added more conversion, and accept READABLE_STRING_8 as argument for make_json	2011-10-07 12:25:00 +00:00
jfiat	3739909e43	Minor changes + cosmetics Added conversion from STRING to JSON_STRING to help users.	2011-10-07 12:19:27 +00:00
jvelilla	05b4bd90f5	Added test cases from getest to autotest. First version.	2011-07-11 12:07:05 +00:00
jfiat	6188f99615	added run_autotest.bat scripts	2011-07-08 10:10:40 +00:00
jfiat	28a699e5f2	Converted the autotest test suite to void-safety + cosmetics	2011-07-07 14:39:06 +00:00
jfiat	591cfb6cfa	Now if you want to use the json utilities for gobo, you just need to include the json_gobo_extension.ecf (note that the related gobo classes are not void-safe) + cosmetics	2011-07-07 14:03:36 +00:00
jvelilla	f4c472cb9f	Updated eJSON to use Eiffel 6.8 version. Basically the changes are: Replace ? by detachable indexing by note removing `is' from features, and in some places replaced by = In the ecf now we need to include every gobo library, because the gobo.ecf, exclude libraries that are needed. TODO: the test-suite is not void-safety.	2011-07-07 12:03:25 +00:00
jvelilla	94c5c90eaa	Updated History and Readme files.	2011-07-06 22:12:26 +00:00
jvelilla	e638eeaae4	Updated skip_white_spaces, now check %U and %T codes	2010-03-16 00:08:37 +00:00
jvelilla	5d63c63a39	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.	2010-03-10 11:16:16 +00:00
jvelilla	a863e495ae	Updated test_json_fail18 , it's a valid JSON, maybe we need to rename this to test_json_pass4 and the file fail18.json to pass4.json	2010-03-10 11:07:33 +00:00
jvelilla	327196a3cf	Removed obsolete cluster.	2010-03-09 11:41:08 +00:00
jvelilla	805874dc9c	Added autotest test suite	2010-03-09 11:37:55 +00:00
paul.cohen	11256d697d	Added getest based test program	2010-03-08 23:46:59 +00:00
jvelilla	b389d532b7	Updated Eiffel configuration file, updated to the new clusters	2010-03-08 23:43:35 +00:00
paul.cohen	a0e570226c	Ported r75 (all JSON value classes) from POC_CONVERTERS_FACTORY branch to trunk	2010-03-08 22:45:41 +00:00
paul.cohen	2710cae1da	Merged converters and factory classes from POC_CONVERTERS_FACTORY to trunk	2010-03-08 15:35:32 +00:00
paul.cohen	8cd53b87eb	New directory layout created	2010-03-08 15:28:47 +00:00
paul.cohen	6bef8ec387	Added new top level directories; library, test, build and example	2010-03-08 15:08:37 +00:00
jvelilla	f86abed2ff	Added History, Readme and License files	2010-03-05 09:18:38 +00:00
jvelilla	7a31e80f90	Simples fixes to the parser, add is_valid_start_symbol and updated parse_json.	2009-08-14 11:19:54 +00:00
jvelilla	aed8d1a516	Added set_representation feature.	2009-08-14 11:09:38 +00:00
jfiat	ab19cc2b16	use item (i) instead [i]	2009-08-13 06:32:32 +00:00
jfiat	d4da754a9c	Optimized code, and removed extra dependencies. Added void-safe version	2009-08-04 12:01:03 +00:00
jfiat	f1f1f5fbf6	Fixed typo	2009-03-18 16:46:27 +00:00
jfiat	548a320448	Cosmetic + Optimization + Assertion + Void-safety (no significant interface changes)	2009-03-18 15:29:41 +00:00
jvelilla	1359a1ceae	Add descriptions. Change in skip_withe_spaces to handle newline %N and carriage Return %R	2008-08-29 10:49:24 +00:00
jvelilla	fc7c2d151f	Change in the loop, to generate the correct answer (feature visit_json_object).	2008-08-29 10:45:04 +00:00
jvelilla	4e6935655f	Add cluster visitor.	2008-08-29 10:40:12 +00:00
berend	d940da7b13	SmartEiffel doesn't have is_space.	2008-08-27 04:29:42 +00:00
berend	31619fc88e	JSON number is a double precision IEEE number, not a single precision.	2008-08-27 04:29:12 +00:00
berend	bf781a9d25	Changed formatting a bit. Made it compile with SE 1.2r7	2008-08-27 04:26:44 +00:00
jvelilla	31750efb8e	Add accept method (JSON_VISITOR), remove is_xxx queries, remove to_json feature. Improve comments	2008-08-25 01:13:35 +00:00
jvelilla	f83c5d2643	Add Visitor Pattern , JSON_VISITOR and PRINT_JSON_VISITOR	2008-08-25 01:10:42 +00:00
jvelilla	c59bc37a40	Fix Bug in quey 'is_a_valid_number' Remove the space after : in the regular expression "-?(?: 0\|[1-9]\d*)(?: \.\d+)?(?: [eE][+-]?\d+)?\b"	2008-08-08 11:17:32 +00:00
jvelilla	b674dbddf7	Add precondition in query i_th Remove infix "@" which is deprecated now. Add invariant for values to show that it is always not Void. Add postcondition of add.	2008-08-08 11:12:27 +00:00
jvelilla	ed5f8a9740	Redefine the version of ANY of is_equal.	2008-08-08 11:08:51 +00:00
jvelilla	2c42c0dd1a	Change void to Void. Add invariant for 'object' , object_no_null /= Void	2008-08-08 11:04:33 +00:00
jvelilla	d64e01641b	Reformatted code to Eiffel Standard	2008-08-08 11:01:14 +00:00
berend	fa35ab07a0	Fixed bug where a JSON string had to end with CRLF. But that's optional. Reformatted code to Gobo standard.	2008-08-05 03:26:08 +00:00
berend	0bf10c633f	Reformatted code to Gobo standard.	2008-08-05 03:25:14 +00:00
jvelilla	bc1e6653ae	Add Regular expression to check valid numbers and valid unicodes. Add errors to the parser, under development	2008-07-13 03:30:54 +00:00
jvelilla	b9ccf20d53	Add explicit control characters.	2008-07-13 03:19:20 +00:00
jvelilla	3e7f107b36	Update json.ecf, Dependencies on Gobo Library. (Regular Expressions)	2008-07-13 03:17:37 +00:00
jvelilla	aa8c2d0a95	Update parse_number	2008-07-09 02:40:38 +00:00
jvelilla	65cd9e8780	Add new files to test ejson, based on json t test material http://www.json.org/JSON_checker/test.zip	2008-06-09 02:24:33 +00:00
jvelilla	cb595d27f4	Update JSON_OBJECT, put routine, now follows Eiffel Style based on HAST_TABLE	2008-06-09 02:18:34 +00:00
jvelilla	aaa10d178a	Update Parser with is_parsed. Update parse_string	2008-06-09 01:32:28 +00:00
jvelilla	1052c10b8d	Update test	2008-05-25 18:29:54 +00:00
jvelilla	3083f378a6	Update test	2008-05-25 18:28:40 +00:00
jvelilla	8357bf5d72	Update JSON_VALUE and JSON_OBJECT interface	2008-05-25 18:23:25 +00:00
jvelilla	8f3c7beba8	CDD classes	2008-05-25 00:03:46 +00:00
jvelilla	5a779fbb57	Add new test_json_object	2008-05-25 00:02:56 +00:00
jvelilla	4559b7fef5	Add new test_json_object	2008-05-25 00:00:43 +00:00
jvelilla	7dc33a52f6	Update JSON_STRING rutine is_equal Update JSON_OBJECT new features (has_keys, item,get_keys), and fixed an incorrect use of HASH_TABLE	2008-05-24 23:57:04 +00:00
jvelilla	de347f6c98	eJson tests initial import	2008-05-24 15:04:36 +00:00
jvelilla	308fa7f2e7	eJson initial import	2008-05-24 14:23:27 +00:00