From 82f832a556ba8c113df35e838260f39f5f0b8ad5 Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <git@djoce.net>
Date: Tue, 30 Sep 2014 10:46:12 +0200
Subject: [PATCH] Updated license and copyright. Updated classes with bottom
 indexing notes related to copyright and license.

---
 License.txt                                       |  3 ++-
 library/json-safe.ecf                             | 15 ++++++++-------
 library/kernel/json_array.e                       |  3 +++
 library/kernel/json_boolean.e                     |  3 +++
 library/kernel/json_null.e                        |  3 +++
 library/kernel/json_number.e                      |  3 +++
 library/kernel/json_object.e                      |  3 +++
 library/kernel/json_string.e                      |  3 +++
 library/kernel/json_value.e                       |  3 +++
 library/license.lic                               |  4 ++++
 library/parser/json_parser.e                      |  9 ++++++---
 library/parser/json_parser_access.e               |  3 +++
 library/parser/json_reader.e                      |  3 +++
 library/parser/json_tokens.e                      |  3 +++
 library/utility/file/json_file_reader.e           |  3 +++
 library/utility/visitor/json_iterator.e           |  3 +++
 .../utility/visitor/json_pretty_string_visitor.e  |  3 +++
 library/utility/visitor/json_visitor.e            |  3 +++
 library/utility/visitor/print_json_visitor.e      |  3 +++
 19 files changed, 65 insertions(+), 11 deletions(-)
 create mode 100644 library/license.lic

diff --git a/License.txt b/License.txt
index 8bf6765c..56c30878 100644
--- a/License.txt
+++ b/License.txt
@@ -1,4 +1,5 @@
-Copyright (c)  2010 Javier Velilla and others, http://ejson.origo.ethz.ch
+Copyright (c)  2010-2014 Javier Velilla and others,
+https://github.com/eiffelhub/json .
 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/library/json-safe.ecf b/library/json-safe.ecf
index f3a3bb52..8025f959 100644
--- a/library/json-safe.ecf
+++ b/library/json-safe.ecf
@@ -1,5 +1,6 @@
 <?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">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="json" uuid="4E21C3BD-7951-4C6E-A673-431E762D7414" library_target="json">
+	<description>JSON parser</description>
 	<target name="json">
 		<root all_classes="true"/>
 		<file_rule>
@@ -7,15 +8,15 @@
 			<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">
+		<option trace="false" profile="false" debug="false" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="transitional" syntax="standard" namespace="EJSON.Library">
 			<assertions/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf" readonly="true"/>
-		<cluster name="json" location=".\" >
-			<cluster name="json_kernel" location=".\kernel" recursive="true"/>
-			<cluster name="json_parser" location=".\parser" recursive="true"/>
-			<cluster name="json_utility" location=".\utility" recursive="true"/>
+		<cluster name="json" location=".\">
+			<cluster name="json_kernel" location=".\kernel\" recursive="true"/>
+			<cluster name="json_parser" location=".\parser\" recursive="true"/>
+			<cluster name="json_utility" location=".\utility\" recursive="true"/>
 		</cluster>
-		<cluster name="json_converter" location=".\converter" recursive="true"/>
+		<cluster name="json_converter" location=".\converter\" recursive="true"/>
 	</target>
 </system>
diff --git a/library/kernel/json_array.e b/library/kernel/json_array.e
index 2006c1e1..6b30b8fd 100644
--- a/library/kernel/json_array.e
+++ b/library/kernel/json_array.e
@@ -186,4 +186,7 @@ feature {NONE} -- Implementation
 invariant
 	items_not_void: items /= Void
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end
diff --git a/library/kernel/json_boolean.e b/library/kernel/json_boolean.e
index e642ed48..47b49979 100644
--- a/library/kernel/json_boolean.e
+++ b/library/kernel/json_boolean.e
@@ -81,4 +81,7 @@ feature -- Status report
 			Result := item.out
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end
diff --git a/library/kernel/json_null.e b/library/kernel/json_null.e
index 04130ce5..ad0a85fe 100644
--- a/library/kernel/json_null.e
+++ b/library/kernel/json_null.e
@@ -45,4 +45,7 @@ feature {NONE} -- Implementation
 
 	null_value: STRING = "null"
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end
diff --git a/library/kernel/json_number.e b/library/kernel/json_number.e
index ea72cf4c..84ccbf8f 100644
--- a/library/kernel/json_number.e
+++ b/library/kernel/json_number.e
@@ -143,4 +143,7 @@ feature -- Implementation
 invariant
 	item_not_void: item /= Void
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end
diff --git a/library/kernel/json_object.e b/library/kernel/json_object.e
index b5a0d44b..7b37ea1e 100644
--- a/library/kernel/json_object.e
+++ b/library/kernel/json_object.e
@@ -325,4 +325,7 @@ feature {NONE} -- Implementation
 invariant
 	items_not_void: items /= Void
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end
diff --git a/library/kernel/json_string.e b/library/kernel/json_string.e
index 1359c4bb..bf246f6a 100644
--- a/library/kernel/json_string.e
+++ b/library/kernel/json_string.e
@@ -500,4 +500,7 @@ feature {NONE} -- Implementation
 invariant
 	item_not_void: item /= Void
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end
diff --git a/library/kernel/json_value.e b/library/kernel/json_value.e
index f5a5fccf..a7fb0f43 100644
--- a/library/kernel/json_value.e
+++ b/library/kernel/json_value.e
@@ -40,4 +40,7 @@ feature -- Visitor pattern
 		deferred
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end
diff --git a/library/license.lic b/library/license.lic
new file mode 100644
index 00000000..4d58ac79
--- /dev/null
+++ b/library/license.lic
@@ -0,0 +1,4 @@
+${NOTE_KEYWORD}
+	copyright: "2010-${YEAR}, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
+
diff --git a/library/parser/json_parser.e b/library/parser/json_parser.e
index d607ddce..b513de80 100644
--- a/library/parser/json_parser.e
+++ b/library/parser/json_parser.e
@@ -1,8 +1,8 @@
 note
 	description: "Parse serialized JSON data"
-	author: "jvelilla"
-	date: "2008/08/24"
-	revision: "Revision 0.1"
+	author: "$Author$"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	JSON_PARSER
@@ -637,4 +637,7 @@ feature {NONE} -- Constants
 
 	null_id: STRING = "null"
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end
diff --git a/library/parser/json_parser_access.e b/library/parser/json_parser_access.e
index 19b8e815..ffc32d6e 100644
--- a/library/parser/json_parser_access.e
+++ b/library/parser/json_parser_access.e
@@ -6,4 +6,7 @@ note
 deferred class
 	JSON_PARSER_ACCESS
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end
diff --git a/library/parser/json_reader.e b/library/parser/json_reader.e
index 9cd3c2b0..3869ee9f 100644
--- a/library/parser/json_reader.e
+++ b/library/parser/json_reader.e
@@ -121,4 +121,7 @@ feature {NONE} -- Implementation
 invariant
 	representation_not_void: representation /= Void
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end
diff --git a/library/parser/json_tokens.e b/library/parser/json_tokens.e
index 7286f2b3..0374330f 100644
--- a/library/parser/json_tokens.e
+++ b/library/parser/json_tokens.e
@@ -84,4 +84,7 @@ feature -- Status report
 			Result := c = token_exp or else c.as_lower = token_exp
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end
diff --git a/library/utility/file/json_file_reader.e b/library/utility/file/json_file_reader.e
index cd3f4de3..53085adc 100644
--- a/library/utility/file/json_file_reader.e
+++ b/library/utility/file/json_file_reader.e
@@ -43,4 +43,7 @@ feature -- Access
 			end
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end
diff --git a/library/utility/visitor/json_iterator.e b/library/utility/visitor/json_iterator.e
index 3489ce85..9f09ee92 100644
--- a/library/utility/visitor/json_iterator.e
+++ b/library/utility/visitor/json_iterator.e
@@ -55,4 +55,7 @@ feature -- Visitor Pattern
 		do
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end
diff --git a/library/utility/visitor/json_pretty_string_visitor.e b/library/utility/visitor/json_pretty_string_visitor.e
index 3ac76617..65e69551 100644
--- a/library/utility/visitor/json_pretty_string_visitor.e
+++ b/library/utility/visitor/json_pretty_string_visitor.e
@@ -160,4 +160,7 @@ feature -- Visitor Pattern
 			output.append ("%"")
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end
diff --git a/library/utility/visitor/json_visitor.e b/library/utility/visitor/json_visitor.e
index a4fc6d3f..c1ae4031 100644
--- a/library/utility/visitor/json_visitor.e
+++ b/library/utility/visitor/json_visitor.e
@@ -53,4 +53,7 @@ feature -- Visitor Pattern
 		deferred
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end
diff --git a/library/utility/visitor/print_json_visitor.e b/library/utility/visitor/print_json_visitor.e
index 4dcd08a3..4265413e 100644
--- a/library/utility/visitor/print_json_visitor.e
+++ b/library/utility/visitor/print_json_visitor.e
@@ -101,4 +101,7 @@ feature -- Visitor Pattern
 			to_json.append ("%"")
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end